scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 10:14:17 +08:00
Code Issues Projects Releases Packages Wiki Activity
6231 commits 39 branches 184 tags 168 MiB
Commit graph

130 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin
bc38c6b29e Fix failing test [SCI-3745] 2019-09-16 10:26:13 +02:00
Oleksii Kriuchykhin
c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
aignatov-bio
1f12a63a25
Fix counter on task inventory and failing test (#2043) 2019-09-10 13:51:37 +02:00
Oleksii Kriuchykhin
267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
aignatov-bio
f94b8165dc
Fix marvinjs edit button and icon (#1985) 2019-08-21 11:15:57 +02:00
Urban Rotnik
89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
Oleksii Kriuchykhin
c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
Urban Rotnik
32783576c1 Add controller action 'multiple_update' 
Add controller action, add update permission activity, add JS for handling ajax req
 2019-08-09 14:15:50 +02:00
Urban Rotnik
6cbece9f86 Add service for multiple share 2019-08-09 14:15:49 +02:00
Oleksii Kriuchykhin
973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Anton Ignatov
f35f4886a3 Fix markup 2019-07-29 10:18:34 +02:00
Anton Ignatov
618f0cc334 Fix tests for services 2019-07-26 14:16:44 +02:00
Anton Ignatov
84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Jure Grabnar
6e1d4c205c Add tests for page_id for search service 2019-07-04 16:02:29 +02:00
Urban Rotnik
9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +02:00
Jure Grabnar
06b8d1fda7 Update ApiClient tests 
Closes SCI-3434
 2019-06-27 14:54:19 +02:00
Mojca Lorber
9fd83d54a0 Put network error handeling into api and refactor errors 2019-06-26 14:04:03 +02:00
Mojca Lorber
ebcaa4b014 Implement protocols.io error handling for api client and normalizer 2019-06-18 14:01:57 +02:00
Urban Rotnik
7fad5fc594 Add search service and normalizer for list 2019-06-17 12:24:15 +02:00
Jure Grabnar
eb0d677a36 Refactor pio_protocol -> built_protocol 2019-06-17 12:24:13 +02:00
Urban Rotnik
0d43ecdfab Import protocol service after object is built 2019-06-17 12:24:11 +02:00
Jure Grabnar
eb275c4d12 Add tests for BuildProtocolService and fix bugs 2019-06-17 12:24:11 +02:00
Jure Grabnar
640f6c1211 Fix tests after BuildProtocolFromClientService refactor 
Closes SCI-3544
 2019-06-17 12:24:11 +02:00
Jure Grabnar
1e8627c450 Refactor ImportProtocol service to BuildProtocolService 
Closes SCI-3544
 2019-06-17 12:24:10 +02:00
Urban Rotnik
92c24451d9 Moved normalized_single_protocol.json 2019-06-17 12:24:10 +02:00
Urban Rotnik
a15596a126 Add ImportProtocolService 2019-06-17 12:24:10 +02:00
Luka Murn
98234287f5 Fix failing permission_eval_spec test 2019-05-31 10:33:55 +02:00
Oleksii Kriuchykhin
0fd7a4e8f1 Fix failing tests [SCI-3412] 2019-05-27 17:32:21 +02:00
Alex Kriuchykhin
2a7f70929a
Merge pull request #1717 from okriuchykhin/ok_SCI_3368 
Improve clean up of Export All files [SCI-3368]
 2019-05-09 13:37:56 +02:00
Urban Rotnik
2364c2653f Add bulk insert for UserSystemNotifications, New service for sending emails 2019-05-08 08:38:10 +02:00
Oleksii Kriuchykhin
84712de9ca Fix failing tests [SCI-3368] 2019-05-07 16:42:06 +02:00
Oleksii Kriuchykhin
96cf7b4de2 Fix failing tests [SCI-3177] 2019-04-17 12:58:47 +02:00
Urban Rotnik
86ddbc68b6 fixup! Show date actual value without link 2019-04-02 14:21:06 +02:00
Urban Rotnik
8eaeeee9f8 Show date actual value without link 2019-04-02 13:15:34 +02:00
Urban Rotnik
b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
Jure Grabnar
e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163 
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
 2019-04-01 14:32:54 +02:00
Miha Mencin
4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Jure Grabnar
f3e6a35121 Update PermissionEval tests with team check 2019-03-21 10:45:21 +01:00
Jure Grabnar
5de51f9c58 Prevent smart annotations accessing other teams when importing protocol 
Closes SCI-3163
 2019-03-20 12:58:22 +01:00
Mojca Lorber
70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik
c65d1af18d Fix failing tests 2019-03-13 09:53:34 +01:00
Urban Rotnik
b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Urban Rotnik
117944117b Add service for activity creation 2019-03-11 08:36:15 +01:00
Miha Mencin
51b3aea49a added uniquness validator and index on user_projects and user_teams relations 
finxing typo, fixied failing test

fixing mistakenly commited file

fixing schema to include bigint migration
 2019-02-27 15:09:47 +01:00
Urban Rotnik
7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
aignatov-bio
fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-19 13:51:18 +01:00
Urban Rotnik
f63eaaefe7 Add user_system_notification records when syncing notifications, update email sending 2019-02-19 11:22:58 +01:00
Alex Kriuchykhin
185e3b4832
Merge pull request #1495 from okriuchykhin/ok_SCI_3039 
Create templates project when syncing templates if team doesn't have it [SCI-3039]
 2019-02-14 17:40:01 +01:00