scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
6567 commits 70 branches 179 tags 165 MiB
Commit graph

988 commits

Author SHA1 Message Date
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
Luka Murn d7fe23c6ce
Merge pull request #1796 from Ducz0r/lm-sci-3494 
Fix the user.activities association so it works [SCI-3494]
 2019-05-24 14:21:42 +02:00
Luka Murn 3a2bf2ce8a
Merge pull request #1780 from Ducz0r/lm-perform-wopi-checks-on-startup 
Add a startup check for WOPI_ENABLED == true variables
 2019-05-22 16:56:55 +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
Luka Murn 8b116d9de7 Fix the user.activities association so it works 
Closes SCI-3494.
 2019-05-22 15:42:50 +02:00
Oleksii Kriuchykhin d3f29d5d72 Add type column to zip_exports for STI [SCI-3368] 2019-05-20 16:35:24 +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
Luka Murn 4136aa0575 Add a startup check for WOPI_ENABLED == true variables 2019-05-18 10:22:53 +02:00
Luka Murn 8aa702a4bf Fix bug with external TinyMCE assets 2019-05-16 13:33:04 +02:00
Anton Ignatov 259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +02:00
aignatov-bio 980d86824f
Fix updating process for old tinyMCE tags (#1772) 
* Fix update old tinyMCE for deleted objects

* Add error handling
 2019-05-15 16:11:48 +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
Miha Mencin 13d126bc39
Merge pull request #1761 from mlorb/ml-sci-3456 
Fix broken global activities team filter [SCI-3456]
 2019-05-14 16:36:44 +02:00
aignatov-bio 1555daa0c6
Fix non associated tinyMCE images (#1762) 
* Fix non assosiated tinyMCE images
 2019-05-14 15:01:57 +02:00
Mojca Lorber 54f735551c Fix broken global activities team filter 2019-05-14 13:50:10 +02:00
Oleksii Kriuchykhin 65fb4b1372 Fix processing_image_url for S3 storage [SCI-3381] 2019-05-14 12:53:35 +02:00
Luka Murn bd9ffe4bd2 Refactor WOPI filename length validation onto the model 2019-05-13 15:41:39 +02:00
Anton Ignatov 652fba0e23 Merge branch 'master-with-note-section' 2019-05-13 11:08:11 +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 da5b24ef57
Fix attachment appearence after update (#1745) 2019-05-13 10:54:16 +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 e5b4adcc25 Merge branch 'master-with-note-section' into features/marvinjs-integration 2019-05-11 20:51:01 +02:00
aignatov-bio bbf54de9c7
Merge pull request #1736 from aignatov-bio/ai-sci-3423-add-old-tinymce-support 
Add old tinymce image support [SCI-3423]
 2019-05-10 15:27:42 +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
Oleksii Kriuchykhin 40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +02:00
Anton Ignatov 995408e7fc Fix protocol update error, rollback bootstrap gems and fix step name 2019-05-08 17:18:19 +02:00
Anton Ignatov bee87f51ba Fix tests 2019-05-08 15:22:06 +02:00
Anton Ignatov b5271bdd2c Add remote api support 2019-05-08 15:00:36 +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
Anton Ignatov 5d959f648e Convert old tinymce assets to new on fly 2019-05-08 14:23:26 +02:00
Anton Ignatov dcf94e78e1 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-08 14:03:41 +02:00
Urban Rotnik 62bc0520e9 Update method last_sync_timestamp from Last to First user 2019-05-08 08:38:11 +02:00
Urban Rotnik 2364c2653f Add bulk insert for UserSystemNotifications, New service for sending emails 2019-05-08 08:38:10 +02:00
Urban Rotnik 357c6e6b98 Change ordering by created_at instead by last_time_changed_at 2019-05-08 08:37:34 +02:00
Oleksii Kriuchykhin 8461949bed Fix deletion of inconfirmed users [SCI-3351] 2019-05-07 16:02:45 +02:00
Anton Ignatov 7f296b35fa Update team exporter for new tinymce images 2019-05-07 13:22:55 +02:00
Jure Grabnar c866d96ea7
Merge pull request #1720 from jbargu/jg_sci_3375 
One project is duplicated in project list [SCI-3375]
 2019-05-06 11:43:24 +02:00
Anton Ignatov 565a4959b4 small fixes and improvments 2019-05-03 15:24:28 +02:00
Anton Ignatov 88e67a16c2 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-02 16:16:03 +02:00
Anton Ignatov fef691d30f Add error handling and secutiry checks 2019-05-02 16:12:25 +02:00
Anton Ignatov 4d0d5aa014 Adding team sketches selector 2019-04-30 17:32:55 +02:00
Jure Grabnar de6509cc97 Add distinct to #visible_to in project.rb 
Closes SCI-3375
 2019-04-30 16:40:12 +02:00
Anton Ignatov 7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +02:00
Oleksii Kriuchykhin 1b792e2b7e Improve clean up of Export All files [SCI-3368] 2019-04-30 00:43:34 +02:00
Mojca Lorber 5fd4c47388 Move change owner functionality to RepositoryRow 2019-04-29 14:02:02 +02:00
Anton Ignatov f80d881847 Fix markup 2019-04-28 19:11:41 +02:00
Anton Ignatov 2847ec7609 Add env variable and check for MarvinJS available 2019-04-28 17:08:18 +02:00
Anton Ignatov 260810fff8 Add editing mode for tinymce images 2019-04-28 16:16:31 +02:00
Anton Ignatov 193edfbc35 Add marvin js support to TinyMCE 2019-04-27 22:54:59 +02:00
Anton Ignatov fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +02:00
Mojca Lorber eac90109f7 Change ownership of inventory items, when a user leaves a team 2019-04-26 10:47:08 +02:00
Alex Kriuchykhin 6bb19ed0be
Merge pull request #1697 from okriuchykhin/ok_SCI_3264 
Update limits for new rich text enabled fileds [SCI-3264]
 2019-04-25 23:54:05 +02:00
Oleksii Kriuchykhin a3f5974dbd Update limits for new rich text enabled fileds [SCI-3264] 2019-04-24 13:37:22 +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
Urban Rotnik 11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
Jure Grabnar 1da1558849
Merge pull request #1683 from jbargu/jg_3179 
Archived results are now separated in exported project
 2019-04-19 18:26:22 +02:00
aignatov-bio 6b45dcd475
Update eln export for new tinyMCE image format (#1680) 2019-04-19 14:44:40 +02:00
Jure Grabnar 1295c0583a Archived results are now separated in exported project 
Closes SCI-3179
 2019-04-17 16:37:21 +02:00
Oleksii Kriuchykhin f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Urban Rotnik 0ba0dccd57
Merge pull request #1675 from urbanrotnik/ur-sci-3345-export-all-counter-fix 
Fix for exports_left, fix for some edge cases [SCI-3345]
 2019-04-16 10:32:31 +02:00
Urban Rotnik 22af36dd2d Fix for exports_left, fix for some edge cases 2019-04-16 09:59:02 +02:00
aignatov-bio 8d7cc57da1
Add zoom to image annotation and check jpeg file quality before save [SCI-3300] (#1654) 
* Add zoom to image annotation and check jpeg file quality before save
* Move compression to front end
* Move quality extractor to paperclip processor
 2019-04-15 09:49:44 +02:00
aignatov-bio 8ba0555922
Add check for tasks complete in project notifications (#1657) 2019-04-12 09:17:34 +02:00
Urban Rotnik caccf8d9f0 Reset counter for export in last 24 hours 
Fix for check if user has avaiable exports, bit refactored increas_counter method.
 2019-04-10 10:56:33 +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
Jure Grabnar bc9eff2ef5 Add asset validation on wopi creation 
Missing file
 2019-04-04 17:05:25 +02:00
Miha Mencin 97d9fde3fd SCI-3286 add breadcrumbs to the report activity 2019-04-04 10:30:31 +02:00
Jure Grabnar 26848ecaef Refactor step position + 1 into a method 2019-04-03 13:07:30 +02:00
Alex Kriuchykhin bfd275c313
Merge pull request #1632 from okriuchykhin/ok_SCI_3281 
Fix permission checks for file editing and make protocol preview files read only [SCI-3281]
 2019-04-03 11:39:59 +02:00
aignatov-bio e034a0c055
Fix bug with update protocol from repository and modal disable button [SCI-3284] (#1631) 
* Fix bug with update protocol from repository and modal disable button
 2019-04-03 09:18:18 +02:00
Oleksii Kriuchykhin ffa7c5ecb2 Fix permition checks for file editing and make protocol preview files read only [SCI-3281] 2019-04-02 16:38:53 +02:00
Anton Ignatov c9f9523210 Remove src when save description and rename token tag 2019-04-02 13:41:32 +02:00
aignatov-bio e6102c72c7
Adding missed activities [SCI-3253] (#1614) 
* Adding missed activties

* Adding test for activities
 2019-04-02 11:50:37 +02:00
aignatov-bio e93b0c3109
Adding preload filters for global activities [SCI-3254] (#1619) 
* Adding preload filter for global activities

* Adding link to task activities
 2019-04-02 11:14:36 +02:00
Urban Rotnik b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
Alex Kriuchykhin b3aa6be23d
Merge pull request #1621 from okriuchykhin/ok_SCI_3255 
Add global activities to reports [SCI-3255]
 2019-04-01 15:07:06 +02:00
Jure Grabnar 83130426e2
Merge pull request #1617 from jbargu/jg_3244 
Duplicated activity, report activity ... [SCI-3244]
 2019-04-01 14:31:53 +02:00
Jure Grabnar 111b0e2b7f
Merge pull request #1615 from jbargu/jg_sci_3252 
Change breadcrumbs for copy as template experiment, missing activity for move workflow [SCI-3252]
 2019-04-01 12:30:48 +02:00
Oleksii Kriuchykhin 98e58ff7eb Add global activities to reports [SCI-3255] 2019-04-01 11:26:51 +02:00
Jure Grabnar 6533368763 Add activity for importing inv items 2019-03-29 15:41:34 +01:00
Jure Grabnar f843092aac Add activity for moving worklfows 
Closes SCI-3252
 2019-03-29 13:51:17 +01:00
Oleksii Kriuchykhin 7d4fbcb32e Fix unconfirmed users clean-up issues [SCI-3172] 2019-03-29 11:11:53 +01:00
Alex Kriuchykhin 9137740266
Merge pull request #1607 from okriuchykhin/ok_SCI_3229 
Fix links for archived objects in global activities [SCI-3229][SCI-3241]
 2019-03-28 17:32:24 +01:00
Oleksii Kriuchykhin d7d45bec70 Fix links for archived objects in global activities [SCI-3229] 2019-03-28 13:43:50 +01:00
mlorb 5f663b3c74
Merge pull request #1600 from mlorb/ml-sci-3215 
Implement missing tests for global activities [SCI-3215][SCI-3219]
 2019-03-28 11:10:38 +01:00
Oleksii Kriuchykhin 37c559debd Fix experiment workflow image display after touching [SCI-3177] 2019-03-27 17:02:59 +01:00
Mojca Lorber f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
aignatov-bio c2e1e85913
Adding localization for activity name and activity group (#1598) 2019-03-27 10:33:33 +01:00
Oleksii Kriuchykhin dab75d5aec Fix duplicated projects in new report modal [SCI-3173] 2019-03-26 17:24:30 +01:00
Alex Kriuchykhin 935e3a65cf
Merge pull request #1586 from okriuchykhin/ok_SCI_3199 
Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][SCI-3225]
 2019-03-26 16:02:44 +01:00
aignatov-bio 54fd3a748b
Adding activity groups [SCI-3203] (#1588) 
* Adding activty groups
 2019-03-26 15:29:21 +01:00
Oleksii Kriuchykhin e3a3ec4491 Fix multiple bugs in global activities [SCI-3197][SCI-3199][SCI-3213][3225] 2019-03-25 17:38:13 +01:00
Miha Mencin 4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01: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
Mojca Lorber 4f9814b884 Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021 2019-03-20 11:03:00 +01:00
Mojca Lorber 42ff1c0a68 fix bug in revert protocol method 2019-03-20 09:43:38 +01:00
Mojca Lorber cd7a87348f Protocol activities refactoring, without tests 2019-03-19 16:12:07 +01:00
Mojca Lorber c476816359 Task activities refactoring, without tests 2019-03-19 15:33:57 +01:00
Urban Rotnik fe35c805b7 Add model breadcrumbs, update activities_helper 2019-03-19 14:01:06 +01:00
aignatov-bio 6eae12efab
Updating permission check for image editing [SCI - 3153, 3159] (#1568) 
*Add permission check for assets editing

* Add check for image format
 2019-03-19 13:52:57 +01:00
Oleksii Kriuchykhin 0c71493fdb Add viewing permissions for global activities [SCI-2997] 2019-03-18 15:38:19 +01:00
Urban Rotnik 2ea2700837 fixup! Fix failing tests 2019-03-15 10:30:51 +01:00
Urban Rotnik 3f18166320 Add Task and TaskTags activities 2019-03-12 09:15:06 +01:00
Urban Rotnik b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +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
Urban Rotnik 117944117b Add service for activity creation 2019-03-11 08:36:15 +01:00
Alex Kriuchykhin ec1aec3bf1
Merge pull request #1556 from okriuchykhin/ok_SCI_3048 
Fix local storage file download links [SCI-3048]
 2019-03-07 16:58:30 +01:00
Oleksii Kriuchykhin 0c99ea9c5c Fix local storage file download links [SCI-3048] 2019-03-07 16:46:05 +01:00
Oleksii Kriuchykhin 8cc95bf491 Embed tables JS files to main HTML of Export All [SCI-3151] 2019-03-07 14:23:10 +01:00
Oleksii Kriuchykhin 2b239e2f35 Fix JS files inclusion in export all report [SCI-3150] 2019-03-07 11:14:38 +01:00
aignatov-bio ec2dbb897f
Adding side pane filter and top pane tags [SCI - 3008, 3009, 3010, 3011, 3012, 3018, 3019, 3020] (#1521) 
* Adding side pane filtering and top pane
 2019-03-06 10:34:04 +01:00
Alex Kriuchykhin 985820a97c
Merge pull request #1527 from okriuchykhin/ok_SCI_3101 
Move templates project creation for new team to delayed job [SCI-3101]
 2019-03-01 13:55:49 +01:00
Miha Mencin 576520659c
Merge pull request #1532 from biosistemika/mm-sci-3031-remove-duplicated-relations 
added uniquness validator and index on user_projects and user_teams r…
 2019-02-27 19:53:25 +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
Anton Ignatov a6666c688c Adding check for user tutorial 2019-02-27 13:55:46 +01:00
Oleksii Kriuchykhin 74a60d443d Merge branch 'features/global-activities' into ok_SCI_3014_v2 2019-02-26 13:46:25 +01:00
Oleksii Kriuchykhin a0d2f7c676 Move templates project creation for new team to delayed job [SCI-3101] 2019-02-26 13:32:00 +01:00
Oleksii Kriuchykhin 61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Urban Rotnik 5a123d26ac Activity model update 2019-02-26 07:15:05 +01:00
Urban Rotnik 3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Urban Rotnik 5b5c6c7122 Changes to Activity model 2019-02-25 16:49:55 +01:00
Jure Grabnar f9cb8c8803 Add utc conversion to due_date 2019-02-22 10:47:39 +01:00
Jure Grabnar 87dcf301fb Change due_date calculation to DateTime#end_of_day 2019-02-22 10:23:12 +01:00
Jure Grabnar 96f2da1e8b Shift due day calculations for 1 day 
Closes SCI-3069.
 2019-02-22 08:01:15 +01:00
Miha Mencin bcd0b433b6
Merge pull request #1514 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-21 16:38:58 +01:00
aignatov-bio 5f78d83f9c
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513) 
* fix dropdown apperance

* Remove search and fix duplicate bug

* Fix specs for new method
 2019-02-21 16:15:13 +01:00
aignatov-bio 5fdba554d2
Merge pull request #1510 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-20 17:22:57 +01:00
Urban Rotnik 82ea31e275 Add validation limits for system notification fields 2019-02-20 16:05:15 +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
Urban Rotnik 29d77ca81d Add system_notification sending email feature 2019-02-19 11:20:25 +01:00
aignatov-bio 8e905b67b2
System notification navbar menu drop down [SCI 2955] (#1498) 
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
 2019-02-19 11:08:59 +01:00
aignatov-bio c598541e09
System notification modal window [SCI-2957 and SCI-2958] (#1484) 
* Added new system notification modal

* Adding loading system notification on sign in
 2019-02-15 13:07:29 +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
Mojca Lorber 343a46584f Rename scope 2019-02-14 14:54:04 +01:00
Mojca Lorber 0e14c126e5 Add scope instead of method for active my_module_group 2019-02-14 10:53:48 +01:00
Urban Rotnik 9f3187abdf Add service for sync system notifications 2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin da30d187a6 Create templates project when syncing templates if team doesn't have it [SCI-3039] 2019-02-13 15:17:33 +01:00
mlorb 71e4cc4dbd
Merge branch 'master' into ml-sci-2940 2019-02-13 14:35:03 +01:00
Mojca Lorber 0adb8b2b61 Fix failing tests 2019-02-13 14:31:26 +01:00
aignatov-bio 5c85595ab4
System Notifications - View All Page [SCI-2956 and SCI-3001] (#1482) 
* System notification view and notification partial (SCI 2956 and SCI 3001)
 2019-02-13 13:06:14 +01:00
Oleksii Kriuchykhin fdff69f22e Add comment for Tika start up code [SCI-2967] 2019-02-07 11:06:25 +01:00
Oleksii Kriuchykhin 13c4bd25af Optionally disable Tika background mode through env variable [SCI-2967] 2019-02-04 16:47:29 +01:00
mz3944 a315808d58
Merge pull request #1473 from mz3944/mz-SCI-2918 
In html project export there is formula instead of result in table [SCI-2918]
 2019-02-01 04:49:14 +01:00
Urban Rotnik 8ebb7561d9 Add last_time_changed_at columnd to SystemNotifications 2019-01-31 16:44:20 +01:00
Matej Zrimšek ac78c7d21b Process Handsontable formulas in project HTML files in team export [SCI-2918] 2019-01-31 07:39:17 +01:00
Urban Rotnik 6f7fcb0831 Refactor method clone_experiment_as_template into service object 
[SCI-2925]
 2019-01-31 07:13:40 +01:00
Oleksii Kriuchykhin cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Urban Rotnik 3e2c9934d0 Add SystemNotification model 
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
 2019-01-29 11:40:26 +01:00
Urban Rotnik 4cf12d12d1 Refactor 'move_experiment' method into service object 
Jira Ticket: SCI-2926
 2019-01-28 11:45:36 +01:00
Oleksii Kriuchykhin 05edfae766 Fix failing tests [SCI-2939] 2019-01-25 14:13:00 +01:00
Urban Rotnik 247bae8a9f Refactor export_all_counter increasing/reseting logic 
- Remove daily task
- Add method to user Model
 2019-01-25 11:16:31 +01:00
Oleksii Kriuchykhin bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +01:00
Mojca Lorber fa1dff6352 refactor Demo project generation 2019-01-24 13:40:53 +01:00
mz3944 f6c8af105d
Merge pull request #1434 from mz3944/mz-SCI-2903 
Fix (unite) Date and Time display formats [SCI-2903]
 2019-01-21 09:50:34 +01:00
Urban Rotnik f1d59e65f3 Add module and rename service object 2019-01-18 16:56:33 +01:00
Urban Rotnik 47cc6a9d10 Refactor workflow_image_generation and move to service class 2019-01-18 16:56:33 +01:00
Urban Rotnik 686f10cbd0 Refactor instance method 'ordered_modules' to scope 2019-01-18 16:56:33 +01:00
Urban Rotnik 1b70f42817 Refactor 'Experiment.modules_without_group' to Module's scope 2019-01-18 16:54:00 +01:00
Oleksii Kriuchykhin e62e1873b0 Fix issue with caching in inventories dropdown [SCI-2776] 2019-01-17 15:04:20 +01:00
Oleksii Kriuchykhin 4f9eb7e165 Fix binary files in Export All archive [SCI2950] 2019-01-16 17:07:05 +01:00
Oleksii Kriuchykhin 534866467b Add counters to task inventories dropdown [SCI-2776] 2019-01-03 14:11:00 +01:00
Matej Zrimšek b74105abc2 Fix Date and Time display formats 2018-12-23 20:30:09 +01:00
Luka Murn 1c8407e4f4
Merge pull request #1433 from okriuchykhin/ok_SCI_2864 
Additional fix for export all S3 path [SCI-2864]
 2018-12-20 13:27:50 +01:00
Oleksii Kriuchykhin 2fa4f42883 Additional fix for export all S3 path [SCI-2864] 2018-12-20 13:22:56 +01:00
Luka Murn faf6601962
Merge pull request #1432 from okriuchykhin/ok_SCI_2864 
Fix S3 zip exports path [SCI-2864]
 2018-12-20 11:08:48 +01:00
Oleksii Kriuchykhin c880f3fd84 Fix S3 zip exports path [SCI-2864] 2018-12-20 11:07:19 +01:00
Luka Murn 8935e4c7c1
Merge pull request #1426 from Ducz0r/lm-add-queue-to-export-all-jobs 
Add team_zip_export job queue to export all delayed jobs
 2018-12-16 22:16:10 +01:00
Alex Kriuchykhin abdf64a8c7
Merge pull request #1420 from okriuchykhin/ok_SCI_2894 
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
 2018-12-16 19:44:50 +01:00
Luka Murn 7ba9628cfb Add team_zip_export job queue to export all delayed jobs 2018-12-13 18:40:56 +01:00
Oleksii Kriuchykhin 311189a2e9 Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894] 2018-12-13 11:18:09 +01:00
Luka Murn 3d7b633c25 Hound is love, Hound is life 2018-12-12 14:03:16 +01:00
Luka Murn 24af108e98 Change PDF in export all to HTML 2018-12-12 11:15:16 +01:00
Alex Kriuchykhin 51ba74cbab
Merge pull request #1403 from okriuchykhin/ok_SCI_2757 
Enable caching for navigation sidebar [SCI-2757]
 2018-12-10 14:11:05 +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
Alex Kriuchykhin 9621f0b372
Merge pull request #1408 from okriuchykhin/ok_SCI_2802 
Search for IDs on inventory table as text [SCI-2802]
 2018-12-03 11:39:57 +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 bf3c7e7840 Fix search across reports, search all readable projects [SCI-2823] 2018-11-30 11:46:13 +01:00
Oleksii Kriuchykhin e43b366cdb Disable fragment caching 2018-11-29 18:07:31 +01:00
Oleksii Kriuchykhin 60a19734b2 Enable caching for navigation sidebar [SCI-2757] 2018-11-29 11:28:36 +01:00
Alex Kriuchykhin c3ef391641
Merge pull request #1380 from okriuchykhin/ok_SCI_2869 
Prevent user being added to project/task multiple times [SCI-2869]
 2018-11-20 22:38:38 +01:00
mz3944 6b996fc000
Merge pull request #1362 from mz3944/mz-SCI-2817 
Export - various small changes/fixes [SCI-2817]
 2018-11-20 21:32:47 +01:00
Oleksii Kriuchykhin 5deaf25fd9 Prevent user being added to project/task multiple times [SCI-2869] 2018-11-20 14:29:33 +01:00
Alex Kriuchykhin a6bc02a2cb
Merge pull request #1369 from okriuchykhin/ok_SCI_2830 
Refactor result and step comments [SCI-2830]
 2018-11-20 00:13:15 +01:00
Alex Kriuchykhin d524a1d508
Merge pull request #1364 from okriuchykhin/ok_SCI_2778 
Add time format selection to settings [SCI-2778]
 2018-11-19 10:17:09 +01:00
Matej Zrimšek dea4ed4e15 Add model name to the archive folders in export-all ZIP structure [SCI-2817] 2018-11-19 04:46:33 +01:00
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
 2018-11-14 16:59:04 +01:00
Oleksii Kriuchykhin 537de596a7 Merge latest master [SCI-2778] 2018-11-14 13:05:57 +01:00
Oleksii Kriuchykhin 380a96dcce Add caching for step and result fragments [SCI-2830] 2018-11-14 11:57:53 +01:00