Urban Rotnik
|
60a1e602e0
|
Add ProjectFolders relation to Folder serializer
|
2021-01-12 17:09:39 +01:00 |
|
Urban Rotnik
|
1c5337e6ab
|
Fix for move_modal partial rendering
|
2021-01-12 15:45:21 +01:00 |
|
Alex Kriuchykhin
|
62b1aaf033
|
Merge pull request #3077 from okriuchykhin/ok_SCI_5386
Fix flash messages on sign-in [SCI-5386]
|
2021-01-12 15:44:24 +01:00 |
|
Urban Rotnik
|
91ea82a21d
|
Merge pull request #3062 from urbanrotnik/ur-sci-5362-missing-archived-on-date
Add fallback archived_on and archived_by for MyModule and Experiment [SCI-5362]
|
2021-01-12 15:36:51 +01:00 |
|
Urban Rotnik
|
1070e813fc
|
Add helper for archived_on date
|
2021-01-12 15:35:35 +01:00 |
|
Oleksii Kriuchykhin
|
cf3b0916f6
|
Fix flash messages on sign-in [SCI-5386]
|
2021-01-12 15:28:30 +01:00 |
|
Urban Rotnik
|
ef82fcc5ee
|
Merge pull request #3075 from urbanrotnik/ur-sci-5379-clean-folder-info
Remove project_folder in callback [SCI-5379]
|
2021-01-12 15:17:16 +01:00 |
|
Urban Rotnik
|
2a3bafd6a0
|
Add fallback archived_on and archived_by columns to parent for MyModule and Experiment [SCI-5362]
|
2021-01-12 14:53:06 +01:00 |
|
mlorb
|
61c3a8417e
|
Merge pull request #3076 from mlorb/ml-sci-5335-v2
Change button style again [SCI-5335]
|
2021-01-12 14:52:50 +01:00 |
|
aignatov-bio
|
7cc6ce5659
|
Fix projects page member filter [SCI-5385] (#3074)
|
2021-01-12 14:49:24 +01:00 |
|
Mojca Lorber
|
0b9daaa7d5
|
Change button style again
|
2021-01-12 14:37:22 +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 |
|
Urban Rotnik
|
485aa0d541
|
Remove project_folder in callback
|
2021-01-12 13:04:36 +01:00 |
|
aignatov-bio
|
8533e54adb
|
Add permission check for open manage user modal and experiment actions dropdown [SCI-5382] (#3073)
|
2021-01-12 12:16:33 +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
|
3ad14e06b2
|
Merge pull request #3067 from urbanrotnik/ur-sci-5379-clean-folder-info
Remove project_folder reference on project archive [SCI-5379]
|
2021-01-12 11:27:08 +01:00 |
|
aignatov-bio
|
8099c4ed4c
|
Fix error on task page without due date [SCI-5375] (#3066)
|
2021-01-12 11:11:40 +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 |
|
Urban Rotnik
|
996f604df1
|
Touch parent folder of folder
|
2021-01-12 10:46:19 +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 |
|
Urban Rotnik
|
baba7fc9e7
|
Remove project_folder reference on project archive [SCI-5379]
|
2021-01-11 13:54:21 +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
|
fbce70be0c
|
Add unique validation and ensure_uniqueness callback while moving folder
[SCI-5312]
|
2021-01-08 08:21:09 +01:00 |
|
Urban Rotnik
|
be2949b316
|
Fix tests
|
2021-01-08 08:05:05 +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
|
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 |
|