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
|
20acd9b693
|
Fix controller and tests
|
2021-01-07 17:41:39 +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
|
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 |
|
aignatov-bio
|
ef57489cd9
|
Update repositories sidebar [SCI-5329] (#3031)
* Update repositories sidebar [SCI-5329]
|
2021-01-06 10:13:10 +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 |
|
Oleksii Kriuchykhin
|
58cce0f153
|
Improve task restoring and refactor flash messages [SCI-5341]
|
2021-01-04 17:00:23 +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 |
|
Oleksii Kriuchykhin
|
ffd9132b52
|
Make active projects view default [SCI-5340]
|
2020-12-31 16:00:26 +01:00 |
|
Oleksii Kriuchykhin
|
738f668ba9
|
Disable comment adding for archived objects [SCI-5339]
|
2020-12-30 11:46:56 +01:00 |
|
Oleksii Kriuchykhin
|
f76eb170a1
|
Fix restore action for experiments and tasks [SCI-5341]
|
2020-12-28 22:21:38 +01:00 |
|
Oleksii Kriuchykhin
|
67b3f853d7
|
Merge branch 'develop' into features/folders
|
2020-12-18 14:51:21 +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 |
|
Oleksii Kriuchykhin
|
069704cb78
|
Fix redirects after 2FA sign in [SCI-4973]
|
2020-12-17 19:32:15 +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 |
|
Urban Rotnik
|
9a7ffb0645
|
Add Tags modal to archived tags screen
[SCI-5274]
|
2020-12-17 13:08:57 +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 |
|
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 |
|
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
|
188013dd56
|
Change permission for sorting in steps and asset view [SCI-5289]
|
2020-12-08 10:45:43 +01:00 |
|
Urban Rotnik
|
1332ad2fcd
|
Fix project creation activity [SCI-5181]
|
2020-12-04 14:13:43 +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 |
|
Mojca Lorber
|
bdc8cfc5d5
|
Fix merging
|
2020-12-03 13:04:55 +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 |
|
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 |
|
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 |
|
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
|
dc9fae6af0
|
Remove manage permissions check from step toggle
|
2020-11-27 11:37:39 +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 |
|
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 |
|
Urban Rotnik
|
efd4f8abde
|
Add members dropdown on project filters flyout
|
2020-11-26 12:29:43 +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 |
|
Urban Rotnik
|
be49216e71
|
Fix teams tests
|
2020-11-25 20:02:45 +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 |
|
Oleksii Kriuchykhin
|
0de237cece
|
Implement project search with grouping by folder [SCI-5207]
|
2020-11-25 11:59:02 +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 |
|
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 |
|
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 |
|
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 |
|
aignatov-bio
|
fcdad51222
|
Fix assets sorting in report
|
2020-11-17 15:33:25 +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
|
45efc9a43a
|
Remove skip asset permission check for wopi creation
|
2020-11-12 14:13:30 +01:00 |
|
Mojca Lorber
|
1618d79144
|
Merge branch 'develop' into ml-sci-5152
|
2020-11-11 10:47:43 +01:00 |
|
Oleksii Kriuchykhin
|
038cd8d5d7
|
Fix repository state columns handling [SCI-5190]
|
2020-11-10 17:24:04 +01:00 |
|
Oleksii Kriuchykhin
|
ee1bcd7aac
|
Implement search endpoint for Projects & folders search [SCI-5136]
|
2020-11-09 16:16:09 +01:00 |
|
Mojca Lorber
|
9893e8d5c8
|
Add 403 error handling to current tasks dashboard widget
|
2020-11-06 10:39:04 +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
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
Oleksii Kriuchykhin
|
13fcfedf41
|
Refactor experiment workflow image generation [SCI-5063]
|
2020-10-29 13:16:09 +01:00 |
|
Urban Rotnik
|
bf4062b7cb
|
Refactor rescue block
|
2020-10-29 09:12:12 +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 |
|
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 |
|