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

1788 commits

Author SHA1 Message Date
aignatov-bio eaf751bad6 Improve search input field in the flyouts 2020-02-11 15:01:52 +01:00
Oleksii Kriuchykhin 0fec8f4d95 Improve speed of inventory import [SCI-4336] 2020-02-11 13:51:34 +01:00
Alex Kriuchykhin 9c763f2111 Merge pull request #2383 from okriuchykhin/ok_SCI_4220 
Extend inventory import to support new data types [SCI-4220]
 2020-02-10 11:04:34 +01:00
Alex Kriuchykhin 446280a2e4 Merge pull request #2391 from okriuchykhin/ok_SCI_4330 
Improve speed of global activities fetching query [SCI-4330]
 2020-02-10 10:44:52 +01:00
Alex Kriuchykhin 913f599b9f
Merge pull request #2389 from okriuchykhin/ok_SCI_4301 
Add unsaved data notification when navigating away from the inventory [SCI-4301]
 2020-02-07 13:58:20 +01:00
Oleksii Kriuchykhin 6f8f89fbf0 Improve speed of global activities fetching query [SCI-4330] 2020-02-07 13:53:25 +01:00
Oleksii Kriuchykhin 21bf59b943 Add unsaved data notification when navigating away from the inventory [SCI-4301] 2020-02-06 16:46:16 +01:00
Mojca Lorber 2727614603 Clean up controllers for manage repository columns 2020-02-04 16:05:16 +01:00
Alex Kriuchykhin 637156e417
Merge pull request #2355 from biosistemika/SCI-3403-configurable-openssl-verify-mode 
SCI-3403 read openssl-verify-mode from env variable
 2020-02-04 09:47:08 +01:00
Oleksii Kriuchykhin 632b54cb98 Merge branch 'develop' into ok_SCI_4220 2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
aignatov-bio 44eccaaa12
Merge pull request #2353 from aignatov-bio/ai-sci-4254-inventories-small-visual-fixes-part-1 
Fix small visual bugs [SCI-4254]
 2020-01-30 13:42:07 +01:00
Urban Rotnik 0effb3ee69 Add translation for read-only items 2020-01-25 08:52:33 +01:00
Urban Rotnik ec8af5f943 Add readonly repository rows records 2020-01-24 16:33:44 +01:00
Miha Mencin f5aee0319e
Set default to 'peer' 2020-01-24 13:33:08 +01:00
Miha Mencin baac15c0ff
fix codestyle 2020-01-23 22:06:14 +01:00
Miha Mencin 20c5d7b5f7 SCI-3403 read openssl-verify-mode from env variable 2020-01-23 21:51:38 +01:00
aignatov-bio 4395a7cc6b Fix small visual bugs 2020-01-23 13:12:58 +01:00
Mojca Lorber 404805bef5 Fix constants for email redesign 2020-01-21 09:38:08 +01:00
aignatov-bio 01cce84314
Merge pull request #2339 from aignatov-bio/ai-sci-4195-update-delimiter-dropdown 
Update delimiter dropdown for manage column modal [SCI-4195]
 2020-01-20 15:22:40 +01:00
aignatov-bio cd471bfb25 Update delimiter dropdown for manage column modal 2020-01-20 14:26:17 +01:00
Urban Rotnik 2ecbd8f8c4 Update tooltip 2020-01-17 17:50:53 +01:00
Urban Rotnik 2e8db12ca5 Add error message for status item 2020-01-17 11:25:01 +01:00
Mojca Lorber a342e3d31f Add emojionearea for status column type 2020-01-16 14:58:59 +01:00
Urban Rotnik 218316bea2 Update error handling for name and text 2020-01-16 13:30:05 +01:00
Urban Rotnik 0522b9b0a3 Update too many items error showing 
Update too many items error showing
 2020-01-16 11:40:59 +01:00
aignatov-bio 1ff0351a74 Merge branch 'develop' into ai-sci-4328-fix-general-css-issues-for-repositories 2020-01-16 11:36:00 +01:00
aignatov-bio b116c3720c Fix general css issue for repositories 2020-01-15 16:46:01 +01:00
Miha Mencin b23c874f9e
Merge pull request #2310 from biosistemika/SCI-4199-selected-checklist-is-lost 
Sci 4199 selected checklist is lost
 2020-01-15 15:28:34 +01:00
mlorb e44903bae5
Merge branch 'develop' into ml-sci-4150-v2 2020-01-15 14:47:25 +01:00
Mojca Lorber c234b014cb fix locales 2020-01-15 14:18:08 +01:00
Miha Mencin 5bfa5c7939 SCI-4199 disabling delimiter, adding warning 2020-01-15 13:59:28 +01:00
Oleksii Kriuchykhin eed68a2590 Refactor repository cell clonning to support all data types [SCI-4204] 2020-01-14 16:55:10 +01:00
Mojca Lorber 9176301b7b Refactor manage repository columns, move it from page into modal 2020-01-14 11:13:19 +01:00
Oleksii Kriuchykhin 7b82e33eb6 Fix repository filtering and improve speed [SCI-4224] 2020-01-13 16:09:07 +01:00
Alex Kriuchykhin 007cae39e8
Merge pull request #2291 from okriuchykhin/ok_SCI_4197 
Fix sorting for date time columns [SCI-4197]
 2020-01-10 15:25:53 +01:00
aignatov-bio 751d34a078
Merge pull request #2288 from aignatov-bio/ai-sci-4192-empty-item-field-placeholders 
Update placeholders for cells [SCI-4192]
 2020-01-10 10:50:00 +01:00
Alex Kriuchykhin d2e12e0683
Merge pull request #2265 from okriuchykhin/ok_SCI_4146 
Restrict files to only images in RTE fields [SCI-4146]
 2020-01-10 10:34:00 +01:00
Oleksii Kriuchykhin ad5a5f3ebf Fix sorting for date time columns [SCI-4197] 2020-01-09 16:18:28 +01:00
aignatov-bio 13675dd2e7 Update placeholders for cells 2020-01-09 14:57:37 +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
Urban Rotnik 87288d0771 Add search for statuses 2020-01-06 10:12:08 +01:00
aignatov-bio 3bd44dc5ab
Merge pull request #2271 from aignatov-bio/ai-sci-4168-refactor-checklist-model 
Refactor checklist column data structure [SCI-4168]
 2019-12-24 11:12:36 +01:00
Urban Rotnik 400c109592 Refactor StatusesJS for new dropdown 2019-12-23 14:34:11 +01:00
aignatov-bio 54800cb69b Merge branch 'features/new-column-types' into ai-sci-4168-refactor-checklist-model 2019-12-20 15:46:39 +01:00
Urban Rotnik 181d637ff3 Update/refactor JS for handling Dates and Times 2019-12-20 14:59:27 +01:00
aignatov-bio dc91893d7e Refactor checklist column data structure 2019-12-18 14:10:41 +01:00
Oleksii Kriuchykhin e24bc2775a Add view/edit renderers for numeric data type [SCI-4166] 2019-12-18 11:55:12 +01:00
Oleksii Kriuchykhin 403a3e0140 Restrict files to only images in RTE fields [SCI-4146] 2019-12-16 16:05:40 +01:00
Oleksii Kriuchykhin 0094528a02 Improve connected accounts unlinking [SCI-4142] 2019-12-12 14:57:27 +01:00
aignatov-bio 7664f4be78 Add checklist and list edit mode 2019-12-11 14:49:14 +01:00
Oleksii Kriuchykhin ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
aignatov-bio 7fc9c0d1e4 Adding frontend for checklist edit mode 2019-12-10 15:58:59 +01:00
Mojca Lorber a3a5b21951 small fixes 2019-12-10 12:02:08 +01:00
Mojca Lorber 8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +01:00
aignatov-bio 09079fbcda Fix naming and tests 2019-12-09 13:48:36 +01:00
aignatov-bio d8676596f1 Add checklists column type 2019-12-09 13:48:36 +01:00
Urban Rotnik 06d87cb4b6 Add I18n to serializers 2019-12-06 11:39:10 +01:00
Oleksii Kriuchykhin 03667f619f Merge branch 'release-1-17-7' into develop 2019-12-05 13:03:39 +01:00
Urban Rotnik 2ec99fa696 Add new renderer for File, Status and List 2019-12-05 09:19:19 +01:00
Urban Rotnik 3ab1967703 Add Edit renderer for Statuses 2019-12-02 11:03:05 +01:00
Oleksii Kriuchykhin b4e091b4d4 Add default values to core API configuration [SCI-4098] 2019-11-29 10:28:50 +01:00
Urban Rotnik 65d8d0e35b DateTime HTML and JS simplified 2019-11-29 10:19:57 +01:00
Urban Rotnik 5ae29d549e Add manage modal for DateTime values 2019-11-29 10:19:55 +01:00
Urban Rotnik f39af1916f Split DateTime and DateTimeRange column types, rename DateType table 2019-11-29 10:19:16 +01:00
Urban Rotnik fe4aa12ced Add DateTime columns CRUD endpoints 2019-11-29 10:19:14 +01:00
Urban Rotnik b591346a3f Add DateTime type column 2019-11-29 10:19:13 +01:00
Urban Rotnik 621f7da37b Add fields for StatusItem 2019-11-29 10:19:10 +01:00
Urban Rotnik b2ce600820 Add delimiter column for repository_column 2019-11-29 10:19:10 +01:00
Urban Rotnik b2b6296cb5 Improve update items action, JS and views 2019-11-29 10:19:10 +01:00
Urban Rotnik 6fbb99c8d2 Add List items partial and JS 2019-11-29 10:19:09 +01:00
Urban Rotnik 24acf1f84b Fix edit mode for File and Text 2019-11-29 10:19:08 +01:00
Urban Rotnik 9e0d0d74ea Remove check in routes 2019-11-29 10:19:08 +01:00
Urban Rotnik 1e8261ac2a Update InventoryColumns API for new Status Type 2019-11-29 10:19:07 +01:00
Urban Rotnik 7ab12baef9 Add API endpoint for StatusItems 2019-11-29 10:19:07 +01:00
Oleksii Kriuchykhin 73be1181ac Fix failing tests for repository states [SCI-4070] 2019-11-29 10:19:05 +01:00
Oleksii Kriuchykhin 338b710d81 Refactor inventory edit mode [SCI-4070] 2019-11-29 10:19:05 +01:00
Urban Rotnik 28d7a4f284 Refactor FileColumnController 2019-11-29 10:17:51 +01:00
Urban Rotnik 1720623665 Refactor RepositoryListColumn controller 2019-11-29 10:17:50 +01:00
Mojca Lorber fe8829b592 Fix multiple load of modal 2019-11-29 10:17:49 +01:00
Mojca Lorber 9d4796cf90 refactor repository column javascript 2019-11-29 10:17:44 +01:00
Mojca Lorber 467c80da52 Update basic modal layout for creating new column types 2019-11-29 10:16:47 +01:00
Urban Rotnik 5930bdd794 Add StatusColumnsController 2019-11-29 10:16:44 +01:00
Urban Rotnik c00a837105 Add models for RepositoryStatus column type 2019-11-29 10:16:43 +01:00
Oleksii Kriuchykhin f5abb7c767 Add connected accounts section to settings [SCI-4106] 2019-11-27 23:16:25 +01:00
aignatov-bio 68284c10da Add task description and task protocol description activities 2019-11-27 14:37:53 +01:00
Oleksii Kriuchykhin 6b20a10473 Refactor Azure configuration [SCI-4098] 2019-11-26 15:09:40 +01:00
aignatov-bio 56ae32323c Add autosave for protocol keywords and user preferences 2019-11-20 14:57:53 +01:00
Anton Ignatov 7117b767f4 Fix commnets to PR 2019-11-18 13:59:54 +01:00
Anton Ignatov 17e457c686 Finished global activities refactoring 2019-11-18 13:59:54 +01:00
Anton Ignatov fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +01:00
Urban Rotnik 43e3763ec8 Update x, y, experiment unqiue validation 
[SCI-3887]
 2019-11-18 11:11:40 +01:00
Urban Rotnik cc9d987321 Add update result(file) and create result(file) API endpoint 2019-11-18 11:11:38 +01:00
Urban Rotnik 060125a1c4 Add file size validation 2019-11-18 11:11:38 +01:00
Urban Rotnik 1be88baab1 Add API endpoint for Attachments resource 2019-11-18 11:11:38 +01:00
Urban Rotnik e7083e188c Add API endpoint for Step resource 
[SCI-3835]
 2019-11-18 11:11:37 +01:00
Urban Rotnik 24033bec7a Add API endpoint for Task creation 2019-11-18 11:11:37 +01:00
Urban Rotnik 7802d5ee8b Add uniq validation for x and y position scoped to experiment 2019-11-18 11:11:36 +01:00
aignatov-bio a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
aignatov-bio b6292a029e Fix localization 2019-11-05 10:46:05 +01:00
aignatov-bio ae0db3a7bc Update avatars and small CSS fixes 2019-11-05 10:43:02 +01:00
Oleksii Kriuchykhin ab691efdb2 Fix LinkedIn sign-up [SCI-4047] 2019-10-29 16:20:19 +01:00
Alex Kriuchykhin 16dc2d0fe0
Merge pull request #2130 from jbargu/jg_sci_3920 
[SCI-3920] Add omniauth initializer
 2019-10-29 10:29:26 +01:00
Alex Kriuchykhin 5524598d53
Merge pull request #2172 from biosistemika/release_1_17_3 
Merge release 1.17.3 to master
 2019-10-22 12:45:02 +02:00
Oleksii Kriuchykhin 2637aed853 Fix code styling [SCI-3990][SCI-3993] 2019-10-17 13:38:36 +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
aignatov-bio 198697ff23 Fix avatar localization 2019-10-11 12:22:09 +02:00
aignatov-bio 521a367960 Add predefined avatars 2019-10-11 11:46:51 +02:00
Oleksii Kriuchykhin 3d9c2282f3 Implement JPEG quality extraction for ActiveStorage [SCI-3959] 2019-10-08 10:42:55 +02:00
Jure Grabnar 3c40d58d74 Add omniauth initializer 
Close SCI-3920
 2019-10-07 08:31:41 +02:00
Alex Kriuchykhin 076d61d4d0
Merge pull request #2116 from okriuchykhin/ok_SCI_3908 
Remove Paperclip from the codebase [SCI-3908]
 2019-10-04 14:45:42 +02:00
Urban Rotnik 81d66ceedd Add CustomDisk Service for ActiveStorage 2019-10-03 13:16:15 +02:00
Oleksii Kriuchykhin 260fcd6e89 Remove Paperclip from codebase [SCI-3908] 2019-10-02 19:45:14 +02:00
Anton Ignatov 33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +02:00
Jure Grabnar 477e41a96d Refactor I18n strings for tiny_mce 2019-09-30 11:34:39 +02:00
mlorb 594124dad6
Merge pull request #2053 from mlorb/ml-sci-3637 
Redesign of sorting button for projects/experiments cards [SCI-3637]
 2019-09-27 12:44:44 +02:00
Miha Mencin 11881e54a5
Merge pull request #2062 from aignatov-bio/ai-sci-fix-routes-for-addons-installer 
Fix routes for addons installer
 2019-09-27 10:52:16 +02:00
Alex Kriuchykhin d8a2ed0918
Merge pull request #2073 from okriuchykhin/ok_SCI_3890 
Switch to Rails 6.0 app defaults with zeitwerk loader [SCI-3890]
 2019-09-27 10:50:55 +02:00
Luka Murn 39b3868680
Merge pull request #2093 from Ducz0r/lm-active-mailer-config-minor-changes 
ActiveMailer minor config changes
 2019-09-27 10:17:05 +02:00
Luka Murn a552356bfe Minor comment text update 2019-09-25 13:16:16 +02:00
Luka Murn 093c6e37bc Minor restructure/comment changes to ActionMailer config 2019-09-25 11:58:52 +02:00
Oleksii Kriuchykhin 83184c23f3 Switch to Rails 6.0 app defaults with zeitwerk loader [SCI-3890] 2019-09-19 13:21:32 +02:00
Alex Kriuchykhin 25c91c2724
Merge pull request #2072 from okriuchykhin/ok_SCI_3888 
Add override for ActiveStorage downloader to handle missing file checksums [SCI-3888]
 2019-09-18 15:46:51 +02:00
Oleksii Kriuchykhin b841d3dd6b Add override for ActiveStorage downloader to handle missing file checksums [SCI-3888] 2019-09-18 15:34:49 +02:00
aignatov-bio 11f6517d0a
Fix duplicate marvinjs save (#2057) 2019-09-18 11:18:44 +02:00
Oleksii Kriuchykhin 7181365f7d Allow use of libvips through env variable [SCI-3881] 2019-09-18 09:49:02 +02:00
Oleksii Kriuchykhin 4639d4d1d0 Temporary disable Vips image processor [SCI-3881] 2019-09-17 16:25:37 +02:00
Anton Ignatov 63d62734ee Fix routes for addons installer 2019-09-17 16:11:40 +02:00
Oleksii Kriuchykhin e12cd0ae9d Fix autoloading issues [SCI-3881] 2019-09-17 10:50:01 +02:00
Mojca Lorber 47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +02:00
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
Alex Kriuchykhin 9512b448e6
Merge pull request #2027 from okriuchykhin/ok_SCI_3771 
Implement Cucumber tests for direct upload [SCI-3771]
 2019-09-12 15:34:28 +02:00
Alex Kriuchykhin 5f3b1b207b
Merge pull request #2008 from okriuchykhin/ok_SCI_3786 
Fix cucumber tests, switch to chromium-driver [SCI-3786]
 2019-09-12 15:34:14 +02:00
aignatov-bio 07b9091e23
Fix html escape in unshared warning (#2048) 2019-09-11 16:33:31 +02:00
aignatov-bio 27104a495c
Fix styling for unshared warning message (#2044) 2019-09-11 11:50:02 +02:00
Oleksii Kriuchykhin 265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +02:00
Miha Mencin 12d6804263
Merge pull request #2034 from biosistemika/SCI3818-unshared-inventory-screen 
SCI-3818-unshared-inventory-screen
 2019-09-09 09:30:34 +02:00
Miha Mencin d522b3807a codestyle improvements 2019-09-06 14:59:30 +02:00
Miha Mencin 7fc5035d2d PR fixes, codestyle fixes 2019-09-06 13:47:06 +02:00
Miha Mencin 2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00
Oleksii Kriuchykhin c65c0cf356 Make previewable document filter more strict [SCI-3817] 2019-09-04 10:39:04 +02:00
Oleksii Kriuchykhin e58d3cf169 Implement Cucumber tests for direct upload [SCI-3771] 2019-09-03 15:14:37 +02:00
mlorb ba5bebedb2 change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022) 2019-09-02 10:30:29 +02:00
Oleksii Kriuchykhin 267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
aignatov-bio d209b3abcd
Update share modal window [SCI-3812] (#2018) 
* Update share modal window

* Fix markup
 2019-08-29 13:45:27 +02:00
Oleksii Kriuchykhin 940ef5b92f Fix Travis email config [SCI-3786] 2019-08-26 15:05:24 +02:00
Miha Mencin b850efbceb Code review remarks, added tooltip for unshared inventory 2019-08-26 10:45:40 +02:00
Luka Murn c5c47916d2 Change localization key to not be called custom_field 2019-08-23 16:06:30 +02:00
Oleksii Kriuchykhin 3a87296c7b Fix cucumber tests, switch to chromium-driver [SCI-3786] 2019-08-22 13:38:02 +02:00
Oleksii Kriuchykhin 3918c893db Fix new office file creation [SCI-3778] 2019-08-21 13:26:11 +02:00
Luka Murn 084cdcdd6b Remove old archive endpoint, controller logic 2019-08-21 13:17:19 +02:00
Luka Murn 2db39c049e Remove projects archive page 2019-08-21 13:10:54 +02:00
aignatov-bio 2cf7f52f15
Add inline editing for inventories [SCI-3763] (#1991) 
* Add inline editing for inventories

* Remove old locals

* Markup fix
 2019-08-19 13:30:56 +02:00
Urban Rotnik ef528ccdc6 Fix translation for view only permission 2019-08-19 09:51:28 +02:00
aignatov-bio d4aedbb35f
Small ux changes for inventories (#1989) 2019-08-19 09:24:10 +02:00
Urban Rotnik 89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
aignatov-bio 737f9e572c
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) 
* Replace marvinJS logo and fix some merge issues

* Fix tests
 2019-08-13 11:04:19 +02:00
Miha Mencin d1ecdedd59 SCI-3768 remove .freeze from multiple constants 2019-08-12 22:31:47 +02:00
Oleksii Kriuchykhin c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
Urban Rotnik 7719b825e3 Update wording for sharing activities, rename button, add view-only paragraph 2019-08-09 14:15:51 +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 2648521924 Invite modal with form 2019-08-09 14:15:49 +02:00
Urban Rotnik 466b05a5bc Update repository index page 2019-08-09 14:15:48 +02:00
Urban Rotnik 171cdb319b Add ShareInventory activities 2019-08-09 14:13:01 +02:00
Mojca Lorber 15432ac851 Make changes to inventory list in navigation based on new mockup 2019-08-09 14:13:00 +02:00
Mojca Lorber cac7dab440 Show shared inventories in left navigation and fix read repository permission 2019-08-09 14:13:00 +02:00
Urban Rotnik 5456c1e38a Add basic controller for TeamRepositories 2019-08-09 14:12:59 +02:00
Urban Rotnik f569411bc7 Add TeamRepository model 2019-08-09 14:12:59 +02:00
aignatov-bio 6e5f078dea
Add activities for marvinJS [SCI-3630] (#1950) 
* Add marvinJs activities to step and results

* Add activities for TinyMCE marvinJS assets

* Fix markup
 2019-08-09 09:47:07 +02:00
Oleksii Kriuchykhin d52df56fc4 Fix production build and update packages [SCI-3678] 2019-08-08 14:03:15 +02:00
Oleksii Kriuchykhin 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin b4f632dba8 Remove dowload endpoint from assets controller [SCI-3680] 2019-08-07 15:21:41 +02:00
Jure Grabnar 8323bf5b48 Add missing system_notifications en.yml 2019-08-05 19:05:44 +02:00
Luka Murn 0e71351473 Remove unnecesary report element checks in extends.rb 2019-07-26 10:34:30 +02:00
Luka Murn 83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +02:00
Urban Rotnik 1b9db2f61e Fix for file annotating on Safari 2019-07-24 14:16:29 +02:00
Anton Ignatov d79fec3345 Move TinyMCE logic to correspond controller 2019-07-16 15:51:44 +02:00
Anton Ignatov 1e8663548e Add MarvinJS assets to TinyMCE 2019-07-16 13:40:54 +02:00
Anton Ignatov 3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
Miha Mencin bbf6b709bc
Merge pull request #1936 from jbargu/jg_sci_3696 
[SCI-3696] Small email template styling fixes
 2019-07-15 13:26:59 +02:00
Jure Grabnar 48c6b9ae91 Fix typo 
Fix SCI-3696
 2019-07-15 11:30:59 +02:00
Jure Grabnar a372d4056d Add last_published protocols.io endpoint 2019-07-14 19:24:53 +02:00
Urban Rotnik 5cf100a787 Show 'published_on' instead of 'created_on' on external_protocols list 2019-07-12 16:56:07 +02:00
Miha Mencin d4b09444b2
Merge pull request #1917 from biosistemika/SCI-3672-replace-button-title 
SCI-3672 Replace Talk to us button link
 2019-07-12 16:18:32 +02:00
mlorb 5bc8eb7392
Merge pull request #1921 from mlorb/ml-sci-3641 
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
 2019-07-12 15:52:40 +02:00
Anton Ignatov ba1d6d45ca Fix merging issues 2019-07-12 15:47:15 +02:00
Anton Ignatov ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov 7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00
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