Commit graph

768 commits

Author SHA1 Message Date
Cayo Puigdefabregas af1cb704d5 fixing aspect_ratio 2020-12-17 16:52:42 +01:00
cayop 392fff2ac5
Merge pull request #85 from eReuse/feature/84-new-hid
Feature/84 new hid
2020-12-17 16:11:59 +01:00
Cayo Puigdefabregas 882da7b9b1 . 2020-12-17 16:03:10 +01:00
Cayo Puigdefabregas c480e96f79 drop required in monitor too 2020-12-17 15:09:21 +01:00
Cayo Puigdefabregas b8812f0b82 change required for display, functionality and apparence 2020-12-17 13:08:06 +01:00
Cayo Puigdefabregas 36cd61c0bd simplify token in search 2020-12-17 11:35:55 +01:00
Cayo Puigdefabregas 5241c73a98 not required chassis in all system 2020-12-17 10:45:01 +01:00
Cayo Puigdefabregas aef220a5dc chassis not required 2020-12-16 22:05:33 +01:00
Cayo Puigdefabregas b1c141e02b migration nullable chassis 2020-12-16 12:06:19 +01:00
Cayo Puigdefabregas 349170aa99 nullable chassis 2020-12-16 11:57:51 +01:00
Cayo Puigdefabregas 48d866b2d5 allembic for upgrade datas for actual hid's computers 2020-12-15 20:52:41 +01:00
Cayo Puigdefabregas de2539091c allembic for upgrade datas for actual hid's computers 2020-12-15 20:45:47 +01:00
Cayo Puigdefabregas b23b4d9e2a change version in this branch 2020-12-10 11:15:12 +01:00
Cayo Puigdefabregas 2e11a9f28f resolve conflict CHANGELOG 2020-12-10 11:13:12 +01:00
cayop 2cb4d6e406
Merge pull request #91 from eReuse/bugfix/88-action-end_time
Bugfix/88 action end time
2020-12-10 11:11:22 +01:00
Cayo Puigdefabregas 18993c557c CHANGELOG.md 2020-12-10 11:03:36 +01:00
Cayo Puigdefabregas 51d0bd0cc0 Merge branch 'testing' into bugfix/88-action-end_time 2020-12-10 10:54:11 +01:00
Cayo Puigdefabregas 73a08d6770 CHANGELOG 2020-12-10 10:41:02 +01:00
Cayo Puigdefabregas 729281383e resolve conflicts 2020-12-10 10:30:50 +01:00
Cayo Puigdefabregas 5d6a84a18f adding CHANGELOG file 2020-12-10 10:22:51 +01:00
cayop 5b95cb9ae0
Merge pull request #83 from eReuse/feature/77-add-owner-device
Feature/77 add owner device
2020-12-10 10:19:40 +01:00
Cayo Puigdefabregas 14e974781e fixing bugs 2020-12-09 19:54:24 +01:00
Cayo Puigdefabregas 09d92e818c fixed the TODO of live action 2020-12-09 13:28:50 +01:00
Cayo Puigdefabregas 16132414e6 fixing bug in query 2020-12-09 12:49:56 +01:00
Cayo Puigdefabregas 634806ec1c fixing security query in live action 2020-12-09 12:37:20 +01:00
Cayo Puigdefabregas 2c67e3be93 resolve conflict 2020-12-09 12:32:00 +01:00
Cayo Puigdefabregas 30ef4e594f fixing test 2020-12-09 12:06:43 +01:00
Cayo Puigdefabregas 4a147a50b7 fixing test 2020-12-09 12:05:22 +01:00
Cayo Puigdefabregas 68a8f70de4 resolve conflict 2020-12-09 11:29:10 +01:00
Cayo Puigdefabregas eaa20b4302 fixing conflict merge with testing 2020-12-09 11:12:47 +01:00
cayop f0c17ebd81
Merge pull request #90 from eReuse/bugfix/89-snapshots-in-hdd
Bugfix/89 snapshots in hdd
2020-12-09 10:31:32 +01:00
Cayo Puigdefabregas 2daee4ddd8 update version 2020-12-09 10:23:58 +01:00
Cayo Puigdefabregas e2446c5001 Merge branch 'testing' into bugfix/89-snapshots-in-hdd 2020-12-09 10:11:45 +01:00
cayop c3e78c1f49
Merge pull request #87 from eReuse/feature/renting
Allocate, Deallocate and Live actions
2020-12-05 20:30:00 +01:00
Cayo Puigdefabregas 2a57c436bd fixed comment in debug 2020-12-05 20:22:38 +01:00
Cayo Puigdefabregas 835f875e2e fixed comments 2020-12-04 19:33:05 +01:00
Cayo Puigdefabregas 7e41c66073 implementing the warnings and unnormal cases 2020-12-04 16:58:53 +01:00
Cayo Puigdefabregas c03d872d91 fixed bug hid == None 2020-12-02 13:15:21 +01:00
Cayo Puigdefabregas 8a508ebc0e modify live action 2020-12-02 12:53:15 +01:00
Cayo Puigdefabregas 4d9420d1e9 adding final user and timings as property instead of insert this datas in the database 2020-12-01 22:03:15 +01:00
Cayo Puigdefabregas 783265ad65 adding finale user to live action 2020-12-01 17:27:43 +01:00
Cayo Puigdefabregas 05c81382f2 change comment of allocated 2020-12-01 15:55:21 +01:00
Cayo Puigdefabregas 567a575e36 Merge branch 'feature/renting' of https://github.com/eReuse/devicehub-teal into feature/renting 2020-12-01 15:53:51 +01:00
Cayo Puigdefabregas 1e597cdb93 clean code 2020-12-01 15:48:49 +01:00
Cayo Puigdefabregas 70733db95d fixing bugs 2020-12-01 15:45:19 +01:00
Cayo Puigdefabregas 92c403579b ading finalUserCode to allocate action 2020-12-01 15:33:49 +01:00
Cayo Puigdefabregas b8a7a993ab adding snapshot file for test 2020-11-30 21:42:42 +01:00
Cayo Puigdefabregas 11c1363d04 fixing tests 2020-11-30 21:18:24 +01:00
Cayo Puigdefabregas 0fa7930d88 fixing bug 2020-11-30 21:18:10 +01:00
Cayo Puigdefabregas 4a217634c7 change code for transaction 2020-11-30 18:47:17 +01:00