Cayo Puigdefabregas
|
edeae562d6
|
resolve conflict
|
2022-05-16 18:33:34 +02:00 |
|
Cayo Puigdefabregas
|
68fc1cb2bb
|
resolv conflicts
|
2022-05-16 18:23:03 +02:00 |
|
Cayo Puigdefabregas
|
960c971197
|
Change workbench_lite for schema_workbench
|
2022-05-16 17:57:09 +02:00 |
|
Cayo Puigdefabregas
|
b309cc4410
|
change Mixin clases
|
2022-05-16 17:52:31 +02:00 |
|
cayop
|
8794223385
|
Merge pull request #276 from eReuse/bugfix/#3360-computermonitor-instead-monitor
computer monitor instead of monitor
|
2022-05-16 12:59:41 +02:00 |
|
Cayo Puigdefabregas
|
d935c987b3
|
comiter monitor instead of monitor
|
2022-05-16 12:40:14 +02:00 |
|
Cayo Puigdefabregas
|
727c06c3de
|
add public link to device list
|
2022-05-16 11:54:02 +02:00 |
|
cayop
|
9fdeef08ca
|
Merge pull request #275 from eReuse/change/#3370-Remove-components-in-filter
remove all components in the filter of the inventory
|
2022-05-16 11:31:11 +02:00 |
|
Cayo Puigdefabregas
|
3bd2dd79b1
|
remove all components in the filter of the inventory
|
2022-05-16 11:01:52 +02:00 |
|
cayop
|
ac0d6c7a22
|
Merge pull request #274 from eReuse/feature/#3396-add-columns-status
Feature/#3396 add columns status
|
2022-05-16 10:50:48 +02:00 |
|
Cayo Puigdefabregas
|
0b78178ff4
|
fixed device public page
|
2022-05-16 10:29:07 +02:00 |
|
cayop
|
282b9490fb
|
Merge pull request #265 from eReuse/feature/#3100-wb-settings
Feature/#3100 wb settings
|
2022-05-16 10:18:45 +02:00 |
|
Cayo Puigdefabregas
|
c1665ef4af
|
Merge branch 'testing' into feature/#3396-add-columns-status
|
2022-05-16 10:16:23 +02:00 |
|
Cayo Puigdefabregas
|
f7b6bdccb6
|
fix test_export_extended
|
2022-05-16 10:15:46 +02:00 |
|
Cayo Puigdefabregas
|
ae221dadd1
|
fixed tests
|
2022-05-16 09:53:22 +02:00 |
|
Cayo Puigdefabregas
|
dd081532ba
|
#3402 change public page of device
|
2022-05-13 17:17:57 +02:00 |
|
Cayo Puigdefabregas
|
11913d68c3
|
fix state instead of states
|
2022-05-13 17:16:08 +02:00 |
|
Cayo Puigdefabregas
|
1dcebc0112
|
#3401 change the values of the status in the page of device details
|
2022-05-13 13:11:00 +02:00 |
|
Cayo Puigdefabregas
|
d8c9bcbcf7
|
#3400 change the names of the status for the correct names
|
2022-05-13 13:06:04 +02:00 |
|
Cayo Puigdefabregas
|
df44849ad3
|
add allocate status in devices export
|
2022-05-13 12:51:31 +02:00 |
|
Cayo Puigdefabregas
|
1b5f6412f0
|
#3397 add columns of status in the devices list
|
2022-05-13 12:17:14 +02:00 |
|
Santiago L
|
af833a673a
|
Merge pull request #272 from RubenPX/Show-device-labels
Show lots on deviceList
|
2022-05-13 10:41:55 +02:00 |
|
Santiago L
|
56ccb7591a
|
Cosmetics: display lots inline & use ligh bg
Lower visual weight because it's secundary information
|
2022-05-13 10:39:37 +02:00 |
|
Santiago L
|
300edac5a8
|
Dropped .badge-pill use the .rounded-pill utility instead.
Breaking change on Boostrap 5
https://getbootstrap.com/docs/5.0/migration/#badges
|
2022-05-13 10:35:11 +02:00 |
|
Santiago L
|
a444579c05
|
Merge pull request #271 from eReuse/feature/all-device-list
Feature: 3196 all device list
|
2022-05-13 10:26:49 +02:00 |
|
Santiago L
|
d54f2166dc
|
Keep unassigned as default option on device list
Unassigned devices are the ones that require user attention and
also all devices view will generate larger responses and more
server load.
|
2022-05-13 10:22:32 +02:00 |
|
RubenPX
|
c7e0501828
|
add soft init to reassign events
|
2022-05-12 18:58:06 +02:00 |
|
RubenPX
|
6a408a08c7
|
set const table to var
This allow modify variable
|
2022-05-12 18:44:26 +02:00 |
|
RubenPX
|
cea1c2b717
|
full table replacament
|
2022-05-12 18:44:02 +02:00 |
|
Cayo Puigdefabregas
|
3c02a5480f
|
fixed test render wbsettings
|
2022-05-12 17:42:26 +02:00 |
|
cayop
|
5026768eb5
|
Merge pull request #269 from eReuse/bugfix/allocate-bugs
Bugfix/allocate bugs
|
2022-05-12 17:38:37 +02:00 |
|
Cayo Puigdefabregas
|
3a2e0bd61a
|
fixing bugs
|
2022-05-12 17:25:02 +02:00 |
|
Cayo Puigdefabregas
|
763d2d1361
|
minimalistic settings
|
2022-05-12 17:19:22 +02:00 |
|
Santiago L
|
4406c78aed
|
Merge branch 'testing' into feature/all-device-list
|
2022-05-12 14:49:22 +02:00 |
|
Santiago L
|
8f3bdb71fe
|
Add "All devices" item to sidebar menu
|
2022-05-12 14:44:02 +02:00 |
|
Santiago L
|
290c260511
|
Update breadcrum: All devices VS Unassigned
|
2022-05-12 14:43:41 +02:00 |
|
Santiago L
|
9e779d279c
|
Allow retrieving all devices of a user
|
2022-05-12 14:42:55 +02:00 |
|
Santiago L
|
4ffbeec29d
|
Refactor form initialization
|
2022-05-12 14:23:01 +02:00 |
|
Santiago L
|
3e33b7d63b
|
Refactor DeviceListMix: split code in smaller methods
|
2022-05-12 14:03:09 +02:00 |
|
Cayo Puigdefabregas
|
b927e1ac54
|
Merge branch 'testing' into feature/#3100-wb-settings
|
2022-05-12 11:57:55 +02:00 |
|
cayop
|
b1feff324f
|
Merge pull request #270 from eReuse/feature/#3368-tag-list
add tags in device list
|
2022-05-12 11:39:28 +02:00 |
|
cayop
|
e8edd8e2d7
|
Merge pull request #268 from eReuse/feature/#3368-tag-list
add column created and put order descendent from created field
|
2022-05-12 11:34:25 +02:00 |
|
Cayo Puigdefabregas
|
0e974c0e92
|
add tags in device list
|
2022-05-12 11:33:28 +02:00 |
|
Cayo Puigdefabregas
|
fee1d6787c
|
add column created and put order descendent from created field
|
2022-05-12 11:03:48 +02:00 |
|
Cayo Puigdefabregas
|
9b6d77573f
|
fixed Enhancement #3384
|
2022-05-12 10:33:04 +02:00 |
|
Cayo Puigdefabregas
|
515f31c562
|
fixed bug #3387
|
2022-05-12 10:15:46 +02:00 |
|
Cayo Puigdefabregas
|
b6966328fb
|
fixed bug #3383
|
2022-05-12 10:09:03 +02:00 |
|
Cayo Puigdefabregas
|
eac90d32cf
|
fixed bug #3386
|
2022-05-12 10:05:37 +02:00 |
|
Santiago L
|
cba3bca8cf
|
Merge pull request #267 from RubenPX/lint
[Small-fix] ESLint ignore builded JS files
|
2022-05-11 22:43:20 +02:00 |
|
RubenPX
|
d10bb70da8
|
ESLint ignore builded JS files
|
2022-05-11 19:07:52 +02:00 |
|