Mojca Lorber
|
94fea75fda
|
Fix at long inventory name snapshot in title is not visible
|
2020-09-24 17:19:41 +02:00 |
|
aignatov-bio
|
70a0da17b2
|
Fix markup
|
2020-09-24 17:12:53 +02:00 |
|
aignatov-bio
|
780db9d134
|
Add assets view switcher
|
2020-09-24 17:10:36 +02:00 |
|
Alex Kriuchykhin
|
d02d48f10f
|
Merge pull request #2869 from aignatov-bio/ai-sci-5038-fix-smart-annotaion-link-for-inventory-items
Improve smart annotation in TinyMCE fields [SCI-5038]
|
2020-09-24 14:11:59 +02:00 |
|
mlorb
|
acda21f357
|
Merge pull request #2867 from mlorb/ml-sci-4578-v2
Some protocol repository CSS corrections [SCI-4578]
|
2020-09-24 13:44:06 +02:00 |
|
aignatov-bio
|
4f7814cff4
|
Fix markup
|
2020-09-24 13:32:43 +02:00 |
|
aignatov-bio
|
9da27956d3
|
Merge pull request #2857 from aignatov-bio/ai-sci-4987-fix-smart-annotation-for-archived-projects
Show smart annotation for archived projects/experiments [SCI-4987]
|
2020-09-24 13:29:49 +02:00 |
|
aignatov-bio
|
ff33cb45e0
|
Improve smart annotation in TinyMCE fields
|
2020-09-24 13:29:20 +02:00 |
|
aignatov-bio
|
653fe6fb1d
|
Fix markup
|
2020-09-24 11:56:17 +02:00 |
|
Urban Rotnik
|
3bda6a987d
|
Fix smart annotation for RepositoryItem
|
2020-09-24 11:45:03 +02:00 |
|
Mojca Lorber
|
f0a07acaf4
|
Some protocol repository CSS corrections
|
2020-09-23 20:54:49 +02:00 |
|
aignatov-bio
|
b6f038ff09
|
Merge pull request #2863 from aignatov-bio/ai-sci-5037-update-regexp-for-smart-annotation
Update regexp for smart annotation [SCI-5037]
|
2020-09-23 16:39:24 +02:00 |
|
Urban Rotnik
|
3de2aee921
|
Merge pull request #2864 from urbanrotnik/ur-sci-4993
Assign user to cloned experiment [SCI-4993]
|
2020-09-23 13:37:07 +02:00 |
|
Urban Rotnik
|
33d53c958d
|
Merge pull request #2866 from urbanrotnik/ur-sci-5053
Fix protocol import modal [SCI-5053]
|
2020-09-23 13:19:23 +02:00 |
|
aignatov-bio
|
0865802255
|
Merge pull request #2853 from aignatov-bio/ai-sci-5024-disable-autostrip-on-status-change
Disable autostrip attrbiutes on status change [SCI-5024]
|
2020-09-23 13:18:07 +02:00 |
|
Urban Rotnik
|
7bc31905b5
|
Fix protocol import modal
|
2020-09-23 12:54:16 +02:00 |
|
aignatov-bio
|
e4b94b582a
|
Add dynamic render of wopi files in viewport
|
2020-09-23 12:32:46 +02:00 |
|
aignatov-bio
|
d719c26b6c
|
Add error handling for MarvinJS
|
2020-09-23 12:26:26 +02:00 |
|
Urban Rotnik
|
5be7a1b32d
|
Assign user to cloned experiment
|
2020-09-23 11:31:18 +02:00 |
|
aignatov-bio
|
21dcf1157c
|
Update regexp for smart annotation
|
2020-09-23 11:13:59 +02:00 |
|
Oleksii Kriuchykhin
|
2cda80dc5f
|
Add Endpoins for Project Membership manipulation [SCI-5001]
|
2020-09-23 11:03:29 +02:00 |
|
mlorb
|
feda5622d8
|
Merge pull request #2860 from mlorb/ml-sci-5007
Add info of the locked task to the View status flow modal [SCI-5007]
|
2020-09-23 10:19:48 +02:00 |
|
aignatov-bio
|
7fa98de1da
|
Merge pull request #2859 from aignatov-bio/ai-sci-5036-fix-smart-annotation-cursor-position
Fix smart annotation cursor position [SCI-5036]
|
2020-09-23 10:11:13 +02:00 |
|
Mojca Lorber
|
affae15ccf
|
Simplification
|
2020-09-22 17:19:15 +02:00 |
|
mlorb
|
547af538b3
|
Merge pull request #2856 from mlorb/ml-sci-5009
Update empty states for smart annotation results and dismiss button [SCI-5009]
|
2020-09-22 15:31:22 +02:00 |
|
aignatov-bio
|
bbfd4b1c02
|
Run autostrip when related field changed
|
2020-09-22 12:48:52 +02:00 |
|
aignatov-bio
|
e288a1f911
|
Merge pull request #2861 from aignatov-bio/ai-sci-5038-prevent-tinymce-edit-mode-when-link-click
Prevent tinymce edit mode when link click [SCI-5038]
|
2020-09-22 11:41:50 +02:00 |
|
Mojca Lorber
|
8b3fce9656
|
Move it again
|
2020-09-22 11:38:32 +02:00 |
|
Mojca Lorber
|
0ad93d1288
|
Move close modal function to global event
|
2020-09-22 11:30:05 +02:00 |
|
aignatov-bio
|
2d667acdd1
|
Prevent tinymce edit mode when link click
|
2020-09-22 10:56:40 +02:00 |
|
Mojca Lorber
|
fe779f9146
|
Add info of the locked task to the View status flow modal
|
2020-09-22 10:21:55 +02:00 |
|
aignatov-bio
|
b540f90514
|
Merge pull request #2858 from aignatov-bio/ai-sci-5035-fix-smart-annotation-for-shared-inventories
Add shared inventories to smart annotation [SCI-5035]
|
2020-09-22 10:20:20 +02:00 |
|
Alex Kriuchykhin
|
136ce06022
|
Merge pull request #2851 from okriuchykhin/ok_SCI_4999
Add Create and Update endpoints for experiments [SCI-4999]
|
2020-09-22 10:20:00 +02:00 |
|
aignatov-bio
|
fd7773a3dc
|
Fix smart annotation cursor position
|
2020-09-22 10:15:01 +02:00 |
|
Mojca Lorber
|
23d6d93074
|
Fix css
|
2020-09-21 17:13:42 +02:00 |
|
aignatov-bio
|
fde33e6e63
|
Fix tests
|
2020-09-21 14:41:51 +02:00 |
|
aignatov-bio
|
f8a28f378e
|
Add shared inventories to smart annotation
|
2020-09-21 14:36:34 +02:00 |
|
aignatov-bio
|
545e13304a
|
Show smart annotation for archived projects/experiments
|
2020-09-21 14:09:11 +02:00 |
|
Alex Kriuchykhin
|
e19efe3975
|
Merge pull request #2850 from okriuchykhin/ok_SCI_4997
Add Create and Update endpoints for projects [SCI-4997]
|
2020-09-21 13:22:12 +02:00 |
|
Alex Kriuchykhin
|
9fda2dd97e
|
Merge pull request #2855 from okriuchykhin/ok_SCI_5030
Fix task archiving and moving [SCI-5030]
|
2020-09-21 10:49:37 +02:00 |
|
Mojca Lorber
|
d9a78d20d7
|
Update empty states for smart annotation results and dismiss button
|
2020-09-18 08:50:01 +02:00 |
|
Oleksii Kriuchykhin
|
e456661a98
|
Fix task archiving and moving [SCI-5030]
|
2020-09-17 17:15:41 +02:00 |
|
aignatov-bio
|
644f30fb10
|
Fix syntax for uglifier
|
2020-09-17 15:35:12 +02:00 |
|
aignatov-bio
|
ec9446d0cb
|
Disable autostrip attrbiutes on status change
|
2020-09-17 15:26:48 +02:00 |
|
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
|
d560470df2
|
Merge pull request #2844 from aignatov-bio/ai-sci-4950-implement-remember-selection-of-smart-annotation
Add remembered state for smart annotation [SCI-4950]
|
2020-09-17 14:49:35 +02:00 |
|
aignatov-bio
|
8dbc69aa31
|
Remove console.log
|
2020-09-17 14:48:26 +02:00 |
|
Urban Rotnik
|
462fb12a41
|
Update SQL query
|
2020-09-17 13:30:27 +02:00 |
|
Urban Rotnik
|
777afd0e9b
|
Add improved search for smart annotations
|
2020-09-17 13:19:52 +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 |
|
Oleksii Kriuchykhin
|
0147e1aee1
|
Add Create and Update endpoints for experiments [SCI-4999]
|
2020-09-16 23:15:36 +02:00 |
|
Oleksii Kriuchykhin
|
dd4a62bb45
|
Add Create and Update endpoints for projects [SCI-4997]
|
2020-09-16 17:03:39 +02:00 |
|
aignatov-bio
|
c26f8e7193
|
Add before send condition for status change
|
2020-09-16 15:23:53 +02:00 |
|
Alex Kriuchykhin
|
aadc0bebff
|
Merge pull request #2847 from okriuchykhin/ok_SCI_5004_v2
Fix status consequences execution order [SCI-5004]
|
2020-09-16 15:21:47 +02:00 |
|
Oleksii Kriuchykhin
|
ff1476d46a
|
Fix status consequences execution order [SCI-5004]
|
2020-09-16 13:45:58 +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 |
|
aignatov-bio
|
14acf2b624
|
Add i18n
|
2020-09-15 14:47:57 +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 |
|
Alex Kriuchykhin
|
04686d4ffc
|
Merge pull request #2842 from okriuchykhin/ok_SCI_5004
Add Completion and Uncompletion consequences [SCI-5004]
|
2020-09-15 12:56:27 +02:00 |
|
Alex Kriuchykhin
|
6269802be4
|
Merge pull request #2843 from okriuchykhin/ok_SCI_4881
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
|
2020-09-15 12:53:01 +02:00 |
|
aignatov-bio
|
67d3a1ad12
|
Fix markup
|
2020-09-15 12:06:20 +02:00 |
|
Oleksii Kriuchykhin
|
db3de835f8
|
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
|
2020-09-15 11:58:35 +02:00 |
|
aignatov-bio
|
6dc4422d82
|
Fix markup
|
2020-09-15 11:56:44 +02:00 |
|
Oleksii Kriuchykhin
|
57716fd89c
|
Fix API and tests for new task completion logic [SCI-5004]
|
2020-09-15 11:19:25 +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 |
|
aignatov-bio
|
c10e2d231e
|
Update frontend permission check
|
2020-09-14 15:59:09 +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 |
|
aignatov-bio
|
5a063f070d
|
Clone module before condition validation
|
2020-09-10 16:53:07 +02:00 |
|
aignatov-bio
|
18426b90be
|
Disable button when condition not fullfield
|
2020-09-10 13:40:52 +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 |
|
Urban Rotnik
|
78c9394b1f
|
Fix aligment due date and status on canvas card
|
2020-09-09 14:33:25 +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 |
|
Urban Rotnik
|
45a09e5a3c
|
Fix tests
|
2020-09-09 13:17:07 +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
|
9419a16df5
|
Merge pull request #2833 from urbanrotnik/ur-sci-4988-notes-duplication
Remove notes duplication [SCI-4988]
|
2020-09-09 11:29:10 +02:00 |
|
Urban Rotnik
|
aa88b6bdb4
|
Move redirect to controller
|
2020-09-09 11:26:43 +02:00 |
|
aignatov-bio
|
7763d11634
|
Fix markup
|
2020-09-09 11:24:54 +02:00 |
|
Urban Rotnik
|
9066586149
|
Fix duedate for PDF and DOCX
|
2020-09-09 10:48:42 +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 |
|
aignatov-bio
|
687093e110
|
Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks
Add completed/uncompleted methods to my_module [SCI-4972]
|
2020-09-09 08:20:36 +02:00 |
|
Alex Kriuchykhin
|
c413ac21a1
|
Merge pull request #2798 from aignatov-bio/ai-sci-4831-update-api-for-new-statuses
Add API endpoints for workflows [SCI-4831]
|
2020-09-08 16:23:05 +02:00 |
|
Alex Kriuchykhin
|
7eb43a16d5
|
Merge pull request #2806 from okriuchykhin/ok_SCI_4859
Add secondary-navigation-title-name data hook [SCI-4859]
|
2020-09-08 16:19:42 +02:00 |
|
Urban Rotnik
|
c628fb2598
|
Remove duplicated notes section in reports
|
2020-09-08 16:10:24 +02:00 |
|
Urban Rotnik
|
d9b691103c
|
Add permission error message
|
2020-09-08 15:42:30 +02:00 |
|
aignatov-bio
|
4083ed1755
|
Fix tests
|
2020-09-08 14:52:23 +02:00 |
|
Oleksii Kriuchykhin
|
dd347aa834
|
Improve step reposition after deletion [SCI-4880]
|
2020-09-08 11:48:06 +02:00 |
|
aignatov-bio
|
e1255bf942
|
Remove duplicate action
|
2020-09-08 09:50:26 +02:00 |
|
aignatov-bio
|
0be99c12c2
|
revert changes
|
2020-09-08 09:45:42 +02:00 |
|
aignatov-bio
|
ee333a982a
|
Revert back state logic
|
2020-09-08 09:45:42 +02:00 |
|
aignatov-bio
|
bd1d6a772b
|
Add completed/uncompleted methods to my_module
|
2020-09-08 09:45:09 +02:00 |
|
Mojca Lorber
|
7e9ef9496f
|
Update smart annotation appearance in the text
|
2020-09-07 18:30:54 +02:00 |
|
aignatov-bio
|
492d25f9b3
|
Add description for conditions
|
2020-09-07 15:12:09 +02:00 |
|
Oleksii Kriuchykhin
|
3150a36a64
|
Fix canvas edit mode [SCI-4880]
|
2020-09-07 14:54:49 +02:00 |
|
Oleksii Kriuchykhin
|
ea845040aa
|
Fix missing step edit button [SCI-4880]
|
2020-09-07 13:49:11 +02:00 |
|
aignatov-bio
|
f2ffe17636
|
Skip implications for my_module canvas position update
|
2020-09-07 13:05:26 +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
|
8b1e11a314
|
Add conditions_fulfilled? method
|
2020-09-03 14:20:38 +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
|
5cb497b61d
|
Split params validation to create and update
|
2020-09-03 09:49:00 +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 |
|
Oleksii Kriuchykhin
|
a508b07275
|
Add view mode field to the Asset model [SCI-4958]
|
2020-09-02 15:02:56 +02:00 |
|
Mojca Lorber
|
634dd2ae5e
|
Add css variable
|
2020-09-02 12:00:52 +02:00 |
|
aignatov-bio
|
4c7312faf9
|
Add tests for new workflow endpoints
|
2020-09-02 11:43:00 +02:00 |
|
Mojca Lorber
|
d57eb68f93
|
Fix tables header corners
|
2020-09-01 16:25:30 +02:00 |
|
Urban Rotnik
|
447ba6aa64
|
Merge pull request #2812 from urbanrotnik/ur-sci-4969-status-on-task-card
Show status on task card [SCI-4969]
|
2020-09-01 15:28:48 +02:00 |
|
aignatov-bio
|
68f31ce7ec
|
Add api endpoints for workflows
|
2020-09-01 15:01:38 +02:00 |
|
Urban Rotnik
|
ed5869ff8e
|
Show status on task card
|
2020-09-01 14:56:48 +02:00 |
|
aignatov-bio
|
e1229f5606
|
Fix test and status validations
|
2020-09-01 14:49:58 +02:00 |
|
Urban Rotnik
|
5148902d93
|
Fix error on edit experiment
|
2020-09-01 13:37:57 +02:00 |
|
aignatov-bio
|
ce84c1546b
|
Fix tests
|
2020-09-01 12:41:00 +02:00 |
|
aignatov-bio
|
9ff5e8bd7d
|
Add task state change error handling and validation
|
2020-09-01 12:41:00 +02:00 |
|
Urban Rotnik
|
581cd69963
|
Add activities for status change
|
2020-09-01 11:48:04 +02:00 |
|
Urban Rotnik
|
a259800590
|
Merge branch 'develop' into jg_sci_2228
|
2020-08-31 16:29:23 +02:00 |
|
Urban Rotnik
|
8b0b296b90
|
Merge pull request #2774 from okriuchykhin/ok_SCI_4829
Add task status to export all [SCI-4829]
|
2020-08-31 11:13:44 +02:00 |
|
Urban Rotnik
|
4eebfa5461
|
Controller action for card inline preview
|
2020-08-28 11:05:52 +02:00 |
|
aignatov-bio
|
6229ba6041
|
Add morkflow generator
|
2020-08-27 12:13:13 +02:00 |
|
aignatov-bio
|
c07ebe90fa
|
Add migration for task states
|
2020-08-27 11:34:59 +02:00 |
|
Oleksii Kriuchykhin
|
bc4c18e585
|
Add secondary-navigation-title-name data hook [SCI-4859]
|
2020-08-27 11:33:26 +02:00 |
|
Urban Rotnik
|
a5fb873d19
|
Add default workflow
|
2020-08-27 10:54:39 +02:00 |
|
aignatov-bio
|
7a0dc13f3d
|
Merge pull request #2790 from aignatov-bio/ai-sci-4866-implement-snapshotting-as-consequence
Add consequence for repository snapshotting [SCI-4866]
|
2020-08-25 15:55:31 +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
|
4a837951db
|
Update variable name
|
2020-08-25 15:02:25 +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
|
86bcd9b13b
|
Merge pull request #2799 from urbanrotnik/ur-sci-4945-user-state-fix
Set stateDuration to 0 [SCI-4945]
|
2020-08-25 05:48:18 +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 |
|
Oleksii Kriuchykhin
|
e0f7e181f6
|
Fix user deletion script [SCI-4829]
|
2020-08-21 13:12:14 +02:00 |
|
Oleksii Kriuchykhin
|
e6e47f5106
|
Fix failing tests [SCI-4829]
|
2020-08-21 11:58:12 +02:00 |
|
Alex Kriuchykhin
|
121644decf
|
Merge pull request #2770 from okriuchykhin/ok_SCI_4881
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
|
2020-08-21 11:01:49 +02:00 |
|
Alex Kriuchykhin
|
ccf4e2a747
|
Merge pull request #2759 from okriuchykhin/ok_SCI_4817
Refactor task archive and move permissions [SCI-4817]
|
2020-08-21 11:01:05 +02:00 |
|
Alex Kriuchykhin
|
287f7cce79
|
Merge pull request #2771 from okriuchykhin/ok_SCI_4889
Improve handling of old repository table states [SCI-4889]
|
2020-08-21 10:59:34 +02:00 |
|
Mojca Lorber
|
059c8c88d9
|
Fix css for modal-body
|
2020-08-20 14:12:45 +02:00 |
|
Mojca Lorber
|
faf2d4c533
|
Fix export icon
|
2020-08-14 17:02:03 +02:00 |
|
aignatov-bio
|
19a0d05467
|
Fix for checklist ordering
|
2020-08-14 12:32:39 +02:00 |
|
Urban Rotnik
|
38d3411007
|
Update checklist item positions with validations skip
|
2020-08-13 20:06:03 +02:00 |
|
Mojca Lorber
|
a91aa6ce46
|
Fix Collapse and expand buttons position
|
2020-08-13 13:18:50 +02:00 |
|
aignatov-bio
|
fdb2e46700
|
Add consequence for repository snapshotting
|
2020-08-13 12:51:33 +02:00 |
|
aignatov-bio
|
9474319d6b
|
Fir error handling in invite user view
|
2020-08-13 11:34:21 +02:00 |
|
Urban Rotnik
|
0c28b5d667
|
Merge pull request #2788 from urbanrotnik/ur-sci-4925-report-activities-fix
Fix activities query [SCI-4925]
|
2020-08-13 10:09:45 +02:00 |
|
Urban Rotnik
|
9f74a86ebe
|
Fix activities query
|
2020-08-12 16:56:49 +02:00 |
|
aignatov-bio
|
5360db76be
|
Fix dropdrown selector
|
2020-08-12 14:00:10 +02:00 |
|
aignatov-bio
|
91b8475db5
|
Merge pull request #2784 from aignatov-bio/ai-sci-4918-display-all-errors-on-signup
Fix error handling on registration page [SCI-4918]
|
2020-08-12 09:39:21 +02:00 |
|
Urban Rotnik
|
7d186156a0
|
Fix permission check lapsus
|
2020-08-11 17:00:36 +02:00 |
|
aignatov-bio
|
84b99eaf3d
|
Fix error handling on registration page
|
2020-08-11 15:39:35 +02:00 |
|
mlorb
|
02bb29cf79
|
Merge pull request #2772 from mlorb/ml-sci-4907
Fix inventory card view for snapshots as default view [SCI-4907]
|
2020-08-11 14:43:19 +02:00 |
|
Mojca Lorber
|
5d15e73866
|
Fix failing tests
|
2020-08-11 13:33:44 +02:00 |
|
Urban Rotnik
|
f5ffd685d8
|
Merge pull request #2773 from urbanrotnik/ur-sci-4879-word-format-fix
Fix word reports when using headings [SCI-4879]
|
2020-08-11 13:01:43 +02:00 |
|
Mojca Lorber
|
7af9c387cf
|
Fix errors
|
2020-08-11 10:27:23 +02:00 |
|
Mojca Lorber
|
94e6b554f1
|
Revert back the view
|
2020-08-10 17:29:29 +02:00 |
|
Urban Rotnik
|
29152eeb6d
|
Merge pull request #2783 from urbanrotnik/ur-sci-4920-permission-repository-fix
Fix permission check [SCI-4920]
|
2020-08-10 15:59:21 +02:00 |
|
Miha Mencin
|
b333700f40
|
Merge pull request #2779 from okriuchykhin/ok_SCI_4910
Fix rendering of RTE in API [SCI-4910]
|
2020-08-10 15:26:35 +02:00 |
|
Urban Rotnik
|
e429c78d56
|
Fix permission check
|
2020-08-10 15:22:49 +02:00 |
|
Miha Mencin
|
9c351dd2ed
|
Merge pull request #2782 from aignatov-bio/ai-sci-4902-add-cell-border-to-docx-report
Add border to tinymce table in docx [SCI-4902]
|
2020-08-10 15:02:39 +02:00 |
|
aignatov-bio
|
67b6592470
|
Merge pull request #2781 from aignatov-bio/ai-sci-4919-fix-dashboard-calendar
Fix dashboard calendar due date selection [SCI-4919]
|
2020-08-10 14:34:23 +02:00 |
|
aignatov-bio
|
e9028961db
|
Add border to tinymce table in docx
|
2020-08-10 13:47:32 +02:00 |
|
aignatov-bio
|
a3ad8b5aab
|
Fix dashboard calendar due date selection
|
2020-08-10 12:55:56 +02:00 |
|
Miha Mencin
|
1080ad2821
|
Merge pull request #2778 from okriuchykhin/ok_SCI_4911
Add created_at and user to API Step serializer [SCI-4911]
|
2020-08-10 10:27:53 +02:00 |
|
Miha Mencin
|
98c3721d8c
|
Merge pull request #2775 from urbanrotnik/ur-sci-4904-unlock-instruction
Add check if user is locked, show link unlock instructions [SCI-4904]
|
2020-08-10 10:27:06 +02:00 |
|
Urban Rotnik
|
3c1c562e4c
|
Override password reset action, sign_in user only if 2fa disabled
|
2020-08-10 09:24:15 +02:00 |
|
aignatov-bio
|
56ff4e7702
|
Add new statuses to dashboard
|
2020-08-10 09:10:56 +02:00 |
|
Oleksii Kriuchykhin
|
91d9f5d6ee
|
Fix rendering of RTE in API [SCI-4910]
|
2020-08-07 16:51:57 +02:00 |
|
Oleksii Kriuchykhin
|
3d3fd1625c
|
Add created_at and user to API Step serializer [SCI-4911]
|
2020-08-07 14:54:05 +02:00 |
|
Urban Rotnik
|
3c3a2bfb8b
|
Add check if user is locked, show link unlock instructions
|
2020-08-06 15:18:20 +02:00 |
|
Miha Mencin
|
ae013b6fa8
|
join two renders
|
2020-08-06 14:06:23 +02:00 |
|
Miha Mencin
|
04c294adb1
|
Fix the failing test: repository row should be in correct repository
|
2020-08-06 13:23:40 +02:00 |
|
Oleksii Kriuchykhin
|
02a4da1a55
|
Add task status to export all [SCI-4829]
|
2020-08-06 10:50:11 +02:00 |
|
Urban Rotnik
|
bdf1e62f60
|
Fix word reports when using headings
|
2020-08-05 16:25:10 +02:00 |
|
Mojca Lorber
|
3a8fc01ff7
|
Fix inventory card view for snapshots as default view
|
2020-08-05 15:43:43 +02:00 |
|
Oleksii Kriuchykhin
|
6a50f7f27e
|
Improve handling of old repository table states [SCI-4889]
|
2020-08-05 13:15:38 +02:00 |
|
Oleksii Kriuchykhin
|
ce8d12e1c4
|
Create new activities for exporting assigned items (live & snapshots) [SCI-4881]
|
2020-08-05 09:59:58 +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 |
|
Alex Kriuchykhin
|
abe2243ad2
|
Merge pull request #2762 from okriuchykhin/ok_SCI_4767
Fix import of the old format TinyMCE images [SCI-4767]
|
2020-08-04 09:43:32 +02:00 |
|
Alex Kriuchykhin
|
22015beeb5
|
Merge pull request #2757 from urbanrotnik/ur-sci-4813-base64-multipart-upload
Extend asset API upload to support base64 [SCI-4813]
|
2020-08-04 09:43:01 +02:00 |
|
Urban Rotnik
|
9b06510dcc
|
Update PUT result file endpoint, refactor
|
2020-08-03 15:14:58 +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
|
f09ead703c
|
Fix markup
|
2020-07-28 09:54:47 +02:00 |
|
aignatov-bio
|
b644950e4e
|
Fix I18n markup
|
2020-07-28 09:53:35 +02:00 |
|
Oleksii Kriuchykhin
|
60017661c1
|
Fix import of the old format TinyMCE images [SCI-4767]
|
2020-07-27 16:39:39 +02:00 |
|
aignatov-bio
|
68fc6ec58a
|
Add sorting my module statuses
|
2020-07-27 16:36:21 +02:00 |
|
aignatov-bio
|
968249c6d8
|
Fix tests
|
2020-07-27 13:48:21 +02:00 |
|
aignatov-bio
|
9f7efe6068
|
Add backend for status flow show
|
2020-07-27 13:48: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 |
|
Oleksii Kriuchykhin
|
1a8333612a
|
Merge branch 'features/pwa' into develop
|
2020-07-27 09:47:41 +02:00 |
|
Oleksii Kriuchykhin
|
7bedbd3511
|
Fix canvas update method [SCI-4817]
|
2020-07-24 18:38:53 +02:00 |
|
Oleksii Kriuchykhin
|
94588e4698
|
Refactor task archive and move permissions [SCI-4817]
|
2020-07-24 17:00:42 +02:00 |
|
Urban Rotnik
|
9c05da1071
|
Fix task error
|
2020-07-24 15:25:29 +02:00 |
|
Urban Rotnik
|
4958139699
|
Extend asset API upload to support base64
|
2020-07-24 14:57:03 +02:00 |
|
Urban Rotnik
|
025378cd0e
|
Fix translations and JS
|
2020-07-23 15:53:46 +02:00 |
|
Alex Kriuchykhin
|
8b24a0f704
|
Merge pull request #2754 from urbanrotnik/ur-sci-4730-protocol-error
Add blacklist for dashboard activities [SCI-4730]
|
2020-07-23 15:21:51 +02:00 |
|
Alex Kriuchykhin
|
26cfa001c8
|
Merge pull request #2747 from urbanrotnik/ur-sci-4769-canvas-test
Add test for canvas_controller [SCI-4769]
|
2020-07-23 15:18:01 +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
|
ac1915351d
|
Merge pull request #2748 from aignatov-bio/ai-sci-4886-add-permission-checks-to-docx
Add scopes and permission checks for docx report [SCI-4886]
|
2020-07-23 14:26:53 +02:00 |
|
aignatov-bio
|
a0d19b5d98
|
Add new statuses to reports
|
2020-07-23 14:24:30 +02:00 |
|
Urban Rotnik
|
9bcf1a5df5
|
Add blacklist for dashboard activities
|
2020-07-23 14:22:58 +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 |
|
aignatov-bio
|
04a6a2a250
|
Small fixes
|
2020-07-23 11:35:22 +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
|
6bb760c0a9
|
Remove cucumber test for complete/uncomplete step
|
2020-07-22 16:50:10 +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
|
53d62b0310
|
Fix tests
|
2020-07-22 13:16:27 +02:00 |
|
aignatov-bio
|
005bfb2ba7
|
Fix merge conflicts
|
2020-07-22 12:37:18 +02:00 |
|
aignatov-bio
|
ddfe8231d8
|
Merge branch 'features/2fa' into develop
|
2020-07-22 11:56:36 +02:00 |
|