scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-21 00:21:37 +08:00
Code Issues Projects Releases Packages Wiki Activity
14970 commits 33 branches 182 tags 166 MiB
Commit graph

209 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
d1208bad0b Merge branch 'develop' into features/new_permissions 2021-07-07 13:44:36 +02:00
Martin Artnik
e1b0b65465 Improved code style, fixed bug [SCI-5828] 2021-06-29 15:57:23 +02:00
Martin Artnik
eaa713f5b8 Fix indices [SCI-5829] 2021-06-22 12:51:25 +02:00
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
Oleksii Kriuchykhin
29c83ffbb1 Merge branch 'develop' into features/new-reports 2021-05-21 11:04:17 +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
Oleksii Kriuchykhin
b67f2a21f5 Add default settings to existing reports [SCI-5619][SCI-5672] 2021-05-06 17:33:58 +02:00
Oleksii Kriuchykhin
67302da968 Add settings to reports [SCI-5612] 2021-04-08 17:40:16 +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
Miha Mencin
ab9b7a7429
Merge pull request #1902 from biosistemika/release-1.16.6 
Merge 'release-1.16.6' into 'master'
 2019-07-08 12:49:40 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
aignatov-bio
88dc2dcdd0
Hot fix for TinyMCE asset permission check (#1896) 
* Hot fix for TimyMCE asset permission check
 2019-07-04 15:59:11 +02:00
Oleksii Kriuchykhin
f2b617ac12 Fix code formatting [SCI-3436] 2019-06-19 14:23:12 +02:00
Oleksii Kriuchykhin
ae1a63037b Raise an exception if required methods for ViewableModel are not implemented [SCI-3436] 2019-06-19 14:17:17 +02:00
Oleksii Kriuchykhin
6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +02:00
aignatov-bio
0b3b6d593b
Small style fixes [SCI-3498] (#1799) 
* Adding error, if TinyMCE asset not in text, when we copy anything

* Small style fixes
 2019-05-27 16:27:27 +02:00
aignatov-bio
0f86ebf173
Adding error, if TinyMCE asset not in text, when we copy anything [SCI-3495] (#1797) 
* Adding error, if TinyMCE asset not in text, when we copy anything
 2019-05-22 16:13:40 +02:00
aignatov-bio
b22dba7f05
Add delay job for handling unknown tinyMCE images (#1781) 
* Add delay job for handling unknown tinyMCE images
 2019-05-20 12:44:16 +02:00
aignatov-bio
f1f04adeb2
Fix placeholder in protocol description [SCI-3454] (#1769) 
* Fix placeholder in protocol description

* Change task tags text
 2019-05-15 14:13:13 +02:00
aignatov-bio
1555daa0c6
Fix non associated tinyMCE images (#1762) 
* Fix non assosiated tinyMCE images
 2019-05-14 15:01:57 +02:00
aignatov-bio
d3aa6371cd
Fix report saving [SCI-3443] (#1753) 
* Fix report saving

* Fix the report saving by using the reports' structures

* Remove uneccesary yarn.lock (mistake)
 2019-05-13 10:55:08 +02:00
aignatov-bio
0b194eb3b1
Revert "Fix report saving (#1748)" (#1752) 
This reverts commit 3db6129808.
 2019-05-13 09:09:36 +02:00
aignatov-bio
3db6129808
Fix report saving (#1748) 2019-05-13 08:58:47 +02:00
Anton Ignatov
5a5101410c Fix markup 2019-05-08 14:35:28 +02:00
Anton Ignatov
b2063d3018 Fix markup 2019-05-08 14:30:33 +02:00
Anton Ignatov
f201c5440b Add check for old tinymce for report and reassign process 2019-05-08 14:29:25 +02:00
aignatov-bio
84993ea3ef
Update protocol repository for new description format [SCI-3371] (#1689) 
* Update protocol repository for new description format

* move image clone method to concerns
 2019-04-24 13:34:56 +02:00
Oleksii Kriuchykhin
7c91b4a255 Merge remote-tracking branch 'scinote/master-with-note-section' into ok_SCI_3266 2019-04-23 17:01:13 +02:00
Oleksii Kriuchykhin
c7a707f9db Fix task clonning with TinyMCE images [SCI-3266] 2019-04-23 15:16:40 +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
6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
aignatov-bio
e2e299b424
Add dynamic generating filters for global activities [SCI-3228] (#1644) 
* Add dynamic generating filters

* Add url methods
 2019-04-09 09:08:27 +02:00
Anton Ignatov
c9f9523210 Remove src when save description and rename token tag 2019-04-02 13:41:32 +02:00
Anton Ignatov
4ec0a3c871 Update TinyMCE image loader for new fields 2019-03-22 10:52:26 +01:00
Anton Ignatov
5d6f009ee8 fix error for delay deleting 2019-03-20 15:20:31 +01:00
Anton Ignatov
55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Anton Ignatov
07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Urban Rotnik
3992336db9 Add type and value_for attributes to user hash 2019-03-11 08:37:22 +01:00
Urban Rotnik
b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Oleksii Kriuchykhin
61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Matej Zrimšek
9480234682 Show all smart annotations when they contain special characters [SCI-2816] 2018-12-09 11:15:31 +01:00
Oleksii Kriuchykhin
2c0927b254 Search for IDs on inventory table as text [SCI-2802] 2018-11-30 15:32:01 +01:00
Oleksii Kriuchykhin
02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Jure Grabnar
6b47165ac1 Fix formatting according to Houndbot 2018-10-16 11:00:38 +02:00
Jure Grabnar
2558b7a313 Fix formatting according to HoundBot 2018-10-16 11:00:38 +02:00
Jure Grabnar
26df1e5a98 Add export project modal 
Closes [SCI-2645]
 2018-10-16 11:00:38 +02:00
Oleksii Kriuchykhin
1cafbd8c50 Move generic code to Viewable Concern [SCI-2733] 2018-10-12 16:14:24 +02:00
zmagod
e654725d9e fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511] 2018-07-06 14:26:20 +02:00
zmagod
23f8f35a2c a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339] 2018-04-26 11:05:02 +02:00
zmagod
6e255a4657 fixes failing specs 2018-04-04 14:44:32 +02:00
zmagod
e630d3113f add ID column to repository [fixes SCI-2206] 2018-04-04 11:55:11 +02:00
Matej Zrimšek
321ddc2916 Grouped existing project permissions and used 'canaid' gem. 2018-02-14 13:09:45 +01:00
Luka Murn
00fe267a2a Minor codestyle fixes 2017-11-23 11:33:39 +01:00
Luka Murn
d715eb06ef Add team & project role-related helper functions to User model 
This will be required later once we start using Canaid.
 2017-11-16 15:50:30 +01:00
Luka Murn
c62002381b Add default settings migration and concern 2017-08-10 11:30:57 +02:00
Oleksii Kriuchykhin
0ee7e11620 Add advanced search options [SCI-1158] 2017-05-05 16:41:23 +02:00
Oleksii Kriuchykhin
07d658ab82 Improve speed of search [SCI-1157] 2017-04-11 14:55:44 +02:00
zmagod
e5ba134e83 fixes search 2016-11-16 14:50:06 +01:00
zmagod
3728a6cef9 fixed sql regex 2016-11-14 12:32:41 +01:00
zmagod
630724df2b strips the html tags from fearch query 2016-11-11 11:41:23 +01:00
Luka Murn
076b67620f Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
Luka Murn
055298fee8 Initial commit. 2016-02-12 16:52:43 +01:00