Commit Graph

3194 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 0ae12e71a6 Merge branch 'master' into testing 2022-11-14 10:23:32 +01:00
cayop 4bf27706db
Merge pull request #404 from eReuse/bugfix/4074-table-row
fixing table.rows()
2022-11-14 10:24:46 +01:00
Cayo Puigdefabregas 17df239599 fixing table.rows() 2022-11-14 10:00:33 +01:00
cayop 3809ae76e1
Merge pull request #403 from eReuse/bugfix/4073-obada
change delimiter
2022-11-11 18:58:36 +01:00
Cayo Puigdefabregas efa9693f16 fixing obada test 2022-11-11 18:34:41 +01:00
Cayo Puigdefabregas b99be1a144 change delimiter 2022-11-11 18:26:15 +01:00
cayop 6addddd974
Merge pull request #402 from eReuse/feature/add-reset-password-link
add reset password link in login page
2022-11-11 18:03:06 +01:00
Cayo Puigdefabregas 79dff1d361 add reset password link in login page 2022-11-11 17:42:29 +01:00
cayop cf5a7651a0
Merge pull request #401 from eReuse/bugfix/4042-new-var-in-environment
fix db_host
2022-11-08 18:59:33 +01:00
Cayo Puigdefabregas 25f2287e98 fix db_host 2022-11-08 18:35:47 +01:00
cayop fe33f2d7e7
Merge pull request #400 from eReuse/bugfix/4046-drop-register-user
remove user_registration
2022-11-08 18:12:56 +01:00
Cayo Puigdefabregas 2c01183604 fix test_basic 2022-11-08 17:52:14 +01:00
Cayo Puigdefabregas 1b7d37b50a drop register in tests 2022-11-08 17:37:10 +01:00
Cayo Puigdefabregas 4df33e8808 remove user_registration 2022-11-08 13:32:29 +01:00
cayop 48de1d5f47
Merge pull request #399 from eReuse/bugfix/4042-new-var-in-environment
put api_host in config
2022-11-07 17:34:19 +01:00
Cayo Puigdefabregas 79877d09a1 put api_host in config 2022-11-07 17:08:03 +01:00
cayop 3d658a9051
Merge pull request #398 from eReuse/bugfix/4028-placeholder-in-new-components
Bugfix/4028 placeholder in new components
2022-11-07 11:57:03 +01:00
Cayo Puigdefabregas 41eb390e39 Merge branch 'master' into testing 2022-11-07 11:56:16 +01:00
Cayo Puigdefabregas d8541d917c fix orohans storage with parents 2022-11-07 11:25:01 +01:00
cayop 375a2de5c1
Merge pull request #397 from eReuse/feature/4023-obada
add obada standard
2022-11-04 15:27:34 +01:00
Cayo Puigdefabregas b2205c56f9 add obada standard 2022-11-04 10:37:56 +01:00
cayop c784fb7499
Merge pull request #396 from eReuse/changes/3853-report
Changes/3853 report
2022-11-03 23:56:57 +01:00
Cayo Puigdefabregas 09a0a30386 fixing bug 2022-11-03 18:19:56 +01:00
Cayo Puigdefabregas c14f40fccb add test 2022-11-03 17:49:18 +01:00
Cayo Puigdefabregas 74d10e1951 add test 2022-11-03 17:49:01 +01:00
Cayo Puigdefabregas 6ee62eb415 test 2022-11-03 13:28:49 +01:00
Cayo Puigdefabregas 6c7ae1bb75 remove report of devicehub commands 2022-11-02 19:44:39 +01:00
Cayo Puigdefabregas eae036d7c0 remove internal stats of actual devicehub 2022-11-02 12:00:39 +01:00
Cayo Puigdefabregas 1cb0634bf1 add ignore files 2022-11-02 09:57:50 +01:00
cayop 3a7a8d6e1d
Merge pull request #395 from eReuse/changes/3943-wb-response
change response
2022-10-28 16:41:24 +02:00
Cayo Puigdefabregas 04a3ec99de change response 2022-10-28 14:08:51 +02:00
cayop 2252fe93cd
Merge pull request #393 from eReuse/features/3969-improvements-login
Features/3969 improvements login
2022-10-28 10:40:44 +02:00
Cayo Puigdefabregas 67cfac6adc fix tests 2022-10-28 10:08:11 +02:00
Cayo Puigdefabregas 4bbec903ef refactor in a module register 2022-10-27 20:10:08 +02:00
Cayo Puigdefabregas 7041bfcf76 change email text 2022-10-27 18:22:54 +02:00
Cayo Puigdefabregas 045b7b4f95 fix test login 2022-10-27 10:43:08 +02:00
Cayo Puigdefabregas 61f2507ead new login style 2022-10-26 18:04:16 +02:00
cayop eb1649f506
Merge pull request #391 from eReuse/feature/3959-dhid-in-erasure
add dhid as column in erasure section
2022-10-26 12:08:07 +02:00
Cayo Puigdefabregas 44985d07a1 add dhid as column in erasure section 2022-10-26 11:26:09 +02:00
cayop 0aa4696fe0
Merge pull request #390 from eReuse/bugfix/edit-placeholder
fix image in edit device
2022-10-26 10:03:56 +02:00
Cayo Puigdefabregas 563e2ec652 Merge branch 'master' into testing 2022-10-26 10:03:07 +02:00
Cayo Puigdefabregas 7c4a3bd770 tests 2022-10-26 09:43:01 +02:00
Cayo Puigdefabregas e30990cc1b fix render image None 2022-10-26 09:33:28 +02:00
Cayo Puigdefabregas 2a8da254d9 fix image in edit device 2022-10-25 17:54:58 +02:00
Cayo Puigdefabregas 9a157eaaee Merge branch 'master' into testing 2022-10-25 16:49:32 +02:00
cayop dfdbf8f1f7
Merge pull request #389 from eReuse/bugfix/3960-datastorage-details
Bugfix/3960 datastorage details
2022-10-25 16:40:53 +02:00
Cayo Puigdefabregas 694663c412 add script for rebuild disks without placeholder 2022-10-25 15:09:03 +02:00
Cayo Puigdefabregas 9d7869929c fix disks without placeholder 2022-10-25 11:10:39 +02:00
Cayo Puigdefabregas 4c2f37dfec resolve conflict 2022-10-24 18:33:40 +02:00
cayop 95ac4e794b
Merge pull request #388 from eReuse/bugfix/3962-system-uuid
2 computers with diferents motherboard with the same system-uuid
2022-10-24 18:27:46 +02:00