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 |
|
Cayo Puigdefabregas
|
73d9db3a88
|
fixing bug moving tags
|
2020-10-28 22:15:28 +01:00 |
|
Cayo Puigdefabregas
|
5717743d2f
|
bug for moving tags
|
2020-10-28 22:15:04 +01:00 |
|
Cayo Puigdefabregas
|
3af8880bcd
|
fixed endpoints of basic test
|
2020-10-28 21:57:24 +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
|
0106728e4f
|
complet test for basic manual merge
|
2020-10-28 13:29:45 +01:00 |
|
Cayo Puigdefabregas
|
1400d292ce
|
refactoring
|
2020-10-27 21:29:38 +01:00 |
|
Cayo Puigdefabregas
|
889ee84f6a
|
base of test merge
|
2020-10-27 19:14:23 +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 |
|
cayop
|
02b18ff115
|
Merge pull request #76 from eReuse/bigfix/csv-export
adding columns rate when no there are rate
|
2020-10-23 10:34:24 +02:00 |
|
Cayo Puigdefabregas
|
b10ed84836
|
adding columns rate when no there are rate
|
2020-10-23 10:27:16 +02:00 |
|
Jordi Nadeu
|
6ee93f36cc
|
Merge pull request #75 from eReuse/feature/#1851-Extended-Export-CSV-file
Feature/#1851 extended export csv file
|
2020-10-22 17:21:55 +02:00 |
|
Jordi Nadeu
|
5c6803a467
|
Update proposal_extended_csv_report.csv
|
2020-10-22 17:15:14 +02:00 |
|
Jordi Nadeu
|
95bea41f02
|
Update complete.export.snapshot.yaml
Change endTime EraseSectors to make sense
|
2020-10-22 16:57:42 +02:00 |
|
Cayo Puigdefabregas
|
4847bdd19d
|
change test for new csv
|
2020-10-22 15:54:42 +02:00 |
|
Cayo Puigdefabregas
|
20f2300ce1
|
modify the pull requirements
|
2020-10-22 15:54:01 +02:00 |
|
Cayo Puigdefabregas
|
216e748594
|
fixed test
|
2020-10-21 23:18:53 +02:00 |
|
Cayo Puigdefabregas
|
a7c5460925
|
fixed test
|
2020-10-21 23:11:13 +02:00 |
|
Cayo Puigdefabregas
|
0a447ad816
|
fixed test
|
2020-10-21 23:04:49 +02:00 |