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
|
349170aa99
|
nullable chassis
|
2020-12-16 11:57:51 +01:00 |
|
Cayo Puigdefabregas
|
2e11a9f28f
|
resolve conflict CHANGELOG
|
2020-12-10 11:13:12 +01:00 |
|
Cayo Puigdefabregas
|
51d0bd0cc0
|
Merge branch 'testing' into bugfix/88-action-end_time
|
2020-12-10 10:54:11 +01:00 |
|
Cayo Puigdefabregas
|
729281383e
|
resolve conflicts
|
2020-12-10 10:30:50 +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
|
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 |
|
Cayo Puigdefabregas
|
e2446c5001
|
Merge branch 'testing' into bugfix/89-snapshots-in-hdd
|
2020-12-09 10:11:45 +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
|
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 |
|
Cayo Puigdefabregas
|
23abf3e08d
|
change code for transaction
|
2020-11-30 18:17:47 +01:00 |
Jordi Nadeu
|
c140a58ca2
|
Update models.pyi of actions Allocate and Deallocate
|
2020-11-30 17:42:02 +01:00 |
|
Cayo Puigdefabregas
|
dd42b10ba5
|
search the bug
|
2020-11-30 16:37:52 +01:00 |
|
Cayo Puigdefabregas
|
a9f6e9ccaa
|
fixing bug
|
2020-11-28 18:47:35 +01:00 |
|
Cayo Puigdefabregas
|
4172711c93
|
change the endpoints for allocate and deallocate
|
2020-11-27 18:10:51 +01:00 |
|
Cayo Puigdefabregas
|
daeae1b4b4
|
fixed deallocate code bug
|
2020-11-26 19:08:07 +01:00 |
|
Cayo Puigdefabregas
|
988f5c1751
|
fixed dates
|
2020-11-26 18:51:36 +01:00 |
|
Cayo Puigdefabregas
|
b072bc3b57
|
change allocate and deallocate
|
2020-11-26 18:44:08 +01:00 |
|
Cayo Puigdefabregas
|
ef563e3595
|
resolve confict
|
2020-11-25 19:09:24 +01:00 |
|
Cayo Puigdefabregas
|
0c1e5b8307
|
changes from review
|
2020-11-25 18:42:36 +01:00 |
|
Cayo Puigdefabregas
|
ab7bf75bd7
|
new version of fixed with suppress
|
2020-11-25 17:57:43 +01:00 |
|
Cayo Puigdefabregas
|
2ed3e3f77f
|
fixing LookupError of metrics
|
2020-11-25 17:46:58 +01:00 |
|
Cayo Puigdefabregas
|
4421db3858
|
clean metrics with views
|
2020-11-25 13:58:53 +01:00 |
|
Cayo Puigdefabregas
|
4657a3bcf9
|
clean metrics
|
2020-11-25 13:58:32 +01:00 |
|
Cayo Puigdefabregas
|
413ce7d76c
|
adding metrics
|
2020-11-24 21:15:49 +01:00 |
|
Cayo Puigdefabregas
|
87704db271
|
adding live into snapshot and adding test
|
2020-11-24 13:44:49 +01:00 |
|
Cayo Puigdefabregas
|
8999b6e9a5
|
adding migration for live
|
2020-11-23 18:42:31 +01:00 |
|
Cayo Puigdefabregas
|
8b4c27dfe2
|
modify live model
|
2020-11-23 18:35:50 +01:00 |
|
Cayo Puigdefabregas
|
6334120237
|
Adding endpoint of metrics
|
2020-11-23 18:03:06 +01:00 |
|
Cayo Puigdefabregas
|
60579437bb
|
resolve conflict
|
2020-11-23 16:32:06 +01:00 |
|
Cayo Puigdefabregas
|
3e8eb03b58
|
fixing bug
|
2020-11-23 15:53:56 +01:00 |
|
Cayo Puigdefabregas
|
78c1f13260
|
clean code
|
2020-11-23 15:53:25 +01:00 |
|
Cayo Puigdefabregas
|
73716a7331
|
fixing tests
|
2020-11-23 11:43:30 +01:00 |
|
Cayo Puigdefabregas
|
ee70288432
|
validate errors of allocate in scheme instead of signal
|
2020-11-22 18:47:58 +01:00 |
|
Cayo Puigdefabregas
|
0e53919607
|
listener
|
2020-11-21 19:10:31 +01:00 |
|
Cayo Puigdefabregas
|
775cd9a215
|
fixing bugs
|
2020-11-21 15:52:29 +01:00 |
|
Cayo Puigdefabregas
|
0415b7efb9
|
deallocate
|
2020-11-21 13:17:23 +01:00 |
|
Cayo Puigdefabregas
|
32a17decd7
|
remove receives
|
2020-11-20 18:16:56 +01:00 |
|
Cayo Puigdefabregas
|
67d7e27cf9
|
adding view of receives
|
2020-11-19 21:04:14 +01:00 |
|
Cayo Puigdefabregas
|
a1eb0f4c90
|
end point receive
|
2020-11-19 17:00:30 +01:00 |
|
Cayo Puigdefabregas
|
c75cdb2c60
|
fixed model receive
|
2020-11-19 17:00:04 +01:00 |
|
Cayo Puigdefabregas
|
13ee6d09e6
|
adding acctions into receives
|
2020-11-19 15:50:21 +01:00 |
|
Cayo Puigdefabregas
|
cf3d44a5e3
|
adding receives
|
2020-11-19 15:25:56 +01:00 |
|
Cayo Puigdefabregas
|
11d766d2a4
|
remove deallocate view
|
2020-11-19 11:38:41 +01:00 |
|
Cayo Puigdefabregas
|
200974e8f6
|
remove deallocate
|
2020-11-19 11:36:09 +01:00 |
|
Cayo Puigdefabregas
|
5adfad8a5e
|
adding deallocate
|
2020-11-18 19:00:43 +01:00 |
|
Cayo Puigdefabregas
|
16735d0199
|
change assigned for allocate
|
2020-11-18 18:13:13 +01:00 |
|
Cayo Puigdefabregas
|
64fe93491c
|
change name rent resource for assigned
|
2020-11-18 11:31:23 +01:00 |
|
Cayo Puigdefabregas
|
69368a8ca3
|
rent with assigned concept
|
2020-11-17 19:21:32 +01:00 |
|
Cayo Puigdefabregas
|
820e253a12
|
new version of rent as asigned
|
2020-11-17 13:19:50 +01:00 |
|
Cayo Puigdefabregas
|
b6f2dedaeb
|
adding changelog
|
2020-11-16 20:37:35 +01:00 |
|
Cayo Puigdefabregas
|
8acca4d2cf
|
definition rent endpoint
|
2020-11-16 20:32:28 +01:00 |
|
Cayo Puigdefabregas
|
0ab8a36832
|
bugfix with none in the mac serial
|
2020-11-13 11:05:00 +01:00 |
|
Cayo Puigdefabregas
|
791308d8e8
|
modify hid when create the snapshot
|
2020-11-12 21:00:07 +01:00 |
|
Cayo Puigdefabregas
|
a122753e34
|
when add or remove components check again the hid
|
2020-11-12 20:58:38 +01:00 |
|
Cayo Puigdefabregas
|
82a3344965
|
centralized in one point the hid
|
2020-11-12 20:57:33 +01:00 |
|
Cayo Puigdefabregas
|
554ec254d8
|
identation problem
|
2020-11-11 16:59:30 +01:00 |
|
Cayo Puigdefabregas
|
17f1ff98e7
|
adding update hid when insert one manual or automatic snapshot
|
2020-11-11 16:53:41 +01:00 |
|
Cayo Puigdefabregas
|
0a7e805f3e
|
clean events from device models
|
2020-11-11 16:52:02 +01:00 |
|
Cayo Puigdefabregas
|
cbe6bb7e90
|
adding mac of networkadapter to hid
|
2020-11-10 20:45:03 +01:00 |
|
Cayo Puigdefabregas
|
725e586e85
|
Merge branch 'testing' into bugfix/79-manual-merge
|
2020-11-09 16:11:12 +01:00 |
|
Cayo Puigdefabregas
|
fb899b558f
|
Merge branch 'testing' into feature/77-add-owner-device
|
2020-11-06 21:26:43 +01:00 |
|
Cayo Puigdefabregas
|
3eecdb4a1e
|
filter from owners in get private device or redirect to public and filter devices from owner the manual merge
|
2020-11-06 17:13:37 +01:00 |
|
Cayo Puigdefabregas
|
8a471c98c0
|
todo an automatic merge with sync only of your devices
|
2020-11-06 17:10:32 +01:00 |
|
Cayo Puigdefabregas
|
52bd6d5271
|
fixed similar_one for get only from your devices
|
2020-11-06 17:09:39 +01:00 |
|
Cayo Puigdefabregas
|
9b25132c29
|
fixed bug for use filters from the website
|
2020-11-04 17:30:12 +01:00 |
|
Cayo Puigdefabregas
|
50a7b59957
|
fixed bug: owner_id is not a physical property
|
2020-11-03 20:26:03 +01:00 |
|
Cayo Puigdefabregas
|
5ac1e8efba
|
adding manually migrate and change model of device
|
2020-10-30 21:08:55 +01:00 |
|
Cayo Puigdefabregas
|
19eca48db0
|
resolve conflict
|
2020-10-29 19:19:33 +01:00 |
cayop
|
f7f7432c4e
|
Merge pull request #81 from eReuse/bugfix/74-json-backup-time-in-name
Bugfix/74 json backup time in name
|
2020-10-29 19:08:31 +01:00 |
|
Cayo Puigdefabregas
|
5f68803d9f
|
adding the directory structure for save all jsons
|
2020-10-29 16:09:02 +01:00 |
|
cayop
|
6d4a7e7abb
|
Merge pull request #72 from eReuse/bugfix/64-bug-updated-date
Bugfix/64 bug updated date
|
2020-10-29 13:23:58 +01:00 |
|
Cayo Puigdefabregas
|
b2c258b699
|
fixed mark time correctly in the name file of json
|
2020-10-29 12:10:12 +01:00 |
|
Cayo Puigdefabregas
|
73d9db3a88
|
fixing bug moving tags
|
2020-10-28 22:15:28 +01:00 |
|
Jordi Nadeu
|
25f3cdb172
|
Merge pull request #71 from eReuse/bugfix/69-ereuseprice-computer-type
Bugfix/69 ereuseprice computer type
|
2020-10-28 17:59:37 +01:00 |
|
Cayo Puigdefabregas
|
fe3f038218
|
refactoring and fixing some problems of manual merge
|
2020-10-28 13:30:22 +01:00 |
|
Cayo Puigdefabregas
|
1400d292ce
|
refactoring
|
2020-10-27 21:29:38 +01:00 |
|
Cayo Puigdefabregas
|
19279acaeb
|
clean view of merge
|
2020-10-27 19:13:31 +01:00 |
|
Cayo Puigdefabregas
|
ab1d268f14
|
rebuild the query for more post structured
|
2020-10-27 19:12:46 +01:00 |
|
Cayo Puigdefabregas
|
b10ed84836
|
adding columns rate when no there are rate
|
2020-10-23 10:27:16 +02:00 |
|
Cayo Puigdefabregas
|
20f2300ce1
|
modify the pull requirements
|
2020-10-22 15:54:01 +02:00 |
|
Cayo Puigdefabregas
|
1f4d30df32
|
rebuild rows with all new collumns
|
2020-10-21 22:11:55 +02:00 |