Urban Rotnik
|
427b5d7107
|
Merge pull request #3059 from biosistemika/features/folders
Features/folders into develop
|
2021-01-08 06:26:44 +01:00 |
|
Urban Rotnik
|
6f155913ff
|
Merge pull request #3056 from urbanrotnik/ur-sci-5334-move-project-folders-feature
Move projects/folders modal [SCI-5334]
|
2021-01-07 17:45:19 +01:00 |
|
Urban Rotnik
|
5d79eaa843
|
Pass projects mode(archived/active) to move_to modal for list [SCI-5334]
|
2021-01-07 17:42:05 +01:00 |
|
Urban Rotnik
|
3dc76a3e57
|
Fix typo, update carets
|
2021-01-07 17:42:04 +01:00 |
|
Urban Rotnik
|
3a52f62d85
|
Implement folders tree for move action
|
2021-01-07 17:42:01 +01:00 |
|
Urban Rotnik
|
20acd9b693
|
Fix controller and tests
|
2021-01-07 17:41:39 +01:00 |
|
Urban Rotnik
|
ba13a0b14b
|
Add jstree lib
|
2021-01-07 17:41:32 +01:00 |
|
aignatov-bio
|
276d6abe19
|
Update archive navigation for tasks page [SCI-5347] (#3052)
* Update archive navigation for tasks page [SCI-5347]
|
2021-01-07 17:18:52 +01:00 |
|
aignatov-bio
|
0d7da90b15
|
Small fixes for projects folder cards [SCI-5345] (#3049)
|
2021-01-07 17:02:25 +01:00 |
|
Urban Rotnik
|
88ed583a0c
|
Fix error rendering on new proejct_folder modal
|
2021-01-07 16:41:10 +01:00 |
|
aignatov-bio
|
5aae35d700
|
Update archived experiments navigation (#3053)
|
2021-01-07 14:58:56 +01:00 |
|
Alex Kriuchykhin
|
962b3a532e
|
Merge pull request #3057 from okriuchykhin/ok_SCI_5317
Add project permissions check to projects toolbar [SCI-5317]
|
2021-01-07 13:25:34 +01:00 |
|
aignatov-bio
|
1f6fff812a
|
Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331] (#3048)
* Add projects navigation buttons and fix sidebar reload on sorting [SCI-5357][SCI-5331]
|
2021-01-07 13:16:05 +01:00 |
|
aignatov-bio
|
1515ffa3f5
|
Add searching to projects member filter [SCI-5373] (#3054)
|
2021-01-07 13:01:14 +01:00 |
|
Oleksii Kriuchykhin
|
9882539213
|
Add project permissions check to projects toolbar [SCI-5317]
|
2021-01-06 22:23:48 +01:00 |
|
mlorb
|
2bd3850802
|
Merge pull request #3055 from mlorb/ml-sci-5374
Fix bug with users edit link not working [SCI-5374]
|
2021-01-06 15:33:43 +01:00 |
|
mlorb
|
ca955b27a8
|
Merge pull request #3051 from mlorb/ml-sci-5335
Change buttons style in projects toolbar [SCI-5335]
|
2021-01-06 15:09:33 +01:00 |
|
Mojca Lorber
|
b1eb4003ed
|
Fix bug with users edit link not working
|
2021-01-06 14:55:27 +01:00 |
|
Oleksii Kriuchykhin
|
53be6a95c4
|
Fix projects filter mark, titles and comments mark [SCI-5332]
|
2021-01-06 11:28:39 +01:00 |
|
Mojca Lorber
|
96e387d06d
|
Change buttons style in projects toolbar [SCI-5335]
|
2021-01-06 11:13:28 +01:00 |
|
mlorb
|
e8b48e51f4
|
Merge pull request #3050 from mlorb/ml-sci-5336
Fix table view of project page display of users [SCI-5336]
|
2021-01-06 10:14:08 +01:00 |
|
aignatov-bio
|
ef57489cd9
|
Update repositories sidebar [SCI-5329] (#3031)
* Update repositories sidebar [SCI-5329]
|
2021-01-06 10:13:10 +01:00 |
|
Mojca Lorber
|
5298a91b48
|
Fix table view of project page display of users [SCI-5336]
|
2021-01-06 09:52:13 +01:00 |
|
Urban Rotnik
|
8f11376285
|
Merge pull request #3045 from urbanrotnik/ur-sci-5320-tooptip-for-avatars
Tooltip for users on project cards [SCI-5320]
|
2021-01-06 09:18:00 +01:00 |
|
Mojca Lorber
|
2ebd78676f
|
Move sanitize_input
|
2021-01-06 09:14:43 +01:00 |
|
Mojca Lorber
|
283bfc8759
|
Update css for users on project cards
|
2021-01-05 18:31:33 +01:00 |
|
Oleksii Kriuchykhin
|
c83327b720
|
Fix project buttons visibility [SCI-5318]
|
2021-01-05 14:29:20 +01:00 |
|
Oleksii Kriuchykhin
|
696b8d19f0
|
Fix new project creation and archiving [SCI-5321][SCI-5326]
|
2021-01-05 14:14:01 +01:00 |
|
Oleksii Kriuchykhin
|
f43340a849
|
Fix projects visibility in the sidebar [SCI-5338]
|
2021-01-05 13:50:42 +01:00 |
|
Alex Kriuchykhin
|
a8991356b5
|
Merge pull request #3033 from okriuchykhin/ok_SCI_5341
Fix restore action for experiments and tasks [SCI-5341]
|
2021-01-05 10:09:39 +01:00 |
|
Alex Kriuchykhin
|
d94d344c22
|
Merge pull request #3046 from okriuchykhin/ok_SCI_5361
Add default sorting to ProjectsOverviewService [SCI-5361]
|
2021-01-05 10:04:53 +01:00 |
|
aignatov-bio
|
f795d5180d
|
Fix file previews bugs [SCI-5284] (#3026)
|
2021-01-05 09:11:22 +01:00 |
|
aignatov-bio
|
2fe55250b9
|
Update settings navigation [SCI-5316] (#3028)
|
2021-01-05 09:11:05 +01:00 |
|
Oleksii Kriuchykhin
|
1c27b99ba5
|
Add default sorting to ProjectsOverviewService [SCI-5361]
|
2021-01-04 22:37:25 +01:00 |
|
Oleksii Kriuchykhin
|
58cce0f153
|
Improve task restoring and refactor flash messages [SCI-5341]
|
2021-01-04 17:00:23 +01:00 |
|
Urban Rotnik
|
cd43973952
|
Add tooltips for users on project cards
|
2021-01-04 16:44:31 +01:00 |
|
aignatov-bio
|
0d1939e405
|
Initialize pdf preview on galery swtich [SCI-5342] (#3044)
|
2021-01-04 13:40:05 +01:00 |
|
Alex Kriuchykhin
|
163a2d1e60
|
Merge pull request #3042 from okriuchykhin/ok_SCI_5340
Make active projects view default [SCI-5340]
|
2021-01-04 11:56:22 +01:00 |
|
Alex Kriuchykhin
|
e0e796c5e7
|
Merge pull request #3040 from okriuchykhin/ok_SCI_5328
Fix project card menu visibility [SCI-5328]
|
2021-01-04 11:55:54 +01:00 |
|
Urban Rotnik
|
a53bfbdd33
|
Merge pull request #3014 from urbanrotnik/ur-sci-5283-smart-annotation-archived-link
Add 'archived' to smart annotation for repository item [SCI-5283]
|
2021-01-04 11:53:47 +01:00 |
|
Urban Rotnik
|
216db90e4a
|
Merge pull request #3013 from urbanrotnik/ur-sci-5084-smart-annotation-missing-icon
Fix cursor on SmartAnnotation [SCI-5084]
|
2021-01-04 11:18:13 +01:00 |
|
Urban Rotnik
|
d08f17d5b5
|
Merge pull request #3022 from urbanrotnik/ur-sci-5288-remove-name-uniqueness
Remove uniqueness validation on Experiment name [SCI-5288]
|
2021-01-04 10:56:51 +01:00 |
|
Alex Kriuchykhin
|
4638e74e1e
|
Merge pull request #3041 from okriuchykhin/ok_SCI_5327
Fix links in sidebar navigation [SCI-5327]
|
2021-01-04 10:53:38 +01:00 |
|
Alex Kriuchykhin
|
15a8524a99
|
Merge pull request #3039 from okriuchykhin/ok_SCI_5339
Disable comment adding for archived objects [SCI-5339]
|
2021-01-04 10:53:13 +01:00 |
|
Alex Kriuchykhin
|
794ba8ac0a
|
Merge pull request #3019 from okriuchykhin/ok_SCI_4973
Fix redirects after 2FA sign in [SCI-4973]
|
2021-01-04 10:52:16 +01:00 |
|
mlorb
|
7b48869557
|
Merge pull request #3024 from mlorb/ml-sci-5293
[SCI-5293] Remove Archived results tab on archived Task
|
2021-01-04 10:25:18 +01:00 |
|
mlorb
|
dafe8a072a
|
Merge pull request #3035 from mlorb/ml-sci-5095
[SCI-5095] Change color of sidebar icons and labels
|
2021-01-04 10:23:52 +01:00 |
|
mlorb
|
aa7ddb7fbe
|
Merge pull request #3036 from mlorb/ml-sci-5059
[SCI-5059] Change font size for manage columns list
|
2021-01-04 10:23:22 +01:00 |
|
Oleksii Kriuchykhin
|
ffd9132b52
|
Make active projects view default [SCI-5340]
|
2020-12-31 16:00:26 +01:00 |
|
Oleksii Kriuchykhin
|
8f0a3fb61c
|
Fix links in sidebar navigation [SCI-5327]
|
2020-12-30 22:49:02 +01:00 |
|
Oleksii Kriuchykhin
|
49dc56caf2
|
Fix project card menu visibility [SCI-5328]
|
2020-12-30 22:17:04 +01:00 |
|
Oleksii Kriuchykhin
|
738f668ba9
|
Disable comment adding for archived objects [SCI-5339]
|
2020-12-30 11:46:56 +01:00 |
|
Mojca Lorber
|
bd49e277cc
|
[SCI-5059] Change font size for manage columns list
|
2020-12-29 11:27:52 +01:00 |
|
Mojca Lorber
|
80b472aba0
|
[SCI-5095] Change color of sidebar icons and labels
|
2020-12-29 11:15:22 +01:00 |
|
Oleksii Kriuchykhin
|
f76eb170a1
|
Fix restore action for experiments and tasks [SCI-5341]
|
2020-12-28 22:21:38 +01:00 |
|
Oleksii Kriuchykhin
|
0cb221609a
|
Fix global activities page [SCI-5324]
|
2020-12-27 22:05:15 +01:00 |
|
Mojca Lorber
|
62af5cc723
|
[SCI-5287] Show step collapse/expand on task
|
2020-12-22 15:50:27 +01:00 |
|
aignatov-bio
|
b3faa170fb
|
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018)
* Add PDF Preview [SCI-5299]
|
2020-12-22 15:25:30 +01:00 |
|
Mojca Lorber
|
21c0ea4f8d
|
[SCI-5293] Remove Archived results tab on archived Task
|
2020-12-21 11:56:33 +01:00 |
|
Urban Rotnik
|
4ff1770d50
|
Remove uniqueness validation on Experiment name
SCI-5288
|
2020-12-18 16:48:50 +01:00 |
|
Oleksii Kriuchykhin
|
67b3f853d7
|
Merge branch 'develop' into features/folders
|
2020-12-18 14:51:21 +01:00 |
|
mlorb
|
a999fb0c80
|
Change the layout of the archived projects cards and the list view [SCI-5267] (#3021)
* change the layout of the archived projects cards and the list view
* change order in css
|
2020-12-18 13:05:23 +01:00 |
|
Urban Rotnik
|
d3e38c89f8
|
Update BE sorting for archived fodlers&projects
SCI-5306
|
2020-12-18 11:27:17 +01:00 |
|
Urban Rotnik
|
7c0ad021de
|
Update sorting dropdown
|
2020-12-18 11:08:38 +01:00 |
|
Urban Rotnik
|
7c967d32f1
|
Reset invalid state
SCI-5306
|
2020-12-18 09:46:05 +01:00 |
|
Urban Rotnik
|
63a41b123d
|
Fix dropdown JS bug, fix folders_search, apply all new filters to search
SCI-5306
|
2020-12-18 09:43:11 +01:00 |
|
Urban Rotnik
|
87ca79717c
|
Add separate sorting for active/archived view
[SCI-5306]
|
2020-12-18 08:41:51 +01:00 |
|
Urban Rotnik
|
4f657ab343
|
Fix CSS
SCI-5306
|
2020-12-18 08:37:57 +01:00 |
|
mlorb
|
f6f7211d77
|
Update styling for projects filters and fix some js bugs [SCI-5210] (#3012)
* Update styling for projects filters and fix some js bugs
* Fix hound
|
2020-12-17 23:13:45 +01:00 |
|
Oleksii Kriuchykhin
|
069704cb78
|
Fix redirects after 2FA sign in [SCI-4973]
|
2020-12-17 19:32:15 +01:00 |
|
Urban Rotnik
|
ad4ee65f6b
|
Merge pull request #3007 from urbanrotnik/ur-sci-5300
Connect manage users modal with new projects cards [SCI-5300]
|
2020-12-17 13:48:10 +01:00 |
|
Miha Mencin
|
f284ef1592
|
Merge pull request #3009 from okriuchykhin/ok_SCI_5276
Archiving: update archived TASK screen layout [SCI-5276]
|
2020-12-17 13:46:35 +01:00 |
|
Oleksii Kriuchykhin
|
7bb334e737
|
Archiving: update archived TASK screen layout [SCI-5276]
|
2020-12-17 13:26:44 +01:00 |
|
Urban Rotnik
|
3eb667b6ba
|
Merge pull request #3005 from urbanrotnik/ur-sci-5274-archived-task-cards
Archived tasks cards [SCI-5274] [SCI-5275]
|
2020-12-17 13:17:11 +01:00 |
|
Miha Mencin
|
6dc4fae45b
|
Merge pull request #3003 from okriuchykhin/ok_SCI_5268
Archiving: add 'archived' flag on folder [SCI-5268]
|
2020-12-17 13:13:26 +01:00 |
|
Urban Rotnik
|
d4c84a38e5
|
Fix css
[SCI-5274]
|
2020-12-17 13:11:30 +01:00 |
|
Urban Rotnik
|
19f16555c6
|
Add checkbox and restore button
[SCI-5275]
|
2020-12-17 13:11:20 +01:00 |
|
Urban Rotnik
|
cd7b94b434
|
Fix users/comments tab showing
[SCI-5274]
|
2020-12-17 13:08:58 +01:00 |
|
Urban Rotnik
|
9a7ffb0645
|
Add Tags modal to archived tags screen
[SCI-5274]
|
2020-12-17 13:08:57 +01:00 |
|
Urban Rotnik
|
2ae075e893
|
Use canvas task card for archived task card
[SCI-5274]
|
2020-12-17 13:08:53 +01:00 |
|
aignatov-bio
|
2ca7b81cea
|
Update archived view for experiments [SCI-5270][[SCI-5271][SCI-5277] (#3011)
* Change experiment archived card [SCI-5270]
|
2020-12-17 13:07:30 +01:00 |
|
Oleksii Kriuchykhin
|
f150a11c4f
|
Archiving: add 'archived' flag on folder [SCI-5268]
|
2020-12-17 12:47:23 +01:00 |
|
Oleksii Kriuchykhin
|
0c65f3f7c2
|
Implement sorting on the project screen (when filterin/searching) [SCI-5281]
|
2020-12-17 12:43:09 +01:00 |
|
Miha Mencin
|
ba3db65437
|
Merge pull request #3008 from okriuchykhin/ok_SCI_5273
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
|
2020-12-17 09:44:40 +01:00 |
|
Miha Mencin
|
ea9f3dcada
|
Merge pull request #2996 from okriuchykhin/ok_SCI_5253
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
|
2020-12-17 09:17:44 +01:00 |
|
Urban Rotnik
|
2d4b0fdbdc
|
Merge pull request #3010 from urbanrotnik/ur-sci-5294-remove-editing-options-of-archived-results
Refactor result permissions [SCI-5294]
|
2020-12-17 06:17:18 +01:00 |
|
Oleksii Kriuchykhin
|
2a666a3718
|
Implement additional preview type PDF of the whole document [SCI-5297]
|
2020-12-16 12:51:10 +01:00 |
|
aignatov-bio
|
329a5bff0b
|
Fix repository text field rendering [SCI-5304] (#3015)
|
2020-12-15 12:23:19 +01:00 |
|
Urban Rotnik
|
a4fd69c292
|
Add 'archived' to smart annotation for repository item
|
2020-12-15 07:36:49 +01:00 |
|
Urban Rotnik
|
c7c6e2d0f2
|
Fix cursor on SmartAnnotation
|
2020-12-14 17:29:30 +01:00 |
|
aignatov-bio
|
30cfe78805
|
Add edit modal for project folders [SCI-5265] (#3002)
Add edit modal for project folders [SCI-5265]
|
2020-12-14 15:54:18 +01:00 |
|
Urban Rotnik
|
ad8cf8a1fa
|
Refactor result permissions
|
2020-12-14 12:50:54 +01:00 |
|
Oleksii Kriuchykhin
|
94b6c96e48
|
Remove the 'Archived tasks' tab and refactor sidebar to include archived [SCI-5273]
|
2020-12-12 22:46:30 +01:00 |
|
Urban Rotnik
|
398978c69a
|
Connect users modal to projects index page
|
2020-12-11 13:07:45 +01:00 |
|
Mojca Lorber
|
5cdab422df
|
Update layout of the navigation for experiments, tasks list and task page
|
2020-12-10 15:15:36 +01:00 |
|
Urban Rotnik
|
207659a2c1
|
Fix markup [SCI-5266]
|
2020-12-10 13:36:38 +01:00 |
|
Urban Rotnik
|
152990b4d6
|
Add archived mode for Projects
[SCI-5266]
|
2020-12-09 08:51:55 +01:00 |
|
aignatov-bio
|
6a44e23697
|
Add projects sidebar [SCI-5178] (#2995)
* Add projects sidebar navigation [SCI-5178]
|
2020-12-08 16:07:26 +01:00 |
|
aignatov-bio
|
a32a2f28d3
|
Fix permission for assets in results
|
2020-12-08 15:31:57 +01:00 |
|
aignatov-bio
|
188013dd56
|
Change permission for sorting in steps and asset view [SCI-5289]
|
2020-12-08 10:45:43 +01:00 |
|
Oleksii Kriuchykhin
|
62374bee0a
|
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
|
2020-12-07 11:04:33 +01:00 |
|
Urban Rotnik
|
1332ad2fcd
|
Fix project creation activity [SCI-5181]
|
2020-12-04 14:13:43 +01:00 |
|
Urban Rotnik
|
342eb34925
|
Merge pull request #2994 from aignatov-bio/ai-sci-5285-fix-protocol-revert-from-repository
Fix protocol revert from repository [SCI-5285]
|
2020-12-04 12:25:36 +01:00 |
|
aignatov-bio
|
568fcb20df
|
Fix protocol revert from repository [SCI-5285]
|
2020-12-04 12:07:25 +01:00 |
|
Urban Rotnik
|
7773afbcdb
|
Add activities for Project Folders [SCI-5181]
|
2020-12-04 12:03:49 +01:00 |
|
aignatov-bio
|
6bd021d88a
|
Add gallery view after image update [SCI-5286] (#2993)
* Add gallery view after image update [SCI-5286]
|
2020-12-04 11:47:24 +01:00 |
|
Alex Kriuchykhin
|
7a4f60f25e
|
Merge pull request #2989 from mlorb/ml-sci-5240
[SCI-5240] Implement Create new folder function
|
2020-12-04 09:57:05 +01:00 |
|
mlorb
|
9693f84bbd
|
Implement actions dropdown on project card [SCI-5132] [SCI-5179] (#2968)
* Implement actions dropdown on project card
* make comments counter to work
|
2020-12-04 09:38:34 +01:00 |
|
aignatov-bio
|
edd774b045
|
Merge pull request #2992 from aignatov-bio/ai-sci-fix-asset-link-partial-in-item-card
Fix asset link partial in item card
|
2020-12-03 13:19:30 +01:00 |
|
Mojca Lorber
|
bdc8cfc5d5
|
Fix merging
|
2020-12-03 13:04:55 +01:00 |
|
aignatov-bio
|
e6e9c84a7c
|
Fix asset link partial in item card
|
2020-12-03 12:58:54 +01:00 |
|
Mojca Lorber
|
d9fdb20a99
|
Fix hound
|
2020-12-03 12:57:45 +01:00 |
|
Mojca Lorber
|
9253cf5ade
|
Change javascript for modal handeling and some other small fixes
|
2020-12-03 12:53:19 +01:00 |
|
mlorb
|
74f0f0474a
|
Merge branch 'features/folders' into ml-sci-5240
|
2020-12-03 12:50:19 +01:00 |
|
Urban Rotnik
|
478d43f9ce
|
Merge pull request #2987 from urbanrotnik/ur-sci-5208
Projects cards and list view with filters [SCI-5208]
|
2020-12-03 12:30:37 +01:00 |
|
Urban Rotnik
|
3700faa04a
|
Update proejcts grid, include breadcrumbs, fix JS
[SCI-5208]
|
2020-12-03 12:29:28 +01:00 |
|
aignatov-bio
|
c43851a2f4
|
Fix download links in reports [SCI-5279]
|
2020-12-03 12:16:48 +01:00 |
|
Oleksii Kriuchykhin
|
dc15accc86
|
Update sidebar usages in partials [SCI-5177]
|
2020-12-03 10:21:53 +01:00 |
|
Oleksii Kriuchykhin
|
9546b8f71d
|
Prepare backend for the improved navigation [SCI-5177]
|
2020-12-03 10:19:11 +01:00 |
|
Alex Kriuchykhin
|
92d579ab8e
|
Merge pull request #2935 from okriuchykhin/ok_SCI_5135
Generate backend for moving the projects and folders [SCI-5135]
|
2020-12-02 14:59:01 +01:00 |
|
Urban Rotnik
|
87b5552b27
|
Add equals team validations for project and folder
|
2020-12-02 14:53:46 +01:00 |
|
Urban Rotnik
|
df2b8ab3df
|
Remove jsonapi_parameters gem, accept rails params in controller
|
2020-12-02 13:15:49 +01:00 |
|
Urban Rotnik
|
7c1a0a9044
|
Add projects to project_folder serializer
|
2020-12-02 13:15:49 +01:00 |
|
Urban Rotnik
|
97733498d9
|
Include project_folders at Projects API endpoints
|
2020-12-02 13:15:48 +01:00 |
|
Urban Rotnik
|
a4fc01d595
|
Add jsonapi_parameters gem, use relationships for parent_folder relation
|
2020-12-02 13:15:48 +01:00 |
|
Urban Rotnik
|
088fa79874
|
Add Project Folders API endpoints
|
2020-12-02 13:15:48 +01:00 |
|
Oleksii Kriuchykhin
|
dfce57d481
|
Generate backend for moving the projects and folders [SCI-5135]
|
2020-12-02 12:11:01 +01:00 |
|
aignatov-bio
|
a27c78e445
|
Merge pull request #2988 from aignatov-bio/ai-sci-5260-add-direction-condition-for-status-consequences
Add direction condition for status consequences [SCI-5260]
|
2020-12-01 16:14:31 +01:00 |
|
aignatov-bio
|
d1af011c0c
|
[SCI-5260] Fix markup
|
2020-12-01 15:10:28 +01:00 |
|
aignatov-bio
|
04624692d3
|
[SCI-5260] Add afterward and backward actions to consequence
|
2020-12-01 15:07:01 +01:00 |
|
Urban Rotnik
|
13d157d1c7
|
Merge pull request #2983 from urbanrotnik/ur-sci-5252-technician-can-not-complete-step
Remove manage permissions check from step toggle [SCI-5252]
|
2020-12-01 13:37:40 +01:00 |
|
Mojca Lorber
|
d7e3b57d0d
|
[SCI-5240] Implement Create new folder function
|
2020-12-01 09:59:08 +01:00 |
|
Alex Kriuchykhin
|
7b17d9d54d
|
Merge pull request #2971 from okriuchykhin/ok_SCI_5238
Improve limit check for repository list and checklist items [SCI-5238]
|
2020-11-30 19:59:46 +01:00 |
|
aignatov-bio
|
ad960d801d
|
[SCI-5260] Fix markup
|
2020-11-30 15:20:02 +01:00 |
|
aignatov-bio
|
99ad705d82
|
[SCI-5260] Fix markup
|
2020-11-30 15:18:46 +01:00 |
|
aignatov-bio
|
0620da99de
|
[SCI-5260] Add direction condition for status consequences
|
2020-11-30 12:28:29 +01:00 |
|
aignatov-bio
|
48184df312
|
Merge pull request #2985 from aignatov-bio/ai-sci-5250-add-preview-to-export-all
Add preview files to export all [SCI-5250]
|
2020-11-30 12:21:43 +01:00 |
|
aignatov-bio
|
f92f65b74b
|
Merge pull request #2986 from aignatov-bio/ai-sci-5256-add-h6-render-to-docx-report
Add h6 render to docx report [SCI-5256]
|
2020-11-30 10:22:49 +01:00 |
|
Oleksii Kriuchykhin
|
8ee1580ae4
|
Fix tests for repository list and checklist items [SCI-5238]
|
2020-11-27 14:59:17 +01:00 |
|
Oleksii Kriuchykhin
|
78e050ccc0
|
Add clickable breadcrumbs above the folder names on the Team Project page [SCI-5171]
|
2020-11-27 14:27:24 +01:00 |
|
aignatov-bio
|
8245f18076
|
Add h6 render to docx report
|
2020-11-27 13:33:44 +01:00 |
|
Urban Rotnik
|
fcb82fd0d2
|
Merge pull request #2984 from okriuchykhin/ok_SCI_5204
Project filters: add text field to the filters [SCI-5204]
|
2020-11-27 12:04:46 +01:00 |
|
Urban Rotnik
|
dc9fae6af0
|
Remove manage permissions check from step toggle
|
2020-11-27 11:37:39 +01:00 |
|
aignatov-bio
|
8cdf09f244
|
Add preview files to export all
|
2020-11-27 11:07:37 +01:00 |
|
Alex Kriuchykhin
|
80a53e14c2
|
Merge pull request #2966 from okriuchykhin/ok_SCI_5235
Fix permission check for archived tasks [SCI-5235]
|
2020-11-27 10:46:25 +01:00 |
|
Oleksii Kriuchykhin
|
1553d32c6e
|
Project filters: add text field to the filters [SCI-5204]
|
2020-11-26 21:29:45 +01:00 |
|
aignatov-bio
|
d162fb6d35
|
Merge pull request #2980 from aignatov-bio/ai-sci-5241-add-confirmation-for-file-delete
Add delete asset confirmation modal [SCI-5241]
|
2020-11-26 15:35:40 +01:00 |
|
aignatov-bio
|
c6f4d23a78
|
Fix protocol preview file background
|
2020-11-26 15:35:06 +01:00 |
|
aignatov-bio
|
fbc7822bfe
|
Add ability to close modal by esc
|
2020-11-26 14:51:10 +01:00 |
|
aignatov-bio
|
60359b595c
|
Add button disabling
|
2020-11-26 14:37:12 +01:00 |
|
aignatov-bio
|
b0ebdceb08
|
Fix typo
|
2020-11-26 14:04:26 +01:00 |
|
Urban Rotnik
|
85b22cd486
|
Fix syntax
|
2020-11-26 12:31:45 +01:00 |
|
Urban Rotnik
|
efd4f8abde
|
Add members dropdown on project filters flyout
|
2020-11-26 12:29:43 +01:00 |
|
aignatov-bio
|
26cbe2105f
|
Merge pull request #2981 from aignatov-bio/ai-sci-5242-small-css-file-preview-issues
Small file preview css fixes [SCI-5242]
|
2020-11-26 11:50:25 +01:00 |
|
aignatov-bio
|
d13ff053b5
|
Merge pull request #2960 from aignatov-bio/ai-sci-5228-fix-sorting-of-assets-in-reports
Fix assets sorting in report [SCI-5228]
|
2020-11-26 11:46:50 +01:00 |
|
Alex Kriuchykhin
|
5a1f169846
|
Merge pull request #2978 from urbanrotnik/ur-sci-5244-folders-projects-sorting
Project and folders sorting [SCI-5244]
|
2020-11-26 11:42:29 +01:00 |
|
Urban Rotnik
|
34fbcb8f56
|
Add clear functionallity to projects filters
|
2020-11-26 09:23:22 +01:00 |
|
Urban Rotnik
|
be49216e71
|
Fix teams tests
|
2020-11-25 20:02:45 +01:00 |
|
Urban Rotnik
|
e3f9087600
|
Fix search
|
2020-11-25 19:33:12 +01:00 |
|
Urban Rotnik
|
5717e37f2b
|
Remove obsolete code, fix tests
|
2020-11-25 18:34:46 +01:00 |
|
Urban Rotnik
|
afc6d12b49
|
Project and folders sorting
|
2020-11-25 18:34:39 +01:00 |
|
aignatov-bio
|
3078e60867
|
Small css fixes
|
2020-11-25 16:25:17 +01:00 |
|
aignatov-bio
|
c212d514d5
|
Fix delete asset in protocol repository
|
2020-11-25 13:13:06 +01:00 |
|
aignatov-bio
|
1979883004
|
Add delete asset confirmation modal
|
2020-11-25 12:50:34 +01:00 |
|
Oleksii Kriuchykhin
|
0de237cece
|
Implement project search with grouping by folder [SCI-5207]
|
2020-11-25 11:59:02 +01:00 |
|
Mojca Lorber
|
81798a96ad
|
Add new SciNote avatars
|
2020-11-25 10:43:59 +01:00 |
|
mlorb
|
e4001dd406
|
Merge pull request #2977 from mlorb/ml-sci-5048
Implement ESC button to exit full-screen modals [SCI-5048]
|
2020-11-25 09:55:16 +01:00 |
|
Mojca Lorber
|
2a8c98b7ec
|
Implement ESC button to exit full-screen modals
|
2020-11-24 23:20:53 +01:00 |
|
aignatov-bio
|
f2ca55dbf8
|
Add new icons for assets
|
2020-11-24 15:37:45 +01:00 |
|
aignatov-bio
|
dc62e2780a
|
Merge pull request #2963 from aignatov-bio/ai-sci-5186-add-new-comments-layout
Add comments sidebar layout [SCI-5186][SCI-5188][SCI-5189]
|
2020-11-24 11:25:36 +01:00 |
|
aignatov-bio
|
966bb7c9ed
|
Merge pull request #2972 from aignatov-bio/ai-sci-5229-replce-loading-spinner-with-new
Replace loading spinner [SCI-5229]
|
2020-11-23 16:32:49 +01:00 |
|
aignatov-bio
|
ba39d8d31b
|
Fix markup
|
2020-11-23 15:02:50 +01:00 |
|
aignatov-bio
|
624e9b1f82
|
Small fixes on current task dashboard
|
2020-11-23 14:29:04 +01:00 |
|
aignatov-bio
|
84d681ecce
|
Replace loading spinner
|
2020-11-23 14:14:54 +01:00 |
|
Alex Kriuchykhin
|
1380d5873d
|
Merge pull request #2946 from okriuchykhin/ok_SCI_5136
Implement search endpoint for Projects & folders search [SCI-5136]
|
2020-11-23 13:09:33 +01:00 |
|
Oleksii Kriuchykhin
|
1a38b34b94
|
Improve limit check for repository list and checklist items [SCI-5238]
|
2020-11-23 12:54:29 +01:00 |
|
aignatov-bio
|
833c327e3a
|
Fix empty state during loading
|
2020-11-23 12:44:23 +01:00 |
|
Mojca Lorber
|
c57da3380f
|
Remove complete step button from protocol step and fix step number in Firefox
|
2020-11-23 10:18:27 +01:00 |
|
aignatov-bio
|
2449f2b500
|
Fix smart annotation for comments
|
2020-11-21 12:34:36 +01:00 |
|
aignatov-bio
|
77b7b1b231
|
Add errors handling and i18n
|
2020-11-21 12:31:49 +01:00 |
|
aignatov-bio
|
60ce51149d
|
Add CRUD to comments
|
2020-11-20 20:25:28 +01:00 |
|
Oleksii Kriuchykhin
|
eafc4cf367
|
Fix permission check for archived tasks [SCI-5235]
|
2020-11-20 14:39:17 +01:00 |
|
aignatov-bio
|
da4b8aaf2f
|
Add comments list
|
2020-11-20 12:29:40 +01:00 |
|
Oleksii Kriuchykhin
|
86e5078622
|
Add project folders to global search [SCI-5180]
|
2020-11-20 11:10:03 +01:00 |
|
Alex Kriuchykhin
|
f5860397f5
|
Merge pull request #2953 from okriuchykhin/ok_SCI_5183
Make folders selectable for 'Export all' functionality [SCI-5183]
|
2020-11-20 09:54:53 +01:00 |
|
Oleksii Kriuchykhin
|
4dc3473c5e
|
Fix showing/hiding export button on folder selection [SCI-5183]
|
2020-11-19 15:50:43 +01:00 |
|
aignatov-bio
|
bc5221d4a7
|
Merge pull request #2959 from aignatov-bio/ai-sci-5225-fix-links-in-report
Add scinote link to PDF reports [SCI-5225]
|
2020-11-19 12:20:32 +01:00 |
|
aignatov-bio
|
96bf3dcea2
|
Merge pull request #2958 from aignatov-bio/ai-sci-5224-update-title-font-color-for-asset-dropdown
Update title font color for asset dropdown [SCI-5224]
|
2020-11-19 12:20:20 +01:00 |
|
aignatov-bio
|
e4e5fc8474
|
Merge pull request #2944 from aignatov-bio/ai-sci-5058-fix-smart-annotation-for-archived-projects
Fix smart annotation for archived experiments [SCI-5058]
|
2020-11-19 11:18:26 +01:00 |
|
aignatov-bio
|
483ff8f1f2
|
Merge pull request #2964 from biosistemika/features/office-file-previews
Features/office file previews merge branch
|
2020-11-19 11:11:39 +01:00 |
|
mlorb
|
cd4252e254
|
Merge pull request #2956 from mlorb/ml-sci-5041
Fix tooltip display when editing inventory row [SCI-5041]
|
2020-11-19 11:01:23 +01:00 |
|
Urban Rotnik
|
aba0034854
|
Convert some values to ems
|
2020-11-19 09:25:26 +01:00 |
|
Urban Rotnik
|
e893d40eea
|
Add filters flyout for projects
|
2020-11-19 09:23:35 +01:00 |
|
aignatov-bio
|
2294d396f9
|
Add comments sidebar layout
|
2020-11-18 16:26:01 +01:00 |
|
aignatov-bio
|
6bb4af1d95
|
Merge pull request #2961 from aignatov-bio/ai-sci-5231-fix-protocol-import-from-protocol-io
Fix protocol import from protocol.io [SCI-5231]
|
2020-11-18 10:06:06 +01:00 |
|
aignatov-bio
|
3a2b36369a
|
Fix protocol import from protocol.io
|
2020-11-18 09:57:50 +01:00 |
|
aignatov-bio
|
fcdad51222
|
Fix assets sorting in report
|
2020-11-17 15:33:25 +01:00 |
|
aignatov-bio
|
2947426b44
|
Add scinote link to pdf reports
|
2020-11-17 13:54:13 +01:00 |
|
aignatov-bio
|
14ccb5c6a6
|
Update title font color for asset dropdown
|
2020-11-17 12:47:45 +01:00 |
|
Mojca Lorber
|
ceb0923ce6
|
Fix tooltip display when editing inventory row
|
2020-11-16 16:16:47 +01:00 |
|
miha
|
ef880d8373
|
SCI-5223 return the missing method into controller
|
2020-11-16 15:49:26 +01:00 |
|
Oleksii Kriuchykhin
|
6dfeae2283
|
Make folders selectable for 'Export all' functionality [SCI-5183]
|
2020-11-13 14:39:10 +01:00 |
|
aignatov-bio
|
80d6e5e87c
|
Add project folders to team import/export
|
2020-11-13 14:13:26 +01:00 |
|
aignatov-bio
|
b5999e27de
|
Merge pull request #2951 from biosistemika/ai-sci-5214-fix-office-online-authorization-issue
Fix wopi authorization issues [SCI-5214]
|
2020-11-13 11:31:33 +01:00 |
|
aignatov-bio
|
45efc9a43a
|
Remove skip asset permission check for wopi creation
|
2020-11-12 14:13:30 +01:00 |
|
aignatov-bio
|
6c305011ca
|
Update dashboard placeholders
|
2020-11-12 12:49:00 +01:00 |
|
aignatov-bio
|
7fd7c2de6a
|
Add download link to reports
|
2020-11-11 15:48:00 +01:00 |
|
Mojca Lorber
|
aadbff94ae
|
Fix double init
|
2020-11-11 11:07:43 +01:00 |
|
Mojca Lorber
|
1618d79144
|
Merge branch 'develop' into ml-sci-5152
|
2020-11-11 10:47:43 +01:00 |
|
Miha Mencin
|
6e2972dc9b
|
Merge pull request #2943 from okriuchykhin/ok_SCI_5190
Add check for zero page size in repository states [SCI-5190]
|
2020-11-11 10:23:06 +01:00 |
|
Miha Mencin
|
1cfb205df7
|
Merge pull request #2939 from aignatov-bio/ai-sci-5122-fix-navigation-on-small-screens
Fix navigation on small screens [SCI-5122]
|
2020-11-11 10:22:12 +01:00 |
|
Oleksii Kriuchykhin
|
038cd8d5d7
|
Fix repository state columns handling [SCI-5190]
|
2020-11-10 17:24:04 +01:00 |
|
aignatov-bio
|
71ddf680b2
|
Add highlight to report table
|
2020-11-10 15:15:18 +01:00 |
|
mlorb
|
a71e8ef9cf
|
Merge pull request #2940 from mlorb/ml-sci-5034
Expose the new step button on task [SCI-5034]
|
2020-11-10 13:10:55 +01:00 |
|
Oleksii Kriuchykhin
|
ee1bcd7aac
|
Implement search endpoint for Projects & folders search [SCI-5136]
|
2020-11-09 16:16:09 +01:00 |
|
Urban Rotnik
|
0f5bf45cf6
|
Rebase, add toolbar, minor fixes css and JS
|
2020-11-06 13:56:21 +01:00 |
|
Urban Rotnik
|
9f12c5f343
|
New cards and list layout
|
2020-11-06 13:01:52 +01:00 |
|
Urban Rotnik
|
a06f421c88
|
Merge pull request #2941 from urbanrotnik/ur-sci-5124
Fix teams query [SCI-5124]
|
2020-11-06 12:08:54 +01:00 |
|
aignatov-bio
|
f3dd749c1d
|
Fix smart annotation for archived experiments
|
2020-11-06 11:47:18 +01:00 |
|
Oleksii Kriuchykhin
|
f2f08a31d5
|
Add check for zero page size in repository states [SCI-5190]
|
2020-11-06 11:42:33 +01:00 |
|
Urban Rotnik
|
8ac59fd699
|
Fix acessiable_by_team scope
|
2020-11-06 10:43:18 +01:00 |
|
Mojca Lorber
|
9893e8d5c8
|
Add 403 error handling to current tasks dashboard widget
|
2020-11-06 10:39:04 +01:00 |
|
Urban Rotnik
|
d6eef4699b
|
Merge pull request #2938 from aignatov-bio/ai-sci-5153-fix-dashboard-widget-overlap
Fix dashboard small screen overlap [SCI-5153]
|
2020-11-06 09:59:52 +01:00 |
|
Alex Kriuchykhin
|
b51e92d5be
|
Merge pull request #2933 from okriuchykhin/ok_SCI_5047
Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]
|
2020-11-06 09:06:37 +01:00 |
|
Mojca Lorber
|
8ee8f7b4d2
|
Expose the new step button on task
|
2020-11-05 16:14:40 +01:00 |
|
aignatov-bio
|
2c64481cda
|
Fix navigation on small screens
|
2020-11-05 15:20:34 +01:00 |
|
aignatov-bio
|
5b22f7d301
|
Fix dashboard small screen overlap
|
2020-11-05 14:47:19 +01:00 |
|
Urban Rotnik
|
2c347af7bf
|
Add data attribute to change status dropdown
|
2020-11-05 13:19:45 +01:00 |
|
aignatov-bio
|
d29a62dad1
|
Improve markup
|
2020-11-05 10:41:06 +01:00 |
|
aignatov-bio
|
e8592d911d
|
Fix markup
|
2020-11-05 10:04:27 +01:00 |
|
aignatov-bio
|
8145a292fd
|
Clear code and add missed I18n translation
|
2020-11-05 10:03:15 +01:00 |
|
aignatov-bio
|
99b52e5d80
|
Fix markup
|
2020-11-05 08:44:48 +01:00 |
|
Oleksii Kriuchykhin
|
40ab03c38d
|
Fix cucumber tests for table results [SCI-5047]
|
2020-11-04 16:46:18 +01:00 |
|
Oleksii Kriuchykhin
|
327baafcd7
|
Improve CSS structure for project toolbar [SCI-5129]
|
2020-11-04 16:10:40 +01:00 |
|
aignatov-bio
|
5d0ab1f2e9
|
Fix markup
|
2020-11-04 13:32:34 +01:00 |
|
aignatov-bio
|
12fdea8d89
|
Add context menu to attahcments
|
2020-11-04 13:08:40 +01:00 |
|
aignatov-bio
|
e8e9244d96
|
Fix I18n and double loading
|
2020-11-03 09:07:49 +01:00 |
|
Oleksii Kriuchykhin
|
8eec4e4b59
|
Add browser notification for unsaved data when navigating away for tables on Task [SCI-5047]
|
2020-11-02 22:19:33 +01:00 |
|
aignatov-bio
|
0f80786433
|
Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into ai-sci-5101-add-attachments-dropdown-to-step
|
2020-11-02 18:52:46 +01:00 |
|
aignatov-bio
|
84a7d49023
|
Fix markup
|
2020-11-02 18:51:21 +01:00 |
|
aignatov-bio
|
f85a3493cd
|
Merge pull request #2925 from aignatov-bio/ai-sci-5110-add-file-previews-to-reports
Add filer previews to reports [SCI-5110]
|
2020-11-02 18:48:45 +01:00 |
|
aignatov-bio
|
eca39a00b5
|
Add attachments dropdown to step
|
2020-11-02 18:47:08 +01:00 |
|
Mojca Lorber
|
8aed48d1ae
|
Merge branch 'develop' into features/office-file-previews
|
2020-11-02 13:45:06 +01:00 |
|
Oleksii Kriuchykhin
|
258c57870f
|
Implement the toolbar on the Team Projects page [SCI-5129]
|
2020-11-02 13:28:37 +01:00 |
|
Alex Kriuchykhin
|
8566d56b68
|
Merge pull request #2928 from okriuchykhin/ok_SCI_5126
Create database structure for project folders [SCI-5126]
|
2020-11-02 11:46:15 +01:00 |
|
Urban Rotnik
|
2549d9deeb
|
Merge pull request #2929 from urbanrotnik/ur-sci-5147-generate-word-with-included-smart
Fix SA in protocol description [SCI-5147]
|
2020-11-02 09:55:40 +01:00 |
|
Mojca Lorber
|
04e3b67968
|
Change the way buttons are toggled
|
2020-10-30 18:47:01 +01:00 |
|
Urban Rotnik
|
042231469c
|
Fix syntax
|
2020-10-30 13:37:59 +01:00 |
|
Urban Rotnik
|
1295299370
|
Fix SA in protocol description
|
2020-10-30 12:55:30 +01:00 |
|
Mojca Lorber
|
a52315fc79
|
Merge branch 'develop' into ml-sci-5033
|
2020-10-29 18:28:25 +01:00 |
|
aignatov-bio
|
6193f91192
|
Update view mode switcher logic
|
2020-10-29 16:42:05 +01:00 |
|
aignatov-bio
|
12991e8fd3
|
Commit add asset preview mode switcher to step
|
2020-10-29 16:42:05 +01:00 |
|
Oleksii Kriuchykhin
|
e87407bbd3
|
Create database structure for project folders [SCI-5126]
|
2020-10-29 15:44:21 +01:00 |
|
aignatov-bio
|
f51416d83a
|
Update permission markup
|
2020-10-29 14:59:14 +01:00 |
|
Urban Rotnik
|
e923128c0e
|
Merge pull request #2927 from biosistemika/features/signature-requests
Features/signature requests into develop
|
2020-10-29 14:48:25 +01:00 |
|
aignatov-bio
|
b0fe68553a
|
Fix tests
|
2020-10-29 14:30:26 +01:00 |
|
aignatov-bio
|
21f584a2c4
|
Fix markup
|
2020-10-29 14:30:26 +01:00 |
|
aignatov-bio
|
131d487e69
|
Add file preview to list view
|
2020-10-29 14:30:26 +01:00 |
|
aignatov-bio
|
d99e279ecc
|
Add gallery to file preview
|
2020-10-29 14:30:26 +01:00 |
|
aignatov-bio
|
c56f7912ef
|
Update file preview
|
2020-10-29 14:23:32 +01:00 |
|
Urban Rotnik
|
bb5c703696
|
Merge pull request #2878 from urbanrotnik/ur-sci-5040
Support multiple file upload in TinyMCE fields [SCI-5040]
|
2020-10-29 14:14:38 +01:00 |
|
Urban Rotnik
|
f5118e5461
|
Merge pull request #2901 from okriuchykhin/ok_SCI_5063
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:55:23 +01:00 |
|
Urban Rotnik
|
c6a891bcea
|
Merge pull request #2912 from urbanrotnik/ur-sci-5091
Add current team to smart annotations permission check [SCI-5091]
|
2020-10-29 13:32:29 +01:00 |
|
Oleksii Kriuchykhin
|
13fcfedf41
|
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:16:09 +01:00 |
|
Urban Rotnik
|
25d050cec4
|
Add current team to smar annotations permission check
|
2020-10-29 12:17:40 +01:00 |
|
aignatov-bio
|
23f9fb212d
|
Merge pull request #2915 from aignatov-bio/ai-sci-5105-update-image-edit-modal
Update image edit modal [SCI-5105]
|
2020-10-29 09:15:32 +01:00 |
|
Urban Rotnik
|
bf4062b7cb
|
Refactor rescue block
|
2020-10-29 09:12:12 +01:00 |
|
Urban Rotnik
|
54f38c8ded
|
Move validation before request
|
2020-10-29 08:45:55 +01:00 |
|
aignatov-bio
|
16249201f3
|
Fix markup
|
2020-10-28 16:44:28 +01:00 |
|
aignatov-bio
|
2f1217688c
|
Add filer previews to reports
|
2020-10-28 16:32:22 +01:00 |
|
Miha Mencin
|
235f87e0d9
|
Merge pull request #2924 from biosistemika/release/1.20.2
Release/1.20.2
|
2020-10-28 13:58:25 +01:00 |
|
Alex Kriuchykhin
|
8ef5bafc1a
|
Revert "Init user session for devise controllers after token auth [SCI-5123]"
|
2020-10-27 13:20:14 +01:00 |
|
aignatov-bio
|
bb983af42f
|
Merge pull request #2911 from aignatov-bio/ai-sci-4579-update-checkbox-style
Update checkbox style at repository and protocol datatable [SCI-4579]
|
2020-10-27 10:22:56 +01:00 |
|
Urban Rotnik
|
cb9db57645
|
Merge pull request #2909 from urbanrotnik/ur-sci-5006
Add lock icon to current task section on dashboard [SCI-5006]
|
2020-10-27 08:20:55 +01:00 |
|
Alex Kriuchykhin
|
792edb62d6
|
Merge pull request #2919 from okriuchykhin/ok_SCI_5123
Init user session for devise controllers after token auth [SCI-5123]
|
2020-10-26 17:21:56 +01:00 |
|
Oleksii Kriuchykhin
|
00a2f5f41b
|
Init user session for devise controllers after token auth [SCI-5123]
|
2020-10-26 16:35:49 +01:00 |
|
Urban Rotnik
|
b94a3a6cb8
|
Clean up controller
|
2020-10-26 16:17:39 +01:00 |
|
aignatov-bio
|
6edcf4b099
|
Add size label
|
2020-10-26 15:10:06 +01:00 |
|
Miha Mencin
|
840b84aa9a
|
Merge pull request #2916 from okriuchykhin/ok_SCI_5139
Add activities for step completion and checklist toggling through API [SCI-5139]
|
2020-10-26 14:19:31 +01:00 |
|
mlorb
|
b941c8c9d4
|
Merge pull request #2917 from mlorb/ml-sci-5119
Move open mobile app button to main navigation [SCI-5119]
|
2020-10-26 14:02:57 +01:00 |
|
Alex Kriuchykhin
|
050e1e0973
|
Merge pull request #2913 from okriuchykhin/ok_SCI_5123
Add token authentication to Active Storage controllers [SCI-5123]
|
2020-10-26 13:46:03 +01:00 |
|
Urban Rotnik
|
1ffc3449bf
|
Clean up index view
|
2020-10-26 13:42:32 +01:00 |
|
aignatov-bio
|
bddd1956ab
|
Fix font size and font weight for status label
|
2020-10-26 12:35:40 +01:00 |
|
Urban Rotnik
|
431b9161b6
|
Code cleanup
|
2020-10-26 11:03:43 +01:00 |
|
Mojca Lorber
|
ec41bdd414
|
Move open mobile app button to main navigation
|
2020-10-26 09:28:44 +01:00 |
|
Oleksii Kriuchykhin
|
4d64883963
|
Add activities for step completion and checklist toggling through API [SCI-5139]
|
2020-10-25 22:33:50 +01:00 |
|
aignatov-bio
|
aefaf4d0c1
|
Update image edit modal
|
2020-10-25 16:57:50 +01:00 |
|
Urban Rotnik
|
b23f110184
|
Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters
Add mark for active filters [SCI-5085]
|
2020-10-25 16:06:59 +01:00 |
|
Oleksii Kriuchykhin
|
5f70984919
|
Add token authentication to Active Storage controllers [SCI-5123]
|
2020-10-23 19:22:31 +02:00 |
|
Urban Rotnik
|
c5a1d34c36
|
Merge pull request #1967 from jbargu/jg_sci_2228
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
|
2020-10-23 15:33:22 +02:00 |
|
Urban Rotnik
|
75351a3aed
|
px to em
|
2020-10-23 14:11:56 +02:00 |
|
Urban Rotnik
|
6ccd34291d
|
Merge pull request #2904 from urbanrotnik/ur-sci-5093
Fix smart annotation in checklist title [SCI-5093]
|
2020-10-23 13:36:22 +02:00 |
|
aignatov-bio
|
d6f8e156c1
|
Update checkbox style at repository and protocol datatable
|
2020-10-22 16:42:12 +02:00 |
|
aignatov-bio
|
f4bf2ab75f
|
Remove empty children from extents
|
2020-10-22 14:29:35 +02:00 |
|
Urban Rotnik
|
aa1520bfb8
|
Merge branch 'develop' into jg_sci_2228
|
2020-10-22 14:21:39 +02:00 |
|
Miha Mencin
|
9f2b7f962b
|
Merge pull request #2908 from mlorb/ml-sci-5120
Fix pwa url and change when banner is displayed [SCI-5120]
|
2020-10-22 13:41:12 +02:00 |
|
Mojca Lorber
|
2639810e1a
|
Fix no step bug
|
2020-10-22 13:21:05 +02:00 |
|
Urban Rotnik
|
58013e215d
|
Add lock icon to current task section on dashboard
|
2020-10-22 08:09:51 +02:00 |
|
Mojca Lorber
|
6d7b55301f
|
Fix pwa url and change when banner is displayed
|
2020-10-21 14:56:20 +02:00 |
|
Urban Rotnik
|
2f99e3a464
|
Remove border, update copy
|
2020-10-21 09:58:35 +02:00 |
|
Urban Rotnik
|
a87302a183
|
Include styled text in list items elements
|
2020-10-21 08:27:10 +02:00 |
|
Urban Rotnik
|
e7d2d78935
|
Add mark for active filters
|
2020-10-20 16:45:54 +02:00 |
|
Urban Rotnik
|
a728ba2f2d
|
Fix smart annotation in checklist title
|
2020-10-20 13:02:49 +02:00 |
|
aignatov-bio
|
2968e677b8
|
Update image for doorkeeper auth
|
2020-10-19 16:23:20 +02:00 |
|
Miha Mencin
|
c31a7373fb
|
Merge pull request #2902 from mlorb/ml-sci-5089
Add 'Open in APP' button to the task
|
2020-10-19 12:28:35 +02:00 |
|
Mojca Lorber
|
23f01ac6a9
|
Add 'Open in APP' button to the task
|
2020-10-19 12:17:03 +02:00 |
|
aignatov-bio
|
bdcc7939ad
|
Update export all generator
|
2020-10-16 18:25:01 +02:00 |
|
aignatov-bio
|
3fe3c2087f
|
Fix hound issues
|
2020-10-16 11:27:23 +02:00 |
|
aignatov-bio
|
566ef7aef7
|
Add list view to atachments
|
2020-10-16 11:00:57 +02:00 |
|
aignatov-bio
|
016fc8a632
|
Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews
|
2020-10-15 15:25:54 +02:00 |
|
Urban Rotnik
|
d88040fd1b
|
Move snapshot default selection to core from addon
|
2020-10-15 15:21:44 +02:00 |
|
aignatov-bio
|
0a4b89cf39
|
Merge branch 'develop' into features/office-file-previews
|
2020-10-15 15:19:56 +02:00 |
|
aignatov-bio
|
a2bfb1cfeb
|
Merge branch 'develop' of https://github.com/biosistemika/scinote-web into develop
|
2020-10-15 15:09:05 +02:00 |
|
Urban Rotnik
|
e1e7496307
|
Merge pull request #2884 from urbanrotnik/ur-sci-5043
DOCX lists [SCI-5043]
|
2020-10-15 11:53:58 +02:00 |
|
aignatov-bio
|
cc70d42193
|
Merge branch 'ur-sci-5043' of https://github.com/urbanrotnik/scinote-web into develop
|
2020-10-15 11:21:03 +02:00 |
|
aignatov-bio
|
f1a5811d5f
|
Merge pull request #2809 from biosistemika/ai-sci-4960-render-wopi-preview-only-in-view-port
Render wopi preview only in view port
|
2020-10-14 21:29:56 +02:00 |
|
Urban Rotnik
|
e748e1eff3
|
Fix smart annotations and links styling
|
2020-10-14 17:58:07 +02:00 |
|
mlorb
|
83ba40d135
|
Merge pull request #2870 from mlorb/ml-sci-4841
Fix at long inventory name snapshot in title is not visible [SCI-4841]
|
2020-10-14 14:38:04 +02:00 |
|
Mojca Lorber
|
5013f224ee
|
Fix ems
|
2020-10-14 13:16:38 +02:00 |
|
aignatov-bio
|
e240b629c4
|
Fix rubocop issues
|
2020-10-14 12:12:32 +02:00 |
|
aignatov-bio
|
36bab10de7
|
Update export all to tree structure
|
2020-10-14 12:08:04 +02:00 |
|
Urban Rotnik
|
a19e0ef846
|
Refactor
|
2020-10-13 14:23:39 +02:00 |
|
Urban Rotnik
|
1b860afe30
|
Move TinyMCE parser to separate class
|
2020-10-13 09:45:13 +02:00 |
|
Urban Rotnik
|
ae8b2cbf8f
|
Add text to I18n
|
2020-10-13 08:37:32 +02:00 |
|
Mojca Lorber
|
a944525d25
|
Change px to em
|
2020-10-12 16:59:33 +02:00 |
|
aignatov-bio
|
a7da7b0de3
|
Refactor export all my module generator
|
2020-10-12 15:55:06 +02:00 |
|
Mojca Lorber
|
cf367baefa
|
Merge branch 'develop' into ml-sci-4841
|
2020-10-12 14:43:03 +02:00 |
|
Oleksii Kriuchykhin
|
caa2098550
|
Improve handling of empty cells in inventory imports [SCI-5094]
|
2020-10-12 14:42:47 +02:00 |
|
Urban Rotnik
|
274293348e
|
Clean up
|
2020-10-09 09:53:27 +02:00 |
|
Urban Rotnik
|
dfca798e2d
|
Refactored tiny_mce_table parser and renderer
|
2020-10-09 09:43:36 +02:00 |
|
Urban Rotnik
|
92b4d95c72
|
Implement lists in DOCX
|
2020-10-09 09:43:00 +02:00 |
|
aignatov-bio
|
5d6c9e78fd
|
Refactor dashboard layout
|
2020-10-06 16:09:26 +02:00 |
|
Oleksii Kriuchykhin
|
7cd12bfb07
|
Fix protocol repository save/load timestamps [SCI-5067]
|
2020-10-06 15:30:04 +02:00 |
|
Miha Mencin
|
3a4a166856
|
Merge pull request #2888 from okriuchykhin/ok_SCI_5082
Fix index page for users without a team [SCI-5082]
|
2020-10-05 10:16:04 +02:00 |
|
Oleksii Kriuchykhin
|
dd64206b25
|
Fix index page for users without a team [SCI-5082]
|
2020-10-02 16:57:46 +02:00 |
|
Mojca Lorber
|
4e4a4a2c4e
|
Change Complete step button on task step
|
2020-10-02 15:02:42 +02:00 |
|
Oleksii Kriuchykhin
|
6c367428a1
|
Fix team switcher [SCI-5080]
|
2020-10-02 14:25:44 +02:00 |
|
Oleksii Kriuchykhin
|
aeba25cf09
|
Fix Hound warning
|
2020-10-01 11:56:33 +02:00 |
|
Oleksii Kriuchykhin
|
21fab4198c
|
Merge branch 'develop' into features/local
|
2020-10-01 11:52:59 +02:00 |
|
Urban Rotnik
|
fc8704b520
|
Add fileUtils for sizeCheck, add url to textarea data attribute
|
2020-09-30 13:20:11 +02:00 |
|
aignatov-bio
|
9010f9c1db
|
Merge pull request #2876 from aignatov-bio/ai-sci-5066-fix-switch-team
Fix switch team on link for object from other team [SCI-5066]
|
2020-09-30 10:09:19 +02:00 |
|
Urban Rotnik
|
e9ac999645
|
Merge pull request #2880 from urbanrotnik/ur-sci-5067-protocols-sync
Fix updating updated_at on protocol while load/sync with repository [SCI-5067]
|
2020-09-29 16:54:42 +02:00 |
|
Urban Rotnik
|
7c312a844f
|
Fix updating updated_at on protocol while load/sync with repository
|
2020-09-29 15:37:40 +02:00 |
|
aignatov-bio
|
d21aee1843
|
Remove complete step button from protocol managment
|
2020-09-29 15:08:01 +02:00 |
|
Alex Kriuchykhin
|
939c0096de
|
Merge pull request #2881 from biosistemika/features/yomu
Switch to a new version of Yomu gem
|
2020-09-29 14:41:36 +02:00 |
|
Oleksii Kriuchykhin
|
1603ec6d1a
|
Switch to a new version of Yomu gem
|
2020-09-29 13:11:50 +02:00 |
|
aignatov-bio
|
9d64121577
|
Refactor WOPI discovery
|
2020-09-29 12:58:05 +02:00 |
|
Urban Rotnik
|
dc0072e707
|
Support multiple file upload in TinyMCE fields
|
2020-09-29 08:21:31 +02:00 |
|
Oleksii Kriuchykhin
|
25a9f5c685
|
Add typeface-lato for shipping Lato fonts
|
2020-09-28 18:02:47 +02:00 |
|
aignatov-bio
|
16fe11f0f7
|
Fix smitch team on link for object from other team
|
2020-09-28 17:16:18 +02:00 |
|
aignatov-bio
|
7c3a3e4490
|
Small smart annotation fixes
|
2020-09-28 12:03:01 +02:00 |
|
aignatov-bio
|
cd9b143bc5
|
Fix markup
|
2020-09-25 15:08:20 +02:00 |
|
aignatov-bio
|
1ed65eddfa
|
Move ordering to front-end
|
2020-09-25 15:06:09 +02:00 |
|
Alex Kriuchykhin
|
fb28fa557b
|
Merge pull request #2872 from okriuchykhin/ok_SCI_5062
Improve performance of fetching of statuses [SCI-5062]
|
2020-09-25 15:00:30 +02:00 |
|
Alex Kriuchykhin
|
3eb448c39b
|
Merge pull request #2862 from okriuchykhin/ok_SCI_5001
Add Endpoins for Project Membership manipulation [SCI-5001]
|
2020-09-25 14:25:20 +02:00 |
|
Oleksii Kriuchykhin
|
134e549ed5
|
Improve performance of fetching of statuses [SCI-5062]
|
2020-09-25 10:14:57 +02:00 |
|
Urban Rotnik
|
f4f0bc706a
|
Fix step deletion
|
2020-09-25 08:43:03 +02:00 |
|
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 |
|