Cayo Puigdefabregas
|
c82f173edf
|
resolve conflict
|
2022-04-28 18:47:56 +02:00 |
cayop
|
09c5126b0c
|
Merge pull request #239 from eReuse/change/#3202-change-tag-for-unique-identifier
change tags for unique identifiers
|
2022-04-28 18:47:55 +02:00 |
|
Cayo Puigdefabregas
|
c14d8482be
|
Merge branch 'testing' into change/#3202-change-tag-for-unique-identifier
|
2022-04-28 18:32:39 +02:00 |
|
cayop
|
a5bc694d86
|
Merge pull request #242 from eReuse/feature/add-column-type-in-devices-list
add icons types of devices in list of devices
|
2022-04-28 18:19:09 +02:00 |
|
Cayo Puigdefabregas
|
7362eb4492
|
add computer monitor
|
2022-04-28 17:56:00 +02:00 |
|
Cayo Puigdefabregas
|
3a5e806104
|
add icons types of devices in list of devices
|
2022-04-28 17:46:12 +02:00 |
 Santiago L
|
293364acfb
|
Merge pull request #222 from eReuse/feature/extend-user-datas-#3016
Feature: allow user to update its password #3016
|
2022-04-28 12:08:00 +02:00 |
|
Santiago L
|
d0e033197c
|
Drop Agent.get_full_name because is unused
|
2022-04-28 12:06:43 +02:00 |
|
Santiago L
|
9afe6bf9e6
|
Revert all changes related to ProfileForm
We need to talk about the concepts of Agent and User and their
relationship before allowing the user to update their data.
|
2022-04-28 12:03:12 +02:00 |
|
Santiago L
|
3fd208c479
|
Restore tabs to include title "Change password"
|
2022-04-28 11:50:07 +02:00 |
|
Cayo Puigdefabregas
|
87c66cf5cd
|
change tags for unique identifiers
|
2022-04-28 11:47:52 +02:00 |
|
Santiago L
|
46c9e3f0cf
|
Merge pull request #235 from eReuse/changes/Hidde-trade-#3250
hide 2 trade buttons
|
2022-04-28 11:41:27 +02:00 |
|
Santiago L
|
6946a2584b
|
Refactor: group related code (delete button & modal status)
|
2022-04-28 11:39:40 +02:00 |
|
Santiago L
|
8125279619
|
Add comment to not rendered code
|
2022-04-28 11:38:31 +02:00 |
|
Cayo Puigdefabregas
|
c2e4313521
|
change tag for Unique identifier in label_details
|
2022-04-28 11:16:12 +02:00 |
|
Cayo Puigdefabregas
|
ad11521b64
|
fix label details for new architecture
|
2022-04-28 10:14:10 +02:00 |
|
Cayo Puigdefabregas
|
e378fef1a6
|
add customize options in print html and pdf
|
2022-04-27 18:56:15 +02:00 |
|
Cayo Puigdefabregas
|
bf42a79ef7
|
change devices for tags in printlabels
|
2022-04-27 18:55:27 +02:00 |
|
Cayo Puigdefabregas
|
b11bb163a0
|
hide 2 trade buttons
|
2022-04-26 17:35:29 +02:00 |
|
Cayo Puigdefabregas
|
ef3ea288ce
|
Merge branch 'testing' into feature/extend-user-datas-#3016
|
2022-04-26 16:37:12 +02:00 |
|
Cayo Puigdefabregas
|
13950a5ff6
|
show only password reset
|
2022-04-26 16:35:16 +02:00 |
|
Santiago L
|
f299367ba7
|
Merge pull request #231 from RubenPX/testing
fix github actions ESLint
|
2022-04-25 11:29:47 +02:00 |
|
Santiago L
|
b0f9a83dce
|
Merge pull request #232 from RubenPX/fix-max-lots-list
[Change] Set max lots list to 20
|
2022-04-25 11:29:04 +02:00 |
|
Santiago L
|
91277b048d
|
Merge pull request #230 from RubenPX/bugfix/fix-lots
[Bugfix] fix lots component issues
|
2022-04-25 11:27:47 +02:00 |
RubenPX
|
e48a6c1ae4
|
set max lots list to 20
|
2022-04-25 11:19:55 +02:00 |
|
RubenPX
|
f8b852708d
|
Fix github actions
|
2022-04-25 11:15:33 +02:00 |
|
RubenPX
|
1c0cef120e
|
Fix height list, use px instead of vh
|
2022-04-22 13:04:09 +02:00 |
|
Santiago L
|
73d0e77281
|
Rename CSS files
|
2022-04-22 11:12:29 +02:00 |
|
Santiago L
|
dd4e938d30
|
Split custom CSS & niceadmin theme CSS
Keep original source Nice Admin template to keep easy future updates
|
2022-04-22 11:07:18 +02:00 |
|
RubenPX
|
49c7caf5bd
|
Fix set max height
|
2022-04-21 20:14:36 +02:00 |
Lint Action
|
7c96c5706c
|
Fix code style issues with ESLint
|
2022-04-21 18:04:42 +00:00 |
|
RubenPX
|
a9299077aa
|
fix typo
|
2022-04-21 19:59:10 +02:00 |
|
RubenPX
|
454fb891e2
|
Order lots
|
2022-04-21 19:53:27 +02:00 |
|
RubenPX
|
740af8f7b6
|
Style fix show lots as list
|
2022-04-21 19:53:09 +02:00 |
|
Santiago L
|
d1d693542f
|
Merge pull request #228 from RubenPX/ESLint-Action
ESLint integration to indent code (Github Actions)
|
2022-04-20 14:13:02 +02:00 |
|
Lint Action
|
8a37217a38
|
Fix code style issues with ESLint
|
2022-04-20 10:12:59 +00:00 |
|
RubenPX
|
57c3bee109
|
Merge branch 'testing' into ESLint-Action
|
2022-04-20 12:12:30 +02:00 |
|
RubenPX
|
97e931e165
|
Action failed, fix issues
|
2022-04-20 12:09:56 +02:00 |
|
Santiago L
|
dded82945e
|
Merge pull request #221 from RubenPX/change/frontend-fixes
Change: fix minor responsive issues
|
2022-04-20 12:05:56 +02:00 |
|
Lint Action
|
a51cc9872d
|
Fix code style issues with ESLint
|
2022-04-20 10:04:53 +00:00 |
|
Santiago L
|
33783b6e7d
|
Revert "Fix login width"
This reverts commit d3564a6ba5.
|
2022-04-20 12:04:50 +02:00 |
|
RubenPX
|
fb7b58bbae
|
Change order steps
|
2022-04-20 12:04:18 +02:00 |
|
RubenPX
|
b1746421a3
|
add prettier rule
|
2022-04-20 11:55:15 +02:00 |
|
RubenPX
|
e68471d307
|
Create basic config
|
2022-04-20 11:54:58 +02:00 |
|
RubenPX
|
154362613e
|
fix trade lots modal
|
2022-04-20 11:53:51 +02:00 |
|
Santiago L
|
9e47cd967c
|
Merge pull request #224 from RubenPX/bugfix/fix-clickable-lots
FIX: clickable lots selector not working when click in text
|
2022-04-19 19:49:07 +02:00 |
|
RubenPX
|
22ddea4a43
|
Merge branch 'testing' into change/frontend-fixes
|
2022-04-19 10:42:51 +02:00 |
|
Cayo Puigdefabregas
|
d870d254f1
|
drop pdbs
|
2022-04-13 19:12:12 +02:00 |
|
Cayo Puigdefabregas
|
4e19b9233b
|
validate email is unique
|
2022-04-13 19:11:23 +02:00 |
|
Cayo Puigdefabregas
|
04cdb8181f
|
drop settings and last_name of agent
|
2022-04-13 18:41:05 +02:00 |