Cayo Puigdefabregas
|
eca2795857
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-05-05 18:52:59 +02:00 |
cayop
|
1a04b44dbe
|
Merge pull request #253 from eReuse/changes/#3327-drop-public-link-csv
drop download public links
|
2022-05-05 18:56:08 +02:00 |
|
Cayo Puigdefabregas
|
3ca7292448
|
drop download public links
|
2022-05-05 18:36:52 +02:00 |
|
cayop
|
3f9e771ad6
|
Merge pull request #252 from eReuse/feature/#3308-device-details
Feature/#3308 device details
|
2022-05-05 13:35:29 +02:00 |
|
Cayo Puigdefabregas
|
e34b591690
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-05-05 13:32:32 +02:00 |
|
Cayo Puigdefabregas
|
af30453c12
|
fix message of allocate bug
|
2022-05-05 13:10:02 +02:00 |
|
Cayo Puigdefabregas
|
33fd574f18
|
add lots tab in device details
|
2022-05-05 12:31:29 +02:00 |
|
Cayo Puigdefabregas
|
1c670641f4
|
add web: public link in device details page
|
2022-05-05 12:00:40 +02:00 |
|
Cayo Puigdefabregas
|
1023f3fdca
|
add public link in model
|
2022-05-05 12:00:02 +02:00 |
|
cayop
|
34f7989553
|
Merge pull request #251 from eReuse/bugfix/allocate-#3304
add checks of device.allocated
|
2022-05-05 11:37:06 +02:00 |
|
Cayo Puigdefabregas
|
9eda5c0466
|
add checks of device.allocated
|
2022-05-05 11:31:13 +02:00 |
|
cayop
|
ce32db6d37
|
Merge pull request #250 from eReuse/change/#3300-change-color-blue
add color in bordered navs links
|
2022-05-04 18:10:34 +02:00 |
|
Cayo Puigdefabregas
|
875fe7a340
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-05-04 18:07:23 +02:00 |
|
Cayo Puigdefabregas
|
9a74eabc23
|
add color in bordered navs links
|
2022-05-04 18:06:19 +02:00 |
|
Cayo Puigdefabregas
|
20fc9ded06
|
fix url response
|
2022-05-04 17:58:14 +02:00 |
|
Cayo Puigdefabregas
|
780b7d4ef2
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-05-04 17:56:30 +02:00 |
|
cayop
|
de53649aa8
|
Merge pull request #249 from eReuse/change/#3300-change-color-blue
fix sidebar
|
2022-05-04 17:43:53 +02:00 |
|
Cayo Puigdefabregas
|
074fd4e542
|
fix sidebar
|
2022-05-04 17:39:20 +02:00 |
|
cayop
|
9826185e26
|
Merge pull request #248 from eReuse/change/#3300-change-color-blue
fix login
|
2022-05-04 12:58:18 +02:00 |
|
Cayo Puigdefabregas
|
8cd2f22fcc
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-05-04 12:55:10 +02:00 |
|
Cayo Puigdefabregas
|
f2a85af1c2
|
fix login
|
2022-05-04 12:53:22 +02:00 |
|
cayop
|
bba1e57f13
|
Merge pull request #247 from eReuse/change/#3300-change-color-blue
change colors and log
|
2022-05-04 12:28:41 +02:00 |
|
Cayo Puigdefabregas
|
16b8b4c78f
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-05-04 12:25:44 +02:00 |
|
Cayo Puigdefabregas
|
8a6b0cde37
|
change colors and log
|
2022-05-04 12:23:04 +02:00 |
|
cayop
|
8591f061a8
|
Merge pull request #246 from eReuse/bugfix/change-lot-name
fix bug
|
2022-05-03 17:22:59 +02:00 |
|
Cayo Puigdefabregas
|
d2b63af17a
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-05-03 17:20:09 +02:00 |
|
Cayo Puigdefabregas
|
eaf8bdef65
|
fix bug
|
2022-05-03 17:00:02 +02:00 |
|
Cayo Puigdefabregas
|
db648a1bb0
|
fix render tests
|
2022-04-29 19:59:52 +02:00 |
|
Cayo Puigdefabregas
|
67ee1cdde8
|
resolve conflict
|
2022-04-29 19:26:44 +02:00 |
|
cayop
|
60a11794ae
|
Merge pull request #243 from eReuse/bugfix/#3288-common-lots
Bugfix/#3288 common lots
|
2022-04-29 19:25:55 +02:00 |
|
cayop
|
861515c46d
|
Merge pull request #229 from eReuse/feature/server-side-render-testing
Feature/server side render testing
|
2022-04-29 18:39:37 +02:00 |
|
Cayo Puigdefabregas
|
98ffe1092c
|
Merge branch 'testing' into bugfix/#3288-common-lots
|
2022-04-29 18:36:52 +02:00 |
|
Cayo Puigdefabregas
|
921049a28b
|
add more render basic tests
|
2022-04-29 18:23:05 +02:00 |
|
Cayo Puigdefabregas
|
7fe33f3a42
|
ass form errors in message
|
2022-04-29 17:53:59 +02:00 |
|
Cayo Puigdefabregas
|
322b340607
|
add fix test with redirects
|
2022-04-29 17:41:13 +02:00 |
|
Cayo Puigdefabregas
|
ef71eed27f
|
Merge branch 'testing' into feature/server-side-render-testing
|
2022-04-29 13:12:09 +02:00 |
|
Cayo Puigdefabregas
|
ad0ced98e4
|
refactor common context
|
2022-04-29 13:10:44 +02:00 |
|
Cayo Puigdefabregas
|
02bfeea2fc
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-04-29 11:39:04 +02:00 |
|
Cayo Puigdefabregas
|
9f8f5ec9e0
|
fix unique identifier
|
2022-04-29 11:38:47 +02:00 |
|
Cayo Puigdefabregas
|
112f459db3
|
resolve conflict
|
2022-04-29 11:09:18 +02:00 |
 Santiago L
|
c176659cbe
|
Merge pull request #238 from eReuse/feature/#3262-customize-labels
Feature/#3262 customize labels
|
2022-04-29 09:09:49 +02:00 |
|
Cayo Puigdefabregas
|
c82f173edf
|
resolve conflict
|
2022-04-28 18:47:56 +02:00 |
|
cayop
|
09c5126b0c
|
Merge pull request #239 from eReuse/change/#3202-change-tag-for-unique-identifier
change tags for unique identifiers
|
2022-04-28 18:47:55 +02:00 |
|
Cayo Puigdefabregas
|
d8a44c661a
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-04-28 18:45:51 +02:00 |
|
Cayo Puigdefabregas
|
c14d8482be
|
Merge branch 'testing' into change/#3202-change-tag-for-unique-identifier
|
2022-04-28 18:32:39 +02:00 |
|
cayop
|
a5bc694d86
|
Merge pull request #242 from eReuse/feature/add-column-type-in-devices-list
add icons types of devices in list of devices
|
2022-04-28 18:19:09 +02:00 |
|
Cayo Puigdefabregas
|
7362eb4492
|
add computer monitor
|
2022-04-28 17:56:00 +02:00 |
|
Cayo Puigdefabregas
|
3a5e806104
|
add icons types of devices in list of devices
|
2022-04-28 17:46:12 +02:00 |
|
Santiago L
|
293364acfb
|
Merge pull request #222 from eReuse/feature/extend-user-datas-#3016
Feature: allow user to update its password #3016
|
2022-04-28 12:08:00 +02:00 |
|
Santiago L
|
d0e033197c
|
Drop Agent.get_full_name because is unused
|
2022-04-28 12:06:43 +02:00 |