Commit Graph

2407 Commits

Author SHA1 Message Date
Cayo Puigdefabregas 8ea0f028d6 fix test 2022-06-01 15:04:04 +02:00
Cayo Puigdefabregas f58993c9d1 resolve conflicts 2022-06-01 15:01:02 +02:00
cayop e43e47c4f5
Merge pull request #289 from eReuse/feature/3415-transfer
Feature/3415 transfer
2022-06-01 14:46:41 +02:00
Cayo Puigdefabregas ea5867e32a fixed tests 2022-06-01 14:00:16 +02:00
Cayo Puigdefabregas 29313e3470 add colors to open and closed 2022-06-01 13:26:17 +02:00
Cayo Puigdefabregas 1e50db9194 fix render lot 2022-06-01 13:15:04 +02:00
Cayo Puigdefabregas b7eb438767 fix migration datas 2022-06-01 13:14:45 +02:00
Cayo Puigdefabregas 96680937e9 add arrow right 2022-06-01 13:14:27 +02:00
Cayo Puigdefabregas e1e38015ee fix 2022-06-01 12:34:48 +02:00
Cayo Puigdefabregas ef36c11f6b change names of vars 2022-06-01 11:54:02 +02:00
Cayo Puigdefabregas f8f1276313 add description in transfer 2022-06-01 11:09:28 +02:00
Cayo Puigdefabregas 7e4bdfdc69 create transfer in angular version for code trades 2022-06-01 10:29:55 +02:00
Cayo Puigdefabregas 2dd3b7c276 upgrade the datas in the migration 2022-05-31 18:33:41 +02:00
Cayo Puigdefabregas dbd5645c94 show transfers if there are transfer 2022-05-31 16:28:38 +02:00
Cayo Puigdefabregas 01f2996c48 fixed query lots 2022-05-31 15:14:56 +02:00
RubenPX 54295556f1 fix style 2022-05-31 11:25:32 +02:00
Cayo Puigdefabregas c36bf77ab7 render test edit transfer 2022-05-31 10:22:21 +02:00
Cayo Puigdefabregas f6d4c48487 drop pdbs 2022-05-31 10:22:01 +02:00
RubenPX 5b164221ae hotfix lots search not working 2022-05-30 19:28:16 +02:00
Cayo Puigdefabregas 7cd59b4598 add test render transfers 2022-05-30 17:36:03 +02:00
Cayo Puigdefabregas a1728810d1 fixed bugs 2022-05-30 17:35:27 +02:00
Cayo Puigdefabregas b0c58595c1 add EditTransfer 2022-05-30 16:33:01 +02:00
Cayo Puigdefabregas 9ca5ce48d1 add edit transfer 2022-05-30 16:32:25 +02:00
Cayo Puigdefabregas 0f563d58d8 fix closed 2022-05-30 16:32:02 +02:00
Cayo Puigdefabregas b8819b7a4a change is_temporary, is_outgoing, is_incoming 2022-05-27 16:48:40 +02:00
Cayo Puigdefabregas b2e11527cb fix model transfer 2022-05-27 16:32:54 +02:00
Cayo Puigdefabregas a8368e92b8 add html and form for transfers 2022-05-27 16:32:22 +02:00
Cayo Puigdefabregas 0998adc956 add model transfer 2022-05-27 11:30:48 +02:00
cayop 776c27a082
Merge pull request #284 from eReuse/bugfix/3385-bug-date-allocate
fixed bugs of allocate
2022-05-26 18:11:37 +02:00
Cayo Puigdefabregas d3e7c49a86 fixed bugs of allocate 2022-05-26 17:55:52 +02:00
cayop cbba8c7908
Merge pull request #283 from eReuse/feature/3431-add-date-of-Registered
modify updated and add registered
2022-05-25 17:55:57 +02:00
Cayo Puigdefabregas ebe800158a modify updated and add registered 2022-05-25 17:37:24 +02:00
Cayo Puigdefabregas 83067fd2bb modify updated and add registered 2022-05-25 17:33:54 +02:00
Cayo Puigdefabregas 5f025ff869 fix env vars 2022-05-25 09:56:47 +02:00
dependabot[bot] e6e57e6608
Bump pyjwt from 2.0.0a1 to 2.4.0
Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.0.0a1 to 2.4.0.
- [Release notes](https://github.com/jpadilla/pyjwt/releases)
- [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/jpadilla/pyjwt/compare/2.0.0a1...2.4.0)

---
updated-dependencies:
- dependency-name: pyjwt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-25 05:05:46 +00:00
Cayo Puigdefabregas ef570232e7 fix env vars 2022-05-24 17:20:17 +02:00
Cayo Puigdefabregas a5d3976274 fix env vars 2022-05-24 17:16:50 +02:00
Cayo Puigdefabregas ab20cdd1d0 fix env vars 2022-05-24 17:12:53 +02:00
Cayo Puigdefabregas 0530fef414 fix env vars 2022-05-24 17:03:41 +02:00
Cayo Puigdefabregas a6b3e725be fix pip 2022-05-24 17:02:33 +02:00
Cayo Puigdefabregas 7299ce15cf fix pip 2022-05-24 16:57:42 +02:00
Cayo Puigdefabregas f6e115909f Merge branch 'testing' into feature/3096-testing_selenium 2022-05-24 16:53:12 +02:00
Cayo Puigdefabregas 7ce18e1482 add new process for check 2022-05-24 16:52:19 +02:00
Cayo Puigdefabregas af470c0ecd add selenium test 2022-05-24 16:41:23 +02:00
Santiago L 1bd0d6cc30
Merge pull request #280 from eReuse/bugfix/279-alembic
fix enums in migration process
2022-05-24 14:11:02 +02:00
Santiago L c2bff5dd92 Fix #279. Update existing enum 2022-05-24 14:08:23 +02:00
Santiago L e081310069 Apply pre-commit hook 2022-05-24 14:06:56 +02:00
Santiago L 7d7507c1d9
Merge pull request #273 from RubenPX/feature/lots-search
Feature: lots-search US 3334
2022-05-23 13:39:42 +02:00
Santiago L 20440a55ca Update CHANGELOG.md 2022-05-23 13:39:12 +02:00
Cayo Puigdefabregas 20b09f7b39 add selenium un requirements 2022-05-23 13:03:00 +02:00