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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
62374bee0a
|
Implement the 'seen comments' functionality (red dot) for the comments [SCI-5253]
|
2020-12-07 11:04:33 +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
|
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
|
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 |
|
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 |
|
Urban Rotnik
|
efd4f8abde
|
Add members dropdown on project filters flyout
|
2020-11-26 12:29:43 +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
|
afc6d12b49
|
Project and folders sorting
|
2020-11-25 18:34:39 +01:00 |
|
Oleksii Kriuchykhin
|
0de237cece
|
Implement project search with grouping by folder [SCI-5207]
|
2020-11-25 11:59:02 +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 |
|
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 |
|
Urban Rotnik
|
e893d40eea
|
Add filters flyout for projects
|
2020-11-19 09:23:35 +01:00 |
|
Oleksii Kriuchykhin
|
6dfeae2283
|
Make folders selectable for 'Export all' functionality [SCI-5183]
|
2020-11-13 14:39:10 +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 |
|
Oleksii Kriuchykhin
|
327baafcd7
|
Improve CSS structure for project toolbar [SCI-5129]
|
2020-11-04 16:10:40 +01:00 |
|
Oleksii Kriuchykhin
|
258c57870f
|
Implement the toolbar on the Team Projects page [SCI-5129]
|
2020-11-02 13:28:37 +01:00 |
|
Urban Rotnik
|
042231469c
|
Fix syntax
|
2020-10-30 13:37:59 +01:00 |
|
Oleksii Kriuchykhin
|
13fcfedf41
|
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:16:09 +01:00 |
|
Urban Rotnik
|
b94a3a6cb8
|
Clean up controller
|
2020-10-26 16:17:39 +01:00 |
|
Urban Rotnik
|
1ffc3449bf
|
Clean up index view
|
2020-10-26 13:42:32 +01:00 |
|
Urban Rotnik
|
a259800590
|
Merge branch 'develop' into jg_sci_2228
|
2020-08-31 16:29:23 +02:00 |
|
Urban Rotnik
|
b11f166c38
|
Fix cucumber tests
|
2020-07-09 13:14:07 +02:00 |
|
Urban Rotnik
|
8fa024ed10
|
Remove all tooltips from HTML
|
2020-04-28 12:30:43 +02:00 |
|
Mojca Lorber
|
24c345721c
|
Add hook
|
2020-03-13 15:04:56 +01:00 |
|
aignatov-bio
|
68646276f5
|
Replace bootstrap styles for button
|
2020-01-07 16:13:34 +01:00 |
|
aignatov-bio
|
d93095b489
|
Fix markup
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
ef3814ccec
|
Add new buttons to protocols, tasks, experiments, projects
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
3f38b1e6a1
|
Add text input fields
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
443ab8645f
|
Add toggles
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
7bfefd8659
|
Add checkboxes and radio buttons
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
9694117635
|
Add new colors and buttons
|
2020-01-06 10:40:20 +01:00 |
|
aignatov-bio
|
23581059e7
|
Remove image
|
2019-10-04 14:50:27 +02:00 |
|
Anton Ignatov
|
33497d11a3
|
Merge branch 'activestorage_migration'
|
2019-10-01 10:36:05 +02:00 |
|
Anton Ignatov
|
5a1efb84c6
|
Fix error on archived experiment page
|
2019-09-18 15:23:45 +02:00 |
|
Mojca Lorber
|
47ccf38662
|
Redesign of sorting button for projects/experiments cards
|
2019-09-16 14:43:12 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Luka Murn
|
2db39c049e
|
Remove projects archive page
|
2019-08-21 13:10:54 +02:00 |
|
Anton Ignatov
|
a4b2825258
|
Fix tests for active storage
|
2019-07-26 15:58:51 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
Oleksii Kriuchykhin
|
c0c8e0e1a3
|
Refactor Experiment workflow images [SCI-3539]
|
2019-07-04 09:33:12 +02:00 |
|
aignatov-bio
|
d207cf5dce
|
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments
* Refactored comments over scinote
* Update events
|
2019-06-04 14:40:21 +02:00 |
|
Oleksii Kriuchykhin
|
1128fedc51
|
Refactor title inline editing permission checking [SCI-3471]
|
2019-05-20 13:13:31 +02:00 |
|
Oleksii Kriuchykhin
|
2ef926e795
|
Add permission checking to inline editor fields [SCI-3468]
|
2019-05-15 17:47:09 +02:00 |
|
aignatov-bio
|
60296419e8
|
Update project card due date dropdown (#1716)
|
2019-04-30 13:30:09 +02:00 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
aignatov-bio
|
8ba0555922
|
Add check for tasks complete in project notifications (#1657)
|
2019-04-12 09:17:34 +02:00 |
|
aignatov-bio
|
e93b0c3109
|
Adding preload filters for global activities [SCI-3254] (#1619)
* Adding preload filter for global activities
* Adding link to task activities
|
2019-04-02 11:14:36 +02:00 |
|
aignatov-bio
|
b1df8c9aa7
|
Adding inline editing to experiment title, project title and task title [SCI-3059] (#1524)
* Adding inline editing to experiment title, project title and task title
|
2019-03-06 09:17:34 +01:00 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +01:00 |
|
mlorb
|
7fdef4d3ec
|
Change experiment cards look and feel
|
2019-01-18 15:57:44 +01:00 |
|
Oleksii Kriuchykhin
|
1861f86b2c
|
Improve export all modal messages in case of unlimited exports [SCI-2965]
|
2019-01-17 17:27:32 +01:00 |
|
Oleksii Kriuchykhin
|
311189a2e9
|
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
|
2018-12-13 11:18:09 +01:00 |
|
Alex Kriuchykhin
|
37db41e18e
|
Merge pull request #1405 from okriuchykhin/ok_SCI_2881
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-12-10 14:11:34 +01:00 |
|
Alex Kriuchykhin
|
51ba74cbab
|
Merge pull request #1403 from okriuchykhin/ok_SCI_2757
Enable caching for navigation sidebar [SCI-2757]
|
2018-12-10 14:11:05 +01:00 |
|
Oleksii Kriuchykhin
|
e43b366cdb
|
Disable fragment caching
|
2018-11-29 18:07:31 +01:00 |
|
Oleksii Kriuchykhin
|
2c96f08b98
|
Refresh sidebar when project is archived/restored [SCI-2881]
|
2018-11-29 14:20:20 +01:00 |
|
Oleksii Kriuchykhin
|
60a19734b2
|
Enable caching for navigation sidebar [SCI-2757]
|
2018-11-29 11:28:36 +01:00 |
|
mz3944
|
4d460d14ea
|
Merge pull request #1378 from mz3944/mz-SCI-2861
All users in smart annotation have removed in brackets [SCI-2861]
|
2018-11-20 21:22:23 +01:00 |
|
mlorb
|
3b96a60938
|
Merge pull request #1374 from mlorb/ml-sci-2842
Update the Export all confirmation modal and export interaction [SCI-2842]
|
2018-11-19 11:36:08 +01:00 |
|
Alex Kriuchykhin
|
d524a1d508
|
Merge pull request #1364 from okriuchykhin/ok_SCI_2778
Add time format selection to settings [SCI-2778]
|
2018-11-19 10:17:09 +01:00 |
|
Matej Zrimšek
|
c144d599fc
|
Fix user smart annotation showing as if the user is removed from team [SCI-2861]
|
2018-11-19 08:02:25 +01:00 |
|
mlorb
|
4b540958bd
|
change close/cancel button and refactor export_project_modal endpoint
|
2018-11-16 13:37:32 +01:00 |
|
mlorb
|
6453ab6fb1
|
update the Export all confirmation modal and export interaction
|
2018-11-15 15:53:58 +01:00 |
|
Oleksii Kriuchykhin
|
3fd687161f
|
Remove unused variables from activities controller [SCI-2778]
|
2018-11-14 13:17:38 +01:00 |
|
Oleksii Kriuchykhin
|
537de596a7
|
Merge latest master [SCI-2778]
|
2018-11-14 13:05:57 +01:00 |
|
Luka Murn
|
98a39ecd72
|
Fix visual bug (everything bold) on projects index page
Bug was introduced in projects absent section, there was no
closing </strong> tag.
|
2018-11-14 11:33:27 +01:00 |
|
Luka Murn
|
84df2c81f9
|
Merge branch 'features/export-all'
Conflicts:
app/controllers/experiments_controller.rb
app/controllers/my_modules_controller.rb
db/schema.rb
|
2018-11-13 09:14:02 +01:00 |
|
Oleksii Kriuchykhin
|
98d1ea8542
|
Improve Export All button behaviour [SCI-2839]
|
2018-11-12 15:51:03 +01:00 |
|
Oleksii Kriuchykhin
|
e89d60785f
|
Fix dates on activities and experiments [SCI-2778]
|
2018-11-12 10:26:48 +01:00 |
|
mlorb
|
4d156080ac
|
fix empty projects page bug and projects tree bug
|
2018-11-07 13:45:46 +01:00 |
|
mlorb
|
63e039e235
|
fix bug with new project button not working
|
2018-11-06 11:38:31 +01:00 |
|
Alex Kriuchykhin
|
c1d853f7bd
|
Merge pull request #1344 from okriuchykhin/ok_SCI_2783
Fix issue with project dropdown caching [SCI-2783]
|
2018-10-29 10:56:02 +01:00 |
|