aignatov-bio
|
e5d3fac112
|
Merge branch 'features/smart-annotation-improvements' into develop
|
2020-09-17 14:52:51 +02:00 |
|
aignatov-bio
|
6ed8757eb1
|
Merge branch 'features/task-flows' into develop
|
2020-09-17 14:52:05 +02:00 |
|
aignatov-bio
|
8dbc69aa31
|
Remove console.log
|
2020-09-17 14:48:26 +02:00 |
|
aignatov-bio
|
f11f54db33
|
Small fixes
|
2020-09-17 13:11:54 +02:00 |
|
aignatov-bio
|
b4102f3cfd
|
Add try/cath for JSON.parse
|
2020-09-17 11:43:08 +02:00 |
|
aignatov-bio
|
9cb26a1cb9
|
Fix markup
|
2020-09-17 11:43:08 +02:00 |
|
aignatov-bio
|
3691d21215
|
Fix multiple smart annotation selected
|
2020-09-17 11:43:08 +02:00 |
|
aignatov-bio
|
86667feb6b
|
Add remembered state for smart annotation
|
2020-09-17 11:43:07 +02:00 |
|
mlorb
|
4acd0c4cb9
|
Merge pull request #2841 from mlorb/ml-sci-4984
Add saving state for filters on dashboard [SCI-4984]
|
2020-09-17 09:53:16 +02:00 |
|
aignatov-bio
|
c26f8e7193
|
Add before send condition for status change
|
2020-09-16 15:23:53 +02:00 |
|
Urban Rotnik
|
c9de9e857f
|
Fix constant initialization
|
2020-09-16 12:15:23 +02:00 |
|
Mojca Lorber
|
9cd8e3b7ac
|
Change default status values, add project and experiment to saved state and fix parsing error handeling
|
2020-09-16 09:48:06 +02:00 |
|
Mojca Lorber
|
3c30ee904e
|
Merge branch 'features/task-flows' into ml-sci-4984
|
2020-09-15 13:27:34 +02:00 |
|
mlorb
|
bf707a11a9
|
Merge branch 'features/task-flows' into ml-sci-4976
|
2020-09-15 12:59:49 +02:00 |
|
aignatov-bio
|
67d3a1ad12
|
Fix markup
|
2020-09-15 12:06:20 +02:00 |
|
aignatov-bio
|
6dc4422d82
|
Fix markup
|
2020-09-15 11:56:44 +02:00 |
|
Mojca Lorber
|
fe7d922cc5
|
Refactor complete step button
|
2020-09-15 11:18:15 +02:00 |
|
Oleksii Kriuchykhin
|
73cf620960
|
Add Completion and Uncompletion consequences [SCI-5004]
|
2020-09-14 20:06:48 +02:00 |
|
Mojca Lorber
|
13f719a9e1
|
Add saving state for filters on dashboard
|
2020-09-14 18:15:57 +02:00 |
|
Oleksii Kriuchykhin
|
a7c6ab9d89
|
Move some consequence executon into background process [SCI-4978]
|
2020-09-11 16:18:39 +02:00 |
|
aignatov-bio
|
008563a7f4
|
Update user smart annotation
|
2020-09-11 13:00:13 +02:00 |
|
mlorb
|
3d2aaed791
|
Merge pull request #2820 from mlorb/ml-sci-4580
Fix buttons visability on reports page according to new styleguide [SCI-4580]
|
2020-09-10 09:32:16 +02:00 |
|
Mojca Lorber
|
d055d6e241
|
Fix quotes again
|
2020-09-09 14:43:12 +02:00 |
|
aignatov-bio
|
7a86bb47c5
|
Add styling and highligh
|
2020-09-09 14:17:19 +02:00 |
|
Urban Rotnik
|
0ae39678d4
|
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state
Add error message for locked task, update some permission checks[SCI-4982]
|
2020-09-09 14:04:08 +02:00 |
|
Urban Rotnik
|
8b10cde6b4
|
Fix DeepScan error
|
2020-09-09 13:51:11 +02:00 |
|
aignatov-bio
|
661220890f
|
Update error handling
|
2020-09-09 12:25:34 +02:00 |
|
aignatov-bio
|
f4a13a73cb
|
Refactor smart annotation front-end
|
2020-09-09 12:25:34 +02:00 |
|
Urban Rotnik
|
aa88b6bdb4
|
Move redirect to controller
|
2020-09-09 11:26:43 +02:00 |
|
Mojca Lorber
|
ea1510bcdd
|
Fix quotes
|
2020-09-09 10:27:32 +02:00 |
|
aignatov-bio
|
84682c6346
|
Merge pull request #2823 from mlorb/ml-sci-4575
Replace old arrow with new one [SCI-4575]
|
2020-09-09 09:05:39 +02:00 |
|
Urban Rotnik
|
d9b691103c
|
Add permission error message
|
2020-09-08 15:42:30 +02:00 |
|
Oleksii Kriuchykhin
|
dea75553a3
|
Fix handling of duplicated step positions [SCI-4880]
|
2020-09-07 10:44:00 +02:00 |
|
Mojca Lorber
|
9dac4079f8
|
Replace old arrow with new one and remove redundant javascript for arrow collapsing
|
2020-09-04 14:43:30 +02:00 |
|
Mojca Lorber
|
24745203e1
|
Fix buttons visability on protocols page according to new styleguide
|
2020-09-03 17:05:25 +02:00 |
|
Mojca Lorber
|
1f0d9f3ad7
|
Fix buttons visability on reports page according to new styleguide
|
2020-09-03 16:19:02 +02:00 |
|
aignatov-bio
|
9ff5e8bd7d
|
Add task state change error handling and validation
|
2020-09-01 12:41:00 +02:00 |
|
Urban Rotnik
|
a259800590
|
Merge branch 'develop' into jg_sci_2228
|
2020-08-31 16:29:23 +02:00 |
|
Urban Rotnik
|
4eebfa5461
|
Controller action for card inline preview
|
2020-08-28 11:05:52 +02:00 |
|
aignatov-bio
|
c07ebe90fa
|
Add migration for task states
|
2020-08-27 11:34:59 +02:00 |
|
Oleksii Kriuchykhin
|
ed2eb81c68
|
Switch to position swapping when updating step position [SCI-4880]
|
2020-08-25 15:46:23 +02:00 |
|
Oleksii Kriuchykhin
|
a206890a8c
|
Fix step position adjusting on move and destroy [SCI-4880]
|
2020-08-25 15:46:21 +02:00 |
|
Urban Rotnik
|
5923a4c014
|
Merge branch 'develop' into features/task-flows
|
2020-08-25 15:30:22 +02:00 |
|
aignatov-bio
|
c3ddfd5bed
|
Merge pull request #2786 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard
Fix dropdrown selector [SCI-4899]
|
2020-08-25 14:51:55 +02:00 |
|
aignatov-bio
|
21e4dcd96a
|
Add wopi preview for office files
|
2020-08-25 13:22:36 +02:00 |
|
Urban Rotnik
|
b6495becdb
|
Set stateDuration to 0
|
2020-08-24 15:51:35 +02:00 |
|
Alex Kriuchykhin
|
5006173d59
|
Merge pull request #2780 from aignatov-bio/ai-sci-4856-add-new-statuses-to-dashboard
Add new statuses to dashboard [SCI-4856]
|
2020-08-24 11:09:57 +02:00 |
|
aignatov-bio
|
19a0d05467
|
Fix for checklist ordering
|
2020-08-14 12:32:39 +02:00 |
|
aignatov-bio
|
5360db76be
|
Fix dropdrown selector
|
2020-08-12 14:00:10 +02:00 |
|
aignatov-bio
|
56ff4e7702
|
Add new statuses to dashboard
|
2020-08-10 09:10:56 +02:00 |
|
Urban Rotnik
|
073979534c
|
Merge branch 'features/task-flows' into develop_to_task_flows
|
2020-08-04 16:43:05 +02:00 |
|
Urban Rotnik
|
e221d960e7
|
Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard"
This reverts commit 8b6d57058c , reversing
changes made to 957ac92669 .
|
2020-08-04 15:07:22 +02:00 |
|
Urban Rotnik
|
7c14da70d9
|
Merge branch 'features/task-flows' into develop_to_task_flows
|
2020-08-04 14:50:46 +02:00 |
|
Urban Rotnik
|
6853caa0c8
|
Merge pull request #2760 from aignatov-bio/ai-sci-4894-small-2fa-fixes
Small 2fa fixes [SCI-4894]
|
2020-08-04 11:23:08 +02:00 |
|
Urban Rotnik
|
cce76f6f0f
|
Merge pull request #2763 from aignatov-bio/ai-sci-4895-add-sorting-to-reults
Add ordering for result page [SCI-4895]
|
2020-08-04 11:17:43 +02:00 |
|
Alex Kriuchykhin
|
a9bc5b664a
|
Merge pull request #2750 from aignatov-bio/ai-sci-4835-add-status-flow-modal
Add modal for status flow [SCI-4835]
|
2020-08-04 09:47:40 +02:00 |
|
Urban Rotnik
|
aaae33e603
|
Merge pull request #2764 from aignatov-bio/ai-sci-4766-add-start-date-filter-to-dashboard
Add start date to current task dashboard filter [SCI-4766]
|
2020-08-03 11:56:24 +02:00 |
|
Urban Rotnik
|
ac3c06d882
|
Merge pull request #2741 from aignatov-bio/ai-sci-4748-add-export-for-assinged-items
Add export for assigned items [SCI-4748]
|
2020-08-03 11:30:31 +02:00 |
|
aignatov-bio
|
536367362c
|
Add statuses to dashboard filters
|
2020-07-31 10:59:10 +02:00 |
|
aignatov-bio
|
2f5231e832
|
Add start date to current task dashboard filter
|
2020-07-29 16:09:23 +02:00 |
|
aignatov-bio
|
15b5f9bb68
|
Add ordering for result page
|
2020-07-28 15:39:29 +02:00 |
|
aignatov-bio
|
68fc6ec58a
|
Add sorting my module statuses
|
2020-07-27 16:36:21 +02:00 |
|
aignatov-bio
|
6bd12e0397
|
Add modal for status flow
|
2020-07-27 13:48:21 +02:00 |
|
aignatov-bio
|
33e3e3d301
|
Small 2fa fixes
|
2020-07-27 13:42:51 +02:00 |
|
Urban Rotnik
|
025378cd0e
|
Fix translations and JS
|
2020-07-23 15:53:46 +02:00 |
|
Urban Rotnik
|
077f5eefdb
|
Merge pull request #2753 from urbanrotnik/ur-sci-4890-inventory-empty-text-value
Fix undefined text cell [SCI-4890]
|
2020-07-23 12:56:43 +02:00 |
|
Alex Kriuchykhin
|
cb9fe04584
|
Merge pull request #2745 from aignatov-bio/ai-sci-4785-fix-inventories-activity-filters
Fix global activities filters [SCI-4785]
|
2020-07-23 10:09:36 +02:00 |
|
Urban Rotnik
|
51ca828399
|
Fix undefined text cell
|
2020-07-22 17:27:36 +02:00 |
|
Urban Rotnik
|
512d6f3229
|
Add actions for update status, clean old complete actions
|
2020-07-22 16:12:34 +02:00 |
|
aignatov-bio
|
1d3055011f
|
Merge branch 'features/tinymce-tables' into develop
|
2020-07-22 13:41:43 +02:00 |
|
aignatov-bio
|
ddfe8231d8
|
Merge branch 'features/2fa' into develop
|
2020-07-22 11:56:36 +02:00 |
|
aignatov-bio
|
75930b99c3
|
Fix global activities filters
|
2020-07-20 15:01:00 +02:00 |
|
aignatov-bio
|
e69e3ea8d3
|
Add export for assigned items
|
2020-07-17 15:17:09 +02:00 |
|
Mojca Lorber
|
9464d2753d
|
Fix naming of filter field for repositories tables
|
2020-07-15 10:52:47 +02:00 |
|
Mojca Lorber
|
cea9e6f956
|
Add check for search state
|
2020-07-10 15:39:01 +02:00 |
|
Alex Kriuchykhin
|
594d8031ce
|
Merge pull request #2726 from mlorb/ml-sci-4855
Remove search state load from repositories table [SCI-4855]
|
2020-07-10 13:07:44 +02:00 |
|
Mojca Lorber
|
39ae1ed25e
|
Fix search status
|
2020-07-10 12:52:07 +02:00 |
|
aignatov-bio
|
50714eb59d
|
Disable inventories table initialization on turbolinks preview
|
2020-07-10 11:05:27 +02:00 |
|
Mojca Lorber
|
21f0d431b0
|
Remove search state load from repositories table
|
2020-07-10 11:05:22 +02:00 |
|
aignatov-bio
|
fef6e5f1db
|
Add recovery strategy for 2fa
|
2020-07-09 17:01:00 +02:00 |
|
mlorb
|
0f43f6a479
|
Merge pull request #2721 from mlorb/ml-sci-4788-v2
Fix bug with not hidden navigation on inventory page [SCI-4788]
|
2020-07-09 15:12:44 +02:00 |
|
mlorb
|
3f44f44cbe
|
Merge pull request #2711 from mlorb/ml-sci-4810
Hide inventory buttons and fix css of disabled button [SCI-4810]
|
2020-07-09 15:11:02 +02:00 |
|
Miha Mencin
|
2cb3720602
|
Merge pull request #2720 from aignatov-bio/ai-sci-4842-snapshot-archived-label-wrong-position
Add archived label to correct column [SCI-4842]
|
2020-07-09 14:49:54 +02:00 |
|
Mojca Lorber
|
1a2b321523
|
Fix bug with not hidden navigation on inventory page
|
2020-07-09 14:09:55 +02:00 |
|
aignatov-bio
|
c240474f76
|
Add archived label to correct column
|
2020-07-09 13:39:26 +02:00 |
|
aignatov-bio
|
6245e19069
|
Merge pull request #2718 from biosistemika/master
Merge master to develop
|
2020-07-09 12:56:31 +02:00 |
|
mlorb
|
73e2654d78
|
Merge pull request #2701 from mlorb/ml-sci-4793
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
|
2020-07-09 11:49:16 +02:00 |
|
mlorb
|
d9038e6f7f
|
Merge branch 'develop' into ml-sci-4810
|
2020-07-09 11:46:54 +02:00 |
|
aignatov-bio
|
b2a42c182b
|
Merge pull request #2717 from aignatov-bio/ai-sci-4844-fix-dropdown-options-for-active-repository
Small archived repositories fixes [SCI-4844]
|
2020-07-09 08:56:21 +02:00 |
|
aignatov-bio
|
135ac487d0
|
Small archived repositories fixes
|
2020-07-08 13:42:27 +02:00 |
|
Urban Rotnik
|
d6f37ce28e
|
Merge pull request #2710 from urbanrotnik/ur-sci-4568-remove-flash-message
Remove flash message for redirects from root url [SCI-4568]
|
2020-07-08 11:42:05 +02:00 |
|
Urban Rotnik
|
33aa1d3641
|
Merge pull request #2709 from urbanrotnik/ur-sci-4804
Fix Repository rows count & table header adjustmen [SCI-4804]
|
2020-07-08 11:39:44 +02:00 |
|
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 |
|
aignatov-bio
|
88c092dc98
|
Add i18n and constants
|
2020-07-07 15:59:02 +02:00 |
|
Mojca Lorber
|
9642e92fdc
|
Hide inventory buttons and fix css of disabled button
|
2020-07-07 13:53:31 +02:00 |
|
aignatov-bio
|
be3a1994f8
|
Add basic UX to 2FA
|
2020-07-07 13:09:48 +02:00 |
|
aignatov-bio
|
13f7653667
|
Merge branch 'develop' into features/2fa
|
2020-07-07 13:05:45 +02:00 |
|
Urban Rotnik
|
ceddfdd978
|
Remove flash message for redirects from root url
|
2020-07-07 11:13:36 +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 |
|
aignatov-bio
|
4b9881e31e
|
Add 2fa to user settings page
|
2020-07-01 13:25:06 +02:00 |
|
aignatov-bio
|
630bef1adf
|
Add special characters to smart annotation
|
2020-06-29 14:47:35 +02:00 |
|
aignatov-bio
|
6fa97d3639
|
Add enable 2fa button to user settings
|
2020-06-29 10:56:06 +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 |
|
Miha Mencin
|
6db1401759
|
Merge pull request #2670 from aignatov-bio/ai-sci-4745-fix-manage-column-dropdown-position
Fix dropdown position for full-screen modals [SCI-4745]
|
2020-06-29 09:43:13 +02:00 |
|
Alex Kriuchykhin
|
faa76a6442
|
Merge pull request #2660 from okriuchykhin/ok_SCI_4707_v2
Improve user input filtering on user settings page and for task tags [SCI-4707]
|
2020-06-29 09:30:45 +02:00 |
|
Oleksii Kriuchykhin
|
64b66f0d73
|
Remove obsolete attribute in repository_datatable.js after feature branch merge
|
2020-06-24 16:25:42 +02:00 |
|
aignatov-bio
|
6a41290d9d
|
Add tables to TinyMce and small table improvments
|
2020-06-24 15:51:59 +02:00 |
|
aignatov-bio
|
4f8a612106
|
add new line
|
2020-06-24 15:25:34 +02:00 |
|
aignatov-bio
|
a3ea0927c9
|
Revert helper JS to es5
|
2020-06-24 15:12:13 +02:00 |
|
aignatov-bio
|
80970b6448
|
Remove hashes from datatable helper
|
2020-06-24 14:39:33 +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 |
|
Urban Rotnik
|
a05be67d3a
|
Merge pull request #2652 from urbanrotnik/ur-sci-4703-archived-tag
Add archived tags to assigned repository rows [SCI-4703]
|
2020-06-18 13:47:57 +02:00 |
|
aignatov-bio
|
7f9af06f78
|
Fix dropdown position for full screen modals
|
2020-06-18 13:29:28 +02:00 |
|
Oleksii Kriuchykhin
|
8280d2a41e
|
Allow HTML in inline editor, needed for handling smart annotations [SCI-4707]
|
2020-06-16 13:55:27 +02:00 |
|
Oleksii Kriuchykhin
|
0641ad094f
|
Improve user input filtering on user settings page and for task tags [SCI-4707]
|
2020-06-15 15:41:06 +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 |
|
Urban Rotnik
|
868c1c1fa0
|
Improve row state passing
|
2020-06-15 13:42:16 +02:00 |
|
Urban Rotnik
|
ec14cf9fef
|
Merge pull request #2657 from urbanrotnik/ai-sci-4765-v2
Fix smart annotation in inventory on edit [SCI-4765] (HotFix branch)
|
2020-06-12 11:41:02 +02:00 |
|
Urban Rotnik
|
800465f9a9
|
Merge pull request #2648 from aignatov-bio/ai-sci-4733-disable-marvinjs-if-not-using
Not include marvinJS library, if marvinJS disabled [SCI-4733]
|
2020-06-12 11:40:41 +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 |
|
Mojca Lorber
|
cfeb4b4d3d
|
Fix protocol duplication at saving protocol from task to repository
|
2020-06-11 13:19:21 +02:00 |
|
aignatov-bio
|
db35da0cee
|
Add archiving column to datatable helper
|
2020-06-11 12:48:31 +02:00 |
|
Urban Rotnik
|
9bac0fb867
|
Add archived tags to assigned repository rows
|
2020-06-10 14:48:03 +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 |
|
Mojca Lorber
|
c0c93772ff
|
Fix protocol duplication at saving protocol from task to repository
|
2020-06-09 11:45:03 +02:00 |
|
aignatov-bio
|
15de84ff2f
|
Not include marvinJS library, if marvinJS disabled
|
2020-06-08 09:59:26 +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 |
|
Urban Rotnik
|
4fc37e12a0
|
Fix dropdown render for columns manage modal
|
2020-06-01 18:41:58 +02:00 |
|
aignatov-bio
|
3294840611
|
Fix sidebar event
|
2020-06-01 14:45:03 +02:00 |
|
aignatov-bio
|
aee75a2f83
|
Add repository list view
|
2020-06-01 10:24:03 +02:00 |
|
Alex Kriuchykhin
|
be8c7e01e2
|
Merge pull request #2622 from aignatov-bio/ai-sci-4699-show-selected-snapshot-in-sidebar
Show selected snapshot in sidebar [SCI-4699]
|
2020-05-29 11:14:52 +02:00 |
|
aignatov-bio
|
368ee8a689
|
Show selected snapshot in sidebar
|
2020-05-28 15:18:26 +02:00 |
|
aignatov-bio
|
f7a215c953
|
Fix escape issue in dropdowns
|
2020-05-28 10:55:36 +02:00 |
|
aignatov-bio
|
7b36392a19
|
Merge pull request #2606 from aignatov-bio/ai-sci-4621-resize-simple-table-header-size-on-sidebar-colapse
Resize simple table header on sidebar collapse [SCI-4621]
|
2020-05-27 09:35:40 +02:00 |
|
aignatov-bio
|
f86b71144d
|
Resize simple table header on sidebar collapse
|
2020-05-25 16:21:28 +02:00 |
|
Mojca Lorber
|
76a1f73989
|
Change order of snapshots versions
|
2020-05-25 12:15:24 +02:00 |
|
mlorb
|
384ec40c4e
|
Merge pull request #2542 from mlorb/ml-sci-4582
Task details description corrections and some changes of locales [SCI-4582]
|
2020-05-25 09:10:37 +02:00 |
|
aignatov-bio
|
9973151278
|
Merge pull request #2598 from aignatov-bio/ai-sci-4662-fix-new-comment-field
Fix new comment field [SCI-4662]
|
2020-05-25 09:09:33 +02:00 |
|
aignatov-bio
|
100108bd43
|
Merge pull request #2596 from aignatov-bio/ai-sci-4642-improve-assigned-task-search
Improve search through assigned tasks [SCI-4642]
|
2020-05-25 09:09:19 +02:00 |
|
aignatov-bio
|
230ec487ba
|
Make snapshots versions buttons full size clickable
|
2020-05-22 17:16:20 +02:00 |
|
aignatov-bio
|
ce53235cb9
|
Merge pull request #2592 from aignatov-bio/ai-sci-4621-fix-order-icon-position-in-simple-view
Fix ordering in simple table view [SCI-4621]
|
2020-05-22 16:52:45 +02:00 |
|
aignatov-bio
|
8161bbb31c
|
Fix new comment field
|
2020-05-22 16:51:11 +02:00 |
|
aignatov-bio
|
cbc578f84b
|
Fix snapshot name column id
|
2020-05-22 15:10:21 +02:00 |
|
aignatov-bio
|
3287070df7
|
Improve search through assigned tasks
|
2020-05-22 14:36:28 +02:00 |
|
Mojca Lorber
|
92861fdd32
|
Expand assigned inventory after updating assigned items on task
|
2020-05-21 22:36:09 +02:00 |
|
aignatov-bio
|
0aa1c32813
|
Fix ordering in simple table view
|
2020-05-21 16:51:07 +02:00 |
|
Mojca Lorber
|
e2959fec32
|
Merge branch 'develop' into ml-sci-4582
|
2020-05-20 10:37:33 +02:00 |
|
aignatov-bio
|
40b266ee0d
|
Clear full view repository modal before open
|
2020-05-19 16:44:47 +02:00 |
|
aignatov-bio
|
2dcada4bc5
|
Merge pull request #2580 from aignatov-bio/ai-sci-4647-add-custom-tinymce-plugins-to-asset-pipeline
Add custom tinymce plugins to assets pipeline [SCI-4647]
|
2020-05-19 10:31:51 +02:00 |
|
aignatov-bio
|
c00b96ff7e
|
Merge pull request #2577 from aignatov-bio/ai-sci-4646-fix-task-sections-collapse-animation
Fix collapse animation for task sections [SCI-4646]
|
2020-05-19 10:31:36 +02:00 |
|
Urban Rotnik
|
1dc0e2b40b
|
Merge pull request #2581 from urbanrotnik/ur-sci-4640-wrong-snapshot-displayed
Hide sidebar Versions by default [SCI-4640]
|
2020-05-19 10:27:57 +02:00 |
|
Alex Kriuchykhin
|
49a35f43c5
|
Merge pull request #2578 from okriuchykhin/ok_SCI_4645
Fix error message for file upload limit on steps [SCI-4645]
|
2020-05-19 10:27:12 +02:00 |
|
Alex Kriuchykhin
|
afdd6fd149
|
Merge pull request #2572 from okriuchykhin/ok_SCI_4629
Prevent the inventory items editing while snapshot is being created [SCI-4629]
|
2020-05-19 10:10:34 +02:00 |
|
Urban Rotnik
|
ea0e97d046
|
Hide sidebar on modal close
|
2020-05-19 09:46:38 +02:00 |
|
aignatov-bio
|
3047af759f
|
Add custom tinymce plugins to assets pipeline
|
2020-05-18 18:06:52 +02:00 |
|
Oleksii Kriuchykhin
|
bc1ee1bd8d
|
Fix error message for file upload limit on steps [SCI-4645]
|
2020-05-18 16:16:39 +02:00 |
|
aignatov-bio
|
9f4457642d
|
Fix collapse animation for task sections
|
2020-05-18 16:01:26 +02:00 |
|
Alex Kriuchykhin
|
e9a05d2e3d
|
Merge pull request #2575 from okriuchykhin/ok_SCI_4637
Fix selection of the default snapshot on tasks [SCI-4637]
|
2020-05-18 14:25:26 +02:00 |
|
Oleksii Kriuchykhin
|
d77930af61
|
Fix failing tests for repository rows controller [SCI-4629]
|
2020-05-18 14:12:06 +02:00 |
|
aignatov-bio
|
1f24adddf9
|
Merge pull request #2562 from aignatov-bio/ai-sci-4627-remove-search-word-from-task-table-state
Remove search from state load in task repository [SCI-4627]
|
2020-05-18 11:16:27 +02:00 |
|
aignatov-bio
|
343356cab7
|
Merge pull request #2571 from aignatov-bio/ai-sci-4639-select-correct-button-for-assign-modal
Select correct button name for assign modal [SCI-4639]
|
2020-05-18 11:16:07 +02:00 |
|
aignatov-bio
|
f2d81cb199
|
Merge pull request #2570 from aignatov-bio/ai-sci-4617-make-snapshot-creation-text-switchable
Make snapshot creation info text switchable [SCI-4617]
|
2020-05-18 11:15:46 +02:00 |
|
aignatov-bio
|
2b3dda8ce0
|
Merge pull request #2569 from aignatov-bio/ai-sci-4613-add-title-for-assign-modal
Add a title for full view assign modal [SCI-4613]
|
2020-05-18 11:15:36 +02:00 |
|
Oleksii Kriuchykhin
|
8b968f6f67
|
Fix selection of the default snapshot on tasks [SCI-4637]
|
2020-05-18 11:06:42 +02:00 |
|
aignatov-bio
|
820514789d
|
Update tinymce gem version
|
2020-05-17 17:36:26 +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
|
f921ac75d8
|
Select correct button name for assign modal
|
2020-05-15 15:37:48 +02:00 |
|
aignatov-bio
|
bc81a48b00
|
Make snapshot creation info text switchable
|
2020-05-15 14:44:26 +02:00 |
|
Urban Rotnik
|
a2ade6e0ec
|
Merge branch 'develop' into features/new-task-layout
|
2020-05-15 14:27:56 +02:00 |
|
aignatov-bio
|
69abccbbd6
|
Add title for full view assign modal
|
2020-05-15 14:22:20 +02:00 |
|
Mojca Lorber
|
4c15c89cf5
|
Add New Task layout Collapsed/Expanded States saving
|
2020-05-15 00:49:23 +02:00 |
|
aignatov-bio
|
c9a9cd2e75
|
Remove search from state load in task repository
|
2020-05-14 21:49:01 +02:00 |
|
aignatov-bio
|
e49d2dfbae
|
Merge pull request #2546 from aignatov-bio/ai-sci-4605-some-inventories-task-corrections
Small task inventories corrections [SCI-4605]
|
2020-05-14 16:45:45 +02:00 |
|
aignatov-bio
|
ce1540aaa9
|
Small task inventories corrections
|
2020-05-14 16:41:02 +02:00 |
|
aignatov-bio
|
af4ac7c53b
|
Add const to dropdown library
|
2020-05-14 16:29:50 +02:00 |
|
aignatov-bio
|
309f8c1a3d
|
Small snapshots CSS corrections
|
2020-05-14 16:29:50 +02:00 |
|
aignatov-bio
|
78b4067c50
|
Merge pull request #2549 from aignatov-bio/ai-sci-4604-small-snapshot-corrections
Small snapshot css corrections [SCI-4604]
|
2020-05-14 15:18:13 +02:00 |
|
aignatov-bio
|
445f55acc7
|
Merge pull request #2555 from aignatov-bio/ai-sci-4598-change-task-details-to-onclick
Replace bootstrap popover with bootstrap dropdown [SCI-4598]
|
2020-05-14 13:19:08 +02:00 |
|
aignatov-bio
|
99e1affa73
|
Merge pull request #2556 from aignatov-bio/ai-sci-4515-fix-smart-annotation-position
Fix smart annotation position for horizontal scroll [SCI-4515]
|
2020-05-14 13:18:57 +02:00 |
|
Miha Mencin
|
26caeed04f
|
increase pooling interval to 10s
|
2020-05-14 12:39:13 +02:00 |
|
Miha Mencin
|
0e5ce1054e
|
decrease pooling time for snapshots
|
2020-05-14 12:03:07 +02:00 |
|
Alex Kriuchykhin
|
a341bd533b
|
Merge pull request #2557 from okriuchykhin/ok_SCI_4596
Make snapshots selectable [SCI-4596]
|
2020-05-14 10:15:44 +02:00 |
|
Oleksii Kriuchykhin
|
ba1661b40f
|
Fix handling of deleted repositories for snapshots [SCI-4596]
|
2020-05-13 18:00:56 +02:00 |
|
Oleksii Kriuchykhin
|
c74fa3c244
|
Make snapshots selectable [SCI-4596]
|
2020-05-13 17:58:05 +02:00 |
|
aignatov-bio
|
cbaaa7413c
|
Fix smart annotation position for horizontal scroll
|
2020-05-13 12:45:22 +02:00 |
|
aignatov-bio
|
8447a13afd
|
Replace bootstrap popover with bootstrap dropdown
|
2020-05-13 12:20:25 +02:00 |
|
Urban Rotnik
|
334da7c3ec
|
Fix for assign view
|
2020-05-12 19:38:45 +02:00 |
|
aignatov-bio
|
f94ea51ecb
|
Small snapshot css corrections
|
2020-05-10 13:08:19 +02:00 |
|
aignatov-bio
|
8e20dccc66
|
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab
Add recent protocol tab to load protocal from repository [SCI-4509]
|
2020-05-08 13:17:26 +02:00 |
|
aignatov-bio
|
d2a479c2e8
|
Merge pull request #2526 from aignatov-bio/ai-sci-4559-add-assigned-tasks-dropdown-to-inventory
Add assigned task dropdown to repository and task page [SCI-4559][SCI-4565]
|
2020-05-08 12:39:28 +02:00 |
|
aignatov-bio
|
e9c54f10fb
|
Fix markup
|
2020-05-08 11:58:40 +02:00 |
|
aignatov-bio
|
c9545ddb19
|
Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab
|
2020-05-08 10:28:33 +02:00 |
|
aignatov-bio
|
dad5ac7a27
|
Fix snapshot button place
|
2020-05-07 19:36:30 +02:00 |
|
Mojca Lorber
|
b3bce933e5
|
Task details description corrections and some changes of locales
|
2020-05-07 16:11:22 +02:00 |
|
aignatov-bio
|
fe658a9b23
|
Merge pull request #2534 from aignatov-bio/ai-sci-4594-refactor-css-for-full-view-repository-view
Update CSS for full view assigned rows modal [SCI-4594]
|
2020-05-07 15:22:06 +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
|
8b5872347a
|
Merge pull request #2514 from aignatov-bio/ai-sci-4538-new-protocol-template-dropdown
Add new protocol template dropdown [SCI-4538]
|
2020-05-07 08:32:54 +02:00 |
|
aignatov-bio
|
a29db548f8
|
Update CSS for full view assigned rows modal
|
2020-05-05 18:17:14 +02:00 |
|
Alex Kriuchykhin
|
7e9054e6d2
|
Merge pull request #2519 from aignatov-bio/ai-sci-4523-add-assign-items-to-task
Add assign items modal and update modal for task inventories [SCI-4523][SCI-4524]
|
2020-05-05 13:20:01 +02:00 |
|
aignatov-bio
|
85dae268fe
|
Merge pull request #2498 from aignatov-bio/ai-sci-4481-fix-notification-when-search-field-active
Fix notification when search field active [SCI-4481]
|
2020-05-05 12:59:32 +02:00 |
|
aignatov-bio
|
f3046c8515
|
Merge pull request #2529 from aignatov-bio/ai-sci-4584-fix-handsone-table
Fix Handson table for collapsed protocol section [SCI-4584]
|
2020-05-05 12:58:04 +02:00 |
|
aignatov-bio
|
cf2508c5d0
|
Merge pull request #2522 from aignatov-bio/ai-sci-4508-small-protocol-layout-fixes
Small layout changes for protocol [SCI-4508]
|
2020-05-05 12:57:40 +02:00 |
|
Urban Rotnik
|
429519e930
|
Merge pull request #2521 from urbanrotnik/ur-sci-4513-counter-fix
Fix items count validation [SCI-4513]
|
2020-05-05 12:31:00 +02:00 |
|
aignatov-bio
|
1b57040c37
|
Fix deepscan issues
|
2020-05-05 09:44:38 +02:00 |
|
aignatov-bio
|
9d006aac9e
|
Fix handson table for colapsed protocol section
|
2020-05-02 22:15:38 +02:00 |
|
aignatov-bio
|
1ed62c4a49
|
Fix I18n and save to repository button
|
2020-05-01 20:45:09 +02:00 |
|
aignatov-bio
|
19d30e2019
|
Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task
|
2020-04-29 15:13:38 +02:00 |
|
Alex Kriuchykhin
|
0e865f8e45
|
Merge pull request #2525 from okriuchykhin/ok_SCI_4552
Implement background processing of repository snapshots [SCI-4552]
|
2020-04-29 12:03:23 +02:00 |
|
Urban Rotnik
|
276351bbed
|
Remove Tooltips JS code
|
2020-04-28 12:51:59 +02:00 |
|
aignatov-bio
|
be8ef5a310
|
Add I18n
|
2020-04-28 12:49:19 +02:00 |
|
Urban Rotnik
|
5c72200801
|
Remove tooltips settings for user
|
2020-04-28 12:44:47 +02:00 |
|
aignatov-bio
|
b9c5089c2b
|
Add search to assigned tasks dropdown
|
2020-04-28 12:41:59 +02:00 |
|
Oleksii Kriuchykhin
|
e6ad5047e0
|
Implement background processing of repository snapshots [SCI-4552]
|
2020-04-28 12:09:36 +02:00 |
|
Urban Rotnik
|
9c3fb063c0
|
Fix counter and error showing for CheckList column type
|
2020-04-24 16:09:54 +02:00 |
|
aignatov-bio
|
ad705a740c
|
Add new protocol template dropdown
|
2020-04-24 15:48:40 +02:00 |
|
aignatov-bio
|
0604815c00
|
Add assigned task dropdown to repository
|
2020-04-24 15:43:10 +02:00 |
|
aignatov-bio
|
4f941610b2
|
Small layout changes for protocol
|
2020-04-24 11:50:03 +02:00 |
|
Urban Rotnik
|
6c5be802ba
|
Fix items count validation
|
2020-04-24 08:45:34 +02:00 |
|
aignatov-bio
|
f65b50c6ff
|
Fix rebase conflicts
|
2020-04-23 16:36:22 +02:00 |
|
aignatov-bio
|
d48997464d
|
Fix markup
|
2020-04-23 15:25:28 +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
|
10fdd0c1c7
|
Merge branch 'develop' into features/new-task-layout
|
2020-04-23 14:07:40 +02:00 |
|
Alex Kriuchykhin
|
1802d7cb59
|
Merge pull request #2516 from okriuchykhin/ok_SCI_4525
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
|
2020-04-23 13:18:23 +02:00 |
|
Oleksii Kriuchykhin
|
608ee23ec4
|
Add task details popover [SCI-4503]
|
2020-04-21 15:11:57 +02:00 |
|
Oleksii Kriuchykhin
|
f811d11c59
|
Add versions sidebar to assigned repository rows full view modal [SCI-4525]
|
2020-04-21 14:49:36 +02:00 |
|
aignatov-bio
|
be47efce74
|
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list
Add repositories dropdown list [SCI-4506]
|
2020-04-16 14:17:17 +02:00 |
|
mlorb
|
9584b11d45
|
Merge pull request #2507 from mlorb/ml-sci-4505
Add the user management section of to the Details section of task layout [SCI-4505]
|
2020-04-16 13:47:31 +02:00 |
|
Mojca Lorber
|
e9959747d6
|
small refactor
|
2020-04-14 17:25:36 +02:00 |
|
aignatov-bio
|
338f3a0192
|
Fix css
|
2020-04-14 13:08:07 +02:00 |
|
aignatov-bio
|
c1cac01b28
|
Add repositories dropdown list
|
2020-04-14 12:10:16 +02:00 |
|
aignatov-bio
|
b53ad2850a
|
Remove old code
|
2020-04-09 17:31:28 +02:00 |
|
aignatov-bio
|
fe718349da
|
Add recent protocol tab to load protocal from repository
|
2020-04-09 17:29:39 +02:00 |
|
Mojca Lorber
|
f22f076e6c
|
Add the user management secion of to the Details section of task layout
|
2020-04-08 16:24:59 +02:00 |
|
aignatov-bio
|
c9b59f96a8
|
Hide checkbox column for full view
|
2020-04-08 15:58:22 +02:00 |
|
aignatov-bio
|
e4b65aaf6f
|
Finish full view repository
|
2020-04-08 15:13:21 +02:00 |
|
aignatov-bio
|
087f71a82f
|
Add full view for my-module repository
|
2020-04-07 21:02:16 +02:00 |
|
aignatov-bio
|
9dfc652580
|
Fix markup
|
2020-04-07 12:50:58 +02:00 |
|
aignatov-bio
|
845e8c3d6d
|
Fix loading process
|
2020-04-07 12:36:01 +02:00 |
|
aignatov-bio
|
7fdc169ba2
|
Add simple view to repository table
|
2020-04-06 19:52:41 +02:00 |
|
aignatov-bio
|
5705bd8497
|
Fix caching issue for sidebar
|
2020-03-31 22:12:38 +02:00 |
|
Oleksii Kriuchykhin
|
3c53be1f9a
|
Add start date to the task [SCI-4504]
|
2020-03-31 14:17:14 +02:00 |
|
aignatov-bio
|
5eebf3b46b
|
Fix notification when search field active
|
2020-03-30 15:46:35 +02:00 |
|
Alex Kriuchykhin
|
92279d07ad
|
Merge pull request #2437 from aignatov-bio/ai-sci-4380-saving-navigation-state
Refactor sidebar [SCI-4380]
|
2020-03-30 09:56:51 +02:00 |
|
Alex Kriuchykhin
|
4fe3d9f3a7
|
Merge pull request #2414 from aignatov-bio/ai-sci-4134-auto-open-tiny-mce-if-unsaved-data
Open unsaved TinyMce editor [SCI-4134]
|
2020-03-30 09:50:32 +02:00 |
|
aignatov-bio
|
a7e4083ef1
|
Fix team dropdown
|
2020-03-25 12:31:47 +01:00 |
|
aignatov-bio
|
da4b55ceea
|
Fix protocol and report create modals after dashboard redirect
|
2020-03-19 19:43:20 +01:00 |
|
aignatov-bio
|
37304df878
|
Fix markup
|
2020-03-19 15:48:45 +01:00 |
|
aignatov-bio
|
b188b0511b
|
Refactor TinyMCE autosave check
|
2020-03-19 15:45:14 +01:00 |
|
aignatov-bio
|
1d02ba5ebf
|
Open unsaved TinyMce editor
|
2020-03-18 16:03:36 +01:00 |
|
Alex Kriuchykhin
|
2a2e479cd3
|
Merge pull request #2470 from okriuchykhin/ok_SCI_4408
Enable time fraction for task due date [SCI-4408]
|
2020-03-16 18:55:10 +01:00 |
|
Oleksii Kriuchykhin
|
a518bfe023
|
Enable time fraction for task due date [SCI-4408]
|
2020-03-16 17:55:35 +01:00 |
|
aignatov-bio
|
87a097b0e1
|
Fix markup
|
2020-03-12 15:08:29 +01:00 |
|
aignatov-bio
|
8164b0d0c6
|
Change placeholders for dashboards
|
2020-03-12 15:00:14 +01:00 |
|
aignatov-bio
|
b9a0fb47de
|
Add total size validation check to result files
|
2020-03-12 11:50:31 +01:00 |
|
aignatov-bio
|
d924faaafd
|
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
|
2020-03-12 11:26:23 +01:00 |
|
aignatov-bio
|
c13721f842
|
Fix recent work service and move templates to html
|
2020-03-11 11:34:59 +01:00 |
|
Miha Mencin
|
26b687f2e6
|
Merge pull request #2460 from biosistemika/features/dashboard
Features/dashboard
|
2020-03-10 18:06:23 +01:00 |
|
mlorb
|
bea7a6172b
|
Merge pull request #2456 from mlorb/ml-sci-4412
Remove academy link from navigation and move about modal to support menu [SCI-4412]
|
2020-03-10 17:08:22 +01:00 |
|
aignatov-bio
|
63a5459d21
|
Add error handling to create task modal
|
2020-03-10 13:16:56 +01:00 |
|
Miha Mencin
|
9836a8b5a2
|
Merge pull request #2434 from aignatov-bio/ai-sci-4352-inventory-item-is-not-saved-in-case-of-empty-dropdown
Prevent create empty dropdown in inventories [SCI-4352]
|
2020-03-10 12:35:00 +01:00 |
|
Alex Kriuchykhin
|
769ba76afa
|
Merge pull request #2445 from okriuchykhin/ok_SCI_4379
Improve file upload checks [SCI-4382]
|
2020-03-10 09:47:23 +01:00 |
|
aignatov-bio
|
180b736769
|
Refactor recent work service
|
2020-03-09 15:10:51 +01:00 |
|
aignatov-bio
|
49afb5631d
|
Merge pull request #2457 from aignatov-bio/ai-sci-4442-fix-missing-progress-bar
Fix progress bar [SCI-4442]
|
2020-03-09 10:43:15 +01:00 |
|
Miha Mencin
|
62b934f012
|
Merge branch 'develop' into features/dashboard
|
2020-03-09 09:56:32 +01:00 |
|
aignatov-bio
|
77a399e457
|
Fix progress bar
|
2020-03-09 09:54:02 +01:00 |
|
Mojca Lorber
|
6bf191d124
|
Remove academy link from navigation and move about modal to support menu
|
2020-03-06 14:36:22 +01:00 |
|
aignatov-bio
|
e729aa043e
|
Add recent work widget
|
2020-03-06 13:51:18 +01:00 |
|
aignatov-bio
|
3494d1071e
|
Merge pull request #2448 from aignatov-bio/ai-sci-4416-add-yellow-due-dates
Refactor current task widget [SCI-4416]
|
2020-03-05 14:46:16 +01:00 |
|
aignatov-bio
|
79560e517d
|
Fix markup
|
2020-03-05 14:40:46 +01:00 |
|
Mojca Lorber
|
8325ed80f0
|
Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard
|
2020-03-04 23:26:01 +01:00 |
|
aignatov-bio
|
77d66b65b1
|
Refactor current task for addons integration
|
2020-03-04 13:21:52 +01:00 |
|
mlorb
|
ba438e7728
|
Merge branch 'features/dashboard' into ml-sci-4354
|
2020-03-03 16:29:47 +01:00 |
|
aignatov-bio
|
7d7cdce91a
|
Add file size limitation to tinyMCE
|
2020-03-03 15:55:17 +01:00 |
|
Oleksii Kriuchykhin
|
11a5536af5
|
Improve file upload checks [SCI-4382]
|
2020-03-03 15:26:40 +01:00 |
|
aignatov-bio
|
3dc94a225d
|
Small visual improvments for current tasks widget
|
2020-03-03 14:21:16 +01:00 |
|
Mojca Lorber
|
7dfd1d5ba6
|
Small fixes
|
2020-03-03 13:52:36 +01:00 |
|
mlorb
|
4d52fc9b45
|
Merge branch 'features/dashboard' into ml-sci-4354
|
2020-03-03 13:00:05 +01:00 |
|
Mojca Lorber
|
52493fd834
|
Add pagination for current tasks on dashboard
|
2020-03-03 12:07:21 +01:00 |
|
aignatov-bio
|
51c7aa2c7a
|
Remove keydown event
|
2020-03-03 09:58:53 +01:00 |
|
aignatov-bio
|
50810dc55e
|
Fix markup
|
2020-03-03 09:53:44 +01:00 |
|
aignatov-bio
|
d9bfd8c28e
|
Add search to current task widget
|
2020-03-03 09:50:44 +01:00 |
|
Oleksii Kriuchykhin
|
03f08c4c06
|
Merge branch 'hotfix/1.18.4' into develop
|
2020-03-02 11:56:45 +01:00 |
|
Oleksii Kriuchykhin
|
73623da02c
|
Merge branch 'develop' into features/dashboard
|
2020-02-28 16:46:56 +01:00 |
|
Alex Kriuchykhin
|
f9ad438fb5
|
Merge pull request #2431 from okriuchykhin/ok_SCI_4381
Add invite users to the team permission check [SCI-4381]
|
2020-02-28 16:40:57 +01:00 |
|
Alex Kriuchykhin
|
b83cbf33a7
|
Merge pull request #2408 from aignatov-bio/ai-sci-4345-file-results-bug
Fix files handling in results [SCI-4345]
|
2020-02-28 16:40:05 +01:00 |
|
Alex Kriuchykhin
|
409c4b7f65
|
Merge pull request #2438 from okriuchykhin/ok_SCI_4356
Improve loading of tasks statistics for dashboard [SCI-4356]
|
2020-02-28 16:38:39 +01:00 |
|
Oleksii Kriuchykhin
|
78ceb41a9e
|
Improve loading of tasks statistics for dashboard [SCI-4356]
|
2020-02-28 16:17:32 +01:00 |
|
aignatov-bio
|
c4be9bca2f
|
Fix files handling in results
|
2020-02-28 14:55:13 +01:00 |
|
aignatov-bio
|
95fca105eb
|
Add quickstart layout and create task modal
|
2020-02-28 14:34:34 +01:00 |
|
aignatov-bio
|
8b273acaca
|
Update all sidebars
|
2020-02-28 14:03:08 +01:00 |
|
Miha Mencin
|
1fd876bb40
|
Merge pull request #2425 from mlorb/ml-sci-4348
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
|
2020-02-28 12:11:31 +01:00 |
|
Mojca Lorber
|
3c09923d96
|
Refactoring current tasks backend
|
2020-02-28 11:51:08 +01:00 |
|
Oleksii Kriuchykhin
|
b4a8a7ba72
|
Switch to serial multiple file uploads for better compatibility [SCI-4404]
|
2020-02-27 16:58:00 +01:00 |
|
aignatov-bio
|
9e15d1ea42
|
Refactor experiment sidebar
|
2020-02-27 16:04:44 +01:00 |
|
aignatov-bio
|
b2580c1704
|
Prevent create empty dropdown in inventories
|
2020-02-27 13:10:00 +01:00 |
|
Alex Kriuchykhin
|
a41c1c606b
|
Merge pull request #2419 from aignatov-bio/ai-sci-4328-hide-tooltip-if-object-hide
Hide tooltip if parent object disabled or hidden [SCI-4328]
|
2020-02-26 17:35:34 +01:00 |
|
Oleksii Kriuchykhin
|
62c19f7c02
|
Add invite users to the team permission check [SCI-4381]
|
2020-02-26 17:25:38 +01:00 |
|
Mojca Lorber
|
f29ce66bea
|
Refactor backend, add empty state and fix some small scc changes
|
2020-02-26 11:07:17 +01:00 |
|
aignatov-bio
|
b664c88819
|
Remove clndr from package.json
|
2020-02-22 13:03:51 +01:00 |
|
Mojca Lorber
|
9bd2e8bec4
|
Dashboard current tasks visual layout and backend
|
2020-02-21 10:41:42 +01:00 |
|
aignatov-bio
|
2cbac634bf
|
Add localization
|
2020-02-21 10:00:32 +01:00 |
|
aignatov-bio
|
cf4dbd5ff4
|
Add calendar widget
|
2020-02-20 17:02:38 +01:00 |
|
aignatov-bio
|
01868fff23
|
Add calendar front-end
|
2020-02-19 15:57:06 +01:00 |
|
aignatov-bio
|
f11b051715
|
Merge branch 'develop' into features/dashboard
|
2020-02-19 10:29:50 +01:00 |
|
Alex Kriuchykhin
|
d73ea73b04
|
Merge pull request #2411 from okriuchykhin/ok_SCI_4319_v2
Fix unfolding of the active element in sidebar [SCI-4319]
|
2020-02-19 10:24:13 +01:00 |
|
aignatov-bio
|
47a86f2cf9
|
Hide tooltip if parent object disabled or hidden
|
2020-02-18 15:40:05 +01:00 |
|
aignatov-bio
|
ff45b17b53
|
Fix localization and small markup fixes
|
2020-02-17 15:32:43 +01:00 |
|
aignatov-bio
|
a438f6b4f0
|
Finished filters
|
2020-02-17 10:47:10 +01:00 |
|
aignatov-bio
|
485597a9ef
|
Add front-end part
|
2020-02-14 12:07:40 +01:00 |
|
mlorb
|
618aa698d5
|
Merge pull request #2407 from mlorb/ml-sci-4329
Fix adding too small/big number to input... [SCI-4329]
|
2020-02-14 10:40:20 +01:00 |
|
Oleksii Kriuchykhin
|
3959f880eb
|
Fix unfolding of the active element in sidebar [SCI-4319]
|
2020-02-13 12:16:35 +01: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
|
ddadc073d4
|
Merge pull request #2404 from aignatov-bio/ai-sci-4307-add-indetermined-state-for-share-inventory
Add "indetermined" state for the "select all" checkbox in the Share Inventories [SCI-4307]
|
2020-02-12 14:16:19 +01:00 |
|
aignatov-bio
|
5200096f69
|
Merge pull request #2400 from aignatov-bio/ai-sci-4312-improve-search-for-dropdown
Improve search input field in the flyouts [SCI-4312]
|
2020-02-12 14:16:06 +01:00 |
|
Mojca Lorber
|
0f67ce78c0
|
Fix adding too small/big number to input for decimals for number repo column type
|
2020-02-12 12:14:58 +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 |
|
mlorb
|
a472eda699
|
Merge pull request #2403 from okriuchykhin/ok_SCI_4346
Fix multiple file result creation [SCI-4346]
|
2020-02-12 09:27:47 +01:00 |
|
mlorb
|
399f5411fc
|
Merge pull request #2401 from mlorb/ml-sci-4342
Fix console error at deleting inventory column [SCI-4342]
|
2020-02-12 09:26:15 +01:00 |
|
Oleksii Kriuchykhin
|
5be4ffb139
|
Fix multiple file result creation [SCI-4346]
|
2020-02-11 20:08:36 +01:00 |
|
aignatov-bio
|
05f2fa8199
|
Merge pull request #2402 from aignatov-bio/ai-sci-4343-misaligned-filter
Fix protocols table CSS [SCI-4343]
|
2020-02-11 16:26:41 +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 |
|
aignatov-bio
|
26783e64da
|
Fix protocols table CSS
|
2020-02-11 15:58:17 +01:00 |
|
Mojca Lorber
|
4c81e4b087
|
Fix console error at deleting inventory column
|
2020-02-11 15:27:11 +01:00 |
|
aignatov-bio
|
eaf751bad6
|
Improve search input field in the flyouts
|
2020-02-11 15:01:52 +01:00 |
|
Oleksii Kriuchykhin
|
fe0ebae383
|
Fix edit button behaviour in repository table [SCI-4331]
|
2020-02-11 11:07:03 +01:00 |
|
Mojca Lorber
|
232209e64a
|
Set timeout for loading manage column index modal to load after datatable redraw
|
2020-02-10 15:29:34 +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
|
49e1e67231
|
Fix JS condition [SCI-4321]
|
2020-02-07 15:54:57 +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 |
|
Alex Kriuchykhin
|
edaf7adbbb
|
Merge pull request #2387 from okriuchykhin/ok_SCI_4319
Fix sidebar current project expanding [SCI-4319]
|
2020-02-07 13:55:15 +01:00 |
|
mlorb
|
f26ea42cc5
|
Merge pull request #2390 from mlorb/ml-sci-4265-v2
Redesign clear buttons on global activities page [SCI-4265]
|
2020-02-07 13:49:00 +01:00 |
|
mlorb
|
e05b2c9ce2
|
Merge pull request #2368 from mlorb/ml-sci-4217
Fix css for icons for repository file type [SCI-4217]
|
2020-02-07 13:25:22 +01:00 |
|
Mojca Lorber
|
9068c20588
|
Redesign clear buttons on global activities page
|
2020-02-07 11:33:25 +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 |
|
Mojca Lorber
|
ef241150f6
|
Fix edit tag on task page
|
2020-02-06 12:57:03 +01:00 |
|
Oleksii Kriuchykhin
|
b7455f6b85
|
Fix sidebar current project expanding [SCI-4319]
|
2020-02-05 21:29:12 +01:00 |
|
mlorb
|
49bfb603c8
|
Merge pull request #2357 from mlorb/ml-sci-4130
Sidebar redesign [SCI-4130]
|
2020-02-04 09:55:00 +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 |
|
Urban Rotnik
|
eea80f4a09
|
Remove JS call
|
2020-02-02 18:56:52 +01:00 |
|
Mojca Lorber
|
e70bc67146
|
Implement missing style guide changes
|
2020-01-31 14:11:37 +01:00 |
|
aignatov-bio
|
0ece6c60f0
|
FIx repository column selector
|
2020-01-30 15:09:47 +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
|
9a9088a0da
|
Merge pull request #2354 from aignatov-bio/ai-sci-4279-fix-duplicate-tags-on-task
Fix duplicate tags and small css issues [SCI-4279]
|
2020-01-30 13:42:22 +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 |
|
mlorb
|
a2afa11fef
|
Merge pull request #2378 from mlorb/ml-sci-4311
Fix scroll position on protocol and result page [SCI-4311]
|
2020-01-30 13:39:16 +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 |
|
Mojca Lorber
|
9388883479
|
Fix scroll position on protocol and result page
|
2020-01-29 14:28:52 +01:00 |
|
Urban Rotnik
|
765a577669
|
Ellipsis with css for Sidebar
|
2020-01-29 13:22:35 +01:00 |
|
aignatov-bio
|
470f39ce04
|
Fix scrollbar
|
2020-01-29 11:14:25 +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 |
|
Urban Rotnik
|
6c7a88475e
|
Fix icon selection
|
2020-01-29 09:36:21 +01:00 |
|
aignatov-bio
|
0ce52aae94
|
Add container for repository filters
|
2020-01-28 14:11:11 +01:00 |
|
Urban Rotnik
|
83f4344bb7
|
Merge pull request #2366 from urbanrotnik/ur-sci-4298-hide-buttons-on-column-manage
Hide Edit/Delete buttons if user do not has permissions
|
2020-01-27 16:35:07 +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
|
d7761622ba
|
Hide Edit/Delete buttons if user do not has permissions
|
2020-01-25 12:36:36 +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 |
|
Mojca Lorber
|
9cf77e0551
|
Fix hound
|
2020-01-24 13:35:29 +01:00 |
|
Mojca Lorber
|
f5d245e7cc
|
Sidebar redesign
|
2020-01-24 13:22:04 +01:00 |
|
aignatov-bio
|
24b296fd86
|
Fix duplicate tags and small css issues
|
2020-01-23 13:38:02 +01:00 |
|
aignatov-bio
|
4395a7cc6b
|
Fix small visual bugs
|
2020-01-23 13:12:58 +01:00 |
|
aignatov-bio
|
79d71f1e9b
|
Merge pull request #2346 from aignatov-bio/ai-sci-4268-new-emoji-picker
Add new emoji picker [SCI-4268]
|
2020-01-21 16:33:05 +01:00 |
|
aignatov-bio
|
5a4d74d487
|
Update emoji picker image loading
|
2020-01-21 15:49:13 +01:00 |
|
Mojca Lorber
|
981f8678df
|
Fix alerts style
|
2020-01-21 15:21:40 +01:00 |
|
aignatov-bio
|
bf9c7a70d4
|
Improve event handling
|
2020-01-21 14:01:44 +01:00 |
|
Urban Rotnik
|
1ecea5216e
|
Add webpack libs for emojis and assets
|
2020-01-21 11:43:04 +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
|
96ed19ab22
|
Merge pull request #2342 from aignatov-bio/ai-sci-4269-fix-small-scss-issue-with-new-branding
Fix small css issues [SCI-4269]
|
2020-01-21 09:22:56 +01:00 |
|
Miha Mencin
|
ba4e06f7e6
|
make selector a bit more specific
make selector more specific
|
2020-01-21 09:19:21 +01:00 |
|
aignatov-bio
|
e022f7a096
|
Fix small css issues
|
2020-01-20 15:48:51 +01:00 |
|
Miha Mencin
|
652b9014e1
|
SCI-4270 update selector
|
2020-01-20 15:37:04 +01:00 |
|
aignatov-bio
|
01cce84314
|
Merge pull request #2339 from aignatov-bio/ai-sci-4195-update-delimiter-dropdown
Update delimiter dropdown for manage column modal [SCI-4195]
|
2020-01-20 15:22:40 +01:00 |
|
aignatov-bio
|
cd471bfb25
|
Update delimiter dropdown for manage column modal
|
2020-01-20 14:26:17 +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 |
|
aignatov-bio
|
e4e2e08456
|
Merge pull request #2325 from aignatov-bio/ai-sci-4239-2-fix-smartannotation-position
Fix smart annotation position [SCI-4239]
|
2020-01-17 14:39:54 +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
|
58db10ce7f
|
Merge pull request #2331 from urbanrotnik/ur-sci-4240-status-items-error-message
Add error message for status item [SCI-4240]
|
2020-01-17 14:07:42 +01:00 |
|
Miha Mencin
|
88210bd812
|
applying the patch
|
2020-01-17 14:04:25 +01:00 |
|
mlorb
|
f91db8eb41
|
Merge pull request #2329 from mlorb/ml-sci-4132
Redesign flash alerts [SCI-4132]
|
2020-01-17 13:58:20 +01:00 |
|
aignatov-bio
|
597c88cacc
|
Fix smart annotation position
|
2020-01-17 13:55:43 +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
|
2e8db12ca5
|
Add error message for status item
|
2020-01-17 11:25:01 +01:00 |
|
Mojca Lorber
|
8b635ac38a
|
Refactor flash alerts
|
2020-01-17 10:49:41 +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
|
d32201ad58
|
Fix smart annotation position
|
2020-01-16 16:28:51 +01:00 |
|
mlorb
|
8e4d0e9ff6
|
Merge pull request #2320 from mlorb/ml-sci-4069-v2
Add emojionearea for status column type [SCI-4069]
|
2020-01-16 16:00:36 +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 |
|
Mojca Lorber
|
a342e3d31f
|
Add emojionearea for status column type
|
2020-01-16 14:58:59 +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 |
|
Urban Rotnik
|
0522b9b0a3
|
Update too many items error showing
Update too many items error showing
|
2020-01-16 11:40:59 +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 |
|
aignatov-bio
|
96e1d4a7d0
|
Add new error handling
|
2020-01-16 10:51:37 +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
|
a10e7de9a6
|
Fix smart annotation window position
|
2020-01-15 17:19:56 +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
|
b23c874f9e
|
Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost
Sci 4199 selected checklist is lost
|
2020-01-15 15:28:34 +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 |
|
Miha Mencin
|
5bfa5c7939
|
SCI-4199 disabling delimiter, adding warning
|
2020-01-15 13:59:28 +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 |
|
Mojca Lorber
|
16226640d5
|
changes upon Antons review
|
2020-01-14 16:46:48 +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
|
ac2f431a0b
|
Merge pull request #2292 from aignatov-bio/ai-sci-4221-fix-big-numbers-in-repository-number-value
Fix big number in repository number value [SCI-4221]
|
2020-01-13 10:42:13 +01:00 |
|
Alex Kriuchykhin
|
007cae39e8
|
Merge pull request #2291 from okriuchykhin/ok_SCI_4197
Fix sorting for date time columns [SCI-4197]
|
2020-01-10 15:25:53 +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 |
|
Alex Kriuchykhin
|
f1babb2237
|
Merge pull request #2279 from okriuchykhin/ok_SCI_4000
Fix sidebar update for inline editing [SCI-4000]
|
2020-01-10 10:34:27 +01:00 |
|
Alex Kriuchykhin
|
d2e12e0683
|
Merge pull request #2265 from okriuchykhin/ok_SCI_4146
Restrict files to only images in RTE fields [SCI-4146]
|
2020-01-10 10:34: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 |
|
Oleksii Kriuchykhin
|
ad5a5f3ebf
|
Fix sorting for date time columns [SCI-4197]
|
2020-01-09 16:18:28 +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 |
|
aignatov-bio
|
54c78cf4d1
|
Merge pull request #2262 from aignatov-bio/ai-sci-update-global-styles
Update colors and buttons
|
2020-01-08 12:30:51 +01:00 |
|
aignatov-bio
|
68646276f5
|
Replace bootstrap styles for button
|
2020-01-07 16:13:34 +01:00 |
|
Oleksii Kriuchykhin
|
d9b9243da7
|
Merge branch 'develop' into features/new-column-types
|
2020-01-07 16:03:33 +01:00 |
|
Oleksii Kriuchykhin
|
16b591b110
|
Fix sidebar update for inline editing [SCI-4000]
|
2020-01-06 16:07:23 +01:00 |
|
aignatov-bio
|
f717ce66cb
|
Fix tests
|
2020-01-06 12:31:56 +01:00 |
|
aignatov-bio
|
464d03558a
|
Fix markup, replace buttons and add new logo
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
e714787c38
|
Fix markup
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
a281f09e7f
|
Add reports and missed modals
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
ef3814ccec
|
Add new buttons to protocols, tasks, experiments, projects
|
2020-01-06 10:40:20 +01:00 |
|