scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-15 13:45:25 +08:00
Code Issues Projects Releases Packages Wiki Activity
9340 commits 31 branches 181 tags 166 MiB
Commit graph

103 commits

Author SHA1 Message Date
zmagoD
ad10befcc4 add new manage access permission to PET levels 2021-06-19 17:17:57 +02:00
zmagoD
ddaa4b4c57 replase user_projects with user_assignment where the permissions are calculated 2021-06-06 10:29:01 +02:00
zmagoD
784e43e328 create user_assignments for all child objects when the user is attached to the project 2021-06-06 09:54:47 +02:00
zmagoD
5ee38966a0 Merge branch 'features/new_permissions' of https://github.com/biosistemika/scinote-web into new_perimssions-managing-project-ui 2021-05-11 08:36:39 +02:00
zmagoD
c0eb38b564 Merge branch 'develop' of https://github.com/biosistemika/scinote-web into features/new_permissions 2021-05-08 10:33:43 +02:00
zmagoD
331a68e9b6 fix new experiment creation 2021-05-08 10:05:22 +02:00
miha
11284d3b87 [SCI-5577] filter notifications 2021-03-29 09:52:57 +02:00
Urban Rotnik
ab1477997a Update variables name 2021-03-09 14:50:14 +01:00
Urban Rotnik
1bb2393655 Use translations 
SCI-4140
 2021-02-25 11:59:26 +01:00
Urban Rotnik
347f208480 Bring back old notifications 
SCI-4140
 2021-02-25 11:59:14 +01:00
Oleksii Kriuchykhin
49194d1a45 Prepare initial user roles in the database [SCI-5435] 2021-02-22 11:58:40 +01:00
Oleksii Kriuchykhin
3b90225c5a Add new permission checking logic [SCI-5436] 2021-02-22 11:55:48 +01:00
Oleksii Kriuchykhin
58cce0f153 Improve task restoring and refactor flash messages [SCI-5341] 2021-01-04 17:00:23 +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
Oleksii Kriuchykhin
e456661a98 Fix task archiving and moving [SCI-5030] 2020-09-17 17:15:41 +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
Mojca Lorber
6e8062179c Implement archiving and restoring of whole inventories 2020-06-18 18:07:23 +02:00
Urban Rotnik
26db4f3515 Add Archive and Restore service 2020-06-09 18:50:36 +02:00
Urban Rotnik
1fe1b782f1 Fix for user filter in task activity page 2020-04-30 09:20:29 +02:00
Oleksii Kriuchykhin
7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
Urban Rotnik
728823ed65 fixup! Fix for numeric item in SQL array 2020-01-10 09:46:25 +01:00
Urban Rotnik
39593b6342 Fix for numeric item in SQL array 2020-01-09 11:24:38 +01:00
Oleksii Kriuchykhin
d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Urban Rotnik
c15bcf0769 Add search support for numeric 2020-01-06 10:12:11 +01:00
Oleksii Kriuchykhin
7a89cae56f Fix TinyMCE images and avatars for export all [SCI-4107] 2019-12-05 13:27:17 +01:00
Urban Rotnik
0dc1daa7c6 Add gem Down, File size validation before and during download 2019-11-18 14:28:19 +01:00
aignatov-bio
b1f9e7f1ca Fix global activities jsonb field [SCI-3830] (#2030) 
* Fix global activities jsonb field

* Fix tests
 2019-11-18 13:59:54 +01:00
Urban Rotnik
169a381629
Merge pull request #2170 from urbanrotnik/ur-sci-4008-rte-image-download 
Fix for downloading image [SCI-4008]
 2019-10-22 15:12:11 +02:00
Urban Rotnik
a7d351dc38 Add file size check 2019-10-22 14:13:22 +02:00
Urban Rotnik
0119533e75 Fix for file generation 2019-10-22 11:02:59 +02:00
Oleksii Kriuchykhin
53402c9ce1 Fix images in reports, impove speed of report generation [SCI-3990][SCI-3993] 2019-10-17 13:30:14 +02:00
Oleksii Kriuchykhin
a2d70afeca Improve missing files handling when clonning TinyMceAsset [SCI-3950] 2019-10-04 15:59:22 +02:00
Oleksii Kriuchykhin
bab228e1df Skip missing files when clonning TinyMceAsset [SCI-3950] 2019-10-03 15:43:39 +02:00
Oleksii Kriuchykhin
584f2d07c0 Fix file handling in protocol import/copying [SCI-3935][SCI-3926][SCI-3934] 2019-10-01 13:06:01 +02:00
Anton Ignatov
40a8c6a1cc Markup fix 2019-09-26 16:29:26 +02:00
Anton Ignatov
1f02fb4bc7 Fix tinymce assets render in report 2019-09-26 16:27:22 +02:00
Anton Ignatov
305e9dc109 Fix error handling and rubocop error 2019-09-25 13:45:34 +02:00
Anton Ignatov
646107a35b Fix error on task copy 2019-09-23 16:33:57 +02:00
Anton Ignatov
69eb8681bd Error handling, when image unavaliable for base64 2019-09-18 15:11:51 +02:00
aignatov-bio
a3b2c7d5fe
Fix report image issues [SCI-3772] (#1983) 
* Fix report image issues

* Small fixes
 2019-09-12 09:02:45 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
aignatov-bio
f0b7771e19
Merge pull request #1943 from aignatov-bio/ai-sci-3629-add-metadata-to-protocol-repository-import-export 
Fix protocol copy, add metadata to assets [SCI-3629]
 2019-08-05 12:55:16 +02:00
Anton Ignatov
24da016465 Reuse duplicate file method 2019-08-05 11:30:36 +02:00
Anton Ignatov
3b7f715e0b Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-22 13:09:17 +02:00
Anton Ignatov
b762ae6a90 Copy protocol assets through tempfile 2019-07-19 15:23:34 +02:00
aignatov-bio
2fae7d8208
Fix issue in report (#1941) 2019-07-19 10:37:44 +02:00
Anton Ignatov
b5a35f583a Fix protocol copy, add metadata to assets 2019-07-18 15:39:08 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00