scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-28 19:06:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
8444 commits 69 branches 179 tags 165 MiB
Commit graph

1747 commits

Author SHA1 Message Date
aignatov-bio 4bae87e3f7
Styling changes in DOCX report [SCI-3633] (#1899) 
* Styling changes in DOCX report

* Update result comments in docx report

* Fix markup
 2019-07-12 13:48:14 +02:00
Anton Ignatov 57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
aignatov-bio 26ef970a1e
Add academy button (#1924) 2019-07-12 11:15:34 +02:00
Mojca Lorber f8afc92606 Fix page redirect and add success flash msg after protocols.io import action 2019-07-11 09:50:39 +02:00
Oleksii Kriuchykhin 64b7a5646a Implement custom document file previewer [SCI-3677] 2019-07-10 14:37:23 +02:00
Miha Mencin f8ea51f7d6 SCI-3672 change the copy of the import button 2019-07-10 14:24:17 +02:00
Urban Rotnik 0ee2afae29
Merge pull request #1913 from urbanrotnik/ur-sci-3657-log-errors 
Log to console when error occur on ProtocolsImport actions [SCI-3657]
 2019-07-10 09:01:01 +02:00
Urban Rotnik cc3cd43270 Log to console when error occur on ProtocolsImport actions 2019-07-09 15:32:43 +02:00
mlorb 23270393b0
Merge branch 'master' into ml-sci-3634 2019-07-09 14:38:00 +02:00
Mojca Lorber 7bb82e2fc2 Fix eternal protocols tab visuals 2019-07-09 14:35:40 +02:00
aignatov-bio 1a75a31647
Remove webinar button [SCI-3664] (#1906) 
* Remove webinar button

* Remove constants and i18n
 2019-07-09 14:01:09 +02:00
Oleksii Kriuchykhin a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Jure Grabnar ae7da78bff
Merge pull request #1897 from jbargu/jg_sci_3646 
[SCI-3646] Add paging functionality to external protocols
 2019-07-08 13:06:19 +02:00
aignatov-bio 0d1ec0d4ed
Fix I18n and constants in DOCX report (#1901) 2019-07-08 12:51:26 +02:00
Oleksii Kriuchykhin 9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Jure Grabnar dc7fee51fa Add Show more protocols functionality to external protocols 
Closes SCI-3646
 2019-07-04 15:35:18 +02:00
Oleksii Kriuchykhin c0c8e0e1a3 Refactor Experiment workflow images [SCI-3539] 2019-07-04 09:33:12 +02:00
Jure Grabnar 20134c9f8a
Features/protocolsio integration (#1893) 
Features/protocolsio integration
 2019-07-03 17:32:20 +02:00
Oleksii Kriuchykhin d2aad22bbb Fix webpacker build for production [SCI-3651] 2019-07-03 14:08:44 +02:00
Oleksii Kriuchykhin 25c58770da Fix Uglifier config [SCI-3651] 2019-07-03 12:49:43 +02:00
Oleksii Kriuchykhin 028e647f4d Upgrade to Rails 5.2.3 [SCI-3651] 2019-07-03 11:15:13 +02:00
Jure Grabnar e5defb95d4 Hound formatting issues 2019-07-02 20:21:05 +02:00
Miha Mencin 4efb0b5a4a SCI-3645 added descending sorting by name 2019-07-02 17:42:55 +02:00
Jure Grabnar 49e940f629 Remove node modules from webpacker 2019-07-02 14:37:05 +02:00
Jure Grabnar 9ace3ce8ed Add config changes to support react.js to webpacker 2019-07-02 14:02:43 +02:00
Jure Grabnar fdc65d92d3 Set extract_css to true in default 2019-07-02 13:56:35 +02:00
Jure Grabnar d46069a61c Update config/webpacker.yml to 4.0.0 version 2019-07-02 13:49:16 +02:00
Oleksii Kriuchykhin 4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +02:00
Anton Ignatov 1f40fa69fc Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-07-01 11:51:27 +02:00
aignatov-bio a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +02:00
Anton Ignatov c9ae9f056e Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration 2019-07-01 10:44:29 +02:00
aignatov-bio 2793777463
Features/docx report (#1873) 
* Initial setup for docx report

* Add render for project, experiment, my_module

* Implement converter for RTE fields

* Add all report elements

* fix markup

* Change headers, remove empty blocks, refactored repository draw

* Add smart annotations support

* Fix justify fields

* Prepare for addons integration

* Fix markup

* Add comments to GemFile

* Fix TinyMCE error

* Change UI for new report download selector

* Fix file error in inventory cell for docx

* Fix i18n object for header
 2019-07-01 10:14:16 +02:00
Anton Ignatov 390002f40f Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539 2019-07-01 10:12:26 +02:00
Anton Ignatov 6be227b2d3 Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-06-28 10:47:38 +02:00
Oleksii Kriuchykhin 5acb16d43e Update Asset helper methods [SCI-3539] 2019-06-28 08:17:09 +02:00
Jure Grabnar 1ccabf62b3 Add preview banner in external protocols 2019-06-28 01:38:33 +02:00
Jure Grabnar d3afcbed50 Style card view on external protocols 
Closes SCI-3535
 2019-06-28 00:43:05 +02:00
Jure Grabnar 0a77cedaf8 Fix sorting of external protocols and start showing results 2019-06-27 22:48:56 +02:00
Urban Rotnik 9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +02:00
Urban Rotnik 2761079479 Add modal for import 2019-06-27 16:46:02 +02:00
Oleksii Kriuchykhin ba2daede0b Add migration scripts [SCI-3539] 2019-06-24 15:17:42 +02:00
aignatov-bio 83bc9eb22f
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation 
Adding new activities for image editing [SCI-3369]
 2019-06-24 10:31:39 +02:00
Anton Ignatov 7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +02:00
Alex Kriuchykhin db7c6435b3
Merge pull request #1851 from okriuchykhin/ok_SCI_3436 
Implement saving of attachments ordering on steps [SCI-3436]
 2019-06-20 11:31:15 +02:00
Jure Grabnar b3c3b68dc2 Add external preview to External Protocols tab 
Closes SCI-3563
 2019-06-19 22:54:20 +02:00
Anton Ignatov a843a016a0 Fix markup and naming 2019-06-19 15:19:47 +02:00
Urban Rotnik bf6041e13d Update sanitization of html descriptions 2019-06-19 11:05:22 +02:00
Urban Rotnik c691ad80b5 Add fields to query params for ApiClient 2019-06-17 12:24:16 +02:00
Urban Rotnik 7fad5fc594 Add search service and normalizer for list 2019-06-17 12:24:15 +02:00
Jure Grabnar c8b8bcffdb Add external_protocols#show action 2019-06-17 12:24:14 +02:00
Jure Grabnar f7c6f78925 Add external_protocols#index action 2019-06-17 12:24:14 +02:00
Jure Grabnar 2a61075156 Add ExternalProtocols#create action and tests 2019-06-17 12:24:14 +02:00
Jure Grabnar 9baa66c998 Refactor OnlineSources -> ExternalProtocols 2019-06-17 12:24:13 +02:00
Jure Grabnar 94e7fe1e6c OnlineSourcesController skeleton and #new action tested 2019-06-17 12:24:13 +02:00
Jure Grabnar d103f8ffec Finish external protocols screen 
Closes SCI-3534
 2019-06-17 12:24:12 +02:00
Jure Grabnar 0b60da9b4c Add ExternalProtocols skeleton tab 2019-06-17 12:24:12 +02:00
Urban Rotnik a15596a126 Add ImportProtocolService 2019-06-17 12:24:10 +02:00
Urban Rotnik 2bb4f558b7 View rendering simplified, small improvements 2019-06-17 12:24:09 +02:00
Urban Rotnik aadf2eecb4 Basic data normalizer for ProtocolIO 2019-06-17 12:24:08 +02:00
Jure Grabnar c1cee07a63 Extract API client constants to constants.rb 2019-06-17 12:24:08 +02:00
Anton Ignatov f480c0eb8d Adding new activtiies for image editing 2019-06-14 16:15:30 +02:00
aignatov-bio 52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] (#1800) 
* Add recent protocols dropdown to task page
 2019-06-13 15:47:29 +02:00
Oleksii Kriuchykhin 109793c7fb Upgrade to Rails 5.2.3 and add ActiveStorage [SCI-3539] 2019-06-13 12:10:44 +02:00
Oleksii Kriuchykhin a855eade4c Merge branch 'master' into ok_SCI_3461 2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin 6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +02:00
Jure Grabnar 27edafaafb Fix unlinked file in processing image quality 2019-06-09 09:20:43 +02:00
Oleksii Kriuchykhin e543a849d4 Add document file preview generation with LibreOffice [SCI-3145] 2019-06-05 14:52:30 +02:00
Oleksii Kriuchykhin 01a5a17bb4 Update Handsontable to 6.2.2 [SCI-3526] 2019-06-04 14:31:37 +02:00
Anton Ignatov c9a29b12ba Merge branch 'master' into features/marvinjs-integration 2019-05-31 10:27:14 +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
Luka Murn 5c88e9ab7e Fix 'if..' logic to work properly when WOPI_ENABLED is undefined 2019-05-22 16:36:23 +02:00
Oleksii Kriuchykhin 84a2ad4487 Refactor the async thumbnail reloading (spinner) [SCI-3461] 2019-05-21 17:29:33 +02:00
aignatov-bio 2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] (#1787) 
* Refactor avatar appearance across Scinote
 2019-05-21 15:19:44 +02:00
Luka Murn 4136aa0575 Add a startup check for WOPI_ENABLED == true variables 2019-05-18 10:22:53 +02:00
Anton Ignatov 259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28: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
Anton Ignatov 8b11cec953 Fix wording in en 2019-05-14 09:52:41 +02:00
aignatov-bio fe2a3c4ee6
Add message when turbolinks change page with dirty tinyMCE [SCI-3452] (#1754) 
* Add message when turbolinks change page with dirty tinuMCE
 2019-05-14 09:49:00 +02:00
Alex Kriuchykhin e544edeaf7
Merge pull request #1758 from okriuchykhin/ok_SCI_3381 
Fix handling of processing step attachments [SCI-3381]
 2019-05-14 09:26:30 +02:00
Oleksii Kriuchykhin 4b1c4bd140 Fix handling of proccessing step attachments [SCI-3381] 2019-05-13 17:12:06 +02:00
Luka Murn bd9ffe4bd2 Refactor WOPI filename length validation onto the model 2019-05-13 15:41:39 +02:00
Miha Mencin 5ff344c208
Merge pull request #1746 from biosistemika/lm-sci-3426 
Changes to create new office file button [SCI-3426]
 2019-05-13 10:55:58 +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 e5b4adcc25 Merge branch 'master-with-note-section' into features/marvinjs-integration 2019-05-11 20:51:01 +02:00
aignatov-bio 634b58bd6a
Various UX improvements for note section [SCI-3444] (#1742) 
* Various UX improvments for note section
 2019-05-11 16:04:28 +02:00
Luka Murn 890df8803e Add file name validation to create new Office file modal window 2019-05-10 18:19:32 +02:00
Anton Ignatov dcf94e78e1 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-08 14:03:41 +02:00
Anton Ignatov d36160386f Merge branch 'master' into master-with-note-section 2019-05-07 13:26:55 +02:00
Alex Kriuchykhin f75c642884
Merge pull request #1721 from okriuchykhin/ok_SCI_3401 
Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401]
 2019-05-06 12:58:23 +02:00
Alex Kriuchykhin 49a790c50a
Merge pull request #1698 from okriuchykhin/ok_SCI_3182 
Switch to memory_store for caching in production [SCI-3182]
 2019-05-06 09:59:25 +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 f73dd38780 Add image editor to tinymce drawings 2019-04-30 18:32:59 +02:00
Anton Ignatov 4d0d5aa014 Adding team sketches selector 2019-04-30 17:32:55 +02:00
Oleksii Kriuchykhin 4522e6bf06 Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401] 2019-04-30 17:04:48 +02:00
aignatov-bio 60296419e8
Update project card due date dropdown (#1716) 2019-04-30 13:30:09 +02:00
Anton Ignatov 7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +02:00
mlorb 9f0983de77
Merge pull request #1706 from mlorb/ml-sci-3350 
Change ownership of inventory items, when a user leaves a team [SCI-3350]
 2019-04-30 10:39:14 +02:00
aignatov-bio 687b53feb1
Add new tag activtiies [SCI-3341] (#1712) 
* Add new tag activtiies
 2019-04-30 10:23:09 +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 cf4ff41ec6 Add delete feature 2019-04-27 13:51:35 +02:00
Anton Ignatov 46f0e0c0c2 Add marvin js assets to assets sort and name field 2019-04-27 12:46:45 +02:00
Anton Ignatov fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +02:00
Anton Ignatov 40c1c9aef7 Add marvin js modal 2019-04-26 18:24:21 +02:00
aignatov-bio dc7fddc60a
Improve task tags (#1708) 2019-04-26 15:38:33 +02:00
Mojca Lorber eac90109f7 Change ownership of inventory items, when a user leaves a team 2019-04-26 10:47:08 +02:00
aignatov-bio 1a860037f7
Update reports for new RTE [SCI-3263] (#1691) 
* Update reports for new RTE
 2019-04-25 16:16:43 +02:00
Urban Rotnik 0cf688be39
Merge pull request #1692 from urbanrotnik/ur-sci-3135-comments-section-changes 
Comments section changes [SCI-3135]
 2019-04-25 14:18:05 +02:00
Oleksii Kriuchykhin 8bec85c7b9 Switch to memory_store for caching in production [SCI-3182] 2019-04-24 19:17:31 +02:00
Anton Ignatov e52b985e7b xMerge branch 'ur-sci-3135-comments-section-changes' of https://github.com/urbanrotnik/scinote-web into urbanrotnik-ur-sci-3135-comments-section-changes 2019-04-24 13:40:41 +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 774521df7a Changes to comments section in Task Steps 2019-04-23 15:02:58 +02:00
Urban Rotnik 11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Urban Rotnik ea0368aa11 Attachments update for edit page 2019-04-23 13:50:47 +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
Mojca Lorber b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +02:00
Anton Ignatov dd8b3caf65 Fix duplicate activtiy issue and fix link to inventory 2019-04-15 11:35:30 +02:00
aignatov-bio f47d0e2932
Merge pull request #1561 from aignatov-bio/ai-sci-3131-improve-image-file-upload 
Improve the image file upload into RTE input fields [SCI-3131]
 2019-04-10 14:04:06 +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 7ef7e2397f
Change activity filter order and reduce custom date label size [SCI-3301] (#1651) 
* Change activity filter order and reduce custom date label size

* Fix hound
 2019-04-09 14:18:22 +02:00
Urban Rotnik ee3dc571e1 Update attachments view, add ordering on FE 2019-04-09 14:17:40 +02:00
Urban Rotnik a3932cc67f New asset box style update 2019-04-09 14:17: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
Mojca Lorber 501c46bc92 Remove activities that belong to addons 2019-04-05 16:25:22 +02:00
Jure Grabnar fddff9c627 Perform styling on the WOPI modal 2019-04-04 17:05:25 +02:00
Jure Grabnar b12916b828 Add main functionality 2019-04-04 17:05:25 +02:00
Jure Grabnar 613843d095 Temp commit 2019-04-04 16:58:55 +02:00
Jure Grabnar 3b8e6fa47c Test office online 2019-04-04 16:57:36 +02:00
aignatov-bio a1047f4597
Fix activities wording [SCI-3287] (#1635) 
* Fix activities wording

* Adding project to export protocol
 2019-04-04 10:45:35 +02:00
Oleksii Kriuchykhin d6bd703ec8 Fix activity genereation with discarded inventories [SCI-3290] 2019-04-03 21:18:48 +02:00
Jure Grabnar 7136294386 Remove archive_task from the list of activity_types 
Closes SCI-3288
 2019-04-03 19:13:00 +02:00
Oleksii Kriuchykhin 9e91e9e59d Improve large image saving after editing [SCI-3289] 2019-04-03 16:31:56 +02:00
Urban Rotnik 1257c8fd80 Fix archive task translation 2019-04-03 11:21:53 +02:00
Jure Grabnar 22d193114e Add asset to activity message item type 
Closes SCI-3283
 2019-04-02 16:10:20 +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
Urban Rotnik 0ed96d68de Add step position for steps in Protocol repository. Add default value for blank names also. 2019-04-01 15:58:17 +02:00
Urban Rotnik b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
mlorb b24a07f1c8
Merge pull request #1616 from mlorb/ml-sci-3237 
Change activities for task protocols [SCI-3237]
 2019-04-01 14:32:16 +02:00
Jure Grabnar 6b5cd34811 Capitalize the C in clear 
Closes SCI-3244
 2019-03-29 16:02:45 +01:00
Mojca Lorber 3c69225d6b Change activities for task protocols 2019-03-29 15:09:20 +01:00
Jure Grabnar 8585be1c90 Remove duplicated Task archived activity 2019-03-29 15:07:41 +01:00
aignatov-bio 5c8f976ad1
Adding missed project comment activities [SCI-3250] (#1612) 
* Adding missed project comment activities

* Fix markup
 2019-03-29 11:45:31 +01:00
aignatov-bio b51dcc9d75
Adding children selector to global activities subjects [SCI-3247] (#1605) 
* Adding children selector to global activities subjects

* Fix naming, add seperate check for project id
 2019-03-29 09:26:27 +01:00
aignatov-bio ce7bbd6b07
Adding deselect button to objects filter and some localizations fix (#1608) 2019-03-29 09:04:58 +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
aignatov-bio 08263ab64e
adding filters for task activities [SCI-3076] (#1553) 
* update task activity screen
 2019-03-28 10:55:48 +01:00
Urban Rotnik 685b7138b7
Merge pull request #1597 from urbanrotnik/ur-SCI-3224-add-message-for-empty-activity-list 
Add message for empty activity list [SCI-3224]
 2019-03-28 09:16:29 +01:00
Urban Rotnik d0a8652969 Add message for empty activity list 2019-03-28 09:14:01 +01:00
aignatov-bio 8416d1ab1c
Merge branch 'master' into ai-sci-3239-add-localization-team-for-objects 2019-03-28 09:13:34 +01:00
Jure Grabnar aa186f675a Fix clear filter not clearing date label 
Closes SCI-3226
 2019-03-27 18:47:34 +01:00
Anton Ignatov 3676aeb83c Adding localization to subjects group name in filters 2019-03-27 15:30:04 +01:00
Anton Ignatov 03123c34f8 adding date placeholder 2019-03-27 14:39:29 +01:00
Mojca Lorber f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Anton Ignatov 1d244508f5 Adding placeholders to filters 2019-03-27 11:19:58 +01:00
aignatov-bio c2e1e85913
Adding localization for activity name and activity group (#1598) 2019-03-27 10:33:33 +01:00
Urban Rotnik 2487089dd3 Rename dropdown labels for Activities, Users and Teams 2019-03-27 05:47:54 +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
Miha Mencin 9a30d7be9d SCI-3232 renaming the attribute name so it doesnt get 'constantized' 2019-03-26 11:39:54 +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
Jure Grabnar 171b2eeedc Remove the title of protocol steps when empty 
Closes SCI-3072
 2019-03-25 09:36:56 +01:00
aignatov-bio 9fff93ab0e
Merge pull request #1576 from biosistemika/image-editor-prototype 
Feature/Image annotation
 2019-03-22 16:31:00 +01:00
Anton Ignatov 4ec0a3c871 Update TinyMCE image loader for new fields 2019-03-22 10:52:26 +01:00
Anton Ignatov bc58f0aecd Merge branch 'features/note-section' into ai-sci-3131-improve-image-file-upload 2019-03-21 11:48:51 +01:00
aignatov-bio e8827b0d74
Update tags in task info [SCI-3093] (#1575) 
* Adding inline tags selection
 2019-03-21 10:13:07 +01:00
Mojca Lorber c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Anton Ignatov 55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Mojca Lorber 8f8f4aa250 Move and update the activities locales 2019-03-20 13:20:35 +01:00
Oleksii Kriuchykhin 0c2b7959b6 Fix smart annotations in RTE [SCI-3111] 2019-03-20 11:41:36 +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 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
Mojca Lorber 7757096693 Results activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber 1418abc8d7 Reports activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber d1e38e5bc9 Project activities refactoring 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 a822227383 Add rich text editor to task and protocol description [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
Oleksii Kriuchykhin 645930b8d7 Merge branch 'master' into features/note-section 2019-03-14 16:25:51 +01:00
Luka Murn fc4b271803 Fix stack trace trimming on WOPI middleware 2019-03-14 08:34:04 +01:00
Urban Rotnik b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +01:00
Urban Rotnik 32422c00eb RepositoryRows actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik 1a3c97b978 Add new enum values for Activity type_of 2019-03-12 09:11:00 +01:00
Oleksii Kriuchykhin af94f79f0d Submit image as FormData [SCI-2879] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin 37dc8298b7 Fix webpack config [SCI-2856] 2019-03-11 15:13:06 +01:00
Oleksii Kriuchykhin 9bbdc8fc89 Include tui image editor with webpack [SCI-2856] 2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin 80e525fd97 Improve image editor behaviour [SCI-2855] 2019-03-11 15:09:49 +01:00
Oleksii Kriuchykhin 89e968c410 Add tui.image-editor [SCI-2815] 2019-03-11 15:08:15 +01:00
Urban Rotnik b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Oleksii Kriuchykhin e3bacd6b9a Fix global activities page after refactoring [SCI-2994][SCI-3024] 2019-03-08 13:09:27 +01:00
Oleksii Kriuchykhin 0b87e8e1e4 Merge branch 'features/global-activities' into ok_SCI_3024_v3 2019-03-08 10:29:51 +01:00
Oleksii Kriuchykhin 0c99ea9c5c Fix local storage file download links [SCI-3048] 2019-03-07 16:46:05 +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
aignatov-bio 125d2a3b9b
New inline tags editing in task [SCI 3093] (#1529) 
* Adding inline tags selection
 2019-03-06 09:18:45 +01:00
Oleksii Kriuchykhin 0930277c4e Add views and helpers for global activities individual cards [SCI-2994][SCI-3024] 2019-02-27 16:02:53 +01:00
Urban Rotnik 3121bf1d39 Update tooltip for system notifications dropdown 2019-02-27 14:49:18 +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 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
Miha Mencin a93402d69f sci-2992 routes 2019-02-25 16:50:38 +01:00
aignatov-bio aa8a2b040a
Merge pull request #1518 from biosistemika/features/system-notifications 
Notification changes on settings page [SCI 3084] (#1517)
 2019-02-22 14:01:38 +01:00
aignatov-bio 606708987f
Notification changes on settings page [SCI 3084] (#1517) 
* Fix css and update text settings
 2019-02-22 13:20:51 +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 8768fcac6c Copy change 2019-02-20 14:19:59 +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 d3d9868ba4 Set version for HTTParty dependency, add opts in mailer 2019-02-19 11:23:01 +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
Urban Rotnik 5b55860dea Add scheduler 2019-02-13 15:48:15 +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
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
mlorb 8bad68c854
Merge pull request #1457 from mlorb/ml-sci-2933 
Change experiment cards look and feel [SCI-2933]
 2019-02-12 11:49:24 +01:00
Oleksii Kriuchykhin cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Urban Rotnik 863e3873c2 Comment for depricated NotificationType 2019-01-29 11:40:26 +01:00
Urban Rotnik 16e9a56874 Add recaptcha to invitation modal 
SCI-2935
 2019-01-25 11:27:01 +01:00
Oleksii Kriuchykhin bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +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 6cf4717ab3 Add envirnoments to run app without docker, reorder Gemfile 
- Reorder Gemfile into alphabet order (rule by Rubocop)
- Add extra ENV variable for custom DB settings locally
- Add extra ENV for disable spoof check on Paperclip
 2019-01-18 16:01:09 +01:00
mlorb 7fdef4d3ec Change experiment cards look and feel 2019-01-18 15:57:44 +01:00
Miha Mencin 0766ee96a7
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2 
Fix task tags update on canvas cards [SCI-2875]
 2019-01-16 12:44:50 +01:00
Oleksii Kriuchykhin 89240659a7 Fix task tags update on canvas cards [SCI-2875] 2019-01-11 17:20:39 +01:00
Alex Kriuchykhin b530cea771
Merge pull request #1438 from okriuchykhin/ok_SCI_2776 
Add counters to task inventories dropdown [SCI-2776]
 2019-01-11 16:27:22 +01:00
Alex Kriuchykhin c2b38af91e
Merge pull request #1439 from okriuchykhin/ok_SCI_2888 
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
 2019-01-10 11:05:07 +01:00
Matej Zrimšek 8070b7f8b5 Fix Date and Time display formats on JS side 2019-01-08 08:07:24 +01:00
Oleksii Kriuchykhin 6a64b23f90 Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888] 2019-01-04 10:44:38 +01:00
Oleksii Kriuchykhin 534866467b Add counters to task inventories dropdown [SCI-2776] 2019-01-03 14:11:00 +01:00
Oleksii Kriuchykhin 2769add4d9 Disable edit button for unsupported WOPI formats [SCI-2904] 2018-12-31 18:10:12 +01:00
Alex Kriuchykhin c536130cef
Merge pull request #1427 from okriuchykhin/ok_SCI_2864 
Fix default value setting for rack attack [SCI-2864]
 2018-12-17 15:30:54 +01:00
Oleksii Kriuchykhin 3277ab1422 Fix default value setting for rack attack [SCI-2864] 2018-12-17 15:15:56 +01:00
Alex Kriuchykhin 4e416fe81b
Merge pull request #1404 from okriuchykhin/ok_SCI_2822 
Return task inputs/outputs as references [SCI-2822]
 2018-12-12 11:36:39 +01:00
Alex Kriuchykhin 37db41e18e
Merge pull request #1405 from okriuchykhin/ok_SCI_2881 
Refresh sidebar when project is archived/restored [SCI-2881]
 2018-12-10 14:11:34 +01:00
Oleksii Kriuchykhin 2c96f08b98 Refresh sidebar when project is archived/restored [SCI-2881] 2018-11-29 14:20:20 +01:00
Alex Kriuchykhin 32e9566915
Merge pull request #1401 from okriuchykhin/ok_SCI_2886 
Improve error messages and fix task users/items endpoints [SCI-2886]
 2018-11-28 18:24:53 +01:00
Alex Kriuchykhin a4b75f00d2
Merge pull request #1400 from okriuchykhin/ok_SCI_2727 
Make AWS access key variables optional [SCI-2727]
 2018-11-28 14:45:45 +01:00
Oleksii Kriuchykhin 5b566b48ae Improve error messages and fix task users/items endpoints [SCI-2886] 2018-11-28 14:14:45 +01:00
Oleksii Kriuchykhin b3a377f949 Return task inputs/outputs as references [SCI-2822] 2018-11-28 11:33:00 +01:00
Oleksii Kriuchykhin 32d00cb2b9 Make AWS access key variables optional [SCI-2727] 2018-11-28 10:41:05 +01:00
Alex Kriuchykhin 5ce6a9babd
Merge pull request #1399 from okriuchykhin/ok_SCI_2727 
Add subfolder option to S3 bucket config [SCI-2727]
 2018-11-27 17:46:36 +01:00
Oleksii Kriuchykhin 32536db171 Add subfolder option to S3 bucket config [SCI-2727] 2018-11-27 14:58:34 +01:00
mlorb 398c2f0576
Merge pull request #1392 from mlorb/ml-sci-2676 
Hide sign-in with third party applications (e.g. LinkedIn) in Oauth… [SCI-2676]
 2018-11-27 11:06:45 +01:00
Jure Grabnar 7812f70c2f
Merge pull request #1393 from jbargu/jg_2790_protocolsio_fix 
Protocols - import from protocols.io doesn't work
 2018-11-26 14:56:25 +01:00
mlorb 18d9ab5888 fixes upon @Ducz0r request 2018-11-26 14:23:26 +01:00
Jure Grabnar 2834edb286 Add command/subprotocol/safety for PIO 2018-11-23 20:13:34 +01:00
Jure Grabnar c00b08b101 Add sw_package and dataset component for PIO 2018-11-23 19:44:10 +01:00
Jure Grabnar 87d5e5029a Fix publish_date in PIO import 2018-11-23 17:37:26 +01:00
Luka Murn 87ff7c71e3 Update the delivery email look & feel 
Closes SCI-2884.
 2018-11-23 17:24:10 +01:00
mlorb 4052fad9e0 fix hound 2018-11-23 15:51:18 +01:00
mlorb f61187dd18 Hide sign-in with third party applications (e.g. LinkedIn) in Oauth flows 2018-11-23 15:44:04 +01:00
Luka Murn af307eae73 Move some text into localization file 2018-11-23 11:12:10 +01:00
Alex Kriuchykhin 95e19e1229
Merge pull request #1381 from okriuchykhin/ok_SCI_2859 
Refactor & restyle the API authorization screen [SCI-2859]
 2018-11-22 13:06:13 +01:00
Oleksii Kriuchykhin d98f11abdc Refactor & restyle the API authorization screen [SCI-2859] 2018-11-20 17:02:45 +01:00
Oleksii Kriuchykhin 5deaf25fd9 Prevent user being added to project/task multiple times [SCI-2869] 2018-11-20 14:29:33 +01:00
mlorb 3b96a60938
Merge pull request #1374 from mlorb/ml-sci-2842 
Update the Export all confirmation modal and export interaction [SCI-2842]
 2018-11-19 11:36:08 +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
mlorb 4b540958bd change close/cancel button and refactor export_project_modal endpoint 2018-11-16 13:37:32 +01:00
mlorb 6453ab6fb1 update the Export all confirmation modal and export interaction 2018-11-15 15:53:58 +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
Luka Murn 84df2c81f9 Merge branch 'features/export-all' 
Conflicts:
	app/controllers/experiments_controller.rb
	app/controllers/my_modules_controller.rb
	db/schema.rb
 2018-11-13 09:14:02 +01:00
Oleksii Kriuchykhin 8d0dbc7076 Add time format selection to settings [SCI-2778] 2018-11-09 16:19:40 +01:00
Oleksii Kriuchykhin 23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin 30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Oleksii Kriuchykhin 60e78fa868 Improve code style for error handling [SCI-2773] 2018-11-07 15:43:44 +01:00
mlorb 0f8c80172e remove show protocol api endpoint 2018-10-29 11:21:48 +01:00
Oleksii Kriuchykhin 6d5af3da8f Remove error message for index page and unauthenticated users [SCI-2775] 2018-10-28 23:19:06 +01:00
Luka Murn 95340bcf36 Update team name placeholder & sublabel on sign up pages 2018-10-24 13:43:56 +02:00
Matej Zrimšek 4bf1d904b7 Add project controller unit tests [SCI-2732] 2018-10-23 19:51:50 +02:00
Oleksii Kriuchykhin b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +02:00
Alex Kriuchykhin e9b64b65a3
Merge pull request #1330 from okriuchykhin/ok_SCI_2770 
Add request rate throttling for API [SCI-2770]
 2018-10-19 09:38:31 +02:00
mlorb e5fca1b1cd change the rich text max limit on frontend to 50000 2018-10-18 14:22:15 +02:00
Alex Kriuchykhin 18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772 
Implement inventory column data type name mappings [SCI-2772]
 2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin 02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +02:00
Jure Grabnar 26df1e5a98 Add export project modal 
Closes [SCI-2645]
 2018-10-16 11:00:38 +02:00
Luka Murn 1093ea11f4 Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes 
Conflicts:
	app/serializers/api/v1/activity_serializer.rb
	app/serializers/api/v1/inventory_column_serializer.rb
	app/serializers/api/v1/project_serializer.rb
 2018-10-15 15:20:26 +02:00
Matej Zrimšek 17380ba0ca Refactoring rebased code [SCI-2641] 2018-10-15 01:12:25 +02:00
Matej Zrimšek aa30cf6130 Refactor StringUtility#to_filesystems_compatible_filename [SCI-2641] 2018-10-12 07:40:22 +02:00
Matej Zrimšek c0dc4f6951 Add hyperlinks to inventories' *.csv files in export all PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek 7152d2f0f1 Fix/update file naming convection for exported files [SCI-2641] 2018-10-12 07:40:21 +02:00
Matej Zrimšek 0ebce8e283 Add relative links (not working) to files and tables into the PDF [SCI-2641] 2018-10-12 07:40:21 +02:00
Oleksii Kriuchykhin 8cf59d8d22 Add request rate throttling for API [SCI-2770] 2018-10-11 09:48:06 +02:00
Luka Murn a217b11bba
Merge pull request #1298 from Zanz2/zz_projects_api_task_2539 
Created read endpoint for projects and related models [SCI-2539]
 2018-10-11 09:03:18 +02:00
Luka Murn dd4f7b5d02 Fix project users, activities, comments, reports endpoints 2018-10-10 17:35:09 +02:00
Oleksii Kriuchykhin af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Alex Kriuchykhin 16b29b50a5
Merge pull request #1321 from okriuchykhin/ok_SCI_2731 
Add Projects view - list/table view [SCI-2731]
 2018-10-08 17:53:35 +02:00
Luka Murn dc2ab5fdc0 Fix the Doorkeeper config/access for all users (due to update of Gem) 2018-10-07 13:11:56 +02:00
Luka Murn 0bd3c81e39 Fix /users, /users/:id/identities endpoints 2018-10-07 13:07:27 +02:00
Luka Murn 7527dc7352 Fix READ index, READ show, POST create /tasks/:id/results endpoints 2018-10-07 12:58:17 +02:00
Luka Murn fc5cf33614 Fix GET /tasks/:id/activities endpoint 2018-10-07 11:54:11 +02:00
Luka Murn fca580face Fix GET /tasks/:id/inputs, GET /tasks/:id/outputs endpoints 2018-10-07 11:35:12 +02:00
Luka Murn 239b974fa0 Fix GET /tasks/:tid/protocols, GET /tasks/:tid/protocols/:id endpts 2018-10-07 11:29:56 +02:00
Luka Murn 24299ef4c0 Fix GET /tasks/:task_id/tags, GET /tasks/:task_id/tags/:id endpts 2018-10-07 11:10:41 +02:00
Luka Murn 98544f00e8 Fix GET /tasks/:task_id/users, GET /tasks/:task_id/users/1 endpts 2018-10-07 10:20:01 +02:00
Luka Murn f56e5b1e5a Update GET /task/:task_id/items, GET /task/:task_id/items/:id endpts 2018-10-07 10:07:37 +02:00
Luka Murn 0de3c7eb4e Update GET /tasks, GET /tasks/:id endpoints, refactor routes.rb 2018-10-07 09:45:24 +02:00
Luka Murn 9e78de6ef2 Update CREATE, PATCH, DELETE inventory_column endpoints 2018-10-06 17:11:59 +02:00
Luka Murn 7b5a65416a Update status endpoint 2018-10-06 11:47:23 +02:00
Jure Grabnar d7c875135e
Merge pull request #1304 from jbargu/jg_zipfile_structure 
Create zipfile structure for export all, implement inventory CSV for export [SCI-2640] [SCI-2642] [SCI-2643] [SCI-2644]
 2018-10-05 15:36:56 +02:00
Oleksii Kriuchykhin 0c452f519d Add CRUD endpoints for inventory cells [SCI-2765] 2018-10-05 00:18:42 +02:00
Oleksii Kriuchykhin 363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +02:00
Luka Murn d71be76657 Fix minor styling & text on settings - preferences page 2018-10-02 13:59:19 +02:00
Luka Murn a2c2bca200 Update localized text in report elements modal 2018-10-02 13:51:59 +02:00
Oleksii Kriuchykhin 492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Oleksii Kriuchykhin 2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +02:00
Zanz2 c8ed808920 merged with core-api 2018-09-26 12:17:49 +02:00
Oleksii Kriuchykhin f8388d4bcd Merge branch 'ok_SCI_2729' into ok_SCI_2730 2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin ab3aeac26b Merge latest core-api branch [SCI-2718] 2018-09-24 16:49:27 +02:00
Oleksii Kriuchykhin 80e73bfb97 Implement Projects view - navigation bar (tabs) [SCI-2729] 2018-09-24 16:25:04 +02:00
Luka Murn 63b4f7d909
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
 2018-09-24 16:23:53 +02:00
Zanz2 8699761389
Merge pull request #1297 from Zanz2/zz_tasks_api_task_2667 
Created read endpoint for tasks, results and related data [SCI-2667] [SCI-2669]
 2018-09-24 15:31:47 +02:00
Jure Grabnar 7877d559a3 Update email/notification, type: deliver 
Closes [SCI-2643], [SCI-2644].
 2018-09-23 18:45:13 +02:00
Oleksii Kriuchykhin 84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
Jure Grabnar 449aa12070 Refactor TeamZipExport code (move it into special file) 2018-09-16 20:28:26 +02:00
Zanz2 22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Oleksii Kriuchykhin 49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Oleksii Kriuchykhin acc00ff3b9 Add CREATE Result endpoint: Create Text result [SCI-2718] 2018-09-13 13:38:11 +02:00
Zanz2 e47acfb4a1 Fixed attribute names 2018-09-13 11:57:31 +02:00
Zanz2 7f704c07e3 Created base endpoints for projects and related models 2018-09-13 11:37:07 +02:00
Zanz2 dace81f724 created base projects endpoint 2018-09-13 11:37:07 +02:00
Zanz2 5f39404e83 minor indendation fix 2018-09-13 11:25:25 +02:00
Zanz2 8a925008f9 fixed hound 2018-09-13 11:18:49 +02:00
Zanz2 bd49ea56c5 Added results endpoint 2018-09-13 11:16:34 +02:00
Zanz2 426bd129cc Added task inputs and outputs functionality 2018-09-13 11:14:22 +02:00
Zanz2 8d70764fe8 new routes for endpoints 2018-09-13 11:04:52 +02:00
Zanz2 c2d62667e4 fixed hound 2018-09-10 15:42:21 +02:00
Zanz2 4acc8f5719 fixes travis ci mistake 2018-09-07 12:54:09 +02:00
Zanz2 e64aee5db0 Completed the functionality for experiments and related endpoints 2018-09-07 11:58:02 +02:00
Zanz2 1589cfb1b2 saving work 2018-09-06 15:38:48 +02:00
Luka Murn 586a442abc Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
Zanz2 5ada21725f inital experiments api functionality 2018-09-05 09:55:04 +02:00
Zanz2 e9e7fa08b0 new tooltip texts, provided by Tea 2018-09-05 08:42:00 +02:00
Zanz2 1bed2c2a3c Partially fixed according to pull request review, added comments to code review 2018-08-31 12:11:51 +02:00
Zanz2 d4aa5e60a2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663 
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
 2018-08-31 11:42:26 +02:00
Alex Kriuchykhin 18dfeb537b
Merge pull request #1269 from okriuchykhin/ok_SCI_2604 
Improve health check endpoint [SCI-2604]
 2018-08-24 16:55:47 +02:00
Oleksii Kriuchykhin 4d49671ae8 Add CRUD for inventories and columns [SCI-2690][SCI-2691][SCI-2692][SCI-2693][SCI-2694][SCI-2695] 2018-08-24 16:41:26 +02:00
Oleksii Kriuchykhin c8efa4bffc Add SHOW, UPDATE and DELETE inventory item endpoints [SCI-2688][SCI-2689] 2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin 5c2f268471 Refactor JSON API mime type registration [SCI-2687] 2018-08-24 15:48:10 +02:00
Oleksii Kriuchykhin 730ce96a43 Add inventory item CREATE endpoint [SCI-2687] 2018-08-24 15:46:00 +02:00
Oleksii Kriuchykhin 5488fc66fc Refactor JSON API mime type registration [SCI-2687] 2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin 490376513b Add inventory item CREATE endpoint [SCI-2687] 2018-08-24 15:36:19 +02:00
Oleksii Kriuchykhin c8abb3d9b8 Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686] 2018-08-24 15:27:59 +02:00
Alex Kriuchykhin eb2d3e7951
Merge pull request #1276 from okriuchykhin/ok_SCI_2613 
Add READ user endpoint [SCI-2613]
 2018-08-24 15:23:05 +02:00
Alex Kriuchykhin 427ab5fb41
Merge pull request #1264 from okriuchykhin/ok_SCI_2615 
Add GET inventory columns API endpoint [SCI-2615]
 2018-08-24 15:22:35 +02:00
Alex Kriuchykhin 1832c0e806
Merge pull request #1262 from okriuchykhin/ok_SCI_2614 
Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617]
 2018-08-24 15:22:13 +02:00
Oleksii Kriuchykhin 0322316d74 Make API V1 togglable [SCI-2686] 2018-08-24 12:11:28 +02:00
Oleksii Kriuchykhin a8013118d4 Add READ user endpoint [SCI-2613] 2018-08-21 13:56:14 +02:00
Zanz2 2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2 beb1d02914 Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always 2018-08-20 15:57:09 +02:00
Oleksii Kriuchykhin 6795b08a91 Refactor invite users modal initialization [SCI-2651] 2018-08-20 13:13:34 +02:00
Oleksii Kriuchykhin 1a57289009 Improve health check endpoint [SCI-2604] 2018-08-17 16:13:21 +02:00
Zanz2 8c492e1491 started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute 2018-08-17 16:03:49 +02:00
Oleksii Kriuchykhin ecde634a2c Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
Zanz2 637c7dfb19 modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic 2018-08-17 11:33:44 +02:00
Zanz2 d2373980d4 Testing out new popover 2018-08-16 15:07:59 +02:00
Oleksii Kriuchykhin 3f7590bb57 Rename type for inventories and add mimetype for JSON API [SCI-2614][SCI-2616][SCI-2617] 2018-08-10 17:01:14 +02:00
Oleksii Kriuchykhin ef7e0ac489 Add GET inventory columns API endpoint [SCI-2615] 2018-08-08 17:31:37 +02:00
Oleksii Kriuchykhin 4df9a4c9ca Fix code style warnings [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin 8d11e03d47 Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin 298b866df4 Fix failing tests [SCI-2611][SCI-2612] 2018-08-07 14:58:02 +02:00
Oleksii Kriuchykhin 22e12d8fc3 Add GET teams and team API endpoints [SCI-2611][SCI-2612] 2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin 26b0bd9e11 Refactor tasks tree API endpoint [SCI-2609] 2018-07-30 14:48:11 +02:00
Oleksii Kriuchykhin 0e372af729 Adds API authentication with Azure AD [SCI-2608] 2018-07-24 14:21:33 +02:00
zmagod 5b9b86a2d4 fixes per @Ducz0r 's request 2018-07-04 15:23:41 +02:00
zmagod c9dd8b356a fixes locale, fixes custom file upload style 2018-07-04 13:43:45 +02:00
zmagod 43903080ce code style fixes 2018-07-04 12:42:28 +02:00
nbernot 7aacc2b4a2 extract repository_item html form creation in to a separate 'class' 2018-06-29 14:28:06 +02:00
Zmago Devetak 7fd3eec195
Merge pull request #1219 from ZmagoD/zd_SCI_2415 
move maximum file size limit to an ENV variable [fixes SCI-2415]
 2018-06-26 18:43:16 +02:00
Oleksii Kriuchykhin c0232d9eb2 Add extend for task child elements in reports [SCI-2377] 2018-06-19 14:34:36 +02:00
zmagod db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
zmagod 6a6ff534c0 fixes import flash message [fixes SCI-2398] 2018-06-15 11:12:11 +02:00
Zmago Devetak 29fe58de80
Merge pull request #1208 from ZmagoD/zd_SCI_2408 
adds an additional check if some other user has added/removed reposit…
 2018-06-13 11:30:43 +02:00
Luka Murn 9a4fdd166e Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix 
Conflicts:
	app/views/projects/index.html.erb
 2018-06-12 17:44:42 +02:00
zmagod f8ac083d39 adds an additional check if some other user has added/removed repository columns [fixes SCI-2408] 2018-06-12 15:28:03 +02:00
Zmago Devetak 6ba5c587f7
Merge pull request #1189 from ZmagoD/zd_SCI_2211 
add data-hook, refactor add user to project modal to support addons
 2018-06-08 15:23:26 +02:00
Zmago Devetak 2d3738fc70
Merge pull request #1198 from ZmagoD/zd_SCI_2456 
fixes label in save report to inventory item modal [fixes SCI-2456]
 2018-06-08 15:08:53 +02:00
Zmago Devetak eff68aead8
Merge pull request #1193 from ZmagoD/zd_SCI_2481_ 
fixes project validation message [fixes SCI-2481]
 2018-06-08 14:40:27 +02:00
Zmago Devetak 74ccaf06b9
Merge pull request #1184 from ZmagoD/zd_SCI_2417 
adds asset_text_data to global search options
 2018-06-08 14:30:52 +02:00
zmagod d78c130a47 fixes label in save report to inventory item modal [fixes SCI-2456] 2018-06-08 11:26:33 +02:00
zmagod 11ebea573a fixes project validation message [fixes SCI-2481] 2018-06-07 16:42:11 +02:00
Luka Murn b324a2dab3 Restyle activities page 2018-06-07 09:29:47 +02:00
Luka Murn c07fa5adc2 Update blank page for projects 2018-06-06 17:23:22 +02:00
Luka Murn ff485cb75d Update wording on 'save protocol to protocol repository' modal 2018-06-06 16:38:04 +02:00
Luka Murn e0a3b5a941 Fix Save PDF to repository modal window 2018-06-06 16:29:07 +02:00
Luka Murn b6c4f724db Update text when no experiments are found for moving tasks 2018-06-06 16:10:55 +02:00
Zmago Devetak fad67d7730
Merge pull request #1185 from ZmagoD/zd_SCI_2468 
Limits the max. amount of rows when importing into inventories [fixes…
 2018-06-04 16:29:33 +02:00
zmagod 84170f6de0 add data-hook, refactor add user to project modal to support addons 2018-06-01 16:13:22 +02:00
Oleksii Kriuchykhin 2ddc0fb561 Improve sidebar rendering performance [SCI-2478] 2018-06-01 13:49:02 +02:00
zmagod 9abf50e7c5 Limits the max. amount of rows when importing into inventories [fixes SCI-2468] 2018-05-31 10:45:31 +02:00
zmagod 3da098cb60 fixes the issue with extraction of text from file [fixes SCI-2417] 2018-05-31 09:42:57 +02:00
zmagod e0908fb85f adds asset_text_data to global search options 2018-05-30 18:18:09 +02:00
zmagod 89046e9787 fixes items assign flash message [fixes SCI-2395] 2018-05-29 12:54:41 +02:00
Luka Murn 80323eaf67 Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle 
Conflicts:
	app/assets/javascripts/sidebar_toggle.js.erb
 2018-05-28 12:39:24 +02:00
mlorb 2bce62cab8
Merge branch 'ux-release-1' into ml-sci-2405 2018-05-28 11:43:14 +02:00
mlorb 58ba596a24
update locales 2018-05-28 09:38:24 +02:00
zmagod bcebc03416 adds missing locales 2018-05-28 09:17:29 +02:00
Luka Murn f8c8887d72 Forgot to remove the constant 2018-05-27 17:23:50 +02:00
Luka Murn b86edf20a5 Remove auto-toggling of navigation sidebar depending on width 2018-05-27 15:44:15 +02:00
mlorb f02363dfce fix error if user is not assigned to any teams 2018-05-25 17:14:22 +02:00
mlorb f972676f8d
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix 
Update software with new logo & new brand [SCI-2416]
 2018-05-23 15:47:17 +02:00
mlorb c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
Luka Murn dac44acf2a Rename sciNote -> SciNote (config/ folder) 2018-05-21 15:11:12 +02:00
mlorb 0fccc71fc3 fix load protocol wording and UI-style 2018-05-18 16:57:18 +02:00
mlorb 64cbddb9a0 UI/UX restyle - update colours for navigation 2018-05-18 10:41:32 +02:00
zmagod cf4c33bf92 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 15:22:43 +02:00
zmagod e019767e90 refactor save_pdf_to_inventory_item service 2018-05-17 13:17:19 +02:00
zmagod b125863baf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371 2018-05-17 11:25:33 +02:00
zmagod ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
mlorb 06ce285ae2 add locales 2018-05-16 14:32:15 +02:00
Zmago Devetak 9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321 
fixes images preview in repository/library [fixes SCI-2321]
 2018-05-16 12:05:33 +02:00
mlorb f59ea8c7a6
Merge pull request #1137 from mlorb/ml-sci-2336-v2 
UI/UX restyle - fixes throughout application - part 2 [SCI-2336]
 2018-05-16 11:30:54 +02:00
zmagod 712a3c7ff6 fixes css, changes spinner in preview modal 2018-05-16 10:40:49 +02:00
okriuchykhin ac6c5de83c
Merge pull request #1134 from okriuchykhin/ok_SCI_2301 
Fix initialization of default value for repositories limit [SCI-2301]
 2018-05-16 10:24:56 +02:00
Oleksii Kriuchykhin beacdb934f Change default inventory limit to 6 [SCI-2301] 2018-05-16 10:23:36 +02:00
zmagod 4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +02:00
mlorb cea7f5a3f7 some extra style unification 2018-05-15 17:10:31 +02:00
Luka Murn 10cd494936
Update WEBINARS_URL 2018-05-15 15:58:35 +02:00
mlorb dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +02:00
Oleksii Kriuchykhin 1e5f9519ca Fix initialization of default value for repositories limit [SCI-2301] 2018-05-11 10:34:32 +02:00
mlorb b5649f0574
Merge branch 'ux-release-1' into ml-sci-2336-v1 2018-05-10 13:59:57 +02:00
okriuchykhin 3b4d9fe744
Merge pull request #1132 from okriuchykhin/ok_SCI_2301 
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
 2018-05-10 10:46:25 +02:00
Zmago Devetak 0a4deeaa35
Merge pull request #1112 from ZmagoD/zd_SCI_2261 
propagate assigned repository items in workflow [fixes SCI-2261]
 2018-05-10 09:57:49 +02:00
Oleksii Kriuchykhin 8ec643c54b Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301] 2018-05-09 18:03:16 +02:00
mlorb 7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
Zmago Devetak a6275062b7
Merge pull request #1126 from ZmagoD/zd_SCI_2344 
adds new string truncation method [fixes SCI-2344]
 2018-05-07 16:30:12 +02:00
Zmago Devetak d744f24b85
Merge pull request #1118 from ZmagoD/zd_SCI_2323 
sign_out user after 7 days [fixes SCI-2323]
 2018-05-03 14:36:44 +02:00
zmagod 0b721d86b1 adds new string truncation method [fixes SCI-2344] 2018-05-03 14:24:23 +02:00
mlorb d2c0ae241e
Merge pull request #1121 from mlorb/ml-sci-2244 
Update buttons positions and wording throughout app [SCI-2244]
 2018-05-03 11:05:15 +02:00
mlorb ca022fead7 rename inventories buttons 2018-05-03 10:39:50 +02:00
zmagod 0584453575 fixes per @okriuchykhin 's request 2018-04-26 17:18:03 +02:00
mlorb f97477f3f0 some extra button styling 2018-04-26 15:19:05 +02:00
mlorb 763d934aa7 fix buttons again 2018-04-26 15:02:24 +02:00
zmagod e9642cadad Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304 2018-04-26 14:26:30 +02:00
zmagod 8dac887f10 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261 2018-04-26 14:18:41 +02:00
mlorb 88d5ba369d
Merge branch 'ux-release-1' into ml-sci-2244 2018-04-26 14:07:03 +02:00
Luka Murn cb6fe50832 Merge branch 'master' into ux-release-1 
Conflicts:
	app/assets/javascripts/repositories/index.js
 2018-04-26 11:38:54 +02:00
mlorb 9e11f3b220 update buttons positions and wording throughout app 2018-04-25 13:57:12 +02:00
Luka Murn cd04596c62
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix 
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
 2018-04-25 12:37:27 +02:00
Luka Murn bd6f97fabc Add initializer to include helpers in all assets (including .js) 2018-04-25 10:51:19 +02:00
zmagod 503ad1ba20 removes samples from views [fixes SCI-2304] 2018-04-24 08:26:55 +02:00
zmagod 824962c084 propagate assigned repository items in workflow [fixes SCI-2261] 2018-04-23 11:33:16 +02:00
Luka Murn 68caf56ec2 Add comment to constants 2018-04-20 12:31:22 +02:00
Luka Murn 21e7e7057e Refactor all the methods into two new services 2018-04-20 12:31:22 +02:00
Luka Murn 5e2622ecfc Change default repository state to Ruby representation 
Also remove some dead code from repositories datatables
 2018-04-20 12:31:22 +02:00
zmagod e96b690a5b removes reports link from secondary navigation, fix bug with turbolinks 2018-04-20 11:57:52 +02:00
zmagod dafa29d4bf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124 2018-04-20 10:33:15 +02:00
mlorb 3249d5db0d
Merge pull request #1100 from mlorb/ml-sci-2303 
Update reports show page to work with new navigation [SCI-2303]
 2018-04-20 09:50:35 +02:00
Zmago Devetak 93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259 
set limit on maximum number of dropdown list items [fixes SCI-2259]
 2018-04-19 17:17:54 +02:00
Zmago Devetak 1290435372
Merge pull request #1086 from ZmagoD/zd_SCI_2207 
enables copying of repository items [fixes SCI-2207]
 2018-04-19 17:13:43 +02:00
mlorb d7eccac289
Merge pull request #1099 from mlorb/ml-sci-2167 
Remove breadcrumbs throughout application [SCI-2167]
 2018-04-19 16:11:37 +02:00
Zmago Devetak 540dff25e7
Merge pull request #1091 from ZmagoD/zd_SCI_2254 
adds correct preview images to files [fixes SCI-2254]
 2018-04-19 14:04:24 +02:00
zmagod ce52eb851b add validation to dropdown items 2018-04-19 14:02:42 +02:00
zmagod 66cc76f640 add view label in locales 2018-04-19 12:49:32 +02:00
zmagod 9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
mlorb cc34376253 update reports show page to work with new navigation 2018-04-18 14:40:53 +02:00
Luka Murn 2290b75f8a
Merge pull request #1097 from biosistemika/lm-fix-production-compiling 
Change JS compressor from :uglifier to Uglifier.new(harmony: true)
 2018-04-17 17:46:01 +02:00
mlorb c08d72be36 remove breadcrumbs throughout application 2018-04-17 17:00:04 +02:00
Luka Murn a633861e1f Change JS compressor from :uglifier to Uglifier.new(harmony: true) 
This should fix the command rails assets:precompile for production
environment.
 2018-04-17 09:05:19 +02:00
mlorb 04a20ab7ec change links 2018-04-16 17:05:22 +02:00
zmagod bef166ff30 hides the create new inventory button for non admin users [fixes SCI-2296] 2018-04-13 13:39:58 +02:00
Zmago Devetak d466fdf8e8
Merge pull request #1089 from ZmagoD/zd_SCI_2292 
remove unneeded label in destroy repository record modal [fixes SCI-2…
 2018-04-12 16:58:28 +02:00
Zmago Devetak 09e5579f0f
Merge pull request #1087 from ZmagoD/zd_SCI_2240 
rename Repository/Library => Inventory [fixes SCI-2240]
 2018-04-12 16:58:08 +02:00
Zmago Devetak 9d58292dcf
fix 2018-04-12 16:44:38 +02:00
Zmago Devetak f83390e5ad
fix 2018-04-12 16:20:05 +02:00
zmagod d084998906 remove unneeded label in destroy repository record modal [fixes SCI-2292] 2018-04-12 15:00:41 +02:00
Luka Murn 09c60d2468 Fixes per @Ducz0r's request 2018-04-12 14:38:22 +02:00
zmagod 309bd04e61 rename Repository/Library => Inventory [fixes SCI-2240] 2018-04-12 14:11:26 +02:00
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860 
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
 2018-04-12 13:16:46 +02:00
zmagod 6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod ea4bd8831f fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284] 2018-04-10 13:19:53 +02:00
mlorb a10f671184
Merge pull request #1081 from mlorb/ml-sci-2123 
Refactor settings into the new navigation bar [SCI-2123]
 2018-04-09 13:21:16 +02:00
zmagod b12f6f1b92 set limit on maximum number of dropdown list items [fixes SCI-2259] 2018-04-09 12:50:25 +02:00
mlorb 8a35ce5c58 add locales 2018-04-09 10:53:03 +02:00
Zmago Devetak bdb6554870
Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219 
adds manage columns page
 2018-04-06 17:06:28 +02:00
mlorb 0c851f227c remove unused locals 2018-04-06 15:00:19 +02:00
mlorb 70dfe66b2d refactoring 2018-04-06 14:20:40 +02:00
zmagod cf7761daaa Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223 2018-04-06 12:56:39 +02:00
mlorb b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
Luka Murn 386ede0400 Add special middleware for handling of Rails 5.1 WOPI errors 
Closes SCI-2266.
 2018-04-05 13:26:08 +02:00
zmagod a8a19df06d Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-04-05 08:51:58 +02:00
okriuchykhin e608d629c7
Merge pull request #1068 from okriuchykhin/ok_SCI_2217 
Refactor file preview modal [SCI-2217]
 2018-04-05 00:18:43 +02:00
Oleksii Kriuchykhin 9720063fb3 Fix tests [SCI-2217] 2018-04-05 00:06:11 +02:00
zmagod 0c05c60ebf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-04-04 16:06:38 +02:00
Zmago Devetak ab48e4f527
Merge pull request #1072 from ZmagoD/zd_SCI_2239 
change export model wording [fixes SCI-2239]
 2018-04-04 15:40:18 +02:00
Zmago Devetak d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206 
add ID column to repository [fixes SCI-2206]
 2018-04-04 15:39:59 +02:00
zmagod 77f80271dd fixes per @mojca 's request 2018-04-04 14:52:59 +02:00
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00