trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,668 Commits 19 Branches 14 Tags 7.2 MiB
Commit Graph

1127 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 68269c4b21 device details 2022-01-13 16:08:55 +01:00
Cayo Puigdefabregas 3463d63f31 changes redirect static for reffered 2022-01-12 21:02:47 +01:00
Cayo Puigdefabregas 2cfe8a44c6 fix order of tags and change code for id 2022-01-12 20:45:49 +01:00
Cayo Puigdefabregas 97f450a07c ordered list of devices 2022-01-12 20:40:57 +01:00
Cayo Puigdefabregas bdc518b949 fixing create lot id 2022-01-12 20:26:37 +01:00
Cayo Puigdefabregas aba5b9dc3b confirmation dialog when deleting a lot 2022-01-12 20:26:14 +01:00
Cayo Puigdefabregas 18fc0e6e5b add lots in create or update lot views 2022-01-12 19:44:10 +01:00
Cayo Puigdefabregas d6dd740142 split LotView in LotCreateView and LotUpdateView 2022-01-12 17:09:20 +01:00
Cayo Puigdefabregas e0e4ecfd2d replace Temporal for Temporary 2022-01-12 16:52:55 +01:00
Cayo Puigdefabregas 387a37ecfe add template allocate 2022-01-11 13:42:38 +01:00
Cayo Puigdefabregas 849e482d62 add named tags 2022-01-11 13:42:01 +01:00
Cayo Puigdefabregas 4e43076c04 add tag list 2022-01-11 13:13:57 +01:00
Cayo Puigdefabregas 062eed3d98 unassigned have only the devices than not exist in any lot 2022-01-11 11:46:47 +01:00
Cayo Puigdefabregas c213bddb8c fix a main_inventory 2022-01-11 11:21:17 +01:00
Cayo Puigdefabregas 8303054706 adding deltatime in allocate form 2022-01-11 10:32:04 +01:00
Cayo Puigdefabregas 5eb8a5a4b9 allocate formulary 2022-01-10 15:53:11 +01:00
Cayo Puigdefabregas 86d607800a allocate form 2022-01-10 13:27:27 +01:00
Cayo Puigdefabregas b191b155fd action form standart 2022-01-10 13:07:05 +01:00
Cayo Puigdefabregas a2c3741002 fix click in modal action page 2022-01-10 10:33:41 +01:00
Cayo Puigdefabregas fd00a3ec34 add view, lot and type in formulary new action 2022-01-05 16:00:13 +01:00
Cayo Puigdefabregas 7d341c7d64 adding rendering template for new action 2022-01-05 12:13:44 +01:00
Cayo Puigdefabregas 483f674957 adding edit lot and fix bug of session.commit 2022-01-05 11:10:32 +01:00
Cayo Puigdefabregas 18fead559c first step for render actions view 2022-01-04 12:56:28 +01:00
Cayo Puigdefabregas 8333d6804c Merge branch 'feature/server-side-render-devices' of github.com:eReuse/devicehub-teal into feature/server-side-render-devices 2022-01-04 12:45:36 +01:00
Cayo Puigdefabregas a518e4ebf8 fixing bug when create a new lot 2022-01-04 12:45:13 +01:00
Santiago L c2a058bf51 Merge branch 'feature/server-side-render' into feature/server-side-render-devices 2022-01-04 12:00:15 +01:00
Santiago L e1786ddcb2 Refactor: store current user on `before_request()` 2022-01-04 11:59:03 +01:00
Cayo Puigdefabregas 5b9a9d482d template necessary for create a new lot 2022-01-03 13:41:24 +01:00
Cayo Puigdefabregas 1acd3c4929 refactoring actions of javascript 2022-01-03 13:40:30 +01:00
Cayo Puigdefabregas 5bfe1584b9 add actions in menu New actions 2022-01-03 13:25:35 +01:00
Cayo Puigdefabregas d994cd2f10 remove lot 2022-01-03 12:28:42 +01:00
Cayo Puigdefabregas d17114a0b0 remove device from a lot 2022-01-03 11:32:12 +01:00
Cayo Puigdefabregas 9413e7b3c7 add as global g.user current_user 2022-01-03 11:31:40 +01:00
Cayo Puigdefabregas b730537cde add lot name in the breadcrumb 2021-12-30 22:39:56 +01:00
Cayo Puigdefabregas 0f5ab17a3f refactoring DeviceListView 2021-12-30 21:40:44 +01:00
Cayo Puigdefabregas d3dc5c8986 view for create an edit the a lot 2021-12-30 21:35:54 +01:00
Cayo Puigdefabregas a0ef40328a fix url of redirect when add one device in a lot 2021-12-30 19:57:18 +01:00
Cayo Puigdefabregas 715702658f adding the lots in the correct section 2021-12-30 19:46:34 +01:00
Cayo Puigdefabregas b7a723866b adding lot view 2021-12-30 17:23:34 +01:00
Cayo Puigdefabregas d2701de62b moving selectpicker to main_inventory 2021-12-30 13:55:11 +01:00
Cayo Puigdefabregas 8411a005df adding csrf_token to addinglot.html 2021-12-30 13:54:14 +01:00
Cayo Puigdefabregas ae4dd59f07 adding new viewLotDeviceAddView 2021-12-30 13:53:28 +01:00
Cayo Puigdefabregas e1c46e4725 adding form class for addinglot 2021-12-30 13:52:06 +01:00
Cayo Puigdefabregas 94bf3aaf87 management of the form of adding a device in a batch from the frontend 2021-12-30 12:41:37 +01:00
Cayo Puigdefabregas a5a08a162c adding lots in to modal addinglot form 2021-12-29 13:44:28 +01:00
Cayo Puigdefabregas f0dd2fb4ec adding modal menu in for lots 2021-12-29 13:02:39 +01:00
Cayo Puigdefabregas 8591af5abd adding buttons of lots actions exports and tags with dropdown menu 2021-12-29 12:14:29 +01:00
Cayo Puigdefabregas 2ea5c875c1 table with search and ordering fields 2021-12-29 10:57:39 +01:00
Cayo Puigdefabregas 5b07c274ef drop submoduls in inventory module 2021-12-29 10:13:34 +01:00
Cayo Puigdefabregas e0de5c018c changes order the input checkbox in the devices table 2021-12-29 10:13:03 +01:00
Santiago L 74ae8ce559 Replace favicon with USOdy logo 2021-12-29 08:30:46 +01:00
Santiago L b1d7eb12b7 Set page title 2021-12-29 08:17:42 +01:00
Santiago L 9f31c2cad8 Implement 'remember me' feature 2021-12-29 08:10:26 +01:00
Cayo Puigdefabregas 1da6484f26 adding table 2021-12-28 14:14:02 +01:00
Cayo Puigdefabregas c8be2bb640 adding rendering list 2021-12-28 13:55:56 +01:00
Cayo Puigdefabregas 9e042125a3 clean configs 2021-12-28 13:55:26 +01:00
Santiago L f4e2689f82 Add USOdy logo to login & navbar 2021-12-28 13:41:45 +01:00
Santiago L e97ee61c36 Define Stamps link to StampsView 2021-12-28 13:31:24 +01:00
Santiago L a9515dce13 Print current_user info & drop topbar unused elements 2021-12-28 13:26:56 +01:00
Santiago L 43b5a67cab Create logout view 2021-12-28 13:05:41 +01:00
Cayo Puigdefabregas a23d3427fb Merge branch 'feature/server-side-render' into feature/server-side-render-devices 2021-12-28 12:36:46 +01:00
Cayo Puigdefabregas ed48df70db adding templates for inventory1 2021-12-28 12:36:02 +01:00
Santiago L c226844a43 Encapsulate required app config on Devicehub 2021-12-28 12:32:38 +01:00
Cayo Puigdefabregas 8aa997a2f6 comment decorators 2021-12-28 11:46:17 +01:00
Cayo Puigdefabregas fb81edf799 insert LoginManager in devicehub app 2021-12-28 11:45:53 +01:00
Cayo Puigdefabregas 1feb287ca0 SECRET_KEY in config 2021-12-28 11:13:30 +01:00
Santiago L 338afcc556 Secure UserProfileView with login_required 2021-12-28 09:44:04 +01:00
Santiago L 3af67fee01 Implement user login based on sessions 
Use Flask-Login & Flask-WTF libraries
 2021-12-28 09:39:12 +01:00
Santiago L 95cc6f5e94 Update links on sidebar menu 2021-12-27 09:58:27 +01:00
Santiago L a0509a23a4 Create user login view 2021-12-27 09:15:06 +01:00
Santiago L bf5c76cd04 Create base_site.html 2021-12-27 09:14:10 +01:00
Santiago L 093e1d415d Refactor: use Flask class based views 2021-12-27 08:54:55 +01:00
Santiago L d5b972e9e3 Create base template based on NiceAdmin Template 
Only minimal dependencies are loaded:
- bootstrap
- bootstrap-icons
 2021-12-23 00:41:59 +01:00
Santiago L 339d7f7d7f Create core Blueprint skeleton 2021-12-23 00:29:44 +01:00
Cayo Puigdefabregas 47dcb5efe8 fixing tests 2021-12-21 10:32:04 +01:00
Cayo Puigdefabregas 4acd03e714 fixing ereuse pdf 2021-12-21 09:55:06 +01:00
Cayo Puigdefabregas 46dd173a12 fixing tests 2021-12-16 14:00:54 +01:00
Cayo Puigdefabregas a670a01c5e fixing bug us2524 2021-12-16 13:21:35 +01:00
Cayo Puigdefabregas 10a1e23a5d Metrics only lot 2021-12-07 13:20:16 +01:00
Cayo Puigdefabregas daed1bdafb . 2021-12-03 09:54:59 +01:00
Cayo Puigdefabregas ba858aff89 fixing permitions for excel 2021-11-29 12:15:37 +01:00
Cayo Puigdefabregas f0d9ead977 deactivate removes for RAMs slots 2021-11-26 14:08:11 +01:00
Cayo Puigdefabregas 596b54f818 up of version 2021-11-25 10:29:32 +01:00
Cayo Puigdefabregas 03ee4fba34 changes some values of headers 2021-11-24 12:20:40 +01:00
Cayo Puigdefabregas 0543fb64a5 Merge branch 'testing' into feature/power_on_hours 2021-11-24 11:17:26 +01:00
Cayo Puigdefabregas e8ccbedf40 change of version 2021-11-24 10:15:18 +01:00
Cayo Puigdefabregas c4a2b720ef adding property power_on_hours 2021-11-23 15:27:16 +01:00
Cayo Puigdefabregas 56dcdf2897 get_status docuemnts in metrics 2021-11-23 11:08:48 +01:00
cayop b117a4b267
Merge pull request #170 from eReuse/feature/delete-devices 
Feature/delete devices
 2021-11-22 12:38:00 +01:00
Cayo Puigdefabregas 2d5ead7c1b checking permitions of actions 2021-11-22 12:01:12 +01:00
Cayo Puigdefabregas e09073216c fixing migration 2021-11-22 11:34:03 +01:00
Cayo Puigdefabregas bef5df414b fixing bug in sync 2021-11-22 11:14:27 +01:00
Cayo Puigdefabregas 40bf280c75 Fixing name of document container in metrics 2021-11-22 10:31:20 +01:00
Cayo Puigdefabregas 9d4df05831 litle bugfix taiga 2357 2021-11-22 10:16:39 +01:00
Cayo Puigdefabregas 818e3ad0cc new tests 2021-11-19 12:44:52 +01:00
Cayo Puigdefabregas 3b41ddb66a Merge branch 'testing' into feature/delete-devices 2021-11-19 12:07:14 +01:00
Cayo Puigdefabregas aa17d4b492 clean code test 2021-11-19 11:34:13 +01:00
Cayo Puigdefabregas d8382f8331 drop assert for lot[devices] in dummy 2021-11-18 11:52:59 +01:00
Cayo Puigdefabregas 63f7adf69c try to use only_fields for devices but not used 2021-11-18 11:50:29 +01:00
Cayo Puigdefabregas 5510417125 reduce latency for timeout for lots 2021-11-18 11:48:57 +01:00
Cayo Puigdefabregas e447e15aeb fixing update of migration 2021-11-12 22:26:08 +01:00
Cayo Puigdefabregas fb5286648d fixing update of migration 2021-11-12 22:24:23 +01:00
Cayo Puigdefabregas 287ac8d741 fixing migration of olds confirmRevokes datas 2021-11-12 22:16:02 +01:00
Cayo Puigdefabregas 8e47af8e27 refactoring trading and trading for web 2021-11-12 10:00:43 +01:00
Cayo Puigdefabregas 1279180700 fixing confirms 2021-11-11 22:50:07 +01:00
Cayo Puigdefabregas e326e8ccdf fixing revoke when the device is in one future trade 2021-11-11 22:21:58 +01:00
Cayo Puigdefabregas 872a0be866 rebuild trading function 2021-11-11 22:08:28 +01:00
Cayo Puigdefabregas cef22f01ce fixing deletr_from_trade 2021-11-11 17:23:45 +01:00
Cayo Puigdefabregas 54977d432d refactory in delete_from_trade function 2021-11-11 17:06:26 +01:00
Cayo Puigdefabregas 9dc79a59dc fixing revokeView and reset_owner 2021-11-10 18:59:44 +01:00
Cayo Puigdefabregas f06007e199 fixing conflict 2021-11-08 18:07:07 +01:00
Cayo Puigdefabregas c7ced04e9d fixing bug for documents 2021-11-08 17:33:22 +01:00
Cayo Puigdefabregas f8be48d524 fixing schema 2021-11-05 13:10:23 +01:00
Cayo Puigdefabregas 6bf1354109 fixing change status next trade 2021-11-05 13:00:01 +01:00
Cayo Puigdefabregas 5ebf4f48b5 adding trade in status actions 2021-11-05 12:35:10 +01:00
Cayo Puigdefabregas 56df40c81a fixing actions for computer 2021-11-04 13:27:25 +01:00
Cayo Puigdefabregas 6de83ce4d2 Fixing order of actions_multiple devices 2021-11-04 11:58:15 +01:00
Cayo Puigdefabregas b233b7bb75 fixed 2021-11-03 10:37:15 +01:00
Cayo Puigdefabregas 34def7bd70 fixint trading fuction 2021-11-02 14:25:49 +01:00
Cayo Puigdefabregas c34cbb5c26 fixing metrics 2021-11-02 12:47:23 +01:00
Cayo Puigdefabregas 283f869b4d drop remove 2021-10-28 12:19:49 +02:00
Cayo Puigdefabregas 03238acb9f fixing session in listener 2021-10-26 16:35:41 +02:00
Cayo Puigdefabregas 5861d2fd6f fixing session in listener 2021-10-26 16:21:05 +02:00
Cayo Puigdefabregas 5cce2f4efb change some sintaxis 2021-10-25 13:24:22 +02:00
Cayo Puigdefabregas 15fa4546d1 fixing general case for devices 2021-10-25 12:20:16 +02:00
Cayo Puigdefabregas 1c2f6ba92c fixing tests 2021-10-23 13:02:10 +02:00
Cayo Puigdefabregas 9faa1697a7 fixing event device 2021-10-22 21:14:10 +02:00
Cayo Puigdefabregas 6091f31c17 adding event instead of reuse create_code function 2021-10-22 19:26:27 +02:00
Cayo Puigdefabregas 2ade5a14d4 adding tag when there are a new device 2021-10-22 14:19:42 +02:00
Cayo Puigdefabregas 7c6b20597b fixing supplier permitions 2021-10-20 14:53:33 +02:00
Cayo Puigdefabregas f099a579fb fixing rows 2021-10-19 19:25:17 +02:00
Cayo Puigdefabregas 87f30a1391 adding metrics for tradeDocuments 2021-10-19 18:19:25 +02:00
Cayo Puigdefabregas 31de27769d Merge branch 'testing' into feature/new-metrix 2021-10-18 11:53:05 +02:00
Cayo Puigdefabregas 5ec005e63b resolve conflict 2021-10-18 11:47:55 +02:00
Cayo Puigdefabregas 2d37baca8d fixing minor changes of review 2021-10-18 11:20:05 +02:00
Cayo Puigdefabregas 0eed8330ce adding metrics for documents 2021-10-15 15:04:58 +02:00
Cayo Puigdefabregas 17f8aebb94 fixing rows 2021-10-14 18:13:20 +02:00
Cayo Puigdefabregas 5e9b9bf08d new metrics 2021-10-14 12:56:33 +02:00
Cayo Puigdefabregas aa7a3ffe12 Merge branch 'feature/new-recycling-action' into feature/new-metrix 2021-10-11 14:11:59 +02:00
Cayo Puigdefabregas 35e891bf5d trace in metrics 2021-10-11 14:11:56 +02:00
Cayo Puigdefabregas 007e9a96c6 Merge branch 'testing' into feature/new-recycling-action 2021-10-06 12:49:42 +02:00
Cayo Puigdefabregas fbf74643e9 resolve conflict 2021-10-06 12:11:05 +02:00
Cayo Puigdefabregas 2e564862e8 excluding when it is in one trade action 2021-10-06 11:53:41 +02:00
Cayo Puigdefabregas 03cfbfaa35 fixing model action device 2021-10-06 10:51:53 +02:00
Cayo Puigdefabregas aa4ebeb504 fixing, vanish deactivate devices 2021-10-05 14:33:28 +02:00
Cayo Puigdefabregas 9ea0a05de6 migration file 2021-10-05 14:00:55 +02:00
Cayo Puigdefabregas 6dd54d9645 deactivate devices 2021-10-05 12:17:07 +02:00
Cayo Puigdefabregas ec2d286ed3 adding action delete 2021-10-05 11:56:19 +02:00
Cayo Puigdefabregas ab74240d6c fixing 3 bugs, #168 2021-10-04 13:35:51 +02:00
Cayo Puigdefabregas 920937a51f fixing bug of trade without devices 2021-10-01 13:30:39 +02:00
Cayo Puigdefabregas 6599f4b66c fixing bug 2021-10-01 10:46:08 +02:00
Cayo Puigdefabregas eeb6db7bc2 test for recycling documents 2021-09-29 21:12:46 +02:00
Cayo Puigdefabregas 7e4af161d3 solve conflict 2021-09-29 14:13:42 +02:00
Cayo Puigdefabregas aff86a8f94 using ActionWithMultipleTradeDocuments intead of ActionWithMultipleDevices 2021-09-29 12:59:44 +02:00
cayop baa5fccda0
Merge pull request #163 from eReuse/feature/container 
Feature/container
 2021-09-29 12:58:01 +02:00
Cayo Puigdefabregas 84da94430e fixing bug 2021-09-28 15:44:25 +02:00
Cayo Puigdefabregas f10f2b848f get the status and history status of one devices 2021-09-28 13:05:58 +02:00
Cayo Puigdefabregas 38db59b150 put the correct user un rol_user 2021-09-27 14:58:25 +02:00
Cayo Puigdefabregas c2b0e6341f adding new models for Use, Recycling, Refurbish and Management actions 2021-09-24 12:37:33 +02:00
Cayo Puigdefabregas b195e380a9 adding basic action reuse and recycling 2021-09-22 14:01:49 +02:00
Cayo Puigdefabregas 4eb4c1a480 downgrade of version 2021-09-22 11:35:06 +02:00
Cayo Puigdefabregas 328facab50 adding dhid 2021-09-22 11:30:37 +02:00
Cayo Puigdefabregas 9df5872a44 upgrade version 2021-09-21 12:45:58 +02:00
Cayo Puigdefabregas 1466cbc4f4 fixing bug of csv 2021-09-21 12:44:07 +02:00
Cayo Puigdefabregas 3559b98535 fixing bug 2021-09-20 16:16:53 +02:00
Cayo Puigdefabregas bcaf907255 adding total weight in lots 2021-09-10 14:07:35 +02:00
Cayo Puigdefabregas b7396b4f23 adding action moveOn inside of tradeDocuments 2021-09-09 13:34:24 +02:00
Cayo Puigdefabregas 6cd28a3e3a Adding MoveOnDocument in migration and fixing schema 2021-09-08 13:54:10 +02:00
Cayo Puigdefabregas 74af5add3c adding action moveOn endpoint 2021-09-06 12:45:47 +02:00
Cayo Puigdefabregas f398c50288 clean old code as documents 2021-09-06 12:44:57 +02:00
Cayo Puigdefabregas 0d73bb1f63 Build action moveOn 2021-09-03 16:06:53 +02:00
Cayo Puigdefabregas 1d73a8f0c1 Merge branch 'testing' into feature/container 2021-09-03 11:05:47 +02:00
Cayo Puigdefabregas 16b6325c1b Merge branch 'testing' into feature/lot-unassigned 2021-08-16 11:15:30 +02:00
Cayo Puigdefabregas faa58df4b4 clean pdbs 2021-08-13 17:18:48 +02:00
Cayo Puigdefabregas b2390f3010 adding more mimes type 2021-08-13 17:16:31 +02:00
Cayo Puigdefabregas de727f2645 pdbs 2021-08-11 13:40:37 +02:00
Cayo Puigdefabregas b56e9b106f adding migration for recycle document model 2021-08-10 13:57:18 +02:00
Cayo Puigdefabregas 5799be2a3a fixing foreingkey 2021-08-10 13:56:33 +02:00
Cayo Puigdefabregas 727a7cfccb reolve conflicts 2021-08-10 13:06:53 +02:00
Cayo Puigdefabregas 9086bb628f fixing change type for document_type 2021-08-10 12:55:47 +02:00
Cayo Puigdefabregas f1220dd756 new Recycling document 2021-08-10 12:45:03 +02:00
Cayo Puigdefabregas 9217f7392a Merge branch 'feature/document-erased' into feature/container 2021-08-09 17:22:46 +02:00
Cayo Puigdefabregas ed43bd477c we only need the data files 2021-08-06 11:08:58 +02:00
Cayo Puigdefabregas eed117808c Fixing nullables in models 2021-08-04 18:15:15 +02:00
Cayo Puigdefabregas 710e61fca8 resolve conflicts 2021-08-04 18:03:40 +02:00
Cayo Puigdefabregas 9b2936c795 adding weight to trade documents 2021-08-03 16:40:17 +02:00
Cayo Puigdefabregas d123b4e8a8 up the version 2021-08-03 13:13:35 +02:00
Cayo Puigdefabregas 6326c0b59d fixing reported_uncorrectable_errors 2021-08-03 11:55:47 +02:00
Cayo Puigdefabregas 1961e3d408 rebuild query for filter devs without lots 2021-08-02 18:17:08 +02:00
Cayo Puigdefabregas bc95a618c1 adding result, software and url for DataWipe action 2021-07-30 14:36:10 +02:00
Cayo Puigdefabregas 7160b88199 fixing migration downgrade 2021-07-29 15:55:59 +02:00
Cayo Puigdefabregas 3119178c9c heredit datawipe document form general document model 2021-07-29 15:46:49 +02:00
Cayo Puigdefabregas 1811b81e93 adding success and software field in document 2021-07-29 14:54:58 +02:00
Cayo Puigdefabregas bfe56a8626 DataWipe instead of ToErased 2021-07-29 12:45:43 +02:00
Cayo Puigdefabregas f8ce81cc19 drop endpoint 2021-07-29 11:19:45 +02:00
Cayo Puigdefabregas bb3145f3d8 fixing test_basic 2021-07-28 15:59:11 +02:00
Cayo Puigdefabregas 833b55aefc external document erase 2021-07-26 11:33:11 +02:00
Cayo Puigdefabregas c5e62914b6 try solve problems with foreignkey 2021-07-21 15:02:23 +02:00
Cayo Puigdefabregas 811a3c5262 fixing with bigsIntegers 2021-07-21 09:03:26 +02:00
Cayo Puigdefabregas 2ec03d962e change changelog 2021-07-21 08:46:09 +02:00
Cayo Puigdefabregas 740783b9fd adding generic documents model 2021-07-21 08:35:18 +02:00
Cayo Puigdefabregas c2745fa437 update changelog and versions 2021-07-07 12:46:24 +02:00
Cayo Puigdefabregas eab0400124 open of security 2021-07-07 11:06:07 +02:00
Cayo Puigdefabregas 919d4a43d3 return validating error 2021-07-06 16:23:31 +02:00
Cayo Puigdefabregas e63b2a50ec growing security 2021-07-05 15:57:09 +02:00
Cayo Puigdefabregas 45950997f8 fixed bug manual snapshots 2021-07-05 15:48:17 +02:00
Cayo Puigdefabregas c554d30291 fixing tests 2021-07-05 15:04:44 +02:00
Cayo Puigdefabregas 25482125a3 pass into .env 2021-07-05 15:04:14 +02:00
Cayo Puigdefabregas b8e9ed22f6 fixing new jwt into a json 2021-07-05 12:31:16 +02:00
Cayo Puigdefabregas 4b4c0a1480 fixing owner_id in computer 2021-07-05 12:29:21 +02:00
Cayo Puigdefabregas 3d027270cc ading jwt in snapshots 2021-07-02 15:25:19 +02:00
Cayo Puigdefabregas 167f16b641 Merge branch 'testing' into feature/#155_decode_snapshots 2021-07-01 12:57:08 +02:00
Cayo Puigdefabregas 5e8c4a3231 add code of user for show in angular 2021-07-01 12:08:18 +02:00
Cayo Puigdefabregas 06c5137b32 implementation of hash3 for snapshots 2021-06-30 15:05:44 +02:00
Cayo Puigdefabregas b7e652906e clean views of trade documents 2021-06-29 19:13:00 +02:00
nad e3a0ea7e5b first iteration #155 decode snapshot json 2021-06-29 17:15:45 +02:00
Cayo Puigdefabregas c8b0c56bbb confirm Revoke, confirm and revoke documents actions 2021-06-28 16:06:07 +02:00
Cayo Puigdefabregas 8a797f079b fixing models and build views for revokeDocument 2021-06-24 19:09:12 +02:00
Cayo Puigdefabregas 77000882f5 change model action_trade_documents 2021-06-24 11:41:14 +02:00
Cayo Puigdefabregas f85a0f5ef4 fixing documents trade 2021-06-22 16:53:10 +02:00
Cayo Puigdefabregas c08ccd8d34 Merge branch 'feature/endpoint-confirm' into feature/trade-documents 2021-06-17 13:30:56 +02:00
Cayo Puigdefabregas 5dc1b79596 fixing bug 2281 2021-06-16 17:07:00 +02:00
Cayo Puigdefabregas 00d2b2e81f fixing bug taiga 2280 2021-06-16 11:55:05 +02:00
Cayo Puigdefabregas 4b7a40e6c1 bugfix taiga 2280 2021-06-16 10:53:18 +02:00
Cayo Puigdefabregas 0a96d4f6ef fixing schemas interdependences 2021-06-15 15:22:49 +02:00
Cayo Puigdefabregas f7070dbbf7 adding documents in schema of lots 2021-06-15 15:14:29 +02:00
Cayo Puigdefabregas 814922dbff change tradedocuments in an other file version 2021-06-15 14:45:41 +02:00
Cayo Puigdefabregas 1e05f600a7 fixing schema in migration file 2021-06-15 14:29:38 +02:00
Cayo Puigdefabregas b1f7b629c7 fixing url 2021-06-15 13:11:49 +02:00
Cayo Puigdefabregas 80b7b98ec8 adding trade documents to migration file 2021-06-15 12:58:10 +02:00
Cayo Puigdefabregas 315eb097c9 change view for save hash 2021-06-15 12:38:24 +02:00
Cayo Puigdefabregas b1414cf143 redefine models 2021-06-15 12:38:02 +02:00
Cayo Puigdefabregas 7cee2693ff resolve conflict 2021-06-15 11:22:17 +02:00
Cayo Puigdefabregas 0d4c70a74e fixing bug 2021-06-11 15:49:31 +02:00
Cayo Puigdefabregas ab32b996bd resolve conflict 2021-06-11 12:52:39 +02:00
Cayo Puigdefabregas b12d54d6f1 drop id of trade action 2021-06-11 12:27:14 +02:00
Cayo Puigdefabregas 2cfb126c6c fixing litle bug in delete dev of a lot 2021-06-11 12:26:36 +02:00
Cayo Puigdefabregas 94d4b57be9 fixing id of trading 2021-06-09 12:02:31 +02:00
cayop a0d26a104f
Merge pull request #140 from eReuse/feature/endpoint-confirm 
Feature/endpoint confirm
 2021-06-09 11:46:32 +02:00
Cayo Puigdefabregas c0558733ec fixing remove decvices from a temporary lot 2021-06-09 11:36:11 +02:00
Cayo Puigdefabregas eaea1c3fa3 Merge branch 'feature/endpoint-confirm' into feature/trade-documents 2021-06-08 16:14:54 +02:00
Cayo Puigdefabregas 99fe0407f0 clean 2021-06-08 16:14:30 +02:00
Cayo Puigdefabregas 1e0d993cfe resolve conflict 2021-06-08 09:30:13 +02:00
Cayo Puigdefabregas 24e05b4ecd fixing foreinkey action for confirm actions 2021-06-07 18:18:09 +02:00
Cayo Puigdefabregas 1da5a6cc0e fixing migration 2021-06-07 17:12:53 +02:00
Cayo Puigdefabregas e9a09ec2ae fixing automatic confirmation 2021-06-07 17:12:30 +02:00
Cayo Puigdefabregas 6546332fe5 swap @s for _s in code 2021-06-07 16:04:33 +02:00
Cayo Puigdefabregas a9b341076a fixed 2021-06-07 15:48:55 +02:00
Cayo Puigdefabregas eb52c39ca3 fixing migrations 2021-06-07 15:45:48 +02:00
Cayo Puigdefabregas f9189ea413 confirm check 2021-06-07 15:45:32 +02:00