cayop
|
bba1e57f13
|
Merge pull request #247 from eReuse/change/#3300-change-color-blue
change colors and log
|
2022-05-04 12:28:41 +02:00 |
Cayo Puigdefabregas
|
16b8b4c78f
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-05-04 12:25:44 +02:00 |
|
Cayo Puigdefabregas
|
8a6b0cde37
|
change colors and log
|
2022-05-04 12:23:04 +02:00 |
RubenPX
|
cb4f12eb1e
|
Merge remote-tracking branch 'MyRepo/testing' into feature/confirm-trade-changes
|
2022-05-03 19:21:14 +02:00 |
|
RubenPX
|
e30779fcde
|
Merge remote-tracking branch 'MyRepo/testing' into bugfix/various-fixes
|
2022-05-03 19:20:59 +02:00 |
|
cayop
|
8591f061a8
|
Merge pull request #246 from eReuse/bugfix/change-lot-name
fix bug
|
2022-05-03 17:22:59 +02:00 |
|
Cayo Puigdefabregas
|
d2b63af17a
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-05-03 17:20:09 +02:00 |
|
Cayo Puigdefabregas
|
eaf8bdef65
|
fix bug
|
2022-05-03 17:00:02 +02:00 |
|
RubenPX
|
2aab4b49d3
|
Allow user to cancel all selection
|
2022-05-03 12:52:26 +02:00 |
|
RubenPX
|
9d9514e68b
|
Select full list devices
|
2022-05-03 12:13:15 +02:00 |
|
RubenPX
|
e31e3d3d45
|
Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes
|
2022-05-03 11:10:19 +02:00 |
|
RubenPX
|
d7f7e4d2e5
|
fixed api not working on recive full list
Api needs filter devices to work well
|
2022-05-03 11:06:05 +02:00 |
|
Cayo Puigdefabregas
|
db648a1bb0
|
fix render tests
|
2022-04-29 19:59:52 +02:00 |
|
Cayo Puigdefabregas
|
67ee1cdde8
|
resolve conflict
|
2022-04-29 19:26:44 +02:00 |
|
cayop
|
60a11794ae
|
Merge pull request #243 from eReuse/bugfix/#3288-common-lots
Bugfix/#3288 common lots
|
2022-04-29 19:25:55 +02:00 |
|
cayop
|
861515c46d
|
Merge pull request #229 from eReuse/feature/server-side-render-testing
Feature/server side render testing
|
2022-04-29 18:39:37 +02:00 |
|
Cayo Puigdefabregas
|
98ffe1092c
|
Merge branch 'testing' into bugfix/#3288-common-lots
|
2022-04-29 18:36:52 +02:00 |
|
Cayo Puigdefabregas
|
921049a28b
|
add more render basic tests
|
2022-04-29 18:23:05 +02:00 |
|
Cayo Puigdefabregas
|
7fe33f3a42
|
ass form errors in message
|
2022-04-29 17:53:59 +02:00 |
|
Cayo Puigdefabregas
|
322b340607
|
add fix test with redirects
|
2022-04-29 17:41:13 +02:00 |
|
RubenPX
|
6575e418e7
|
fix undefined
This will fix when you select all lots and you make change that clears list
|
2022-04-29 14:39:56 +02:00 |
|
RubenPX
|
c1829a657e
|
Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes
|
2022-04-29 14:28:24 +02:00 |
|
RubenPX
|
c78c9c5d7d
|
Lint
|
2022-04-29 14:07:04 +02:00 |
|
RubenPX
|
8bbca0301b
|
Selection devices by page
|
2022-04-29 14:06:09 +02:00 |
|
RubenPX
|
b88a514edf
|
Fix reactivity un variables
avoid outdated data variable
|
2022-04-29 13:58:48 +02:00 |
|
RubenPX
|
7503895a4f
|
Adds selector by pages
|
2022-04-29 13:34:45 +02:00 |
|
RubenPX
|
f8f4e10f9f
|
Restore state of checkbox before apply lots changes
|
2022-04-29 13:33:44 +02:00 |
|
RubenPX
|
e238fb287a
|
Fix remove rows using library API
|
2022-04-29 13:27:46 +02:00 |
|
Cayo Puigdefabregas
|
ef71eed27f
|
Merge branch 'testing' into feature/server-side-render-testing
|
2022-04-29 13:12:09 +02:00 |
|
Cayo Puigdefabregas
|
ad0ced98e4
|
refactor common context
|
2022-04-29 13:10:44 +02:00 |
|
RubenPX
|
0fd12ee37c
|
Use TableController to check all devices list
|
2022-04-29 12:36:42 +02:00 |
|
Cayo Puigdefabregas
|
02bfeea2fc
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-04-29 11:39:04 +02:00 |
|
Cayo Puigdefabregas
|
9f8f5ec9e0
|
fix unique identifier
|
2022-04-29 11:38:47 +02:00 |
|
RubenPX
|
f26b441fef
|
create TableController to access more easy to table info
|
2022-04-29 11:36:55 +02:00 |
|
Cayo Puigdefabregas
|
112f459db3
|
resolve conflict
|
2022-04-29 11:09:18 +02:00 |
 Santiago L
|
c176659cbe
|
Merge pull request #238 from eReuse/feature/#3262-customize-labels
Feature/#3262 customize labels
|
2022-04-29 09:09:49 +02:00 |
|
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
|
d8a44c661a
|
Merge branch 'testing' into feature/server-side-render-parser-3021
|
2022-04-28 18:45:51 +02:00 |
|
RubenPX
|
8d43128e68
|
fix render item in confirmation dialog
|
2022-04-28 18:43:38 +02:00 |
|
Cayo Puigdefabregas
|
c14d8482be
|
Merge branch 'testing' into change/#3202-change-tag-for-unique-identifier
|
2022-04-28 18:32:39 +02:00 |
|
RubenPX
|
9cef5188db
|
Merge branch 'bugfix/various-fixes' into feature/confirm-trade-changes
|
2022-04-28 18:31:15 +02:00 |
|
RubenPX
|
962f7cb94c
|
lint
|
2022-04-28 18:29:39 +02:00 |
|
RubenPX
|
c824110b00
|
Send device model through the methods
|
2022-04-28 18:29:18 +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 |
|
RubenPX
|
1727ab70a3
|
lint
|
2022-04-28 17:00:23 +02:00 |
|
RubenPX
|
4aa024b041
|
checkpoint: add confirmation dialog
|
2022-04-28 16:58:44 +02:00 |
|
RubenPX
|
1ff0401b38
|
Merge commit '8d8ce634023e71d463f87527097c3ec8a2cdd7cb' into feature/confirm-trade-changes
|
2022-04-28 16:52:26 +02:00 |