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
|
9f1564a533
|
add column inuse to device table
|
2020-11-18 19:15:30 +01:00 |
|
|
Cayo Puigdefabregas
|
5adfad8a5e
|
adding deallocate
|
2020-11-18 19:00:43 +01:00 |
|
|
Cayo Puigdefabregas
|
cc6f16934d
|
fixing migrations
|
2020-11-18 18:21:22 +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
|
e0b338b414
|
add migration file for assigned action
|
2020-11-17 13:36:26 +01:00 |
|
|
Cayo Puigdefabregas
|
820e253a12
|
new version of rent as asigned
|
2020-11-17 13:19:50 +01:00 |
|
cayop
|
1a7c58f006
|
Merge pull request #80 from eReuse/bugfix/79-manual-merge
Bugfix/79 manual merge
|
2020-11-16 20:46:36 +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
|
86f37d0cf1
|
test of merge 2 devices with 2 diferents tags one for device
|
2020-11-09 16:32:06 +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
|
2055af222d
|
checking if 2 users find the same computer but registered 2 times
|
2020-11-06 21:01:29 +01:00 |
|
|
Cayo Puigdefabregas
|
bc5cbb2eff
|
same computer saved from diferents users
|
2020-11-06 20:48:09 +01:00 |
|
|
Cayo Puigdefabregas
|
bc923d5576
|
fixed test for check with owners
|
2020-11-06 17:14:16 +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
|
af9fe2d6b6
|
fixing tests
|
2020-11-05 16:31:57 +01:00 |
|
|
Cayo Puigdefabregas
|
81da7cb9a8
|
rm migration_owners.py
|
2020-11-04 20:23:12 +01:00 |
|
|
Cayo Puigdefabregas
|
dac0d1d32f
|
adding migration of datas in migrate file
|
2020-11-04 20:22:31 +01:00 |
|
|
Cayo Puigdefabregas
|
8145e606db
|
migration script
|
2020-11-04 17:31:14 +01:00 |
|
|
Cayo Puigdefabregas
|
ed93fa7b29
|
update the datas in the migration process
|
2020-11-04 17:30:46 +01:00 |
|
|
Cayo Puigdefabregas
|
9b25132c29
|
fixed bug for use filters from the website
|
2020-11-04 17:30:12 +01:00 |
|
|
Cayo Puigdefabregas
|
abe7783b93
|
fixed tests_devices
|
2020-11-03 20:26:32 +01:00 |
|
|
Cayo Puigdefabregas
|
50a7b59957
|
fixed bug: owner_id is not a physical property
|
2020-11-03 20:26:03 +01:00 |
|
|
Cayo Puigdefabregas
|
f043d66591
|
migration file for add owner into device tables
|
2020-11-03 19:34:58 +01:00 |
|
|
cayop
|
71f860cef0
|
Merge pull request #82 from eReuse/feature/78-adding-debug-in-snapshot
Feature/78 adding debug in snapshot
|
2020-11-03 13:13:57 +01:00 |
|
|
Cayo Puigdefabregas
|
ed8522c96a
|
script for set the owners to components from parent device
|
2020-10-30 21:39: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
|
2dbcd2e7e2
|
add the snapshot file for test of debug
|
2020-10-29 17:50:52 +01:00 |
|
|
Cayo Puigdefabregas
|
ed32f691f7
|
fixing test for new structure and adding debug test
|
2020-10-29 16:09:38 +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
|
785d8091ea
|
adding new test for check the debug file
|
2020-10-29 12:39:11 +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
|
954dfa95a1
|
check in test this bug about time in the filename
|
2020-10-29 11:59:53 +01:00 |
|