scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-19 23:51:26 +08:00
Code Issues Projects Releases Packages Wiki Activity
15788 commits 31 branches 181 tags 166 MiB
Commit graph

623 commits

Author SHA1 Message Date
aignatov-bio
8c91181abc
Merge pull request #2702 from aignatov-bio/ai-sci-4800-keep-table-page-after-item-update 
Keep table page after repository item update [SCI-4800]
 2020-07-08 09:30:26 +02:00
aignatov-bio
a994c75885
Merge pull request #2700 from aignatov-bio/ai-sci-4801-inventory-list-sorting-date-issue 
Fix date columns sorting in repositories list [SCI-4801]
 2020-07-08 09:30:10 +02:00
aignatov-bio
65c28d641f
Merge pull request #2698 from aignatov-bio/ai-sci-4807-disable-column-reordering-repositories-list 
Disable column reordering in repositories list [SCI-4807]
 2020-07-08 09:29:51 +02:00
aignatov-bio
716319354b
Merge pull request #2706 from aignatov-bio/ai-sci-4820-fix-sidebar-inventory-refresh 
Improve active/archive switcher [SCI-4820]
 2020-07-08 09:29:16 +02:00
Mojca Lorber
9642e92fdc Hide inventory buttons and fix css of disabled button 2020-07-07 13:53:31 +02:00
Urban Rotnik
d16a2ed9c9 Fix Datatable header adjustments on repositories index 2020-07-07 09:49:05 +02:00
aignatov-bio
b127d8c754 Improve active/archive switcher 2020-07-06 14:03:55 +02:00
aignatov-bio
cc1b75644d Keep table page after repository item update 2020-07-03 13:45:02 +02:00
Mojca Lorber
db8c7cd97c Add empty states to inventories datatable and fix filtering bug 2020-07-02 15:51:07 +02:00
aignatov-bio
d226bb5622 Fix date columns sorting in repositories list 2020-07-02 14:35:48 +02:00
Urban Rotnik
1bf8198129 Hide checkbox column when user is not admin 2020-07-02 14:29:18 +02:00
aignatov-bio
9340148b41 Disable column reordering in repositories list 2020-07-02 11:50:40 +02:00
Oleksii Kriuchykhin
405d5b31bb Remove spinner in repository table after error caused by provisioning snapshot [SCI-4665] 2020-06-29 10:04:31 +02:00
Oleksii Kriuchykhin
64b66f0d73 Remove obsolete attribute in repository_datatable.js after feature branch merge 2020-06-24 16:25:42 +02:00
Oleksii Kriuchykhin
7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Urban Rotnik
193375818e Disable checkboxes for shared inventories 2020-06-24 13:41:00 +02:00
Alex Kriuchykhin
2a315ac106
Merge pull request #2681 from biosistemika/SCI-4780-replace-delete-button 
SCI-4780 replace delete button with archive button
 2020-06-24 13:16:11 +02:00
Oleksii Kriuchykhin
29f62419bd Improve repository archive/restore actions [SCI-4780] 2020-06-24 11:32:20 +02:00
aignatov-bio
5fc3146174 Update my module repositories dropdown list 2020-06-24 11:23:17 +02:00
miha
41bb825f33 SCI-4780 Added archive and restore items to repository actions dropdown, minor refactoring of controller 2020-06-23 22:59:21 +02:00
Urban Rotnik
efbc05e00e
Merge pull request #2675 from urbanrotnik/ur-sci-4782 
Include archived columns to inventories export [SCI-4782]
 2020-06-23 16:51:50 +02:00
aignatov-bio
414429afcd
Merge pull request #2674 from aignatov-bio/ai-sci-4784-update-manage-columns-for-archived-repository 
Add archived_by and archived_on column to columns manage modal [SCI-4784]
 2020-06-23 09:10:28 +02:00
Urban Rotnik
d1b1b5f268 Include archived columns to inventories export 2020-06-22 14:28:49 +02:00
aignatov-bio
dc50e7f1fd Add archived_by and archived_on column to columns manage modal 2020-06-22 14:00:44 +02:00
aignatov-bio
6f2d5b359e Add action buttons to repository index 2020-06-19 15:54:45 +02:00
Mojca Lorber
8d43603789 Fix acivities and error handeling 2020-06-19 09:04:42 +02:00
Mojca Lorber
6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
aignatov-bio
323929b270 Add restore/delete buttons 2020-06-18 14:09:29 +02:00
aignatov-bio
e9830ebfee Add view switcher 2020-06-18 14:08:24 +02:00
aignatov-bio
a6ff5b1ed8
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper 
Add archiving column to datatable helper [SCI-4692]
 2020-06-15 15:35:19 +02:00
aignatov-bio
97f5a7e9fc Fix smart annotation in inventory on edit 2020-06-12 11:17:50 +02:00
mlorb
0a7c9aeb1a
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows 
Archiving & restoring rows [SCI-4706]
 2020-06-11 16:41:53 +02:00
aignatov-bio
db35da0cee Add archiving column to datatable helper 2020-06-11 12:48:31 +02:00
Urban Rotnik
c7d6c4d60e Add repository_rows restoring and archiving actions on FE 2020-06-09 22:16:55 +02:00
aignatov-bio
2b9062ac92 Add checkbox selector to datatable 2020-06-09 13:16:50 +02:00
Oleksii Kriuchykhin
85ce72e5ff Remove obsolete JS functions from repositories datatable [SCI-4571] 2020-06-05 11:15:58 +02:00
aignatov-bio
4a6d7d0e12 Add archived inventories 2020-06-04 19:07:10 +02:00
aignatov-bio
66a77d8de9 Add sidebar reload on view change 2020-06-04 18:41:45 +02:00
aignatov-bio
012b7b3d23 Add switch for active/archive repository view 2020-06-04 18:41:45 +02:00
Oleksii Kriuchykhin
48865c8cea Clear the obsolete code for assiging inventory items to the task [SCI-4571] 2020-06-03 22:54:45 +02:00
Urban Rotnik
9d96baf008 Escape special chars for FE and BE 2020-06-02 15:16:01 +02:00
Urban Rotnik
9b0f215187 Fix status dropdown rendering 2020-06-02 06:15:34 +02:00
aignatov-bio
aee75a2f83 Add repository list view 2020-06-01 10:24:03 +02:00
aignatov-bio
3287070df7 Improve search through assigned tasks 2020-05-22 14:36:28 +02:00
Oleksii Kriuchykhin
c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
aignatov-bio
8ec7a4b7b4 Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 2020-05-07 13:03:00 +02:00
aignatov-bio
be8ef5a310 Add I18n 2020-04-28 12:49:19 +02:00
aignatov-bio
b9c5089c2b Add search to assigned tasks dropdown 2020-04-28 12:41:59 +02:00
aignatov-bio
0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
aignatov-bio
34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
aignatov-bio
087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
Mojca Lorber
6fbecf3e88 Hide pencil for shared inventory 2020-02-12 20:28:15 +01:00
aignatov-bio
d0fd956600
Merge pull request #2406 from aignatov-bio/ai-sci-4347-error-caused-by-dot-number 
Fix error in number column in repository [SCI-4347]
 2020-02-12 14:16:46 +01:00
aignatov-bio
00531066f8 Fix error in number column in repository 2020-02-12 11:55:10 +01:00
aignatov-bio
4e4a2cf5ad Add "indetermined" state for the "select all" checkbox in the Share Inventory modal 2020-02-12 10:37:29 +01:00
Alex Kriuchykhin
de219688cc
Merge pull request #2397 from okriuchykhin/ok_SCI_4331 
Fix edit button behavior in repository table [SCI-4331]
 2020-02-11 16:13:39 +01:00
Oleksii Kriuchykhin
fe0ebae383 Fix edit button behaviour in repository table [SCI-4331] 2020-02-11 11:07:03 +01:00
mlorb
c1aa269afc Merge pull request #2392 from mlorb/ml-sci-4313 
Add empty option in dropdown selector [SCI-4313]
 2020-02-10 10:32:03 +01:00
Alex Kriuchykhin
08140f23e5 Merge pull request #2393 from okriuchykhin/ok_SCI_4321 
Fix file result only name update [SCI-4321]
 2020-02-10 10:30:54 +01:00
Oleksii Kriuchykhin
4547e4d61a Fix DateTime picker for repositories edit mode [SCI-4331] 2020-02-07 16:42:04 +01:00
Oleksii Kriuchykhin
5470bb9b9b Fix file result only name update [SCI-4321] 2020-02-07 15:21:50 +01:00
Mojca Lorber
e9e7b85e0b Add empty option in dropdown selector 2020-02-07 14:57:07 +01:00
Alex Kriuchykhin
913f599b9f
Merge pull request #2389 from okriuchykhin/ok_SCI_4301 
Add unsaved data notification when navigating away from the inventory [SCI-4301]
 2020-02-07 13:58:20 +01:00
mlorb
ba597acf8d
Merge branch 'develop' into ml-sci-4217 2020-02-07 09:43:53 +01:00
Oleksii Kriuchykhin
21bf59b943 Add unsaved data notification when navigating away from the inventory [SCI-4301] 2020-02-06 16:46:16 +01:00
Mojca Lorber
769089b555 Fix hound 2020-02-06 14:44:58 +01:00
Mojca Lorber
a22fe28d24 Refactor new and edit renderer for file cell 2020-02-06 14:43:17 +01:00
mlorb
415abf8968
Merge pull request #2382 from mlorb/ml-sci-4283 
Implement missing style guide changes [SCI-4283]
 2020-02-04 09:37:48 +01:00
mlorb
7ad3527338
Merge pull request #2379 from urbanrotnik/ur-sci-4274-visual-fixes 
Visual fixes [SCI-4274]
 2020-02-03 09:44:48 +01:00
Mojca Lorber
e70bc67146 Implement missing style guide changes 2020-01-31 14:11:37 +01:00
mlorb
0ef066f921
Merge pull request #2365 from mlorb/ml-sci-4252 
Fix checklist list in inventory table [SCI-4252]
 2020-01-30 13:44:02 +01:00
aignatov-bio
44eccaaa12
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1 
Fix small visual bugs [SCI-4254]
 2020-01-30 13:42:07 +01:00
Urban Rotnik
7813d3ab75
Merge pull request #2363 from urbanrotnik/ur-sci-4190 
Make less opacity when editing or adding row [SCI-4190]
 2020-01-30 13:24:20 +01:00
aignatov-bio
2c595d01fc
Merge pull request #2370 from biosistemika/ai-sci-add-container-for-repository-filters 
Small fixes
 2020-01-29 15:48:19 +01:00
Urban Rotnik
67cbd47353 Fix icon after file editing 2020-01-29 14:56:03 +01:00
aignatov-bio
3c9bed4b56 Fix markup 2020-01-29 11:03:25 +01:00
aignatov-bio
4aa0a79c02 Fix resize repository 2020-01-29 11:00:48 +01:00
aignatov-bio
0ce52aae94 Add container for repository filters 2020-01-28 14:11:11 +01:00
Mojca Lorber
e6043ee0e5 Fix checklist list in inventory table 2020-01-27 15:52:52 +01:00
Urban Rotnik
dc79174160 Make less opacity when editing or adding row 2020-01-27 14:39:45 +01:00
mlorb
f605c0def3
Merge pull request #2358 from mlorb/ml-sci-4275 
Change to new style checkboxes on share inventory modal [SCI-4275]
 2020-01-27 13:38:30 +01:00
Urban Rotnik
0effb3ee69 Add translation for read-only items 2020-01-25 08:52:33 +01:00
Urban Rotnik
ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
Mojca Lorber
3af2f4af19 Change to new style checkboxes on share inventory modal 2020-01-24 15:43:13 +01:00
aignatov-bio
4395a7cc6b Fix small visual bugs 2020-01-23 13:12:58 +01:00
aignatov-bio
6a67280f6a Add new emoji picker 2020-01-21 10:50:55 +01:00
Alex Kriuchykhin
b0432fd10b
Merge pull request #2345 from urbanrotnik/ur-sci-4266-duplicate-spinner 
Set spinner to the table [SCI-4266]
 2020-01-21 10:43:45 +01:00
Urban Rotnik
74f38af54f Set spinner to the table 2020-01-21 10:26:24 +01:00
Miha Mencin
0157794274
Merge pull request #2341 from biosistemika/SCI-4270-select-all-doesnt-work 
SCI-4270 update selector
 2020-01-21 09:43:40 +01:00
Miha Mencin
5b099cb147
Merge pull request #2334 from okriuchykhin/ok_SCI_4258 
Switch input type to text for Numbers in repositories [SCI-4258]
 2020-01-21 09:23:47 +01:00
Miha Mencin
ba4e06f7e6 make selector a bit more specific 
make selector more specific
 2020-01-21 09:19:21 +01:00
Miha Mencin
652b9014e1 SCI-4270 update selector 2020-01-20 15:37:04 +01:00
Urban Rotnik
c29aee081b
Merge pull request #2335 from urbanrotnik/ur-sci-4236 
Use Jquery scroll [SCI-4236]
 2020-01-20 10:59:04 +01:00
Urban Rotnik
f52a2ef5b8 Use Jquery scroll 2020-01-17 16:23:24 +01:00
Oleksii Kriuchykhin
fa0bff93ff Switch input type to text for Numbers in repositories [SCI-4258] 2020-01-17 16:04:19 +01:00
Miha Mencin
a9add011d9
Merge pull request #2333 from biosistemika/SCI-4260-fix-the-visibility-of-the-buttons-2 
[SCI-4260] Fix the manage buttons visibility after columns reordering
 2020-01-17 14:34:32 +01:00
Miha Mencin
88210bd812 applying the patch 2020-01-17 14:04:25 +01:00
Urban Rotnik
7b50dd7b53
Merge pull request #2330 from urbanrotnik/ur-sci-4236 
Add timeout to scroll efect fix
 2020-01-17 11:26:39 +01:00
Urban Rotnik
0437383132 Add timeout to scroll efect 2020-01-17 10:40:18 +01:00
Miha Mencin
16724f622c
Merge pull request #2326 from urbanrotnik/ur-sci-4236 
Scroll left on new item in repository datatables [SCI-4236]
 2020-01-16 17:30:01 +01:00
Alex Kriuchykhin
4a96fa2648
Merge pull request #2323 from aignatov-bio/ai-sci-4255-disable-column-manage-button-in-edit-mode 
Disable column manage button in edit mode [SCI-4255]
 2020-01-16 16:37:29 +01:00
Urban Rotnik
96457d07bb Scroll left on new item in datatables 2020-01-16 16:34:45 +01:00
aignatov-bio
b7fe8b71c1 Disable column manage button in edit mode 2020-01-16 15:59:57 +01:00
Miha Mencin
e75d85c198
Merge pull request #2318 from biosistemika/SCI-4250-prevent-selecting-inventory-item 
SCI-4250 disable row selection when vieweng selected checklist items
 2020-01-16 15:29:13 +01:00
Miha Mencin
6460d6e879 fix typo, fix codestyle 2020-01-16 14:50:31 +01:00
Urban Rotnik
3a24d3150d Remove error on new file select, fix for new row file cells 2020-01-16 13:49:34 +01:00
Miha Mencin
29458375ab SCI-4250 disable row selection when vieweng selected checklist items 2020-01-16 13:39:49 +01:00
Urban Rotnik
218316bea2 Update error handling for name and text 2020-01-16 13:30:05 +01:00
aignatov-bio
1ff0351a74 Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories 2020-01-16 11:36:00 +01:00
aignatov-bio
2cb167ba7a Fix markup 2020-01-16 10:54:18 +01:00
Miha Mencin
ce3b4450cc
Merge pull request #2314 from biosistemika/SCI-4210-fix-styling-of-checklist-in-view-mode 
[SCI-4210][SCI-4189] show checklist as link, hide edit, copy, delete buttons when no items selected
 2020-01-15 18:16:45 +01:00
Alex Kriuchykhin
077ad7cad1
Merge pull request #2307 from okriuchykhin/ok_SCI_4233 
Unify view and edit modes for number cells [SCI-4233]
 2020-01-15 18:01:41 +01:00
Miha Mencin
960843c008 SCI-4210 move hiding and showing toolbar one level lower 2020-01-15 17:49:25 +01:00
aignatov-bio
b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +01:00
Alex Kriuchykhin
967acb0af3
Merge pull request #2312 from okriuchykhin/ok_SCI_4237 
Improve user experience for repository saving and fix checklist saving [SCI-4237]
 2020-01-15 16:36:40 +01:00
Alex Kriuchykhin
6e24dd4eb6
Merge pull request #2308 from okriuchykhin/ok_SCI_4226 
Disable repository filtering in edit mode [SCI-4226]
 2020-01-15 15:43:17 +01:00
Miha Mencin
79ad164166
Merge pull request #2311 from biosistemika/SCI-4202-dropdown-not-closing-after-select 
SCI-4202 add close param
 2020-01-15 15:27:11 +01:00
Oleksii Kriuchykhin
bb32117796 Improve user experience for repository saving and fix checklist saving [SCI-4237] 2020-01-15 15:23:03 +01:00
Miha Mencin
5085e55f22 fix status selection as well 2020-01-15 15:22:05 +01:00
Miha Mencin
df43c4c15f SCI-4202 add close param 2020-01-15 14:52:06 +01:00
mlorb
e44903bae5
Merge branch 'develop' into ml-sci-4150-v2 2020-01-15 14:47:25 +01:00
Mojca Lorber
c234b014cb fix locales 2020-01-15 14:18:08 +01:00
Oleksii Kriuchykhin
dd48a2902d Disable repository filtering in edit mode [SCI-4226] 2020-01-15 12:44:57 +01:00
aignatov-bio
271d6db792
Merge pull request #2303 from aignatov-bio/ai-sci-4175-update-design-date-time-fields 
Update css and error handling for date and time fields [SCI-4175]
 2020-01-15 12:36:12 +01:00
Oleksii Kriuchykhin
470f6ff541 Unifify view and edit modes for number cells [SCI-4233] 2020-01-15 12:16:17 +01:00
aignatov-bio
2a83c6bae2 Update hidden field for time cell 2020-01-15 09:48:18 +01:00
aignatov-bio
7ea6dbc67b Update css and error handling for date and time fields 2020-01-14 16:31:55 +01:00
aignatov-bio
79b020b97e Update table header color and update checkboxes 2020-01-14 11:39:15 +01:00
Mojca Lorber
9176301b7b Refactor manage repository columns, move it from page into modal 2020-01-14 11:13:19 +01:00
aignatov-bio
accd1d9e16
Merge pull request #2297 from aignatov-bio/ai-sci-4207-fix-datable-overflow 
Update layout for repository [SCI-4207]
 2020-01-13 15:13:39 +01:00
aignatov-bio
b37d8f1275 Update layout for repository 2020-01-13 14:46:43 +01:00
aignatov-bio
9ede0ef716 Fix big number in repository number value 2020-01-10 13:00:14 +01:00
aignatov-bio
751d34a078
Merge pull request #2288 from aignatov-bio/ai-sci-4192-empty-item-field-placeholders 
Update placeholders for cells [SCI-4192]
 2020-01-10 10:50:00 +01:00
aignatov-bio
e371715331
Merge pull request #2289 from aignatov-bio/ai-sci-4215-prevent-editing-two-items 
Prevent editing 2 items [SCI-4215]
 2020-01-10 10:13:30 +01:00
aignatov-bio
38eaf19dde Prevent editing 2 items 2020-01-09 15:19:04 +01:00
Alex Kriuchykhin
704c89a7d6
Merge pull request #2284 from okriuchykhin/ok_SCI_4196 
Fix repository table state updates after column creation/deletion [SCI-4196]
 2020-01-09 15:05:51 +01:00
aignatov-bio
13675dd2e7 Update placeholders for cells 2020-01-09 14:57:37 +01:00
aignatov-bio
9fdea4657c Update validation for repository text field 2020-01-09 13:32:03 +01:00
Oleksii Kriuchykhin
2faab14444 Fix repository table state updates after column creation/deletion [SCI-4196] 2020-01-08 16:16:54 +01:00
Urban Rotnik
356ba6572d Fix naming 2019-12-24 08:13:30 +01:00
Urban Rotnik
7116034b34 Update new renderer for StatusList 2019-12-23 14:40:15 +01:00
Urban Rotnik
400c109592 Refactor StatusesJS for new dropdown 2019-12-23 14:34:11 +01:00
Urban Rotnik
79b7d63116 JS fix 2019-12-20 16:14:39 +01:00
Urban Rotnik
fa6b1fa0db JS fixes 2019-12-20 15:19:30 +01:00
Urban Rotnik
181d637ff3 Update/refactor JS for handling Dates and Times 2019-12-20 14:59:27 +01:00
Urban Rotnik
1531d44e6b Add DateTime validators 2019-12-20 14:59:23 +01:00
Urban Rotnik
2e88f194bc Fix tests 2019-12-20 14:58:14 +01:00
Urban Rotnik
dfe3c5292e Add TimeRange and DateRange renderer 2019-12-20 14:57:04 +01:00
Urban Rotnik
5d4453470a Add DateTimeRange renderer 2019-12-20 14:56:11 +01:00
Urban Rotnik
2a63854123 Edit and new renderers for DateTime columns 2019-12-20 14:55:11 +01:00
Oleksii Kriuchykhin
e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
aignatov-bio
eed56b59aa Fix markup 2019-12-11 15:08:18 +01:00
aignatov-bio
52c0782447 Fix checklist update 2019-12-11 15:05:02 +01:00
aignatov-bio
7664f4be78 Add checklist and list edit mode 2019-12-11 14:49:14 +01:00
aignatov-bio
7fc9c0d1e4 Adding frontend for checklist edit mode 2019-12-10 15:58:59 +01:00
Urban Rotnik
14ec728ae7 Update param for file deletion 2019-12-10 14:29:37 +01:00
Urban Rotnik
b68aadf506 Update params nesting 2019-12-10 14:29:35 +01:00
aignatov-bio
d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Urban Rotnik
2ec99fa696 Add new renderer for File, Status and List 2019-12-05 09:19:19 +01:00
Urban Rotnik
ee5c2ac93d Add edit renderer for Assets 2019-12-04 14:52:52 +01:00
Urban Rotnik
3ab1967703 Add Edit renderer for Statuses 2019-12-02 11:03:05 +01:00
Urban Rotnik
d797469e38 Fix for hidden columns 2019-12-02 08:08:49 +01:00
Urban Rotnik
3a76753b72 Add Edit renderer for ListColumnType 2019-11-29 12:52:27 +01:00
Urban Rotnik
5f2407e3fb Add view renders for DateTime column types 2019-11-29 10:50:14 +01:00
Urban Rotnik
1c9d7ef6e7 Add File type renderer 2019-11-29 10:19:54 +01:00
Oleksii Kriuchykhin
7efcf5abcf Cleanup updateButtons method [SCI-4070] 2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin
3481b50796 Fix column reordering for repositories [SCI-4070] 2019-11-29 10:19:06 +01:00
Oleksii Kriuchykhin
338b710d81 Refactor inventory edit mode [SCI-4070] 2019-11-29 10:19:05 +01:00
Oleksii Kriuchykhin
e8fdfe7111 Implement datatables renderer for status data type [SCI-4032] 2019-11-29 10:19:04 +01:00
aignatov-bio
2024afce4b Fix markup 2019-11-29 10:19:04 +01:00
aignatov-bio
c6a075664c Add default renders for new columns type 2019-11-29 10:19:04 +01:00
aignatov-bio
232e4d78be Add serializers to datatable values 2019-11-29 10:19:03 +01:00
aignatov-bio
a0f11116d2 Add render views for datatables 2019-11-29 10:18:59 +01:00
aignatov-bio
d88d479854
Merge pull request #2175 from aignatov-bio/ai-sci-4007-error-at-click-to-share-button 
Add check for existing elements for shared repository modal [SCI-4007]
 2019-11-15 14:32:46 +01:00
aignatov-bio
4d3e318174 Add check for existing elements 2019-10-22 10:46:16 +02:00
Mojca Lorber
b78211e3ca Fix reloading of datatables header again 2019-10-16 13:02:41 +02:00
aignatov-bio
fcc1829660 Fix merge for repository datatable 2019-10-04 10:51:13 +02:00
Anton Ignatov
33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
mlorb
2fd9345616
Merge pull request #2068 from mlorb/ml-sci-3816 
Fix reloading of datatables header [SCI-3816]
 2019-09-27 10:29:32 +02:00
Anton Ignatov
09e3b7c80b Fix repository row import/export 2019-09-23 13:33:02 +02:00
Mojca Lorber
4263edf0cc Fix inventory item selection when previewing file 2019-09-18 15:08:40 +02:00
Mojca Lorber
4d4a275c0d Fix reloading of datatables header 2019-09-18 14:28:29 +02:00
aignatov-bio
d028856fe0
Fix hidden buttons in inventory (#2063) 2019-09-18 11:36:30 +02:00
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin
265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +02:00
aignatov-bio
d209b3abcd
Update share modal window [SCI-3812] (#2018) 
* Update share modal window

* Fix markup
 2019-08-29 13:45:27 +02:00
aignatov-bio
66326d90e5
Fix shared icon show/hidden (#2014) 2019-08-26 11:24:22 +02:00
aignatov-bio
d70b7e2272
Make share status icon dynamic (#2007) 2019-08-21 15:32:57 +02:00
aignatov-bio
a505ef2462
Fix error in inventories for new teams [SCI-3788] (#1992) 
* Fix error in inventories for new teams

* Replace with current team
 2019-08-19 14:01:48 +02:00
aignatov-bio
d4aedbb35f
Small ux changes for inventories (#1989) 2019-08-19 09:24:10 +02:00
Miha Mencin
5adb745743
Merge pull request #1987 from aignatov-bio/ai-sci-3785-fix-assign-unassing-buttons 
Fix assign/unassign buttons [SCI-3785]
 2019-08-19 08:51:14 +02:00
Anton Ignatov
ec57e0aa91 Fix assign/unassign buttons 2019-08-16 10:05:01 +02:00
Urban Rotnik
89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
aignatov-bio
aad726ac40
Update CSS for share modal (#1978) 2019-08-12 15:02:16 +02:00
Urban Rotnik
61af9e21ad Fix datatable filter position 2019-08-09 14:22:24 +02:00
Urban Rotnik
32783576c1 Add controller action 'multiple_update' 
Add controller action, add update permission activity, add JS for handling ajax req
 2019-08-09 14:15:50 +02:00
Urban Rotnik
2648521924 Invite modal with form 2019-08-09 14:15:49 +02:00
Urban Rotnik
466b05a5bc Update repository index page 2019-08-09 14:15:48 +02:00
aignatov-bio
b57e79a557
Fix tables (#1963) 2019-08-09 09:41:32 +02:00
Oleksii Kriuchykhin
423528933e Switch to global JS constants [SCI-3679] 2019-08-06 15:06:19 +02:00
Oleksii Kriuchykhin
ccf76b8531 Move repository_datatable to JS file [SCI-3679] 2019-07-26 13:00:25 +02:00
Oleksii Kriuchykhin
5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Oleksii Kriuchykhin
ffa7c5ecb2 Fix permition checks for file editing and make protocol preview files read only [SCI-3281] 2019-04-02 16:38:53 +02:00
Anton Ignatov
4145b2565c Fixed bug with order in inventories SCI-3006 2019-02-07 11:34:04 +01:00
Zanz2
a9c0201fcc
Merge pull request #1277 from Zanz2/zz_export_items_unselectable_sci2629 
Fixed disabled export button after new inventory item save [SCI-2629]
 2018-09-13 11:35:07 +02:00
Luka Murn
92a4a54ae7 Slighty change the parameter parsing of removed file cells 2018-08-21 16:46:47 +02:00
Zanz2
6e4730619f Fixed the bug, disabled class in dropdown menu when there was no need 2018-08-21 14:29:34 +02:00
mlorb
f52ccfd606 fix editing of inventory items of hidden columns 2018-08-07 11:47:26 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
zmagod
1491c61d51 trim long file names [fixes SCI-2593] 2018-07-09 17:00:47 +02:00
Zmago Devetak
a6a395e394
Merge pull request #1240 from ZmagoD/zd_SCI_2593 
fixes css for new repository item field field [fixes SCI-2593]
 2018-07-09 13:15:15 +02:00
zmagod
10d20a6555 fixes datatable header on add new item action 2018-07-09 13:12:48 +02:00
zmagod
14254fbde3 fixes per @mlorb 's request 2018-07-09 12:54:02 +02:00
zmagod
dd00de928c fixes css for new repository item field field [fixes SCI-2593] 2018-07-09 10:33:19 +02:00
Oleksii Kriuchykhin
3aceb12f03 Fix delete button in inventories [SCI-2594] 2018-07-08 21:59:02 +02:00
zmagod
fdedfec7d3 fixes bug with bootstrap-select 2018-07-04 17:38:16 +02:00
Zmago Devetak
eb61f728b4
Merge pull request #1227 from ZmagoD/zd_SCI_2546 
Refactor inline row editing in repository
 2018-07-04 15:28:08 +02:00
zmagod
5b9b86a2d4 fixes per @Ducz0r 's request 2018-07-04 15:23:41 +02:00
zmagod
c9dd8b356a fixes locale, fixes custom file upload style 2018-07-04 13:43:45 +02:00
zmagod
43903080ce code style fixes 2018-07-04 12:42:28 +02:00
zmagod
3eef4f87bf fixes hound alerts 2018-07-03 16:18:44 +02:00
zmagod
8b86891177 fixes file destroy button [fixes SCI-2546] 2018-07-03 15:25:37 +02:00
zmagod
28bac14667 first working version of the edit form object 2018-07-03 12:57:39 +02:00
ZmagoD
1e66d25578 refactor list item dropdown 2018-07-02 17:05:52 +02:00
ZmagoD
23de3abd61 Fixes repository items edit action, adds additional event listener for file upload 2018-06-29 16:59:26 +02:00
nbernot
7aacc2b4a2 extract repository_item html form creation in to a separate 'class' 2018-06-29 14:28:06 +02:00
zmagod
0dbd2dc877 fixes typo 2018-06-29 10:29:39 +02:00
zmagod
eb75f6c03d fixes bug with checkAvailableColumns function [fixes SCI-2578] 2018-06-29 10:28:46 +02:00
zmagod
5f1489a100 fix columns check [fixes SCI-2408] 2018-06-18 13:36:56 +02:00
zmagod
2f141e9217 disable buttons on new/edit repository_item action [fixes SCI-2410] 2018-06-15 11:37:01 +02:00
Zmago Devetak
29fe58de80
Merge pull request #1208 from ZmagoD/zd_SCI_2408 
adds an additional check if some other user has added/removed reposit…
 2018-06-13 11:30:43 +02:00
Zmago Devetak
d457a66996
Merge pull request #1205 from ZmagoD/zd_SCI_2427 
enables tooltip on long column names [fixes SCI-2427]
 2018-06-13 11:14:29 +02:00
Zmago Devetak
673410251d
Merge pull request #1197 from ZmagoD/zd_SCI_2384 
fixes repository table on sidebar toggle [fixes SCI-2384]
 2018-06-13 09:57:27 +02:00
Zmago Devetak
50c1a712d8
Merge pull request #1204 from ZmagoD/zd_SCI_2434 
fixes bug with repository items dropdown [fixes SCI-2434]
 2018-06-13 08:42:13 +02:00
zmagod
f8ac083d39 adds an additional check if some other user has added/removed repository columns [fixes SCI-2408] 2018-06-12 15:28:03 +02:00
zmagod
a8971b4e20 enables tooltip on long column names [fixes SCI-2427] 2018-06-11 15:22:56 +02:00
Zmago Devetak
a174e186bb
removes unneeded code 2018-06-11 15:00:13 +02:00
zmagod
256e502982 fixes bug with repository items dropdown [fixes SCI-2434] 2018-06-11 14:57:27 +02:00
zmagod
b7ecf09963 fixes repository table on sidebar toggle [fixes SCI-2384] 2018-06-08 10:58:28 +02:00
zmagod
a51ea399f4 removes unneeded empty lines 2018-06-05 16:39:22 +02:00
zmagod
66cac0b676 removes visibility toggle from Name column [fixes SCI-2435] 2018-06-05 16:36:36 +02:00
zmagod
b74598a748 fixes bug with empty submit of repository row [fixes SCI-2420] 2018-05-29 14:47:40 +02:00
mlorb
3368e3b963
Merge branch 'ux-release-1' into ml-sci-2271 2018-05-23 14:06:54 +02:00
mlorb
5e689f6b4d fix toggle button on inventory page 2018-05-23 11:20:42 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
Luka Murn
6135081a71 Update new repository row code so file columns work again 
Also fix backend code a bit (so update & create of repository rows
are more similar in their behavior), and fix line in JS:
_initSelectPicker() was called a reduntant amount of times when
editing repository row.

Closes SCI-2436.
 2018-05-21 14:46:30 +02:00
okriuchykhin
6dbb5bc583
Merge pull request #1152 from okriuchykhin/ok_SCI_2403 
Change remove file button appearence [SCI-2403]
 2018-05-18 17:34:56 +02:00
Oleksii Kriuchykhin
b79b0b79cf Change remove file button appearence [SCI-2403] 2018-05-18 14:51:45 +02:00
Zmago Devetak
c3d247faae
Merge pull request #1128 from ZmagoD/zd_SCI_2331 
adds deface hook in support dropdown [fixes SCI-2331]
 2018-05-18 09:31:02 +02:00
zmagod
8a99d35a8d removes datatables.noSearchHidden plugin 2018-05-18 09:24:36 +02:00
mlorb
7bda68b9f4
Merge pull request #1146 from mlorb/ml-sci-2336-v3 
Add locales [SCI-2336]
 2018-05-17 13:29:47 +02:00
Zmago Devetak
f73bd18989
Merge pull request #1145 from ZmagoD/zd_SCI_2407 
fixes column name in columns visibility dropdown tooltip [fixes SCI-2…
 2018-05-16 20:34:40 +02:00
okriuchykhin
e9d6b26ec6
Merge pull request #1141 from okriuchykhin/ok_SCI_2403 
Add clear file selector button to repository edit [SCI-2403]
 2018-05-16 14:55:53 +02:00
zmagod
b1b259fdbe fixes column name in columns visibility dropdown tooltip [fixes SCI-2407] 2018-05-16 14:37:58 +02:00
mlorb
06ce285ae2 add locales 2018-05-16 14:32:15 +02:00
Zmago Devetak
9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321 
fixes images preview in repository/library [fixes SCI-2321]
 2018-05-16 12:05:33 +02:00
Oleksii Kriuchykhin
c8094f196c Add margin to clear button and fix case with new file in the cell [SCI-2403] 2018-05-16 11:25:43 +02:00
Oleksii Kriuchykhin
be5d481cdc Add clear file selector button to repository edit [SCI-2403] 2018-05-16 10:32:50 +02:00
okriuchykhin
62f0c21a79
Merge pull request #1140 from okriuchykhin/ok_SCI_2391 
Re-init file preview modal after inventory row editing [SCI-2391]
 2018-05-16 10:18:13 +02:00
okriuchykhin
ffddf3fd94
Merge pull request #1135 from okriuchykhin/ok_SCI_2394 
Fix editing of inventory rows with existing files [SCI-2394]
 2018-05-16 10:16:26 +02:00
Zmago Devetak
b771149477
Merge pull request #1133 from ZmagoD/zd_SCI_2337 
fixes error message for invalid file type [fixes SCI-2337]
 2018-05-16 08:26:11 +02:00
Oleksii Kriuchykhin
95b8821cc9 Re-init file preview modal after inventory row editing [SCI-2391] 2018-05-15 12:57:36 +02:00
Oleksii Kriuchykhin
a92abc5995 Fix editing of inventory rows with existing files [SCI-2394] 2018-05-14 14:26:01 +02:00
mlorb
b5649f0574
Merge branch 'ux-release-1' into ml-sci-2336-v1 2018-05-10 13:59:57 +02:00
zmagod
3db7cc437b fixes error message for invalid file type [fixes SCI-2337] 2018-05-10 13:52:01 +02:00
Luka Murn
8650edbbb9
Merge pull request #1129 from Ducz0r/lm-fix-repositories-index 
Fix merge conflict introduced in when merging master->ux-release-1
 2018-05-10 11:19:38 +02:00
okriuchykhin
ed8237484b
Merge pull request #1131 from okriuchykhin/ok_SCI_2379 
Re-init file preview modal after column visability change [SCI-2379]
 2018-05-10 10:45:56 +02:00
zmagod
e5c3fb6af2 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-05-10 10:38:56 +02:00
Oleksii Kriuchykhin
fa1fea634c Re-init file preview modal after column visability change [SCI-2379] 2018-05-09 17:41:52 +02:00
mlorb
7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
Luka Murn
f8295b60c9 Fix merge conflict introduced in when merging master->ux-release-1 
Bug was introduced in merge commit
cb6fe50832 and resulted in import
into inventories not working.
 2018-05-08 09:41:40 +02:00
zmagod
66b676b5ce Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321 2018-04-26 17:04:36 +02:00
zmagod
8dac887f10 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261 2018-04-26 14:18:41 +02:00
zmagod
24acd5c779 fixes per @duco 's request 2018-04-26 14:13:46 +02:00
Luka Murn
cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
Luka Murn
bd6f97fabc Add initializer to include helpers in all assets (including .js) 2018-04-25 10:51:19 +02:00
zmagod
c2d19fee52 fixes images preview in repository/library [fixes SCI-2321] 2018-04-24 13:11:55 +02:00
zmagod
824962c084 propagate assigned repository items in workflow [fixes SCI-2261] 2018-04-23 11:33:16 +02:00
Luka Murn
caab0cf55c Update the ordering upon table load 2018-04-20 12:31:22 +02:00
Luka Murn
21e7e7057e Refactor all the methods into two new services 2018-04-20 12:31:22 +02:00
Luka Murn
5e2622ecfc Change default repository state to Ruby representation 
Also remove some dead code from repositories datatables
 2018-04-20 12:31:22 +02:00
Zmago Devetak
1290435372
Merge pull request #1086 from ZmagoD/zd_SCI_2207 
enables copying of repository items [fixes SCI-2207]
 2018-04-19 17:13:43 +02:00
mlorb
2627efe402 implement file column type when editing & creating new rows in inventories DataTables 2018-04-13 17:21:17 +02:00
zmagod
6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod
233e73c709 adds asset preview link to repository row modal and to table row item [fixes SCI-2110] 2018-04-10 17:06:53 +02:00
zmagod
ea4bd8831f fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284] 2018-04-10 13:19:53 +02:00
Zmago Devetak
eca69cfc75
Merge pull request #1080 from ZmagoD/zd_SCI_2076 
add asset field preview/sort/search in repository table [fixes SCI-2076]
 2018-04-09 14:29:45 +02:00
zmagod
b51ad84ee5 add asset field preview/sort/search in repository table [fixes SCI-2076] 2018-04-06 12:03:39 +02:00
zmagod
afc2a35557 move import export to dropdown 2018-04-05 09:32:34 +02:00
Zmago Devetak
d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206 
add ID column to repository [fixes SCI-2206]
 2018-04-04 15:39:59 +02:00
zmagod
e630d3113f add ID column to repository [fixes SCI-2206] 2018-04-04 11:55:11 +02:00
okriuchykhin
145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]" 2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin
5dc01a3d42 Fix code style [SCI-2251] 2018-03-26 13:59:45 +02:00
zmagod
3efe06a410 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 12:02:24 +02:00
Oleksii Kriuchykhin
83c7539156 Update turbolinks and fix repository table init [SCI-2251] 2018-03-25 19:44:58 +02:00
Oleksii Kriuchykhin
36302ad6e8 Refactor existing columns management to control only Column visibility and order [SCI-2220] 2018-03-21 16:56:36 +01:00
zmagod
62858bc14f Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-20 14:46:11 +01:00
zmagod
1ad8c259d1 add blank page for repositories [fixes SCI-2139] 2018-03-20 14:45:57 +01:00
zmagod
d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00