Cayo Puigdefabregas
|
7f0167f688
|
remove imported but unused
|
2022-03-02 13:39:15 +01:00 |
|
Cayo Puigdefabregas
|
eb84884db4
|
remove imported but unused
|
2022-03-02 13:38:22 +01:00 |
|
Cayo Puigdefabregas
|
56b8e0886c
|
ignoring warnings of too complex functions
|
2022-03-02 13:36:06 +01:00 |
|
Cayo Puigdefabregas
|
e45a4982c6
|
ignoring warnings of too complex function
|
2022-03-02 13:31:21 +01:00 |
|
Cayo Puigdefabregas
|
c52480231b
|
add error msg when there are more than one device selected for add or remove one tag
|
2022-03-02 13:08:23 +01:00 |
|
Cayo Puigdefabregas
|
ad09d298a0
|
add order by code in tags lists and select
|
2022-03-02 13:07:04 +01:00 |
|
Cayo Puigdefabregas
|
806e9ad8d0
|
fix bug #2840 about trade without confirm and with code
|
2022-03-02 10:56:31 +01:00 |
|
Cayo Puigdefabregas
|
15d913efea
|
add message with result when a devices is add or remove of a lot
|
2022-03-02 10:36:26 +01:00 |
|
Cayo Puigdefabregas
|
6389956adc
|
fix bug #2841. Show lot and devices for all users involved in a trade
|
2022-03-01 14:29:25 +01:00 |
|
Cayo Puigdefabregas
|
ab89b7eff0
|
#2736 Move simple-datatables to base
|
2022-03-01 10:30:47 +01:00 |
|
Cayo Puigdefabregas
|
3886076f50
|
#2736 Move jquery to base
|
2022-03-01 10:07:05 +01:00 |
|
Cayo Puigdefabregas
|
f9840e9f2b
|
fix buttons of form of upload trade document
|
2022-02-28 13:33:03 +01:00 |
|
Cayo Puigdefabregas
|
823594dce4
|
add tab documents
|
2022-02-28 13:27:12 +01:00 |
|
Cayo Puigdefabregas
|
b6cf1f1e3e
|
Merge branch 'feature/server-side-render' into feature/server-side-render-UX-improvements
|
2022-02-28 13:06:04 +01:00 |
|
Cayo Puigdefabregas
|
9a95587cf3
|
remove lot in top
|
2022-02-28 13:05:36 +01:00 |
|
Cayo Puigdefabregas
|
560d9fae05
|
task #2740 add tag code in name of pdf file
|
2022-02-28 12:16:33 +01:00 |
 Santiago L
|
1e9b65e0b5
|
Merge pull request #204 from eReuse/feature/server-side-render-exports
Feature/server side render exports
|
2022-02-28 12:13:15 +01:00 |
|
Cayo Puigdefabregas
|
c6538333f7
|
task #2739 Manufacter and Model empty instead of None
|
2022-02-28 12:02:56 +01:00 |
|
Cayo Puigdefabregas
|
a45fd815a2
|
task #2741 fix Handle error message, provider connection when we are creating an unnamed tag
|
2022-02-28 11:46:31 +01:00 |
|
Cayo Puigdefabregas
|
b6de721da3
|
Merge branch 'feature/server-side-render-exports' of github.com:eReuse/devicehub-teal into feature/server-side-render-exports
|
2022-02-28 11:19:30 +01:00 |
|
Cayo Puigdefabregas
|
692358c343
|
add alert when no there are any device selected
|
2022-02-28 11:19:22 +01:00 |
|
Santiago L
|
21ee6003fd
|
Merge branch 'feature/server-side-render' into feature/server-side-render-exports
|
2022-02-28 10:20:05 +01:00 |
|
Santiago L
|
7895cf457a
|
Merge pull request #203 from eReuse/feature/server-side-render-actions-trade
Feature/server side render actions trade
|
2022-02-28 10:18:33 +01:00 |
|
Cayo Puigdefabregas
|
f655bfb895
|
pre-commit
|
2022-02-25 12:57:13 +01:00 |
|
Cayo Puigdefabregas
|
71d30548cc
|
resolve conflict
|
2022-02-25 12:56:01 +01:00 |
|
Cayo Puigdefabregas
|
826584450a
|
resolve conflict
|
2022-02-25 12:34:02 +01:00 |
|
Cayo Puigdefabregas
|
b85f4f298c
|
pre-commit
|
2022-02-25 12:27:14 +01:00 |
|
Cayo Puigdefabregas
|
26f3a64b46
|
there are views than doesn't have any lot on sidebar because lots are missing as template context
|
2022-02-25 12:25:00 +01:00 |
|
Cayo Puigdefabregas
|
37f50624fa
|
change redirect to unansigned lot next to do login instead of go to profile page
|
2022-02-25 11:49:05 +01:00 |
|
Cayo Puigdefabregas
|
c2f392787c
|
Merge branch 'feature/server-side-render-actions-trade' into feature/server-side-render-exports
|
2022-02-25 10:17:26 +01:00 |
|
Cayo Puigdefabregas
|
1772b4090c
|
close div tag in trade template
|
2022-02-25 10:16:59 +01:00 |
|
Cayo Puigdefabregas
|
e614908c73
|
resolve conflict
|
2022-02-25 10:15:23 +01:00 |
|
Cayo Puigdefabregas
|
04cc244f2d
|
resolve conflict
|
2022-02-25 10:07:44 +01:00 |
|
Cayo Puigdefabregas
|
c54d9a902c
|
fix bug in trade template
|
2022-02-25 09:49:15 +01:00 |
|
Cayo Puigdefabregas
|
179feaba44
|
add exports in front end
|
2022-02-24 14:15:58 +01:00 |
|
Santiago L
|
919e4f4e48
|
Merge pull request #99 from eReuse/dependabot/pip/sqlalchemy-1.3.0
Bump sqlalchemy from 1.2.17 to 1.3.24
|
2022-02-22 13:19:35 +01:00 |
|
Santiago L
|
c51f1aa2e3
|
Pin itsdangerous version
Fix ImportError: cannot import name ‘json’ from itsdangerous
|
2022-02-22 12:31:56 +01:00 |
|
Santiago L
|
197caa5068
|
Merge branch 'testing' into dependabot/pip/sqlalchemy-1.3.0
|
2022-02-22 12:26:26 +01:00 |
|
Santiago L
|
fbedbc8f7f
|
Drop Additional keyword arguments
[Deprecated since version 0.9](https://docs.sqlalchemy.org/en/12/core/type_basics.html#sqlalchemy.types.Float.params.**kwargs)
|
2022-02-22 12:22:23 +01:00 |
|
Santiago L
|
d4e61d992b
|
Raise error if trying to save when validation has failed
|
2022-02-22 12:04:26 +01:00 |
|
Santiago L
|
bacf14ece8
|
Fix method call to `get_or_create_user()`
|
2022-02-22 11:55:01 +01:00 |
|
Cayo Puigdefabregas
|
bfbd7c02b7
|
.
|
2022-02-22 11:40:05 +01:00 |
|
Cayo Puigdefabregas
|
90eb279008
|
fix get_or_create_user
|
2022-02-22 11:31:11 +01:00 |
|
Cayo Puigdefabregas
|
88deb71a26
|
changes of review
|
2022-02-22 11:24:11 +01:00 |
|
Cayo Puigdefabregas
|
eed2849af3
|
Merge branch 'feature/server-side-render-actions-trade' of github.com:eReuse/devicehub-teal into feature/server-side-render-actions-trade
|
2022-02-22 11:17:39 +01:00 |
|
Cayo Puigdefabregas
|
96a240b3cd
|
drop enconded as unicode
|
2022-02-22 11:15:37 +01:00 |
|
Santiago L
|
2cff0499cb
|
Apply suggestions from code review
|
2022-02-22 11:13:00 +01:00 |
|
Santiago L
|
6eb3c62b83
|
Update ereuse_devicehub/inventory/forms.py
|
2022-02-22 11:12:15 +01:00 |
|
Cayo Puigdefabregas
|
60d9c04e2d
|
view of export
|
2022-02-22 11:11:53 +01:00 |
|
Cayo Puigdefabregas
|
4ce359fec4
|
Merge branch 'feature/server-side-render' into feature/server-side-render-actions-trade
|
2022-02-21 13:05:38 +01:00 |