Mojca Lorber
|
d055d6e241
|
Fix quotes again
|
2020-09-09 14:43:12 +02:00 |
|
Mojca Lorber
|
eeb8f4a97a
|
Disable 'complete step' button on locked task
|
2020-09-09 14:32:37 +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
|
946b961b1a
|
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses
Add front-end checks for statuses [SCI-4975]
|
2020-09-09 13:21:04 +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 |
|
aignatov-bio
|
5d9d7d6a12
|
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions
Add description for conditions [SCI-4983]
|
2020-09-09 11:33:48 +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 |
|
aignatov-bio
|
9a771da7f7
|
Merge pull request #2821 from mlorb/ml-sci-4578
Fix buttons visability on protocols page according to new styleguide [SCI-4578]
|
2020-09-09 09:05:26 +02:00 |
|
aignatov-bio
|
ae1bec2a95
|
Merge pull request #2818 from mlorb/ml-sci-4572
Change step checklist and table edit mode [SCI-4572]
|
2020-09-09 09:02:56 +02:00 |
|
aignatov-bio
|
bdb3caf5cf
|
Add i18n
|
2020-09-09 08:50:24 +02:00 |
|
Urban Rotnik
|
d9b691103c
|
Add permission error message
|
2020-09-08 15:42:30 +02:00 |
|
Mojca Lorber
|
7e9ef9496f
|
Update smart annotation appearance in the text
|
2020-09-07 18:30:54 +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
|
d85703113a
|
Add front-end checks
|
2020-09-03 14:34:34 +02:00 |
|
aignatov-bio
|
4c1e120f23
|
Merge pull request #2810 from aignatov-bio/ai-sci-4968-add-error-handling-for-state-change
Add error handling for state change [SCI-4968]
|
2020-09-03 11:47:48 +02:00 |
|
aignatov-bio
|
39105a807a
|
Merge pull request #2816 from aignatov-bio/ai-sci-4960-fix-css-issue-for-status-flow
Fix css for status flows [SCI-4970]
|
2020-09-03 09:46:19 +02:00 |
|
Mojca Lorber
|
06d75fb07e
|
Change step checklist and table edit mode
|
2020-09-02 18:04:37 +02:00 |
|
aignatov-bio
|
257329ce80
|
Fix css for status flows
|
2020-09-02 15:41:07 +02:00 |
|
Mojca Lorber
|
634dd2ae5e
|
Add css variable
|
2020-09-02 12:00:52 +02:00 |
|
Mojca Lorber
|
d57eb68f93
|
Fix tables header corners
|
2020-09-01 16:25:30 +02:00 |
|
Urban Rotnik
|
ed5869ff8e
|
Show status on task card
|
2020-09-01 14:56:48 +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 |
|
Mojca Lorber
|
059c8c88d9
|
Fix css for modal-body
|
2020-08-20 14:12:45 +02:00 |
|
aignatov-bio
|
19a0d05467
|
Fix for checklist ordering
|
2020-08-14 12:32:39 +02:00 |
|
Mojca Lorber
|
a91aa6ce46
|
Fix Collapse and expand buttons position
|
2020-08-13 13:18:50 +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
|
e965844a9e
|
Merge pull request #2755 from aignatov-bio/ai-sci-4837-implement-new-statuses-in-preports
Add new statuses to reports [SCI-4837]
|
2020-08-04 09:49:55 +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
|
868f2e8242
|
Merge pull request #2765 from aignatov-bio/ai-sci-4878-fix-activities-on-task-tab
Fix CSS for activities on task page [SCI-4878]
|
2020-08-03 11:31:47 +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
|
73911cf7ce
|
Fix CSS for activities on task page
|
2020-07-30 13:30:23 +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 |
|
Alex Kriuchykhin
|
d4408f6af7
|
Merge pull request #2738 from aignatov-bio/ai-sci-4732-add-pagination-to-results
Add pagination to results page [SCI-4732]
|
2020-07-23 14:45:10 +02:00 |
|
aignatov-bio
|
a0d19b5d98
|
Add new statuses to reports
|
2020-07-23 14:24:30 +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 |
|
aignatov-bio
|
b214d2df77
|
Merge pull request #2746 from aignatov-bio/ai-sci-4815-fix-margins-on-view-switch
Fix switch view margins [SCI-4815]
|
2020-07-23 08:57:20 +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 |
|
Urban Rotnik
|
aacee14fc6
|
Add Status button
|
2020-07-22 15:30:47 +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 |
|
Urban Rotnik
|
7019e42736
|
Merge pull request #2743 from urbanrotnik/ur-sci-4816-change-font-size-email
Fix font size in dropdown [SCI-4816]
|
2020-07-20 15:50:10 +02:00 |
|
aignatov-bio
|
691b8ec327
|
Fix switch view margins
|
2020-07-20 15:17:24 +02:00 |
|
aignatov-bio
|
75930b99c3
|
Fix global activities filters
|
2020-07-20 15:01:00 +02:00 |
|
Urban Rotnik
|
748dd7912b
|
Fix font size in dropdown
|
2020-07-20 11:36:25 +02:00 |
|
aignatov-bio
|
e69e3ea8d3
|
Add export for assigned items
|
2020-07-17 15:17:09 +02:00 |
|
Mojca Lorber
|
10e607c281
|
Implement Status labels on a Task card
|
2020-07-17 14:48:45 +02:00 |
|
aignatov-bio
|
7c4bfad09b
|
Add pagination to results page
|
2020-07-16 15:47:19 +02:00 |
|
Mojca Lorber
|
9464d2753d
|
Fix naming of filter field for repositories tables
|
2020-07-15 10:52:47 +02:00 |
|
Alex Kriuchykhin
|
8dd478ad61
|
Merge pull request #2730 from aignatov-bio/ai-sci-4874-improve-pdf-reports
Improve pdf reports [SCI-4874]
|
2020-07-13 17:02:10 +02:00 |
|
Mojca Lorber
|
212ba76c16
|
Fix Settings pages titles
|
2020-07-13 14:51:51 +02:00 |
|
aignatov-bio
|
a7fac38fcb
|
Improve pdf reports
|
2020-07-13 14:29:59 +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 |
|
Urban Rotnik
|
7aa40a284e
|
Merge pull request #2724 from urbanrotnik/ur-sci-4771-improve-report-layout
Text wrap for page numbers [SCI-4771]
|
2020-07-09 16:52:41 +02:00 |
|
Urban Rotnik
|
1f220f70ee
|
Text wrap for page numbers
|
2020-07-09 16:24:14 +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
|
cb8070c012
|
Fix pointer event
|
2020-07-09 14:25: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 |
|
Urban Rotnik
|
950f65b90e
|
Merge pull request #2715 from urbanrotnik/ur-sci-4771-improve-report-layout
Improve report layout [SCI-4771]
|
2020-07-09 11:48:33 +02:00 |
|
mlorb
|
d9038e6f7f
|
Merge branch 'develop' into ml-sci-4810
|
2020-07-09 11:46:54 +02:00 |
|
Mojca Lorber
|
19c5b7e5a2
|
Remove redundant css class
|
2020-07-09 11:44:36 +02:00 |
|
Miha Mencin
|
c68aa5c875
|
Merge pull request #2716 from mlorb/ml-sci-4567
Change title size to h1 [SCI-4567]
|
2020-07-09 11:19:02 +02:00 |
|
Mojca Lorber
|
f64172f787
|
Revert repository archived items title
|
2020-07-09 09:17:02 +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 |
|
Mojca Lorber
|
00b668a4ba
|
Change title size to h1
|
2020-07-08 13:02:47 +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 |
|
Urban Rotnik
|
5d067077b1
|
Add logo and timestamp to PDF and Doc reports
|
2020-07-08 10:48:29 +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
|
004a7e3943
|
Merge pull request #2705 from aignatov-bio/ai-sci-4808-update-css-for-inventory-modals
Update inventory modals CSS [SCI-4808]
|
2020-07-08 09:29:02 +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
|
7a9a25e6a9
|
Add 2fa wizzard tabs
|
2020-07-07 13:17:17 +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
|
6352a4ba9b
|
Update inventory modals
|
2020-07-06 12:47:42 +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
|
76c2e032dc
|
Merge pull request #2666 from aignatov-bio/ai-sci-4747-fix-long-inventory-name
Fix long inventory name issue on task page [SCI-4747]
|
2020-06-29 09:44:21 +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 |
|
aignatov-bio
|
8b10d49118
|
Clean up CSS
|
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 |
|
aignatov-bio
|
e8ea8b5b3f
|
Fix long inventory name issue on task page
|
2020-06-17 15:08:07 +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 |
|
Urban Rotnik
|
c0a2d4709c
|
Merge pull request #2662 from urbanrotnik/ai-sci-4770
Fix MarvinJS modal header [SCI-4770] - HotFix
|
2020-06-16 11:44:04 +02:00 |
|
aignatov-bio
|
95ae8215a7
|
Fix MarvinJS modal header
|
2020-06-16 10:28:43 +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
|
7c8460dcf5
|
Merge pull request #2628 from aignatov-bio/ai-sci-4699-change-line-thikness
Change selected line thickness [SCI-4699]
|
2020-06-01 10:43:46 +02:00 |
|
aignatov-bio
|
222e89ea8d
|
Change selected line thickness
|
2020-06-01 10:30:06 +02:00 |
|
aignatov-bio
|
8f3c7fa9aa
|
Merge pull request #2627 from aignatov-bio/ai-sci-4549-fix-shared-inventory-icon
Fix shared inventory icon [SCI-4549]
|
2020-06-01 10:28:07 +02:00 |
|
aignatov-bio
|
e67f345602
|
Merge pull request #2624 from aignatov-bio/ai-sci-4701-small-css-fixes
Small css fixes [SCI-4701]
|
2020-06-01 10:27:54 +02:00 |
|
aignatov-bio
|
aee75a2f83
|
Add repository list view
|
2020-06-01 10:24:03 +02:00 |
|
aignatov-bio
|
1430ca5ae9
|
Fix shared inventory icon
|
2020-05-29 13:17:07 +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 |
|
Alex Kriuchykhin
|
4c50f75aa2
|
Merge pull request #2621 from aignatov-bio/ai-sci-4710-fix-escape-issue-in-dropdowns
Fix escape issue in dropdowns [SCI-4710]
|
2020-05-29 09:52:36 +02:00 |
|
aignatov-bio
|
7f0d43209e
|
Small css fixes
|
2020-05-28 16:04:21 +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
|
32c1f4af84
|
Fix forgot password link margin
|
2020-05-27 12:55:15 +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
|
73c7ff47a5
|
Fix z-index for full view modal
|
2020-05-26 12:41:07 +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 |
|
Oleksii Kriuchykhin
|
c98b042585
|
Improve handling of unassigned inventories with existing snapshots [SCI-4661]
|
2020-05-22 17:36:04 +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 |
|
Urban Rotnik
|
9d3874e343
|
Add margin to keywords container
|
2020-05-22 14:23:03 +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 |
|
aignatov-bio
|
d3781a7048
|
Merge pull request #2588 from aignatov-bio/ai-sci-4660-change-assigned-private-task-view
Add private tasks to assigned task list [SCI-4660]
|
2020-05-21 12:57:59 +02:00 |
|
Mojca Lorber
|
12982260b7
|
Fix css hover effects
|
2020-05-21 08:37:40 +02:00 |
|
Oleksii Kriuchykhin
|
f2043f111b
|
Change display of the live version for a deleted inventory [SCI-4659]
|
2020-05-20 21:50:39 +02:00 |
|
aignatov-bio
|
d16930e987
|
Add private tasks to assigned task list
|
2020-05-20 17:23:48 +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
|
d714b4b7bf
|
Merge pull request #2579 from aignatov-bio/ai-sci-4635-fix-checklist-appearance-in-fullview
Fix checklist render in full view [SCI-4635]
|
2020-05-19 16:18:45 +02:00 |
|
Urban Rotnik
|
431bd0c53b
|
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix
Fonts size update [SCI-4650]
|
2020-05-19 14:55:22 +02:00 |
|
Urban Rotnik
|
ac4532eea3
|
Update fonts
|
2020-05-19 14:14:58 +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 |
|
aignatov-bio
|
9db19603dc
|
Fix checklist render in fullview
|
2020-05-18 16:32:27 +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 |
|
aignatov-bio
|
dc2caca4f3
|
Small css fixes and test fix
|
2020-05-15 11:04:17 +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 |
|