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

1026 commits

Author SHA1 Message Date
Mojca Lorber 6fecee8c0c Add protocol options dropdown 2020-04-21 10:03:53 +02:00
aignatov-bio be47efce74
Merge pull request #2509 from aignatov-bio/ai-sci-4506-add-repositories-dropdown-list 
Add repositories dropdown list [SCI-4506]
 2020-04-16 14:17:17 +02:00
mlorb 9584b11d45
Merge pull request #2507 from mlorb/ml-sci-4505 
Add the user management section of to the Details section of task layout [SCI-4505]
 2020-04-16 13:47:31 +02:00
aignatov-bio 15b291347b Fix I18n 2020-04-14 12:10:17 +02:00
aignatov-bio fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +02:00
Oleksii Kriuchykhin 3a67c99982 Switch to STI for repositories, fix cell values snapshotting [SCI-4516] 2020-04-09 12:33:04 +02:00
Mojca Lorber f22f076e6c Add the user management secion of to the Details section of task layout 2020-04-08 16:24:59 +02:00
Oleksii Kriuchykhin a9c3102835 Add repository snapshots with service, refactor item assigning [SCI-4516] 2020-04-07 18:26:39 +02:00
Alex Kriuchykhin 80bf5123ec
Merge pull request #2497 from aignatov-bio/ai-sci-4472-change-due-date-wording-on-dashboard 
Change i18n for due date on current task widget [SCI-4472]
 2020-04-06 10:27:21 +02:00
Oleksii Kriuchykhin 3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
Mojca Lorber bd177f4f2f Renaming fixes 2020-03-31 11:22:53 +02:00
aignatov-bio 230099ac82 Change i18n for due date on current task widget 2020-03-30 15:30:52 +02:00
Mojca Lorber 7006036626 Add new task general layout and add notes section 2020-03-30 12:51:35 +02:00
aignatov-bio b9e81f208d Fix i18n 2020-03-27 10:34:06 +01:00
aignatov-bio 8ff4b540e2 Update css for login screen 2020-03-27 09:43:49 +01:00
aignatov-bio 8164b0d0c6 Change placeholders for dashboards 2020-03-12 15:00:14 +01:00
aignatov-bio d924faaafd
Merge pull request #2455 from aignatov-bio/ai-sci-4403-recent-work-layout 
Add recent work widget [SCI-4400][SCI-4401][SCI-4402][SCI-4403]
 2020-03-12 11:26:23 +01:00
Miha Mencin 26b687f2e6
Merge pull request #2460 from biosistemika/features/dashboard 
Features/dashboard
 2020-03-10 18:06:23 +01:00
mlorb bea7a6172b
Merge pull request #2456 from mlorb/ml-sci-4412 
Remove academy link from navigation and move about modal to support menu [SCI-4412]
 2020-03-10 17:08:22 +01:00
Mojca Lorber 6bf191d124 Remove academy link from navigation and move about modal to support menu 2020-03-06 14:36:22 +01:00
aignatov-bio e729aa043e Add recent work widget 2020-03-06 13:51:18 +01:00
aignatov-bio 3494d1071e
Merge pull request #2448 from aignatov-bio/ai-sci-4416-add-yellow-due-dates 
Refactor current task widget [SCI-4416]
 2020-03-05 14:46:16 +01:00
Mojca Lorber 8325ed80f0 Add endpoints for lists of projects and experiments with filtering and finish the frontend for quick start create new task on dashboard 2020-03-04 23:26:01 +01:00
aignatov-bio d830fcec4a Remove locked task css and i18n 2020-03-04 14:56:06 +01:00
aignatov-bio 3bc1f0cbe2 Update current tasks widget filters localization 2020-03-04 13:34:12 +01:00
aignatov-bio 77d66b65b1 Refactor current task for addons integration 2020-03-04 13:21:52 +01:00
Oleksii Kriuchykhin 11a5536af5 Improve file upload checks [SCI-4382] 2020-03-03 15:26:40 +01:00
aignatov-bio d9bfd8c28e Add search to current task widget 2020-03-03 09:50:44 +01:00
Oleksii Kriuchykhin 73623da02c Merge branch 'develop' into features/dashboard 2020-02-28 16:46:56 +01:00
aignatov-bio 6900d8384b
Merge pull request #2428 from aignatov-bio/ai-sci-4375-end-point-to-task-create 
Service for task creating and quick start end point [SCI-4375]
 2020-02-28 14:38:07 +01:00
aignatov-bio 0ae5e51cb3 Merge branch 'features/dashboard' into ai-sci-4375-end-point-to-task-create 2020-02-28 14:37:27 +01:00
aignatov-bio 95fca105eb Add quickstart layout and create task modal 2020-02-28 14:34:34 +01:00
Miha Mencin 1fd876bb40
Merge pull request #2425 from mlorb/ml-sci-4348 
Dashboard current tasks visual layout and backend [SCI-4348] [SCI-4355]
 2020-02-28 12:11:31 +01:00
Mojca Lorber f29ce66bea Refactor backend, add empty state and fix some small scc changes 2020-02-26 11:07:17 +01:00
aignatov-bio a28d729aeb Add end point 2020-02-24 17:09:10 +01:00
aignatov-bio 5385a25665 Merge branch 'features/dashboard' into ai-sci-add-calendar-widget 2020-02-24 13:04:49 +01:00
Mojca Lorber 9bd2e8bec4 Dashboard current tasks visual layout and backend 2020-02-21 10:41:42 +01:00
aignatov-bio 2cbac634bf Add localization 2020-02-21 10:00:32 +01:00
aignatov-bio 01868fff23 Add calendar front-end 2020-02-19 15:57:06 +01:00
aignatov-bio 5545d7da1a Add progress bar for current tasks 2020-02-18 14:28:06 +01:00
aignatov-bio 5886f2cf90 New description to import items modal window 2020-02-18 12:13:52 +01:00
aignatov-bio 0117b577f4 Fix typo 2020-02-18 09:27:07 +01:00
aignatov-bio ff45b17b53 Fix localization and small markup fixes 2020-02-17 15:32:43 +01:00
aignatov-bio 95c9479f54 Add page title 2020-02-13 14:54:58 +01:00
aignatov-bio 5c0a769f87 General dashboard layout 2020-02-13 13:50:29 +01:00
aignatov-bio d0fd956600
Merge pull request #2406 from aignatov-bio/ai-sci-4347-error-caused-by-dot-number 
Fix error in number column in repository [SCI-4347]
 2020-02-12 14:16:46 +01:00
aignatov-bio 00531066f8 Fix error in number column in repository 2020-02-12 11:55:10 +01:00
aignatov-bio eaf751bad6 Improve search input field in the flyouts 2020-02-11 15:01:52 +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
Oleksii Kriuchykhin 21bf59b943 Add unsaved data notification when navigating away from the inventory [SCI-4301] 2020-02-06 16:46:16 +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
aignatov-bio 4395a7cc6b Fix small visual bugs 2020-01-23 13:12:58 +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
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
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
Mojca Lorber 9176301b7b Refactor manage repository columns, move it from page into modal 2020-01-14 11:13:19 +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
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 181d637ff3 Update/refactor JS for handling Dates and Times 2019-12-20 14:59:27 +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
Oleksii Kriuchykhin ff4ef818fb Implement SSO with Azure AD [SCI-4142] 2019-12-10 17:24:53 +01:00
Mojca Lorber 8503dd7007 Add numeric repository column type 2019-12-09 16:38:21 +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 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 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
Mojca Lorber 467c80da52 Update basic modal layout for creating new column types 2019-11-29 10:16:47 +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
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
Urban Rotnik 43e3763ec8 Update x, y, experiment unqiue validation 
[SCI-3887]
 2019-11-18 11:11:40 +01:00
Urban Rotnik 060125a1c4 Add file size validation 2019-11-18 11:11:38 +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
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
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
aignatov-bio 11f6517d0a
Fix duplicate marvinjs save (#2057) 2019-09-18 11:18:44 +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 c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +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 2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +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
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
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
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
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 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Jure Grabnar 8323bf5b48 Add missing system_notifications en.yml 2019-08-05 19:05:44 +02:00
Luka Murn 83bb89fdf5 Cherry-picked commit from ZZ (and LM)'s various changes 2019-07-26 10:13:14 +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
Jure Grabnar 48c6b9ae91 Fix typo 
Fix SCI-3696
 2019-07-15 11:30:59 +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 7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +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 cc3cd43270 Log to console when error occur on ProtocolsImport actions 2019-07-09 15:32:43 +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
Jure Grabnar dc7fee51fa Add Show more protocols functionality to external protocols 
Closes SCI-3646
 2019-07-04 15:35:18 +02:00
Jure Grabnar 20134c9f8a
Features/protocolsio integration (#1893) 
Features/protocolsio integration
 2019-07-03 17:32:20 +02:00
Miha Mencin 4efb0b5a4a SCI-3645 added descending sorting by name 2019-07-02 17:42:55 +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 6be227b2d3 Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-06-28 10:47:38 +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
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
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 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 2bb4f558b7 View rendering simplified, small improvements 2019-06-17 12:24:09 +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 6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +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
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
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 88e67a16c2 Merge branch 'master-with-note-section' into feature/marvinjs-integration 2019-05-02 16:16:03 +02:00
Anton Ignatov fef691d30f Add error handling and secutiry checks 2019-05-02 16:12:25 +02:00
Anton Ignatov 4d0d5aa014 Adding team sketches selector 2019-04-30 17:32:55 +02:00
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 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
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 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
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 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
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
Urban Rotnik 1257c8fd80 Fix archive task translation 2019-04-03 11:21:53 +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 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
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
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
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 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
Oleksii Kriuchykhin a822227383 Add rich text editor to task and protocol description [SCI-3062][SCI-3071] 2019-03-14 16:27:33 +01:00
Urban Rotnik b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +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
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
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