Urban Rotnik
|
517026a252
|
Merge pull request #3083 from urbanrotnik/ur-sci-5393-fix-filters
Trigger search on filters flyout close, fix render when filters are clear [SCI-5393]
|
2021-01-15 11:34:03 +01:00 |
|
aignatov-bio
|
823b9175bd
|
Small projects pages fixes [SCI-5330] (#3085)
|
2021-01-14 16:24:28 +01:00 |
|
Urban Rotnik
|
7cd85d8e9d
|
Merge pull request #3080 from urbanrotnik/ur-sci-5388
Fix border radius [SCI-5388]
|
2021-01-14 14:05:20 +01:00 |
|
Urban Rotnik
|
e099827b1b
|
Trigger search on filters flyout close, fix render when filters are clear [SCI-5393]
|
2021-01-14 13:36:45 +01:00 |
|
Oleksii Kriuchykhin
|
8d3a605571
|
Fix projects index page JS initialization [SCI-5380]
|
2021-01-14 13:08:29 +01:00 |
|
Urban Rotnik
|
0e17cde499
|
Fix line height
|
2021-01-14 08:54:17 +01:00 |
|
Urban Rotnik
|
8d076d8c58
|
Fix border radius [SCI-5388]
|
2021-01-13 09:07:35 +01:00 |
|
Alex Kriuchykhin
|
5f506b7459
|
Merge pull request #3072 from okriuchykhin/ok_SCI_5383
Fix folder creation for archived view [SCI-5383]
|
2021-01-12 13:50:20 +01:00 |
|
Oleksii Kriuchykhin
|
78ec862a2c
|
Fix folder creation for archived view [SCI-5383]
|
2021-01-12 13:06:43 +01:00 |
|
mlorb
|
8fbdfa28d5
|
Merge pull request #3070 from mlorb/ml-sci-5333
Add no results page for search on project page [SCI-5333]
|
2021-01-12 12:02:37 +01:00 |
|
Urban Rotnik
|
c04f427c9e
|
Merge pull request #3065 from urbanrotnik/ur-sci-5377-missing-arrows
Fix arrows for JS Tree [SCI-5377]
|
2021-01-12 11:08:05 +01:00 |
|
Alex Kriuchykhin
|
04f68facd3
|
Merge pull request #3064 from okriuchykhin/ok_SCI_5344
Add Restore button to the archived Projects screen [SCI-5344]
|
2021-01-12 10:59:39 +01:00 |
|
Mojca Lorber
|
54a5528495
|
Add no results page for serach on project page [SCI-5333]
|
2021-01-12 09:18:19 +01:00 |
|
Urban Rotnik
|
244995cb3d
|
Fix assets location and url references [SCI-5377]
|
2021-01-11 17:56:51 +01:00 |
|
aignatov-bio
|
e88848cd75
|
Fix comments counter [SCI-5371] (#3063)
|
2021-01-11 10:03:13 +01:00 |
|
Oleksii Kriuchykhin
|
684674952c
|
Add Restore button to the archived Projects screen [SCI-5344]
|
2021-01-09 21:27:19 +01:00 |
|
Urban Rotnik
|
f478ad91c3
|
Merge pull request #3058 from urbanrotnik/ur-sci-5312
Folder name uniqueness validation on folder level and renaming [SCI-5312]
|
2021-01-08 10:40:52 +01:00 |
|
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
|
ba13a0b14b
|
Add jstree lib
|
2021-01-07 17:41:32 +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 |
|
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 |
|
Oleksii Kriuchykhin
|
9882539213
|
Add project permissions check to projects toolbar [SCI-5317]
|
2021-01-06 22:23:48 +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 |
|
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
|
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 |
|
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 |
|
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 |
|
aignatov-bio
|
0d1939e405
|
Initialize pdf preview on galery swtich [SCI-5342] (#3044)
|
2021-01-04 13:40:05 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
0c65f3f7c2
|
Implement sorting on the project screen (when filterin/searching) [SCI-5281]
|
2020-12-17 12:43:09 +01:00 |
|
aignatov-bio
|
329a5bff0b
|
Fix repository text field rendering [SCI-5304] (#3015)
|
2020-12-15 12:23:19 +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
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
9546b8f71d
|
Prepare backend for the improved navigation [SCI-5177]
|
2020-12-03 10:19:11 +01:00 |
|
Mojca Lorber
|
d7e3b57d0d
|
[SCI-5240] Implement Create new folder function
|
2020-12-01 09:59:08 +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 |
|
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 |
|
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
|
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 |
|
Urban Rotnik
|
34fbcb8f56
|
Add clear functionallity to projects filters
|
2020-11-26 09:23:22 +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 |
|
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 |
|
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 |
|
aignatov-bio
|
da4b8aaf2f
|
Add comments list
|
2020-11-20 12:29:40 +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
|
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
|
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 |
|
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
|
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 |
|
Oleksii Kriuchykhin
|
6dfeae2283
|
Make folders selectable for 'Export all' functionality [SCI-5183]
|
2020-11-13 14:39:10 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Mojca Lorber
|
04e3b67968
|
Change the way buttons are toggled
|
2020-10-30 18:47:01 +01:00 |
|
Mojca Lorber
|
a52315fc79
|
Merge branch 'develop' into ml-sci-5033
|
2020-10-29 18:28:25 +01:00 |
|
aignatov-bio
|
12991e8fd3
|
Commit add asset preview mode switcher to step
|
2020-10-29 16:42:05 +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
|
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 |
|
Oleksii Kriuchykhin
|
13fcfedf41
|
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:16:09 +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
|
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 |
|
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 |
|
aignatov-bio
|
bddd1956ab
|
Fix font size and font weight for status label
|
2020-10-26 12:35:40 +01:00 |
|
Mojca Lorber
|
ec41bdd414
|
Move open mobile app button to main navigation
|
2020-10-26 09:28:44 +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 |
|
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 |
|
aignatov-bio
|
d6f8e156c1
|
Update checkbox style at repository and protocol datatable
|
2020-10-22 16:42:12 +02:00 |
|
Urban Rotnik
|
aa1520bfb8
|
Merge branch 'develop' into jg_sci_2228
|
2020-10-22 14:21:39 +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
|
e7d2d78935
|
Add mark for active filters
|
2020-10-20 16:45:54 +02:00 |
|
aignatov-bio
|
2968e677b8
|
Update image for doorkeeper auth
|
2020-10-19 16:23:20 +02:00 |
|
Mojca Lorber
|
23f01ac6a9
|
Add 'Open in APP' button to the task
|
2020-10-19 12:17:03 +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 |
|
aignatov-bio
|
0a4b89cf39
|
Merge branch 'develop' into features/office-file-previews
|
2020-10-15 15:19:56 +02:00 |
|
Mojca Lorber
|
5013f224ee
|
Fix ems
|
2020-10-14 13:16:38 +02:00 |
|
Mojca Lorber
|
a944525d25
|
Change px to em
|
2020-10-12 16:59:33 +02:00 |
|
Mojca Lorber
|
cf367baefa
|
Merge branch 'develop' into ml-sci-4841
|
2020-10-12 14:43:03 +02:00 |
|
aignatov-bio
|
5d6c9e78fd
|
Refactor dashboard layout
|
2020-10-06 16:09:26 +02:00 |
|
Mojca Lorber
|
4e4a4a2c4e
|
Change Complete step button on task step
|
2020-10-02 15:02:42 +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 |
|
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
|
7c3a3e4490
|
Small smart annotation fixes
|
2020-09-28 12:03:01 +02:00 |
|
aignatov-bio
|
1ed65eddfa
|
Move ordering to front-end
|
2020-09-25 15:06:09 +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
|
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 |
|
aignatov-bio
|
4f7814cff4
|
Fix markup
|
2020-09-24 13:32:43 +02:00 |
|
aignatov-bio
|
ff33cb45e0
|
Improve smart annotation in TinyMCE fields
|
2020-09-24 13:29:20 +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 |
|
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 |
|
aignatov-bio
|
21dcf1157c
|
Update regexp for smart annotation
|
2020-09-23 11:13:59 +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 |
|
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 |
|
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 |
|
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 |
|
Mojca Lorber
|
d9a78d20d7
|
Update empty states for smart annotation results and dismiss button
|
2020-09-18 08:50:01 +02:00 |
|
aignatov-bio
|
644f30fb10
|
Fix syntax for uglifier
|
2020-09-17 15:35:12 +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
|
8dbc69aa31
|
Remove console.log
|
2020-09-17 14:48:26 +02:00 |
|
aignatov-bio
|
f11f54db33
|
Small fixes
|
2020-09-17 13:11:54 +02:00 |
|
aignatov-bio
|
b4102f3cfd
|
Add try/cath for JSON.parse
|
2020-09-17 11:43:08 +02:00 |
|
aignatov-bio
|
9cb26a1cb9
|
Fix markup
|
2020-09-17 11:43:08 +02:00 |
|
aignatov-bio
|
3691d21215
|
Fix multiple smart annotation selected
|
2020-09-17 11:43:08 +02:00 |
|
aignatov-bio
|
86667feb6b
|
Add remembered state for smart annotation
|
2020-09-17 11:43:07 +02:00 |
|
mlorb
|
4acd0c4cb9
|
Merge pull request #2841 from mlorb/ml-sci-4984
Add saving state for filters on dashboard [SCI-4984]
|
2020-09-17 09:53:16 +02:00 |
|
aignatov-bio
|
c26f8e7193
|
Add before send condition for status change
|
2020-09-16 15:23:53 +02:00 |
|
Urban Rotnik
|
c9de9e857f
|
Fix constant initialization
|
2020-09-16 12:15:23 +02:00 |
|
Mojca Lorber
|
9cd8e3b7ac
|
Change default status values, add project and experiment to saved state and fix parsing error handeling
|
2020-09-16 09:48:06 +02:00 |
|
Mojca Lorber
|
3c30ee904e
|
Merge branch 'features/task-flows' into ml-sci-4984
|
2020-09-15 13:27:34 +02:00 |
|
mlorb
|
bf707a11a9
|
Merge branch 'features/task-flows' into ml-sci-4976
|
2020-09-15 12:59:49 +02:00 |
|
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 |
|
aignatov-bio
|
67d3a1ad12
|
Fix markup
|
2020-09-15 12:06:20 +02:00 |
|
aignatov-bio
|
6dc4422d82
|
Fix markup
|
2020-09-15 11:56:44 +02:00 |
|
Mojca Lorber
|
fe7d922cc5
|
Refactor complete step button
|
2020-09-15 11:18:15 +02:00 |
|
Oleksii Kriuchykhin
|
73cf620960
|
Add Completion and Uncompletion consequences [SCI-5004]
|
2020-09-14 20:06:48 +02:00 |
|
Mojca Lorber
|
13f719a9e1
|
Add saving state for filters on dashboard
|
2020-09-14 18:15:57 +02:00 |
|
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
|
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 |
|
Mojca Lorber
|
eeb8f4a97a
|
Disable 'complete step' button on locked task
|
2020-09-09 14:32:37 +02:00 |
|
aignatov-bio
|
7a86bb47c5
|
Add styling and highligh
|
2020-09-09 14:17:19 +02:00 |
|
Urban Rotnik
|
0ae39678d4
|
Merge pull request #2832 from urbanrotnik/ur-sci-4982-lock-state
Add error message for locked task, update some permission checks[SCI-4982]
|
2020-09-09 14:04:08 +02:00 |
|
Urban Rotnik
|
8b10cde6b4
|
Fix DeepScan error
|
2020-09-09 13:51:11 +02:00 |
|
aignatov-bio
|
946b961b1a
|
Merge pull request #2819 from aignatov-bio/ai-sci-4975-add-permission-checks-for-statuses
Add front-end checks for statuses [SCI-4975]
|
2020-09-09 13:21:04 +02:00 |
|
aignatov-bio
|
661220890f
|
Update error handling
|
2020-09-09 12:25:34 +02:00 |
|
aignatov-bio
|
f4a13a73cb
|
Refactor smart annotation front-end
|
2020-09-09 12:25:34 +02:00 |
|
aignatov-bio
|
5d9d7d6a12
|
Merge pull request #2829 from aignatov-bio/ai-sci-4983-add-descriptions-for-conditions
Add description for conditions [SCI-4983]
|
2020-09-09 11:33:48 +02:00 |
|
Urban Rotnik
|
aa88b6bdb4
|
Move redirect to controller
|
2020-09-09 11:26:43 +02:00 |
|
Mojca Lorber
|
ea1510bcdd
|
Fix quotes
|
2020-09-09 10:27:32 +02:00 |
|
aignatov-bio
|
84682c6346
|
Merge pull request #2823 from mlorb/ml-sci-4575
Replace old arrow with new one [SCI-4575]
|
2020-09-09 09:05:39 +02:00 |
|
aignatov-bio
|
9a771da7f7
|
Merge pull request #2821 from mlorb/ml-sci-4578
Fix buttons visability on protocols page according to new styleguide [SCI-4578]
|
2020-09-09 09:05:26 +02:00 |
|
aignatov-bio
|
ae1bec2a95
|
Merge pull request #2818 from mlorb/ml-sci-4572
Change step checklist and table edit mode [SCI-4572]
|
2020-09-09 09:02:56 +02:00 |
|
aignatov-bio
|
bdb3caf5cf
|
Add i18n
|
2020-09-09 08:50:24 +02:00 |
|