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

599 commits

Author SHA1 Message Date
Oleksii Kriuchykhin c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
aignatov-bio bac98bdbdc Remove inventory tab from task and routes to inventory page 2020-05-14 22:10:13 +02:00
Oleksii Kriuchykhin ba1661b40f Fix handling of deleted repositories for snapshots [SCI-4596] 2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00
aignatov-bio 8e20dccc66
Merge pull request #2510 from aignatov-bio/ai-sci-4509-add-recent-protocols-tab 
Add recent protocol tab to load protocal from repository [SCI-4509]
 2020-05-08 13:17:26 +02:00
aignatov-bio c9545ddb19 Merge branch 'features/new-task-layout' into ai-sci-4509-add-recent-protocols-tab 2020-05-08 10:28:33 +02:00
aignatov-bio 8ec7a4b7b4 Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 2020-05-07 13:03:00 +02:00
aignatov-bio 19d30e2019 Merge branch 'features/new-task-layout' into ai-sci-4523-add-assign-items-to-task 2020-04-29 15:13:38 +02:00
aignatov-bio 61bbca6bcf Fix path names and markup 2020-04-28 19:12:17 +02:00
Oleksii Kriuchykhin e6ad5047e0 Implement background processing of repository snapshots [SCI-4552] 2020-04-28 12:09:36 +02:00
aignatov-bio 0604815c00 Add assigned task dropdown to repository 2020-04-24 15:43:10 +02:00
aignatov-bio f65b50c6ff Fix rebase conflicts 2020-04-23 16:36:22 +02:00
aignatov-bio 34d6e903a4 Add assign items modal and update modal for task inventories 2020-04-23 15:24:40 +02:00
Oleksii Kriuchykhin f811d11c59 Add versions sidebar to assigned repository rows full view modal [SCI-4525] 2020-04-21 14:49:36 +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
Mojca Lorber e9959747d6 small refactor 2020-04-14 17:25:36 +02:00
aignatov-bio c1cac01b28 Add repositories dropdown list 2020-04-14 12:10:16 +02:00
aignatov-bio fe718349da Add recent protocol tab to load protocal from repository 2020-04-09 17:29:39 +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
aignatov-bio 087f71a82f Add full view for my-module repository 2020-04-07 21:02:16 +02:00
aignatov-bio 7fdc169ba2 Add simple view to repository table 2020-04-06 19:52:41 +02: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
aignatov-bio e729aa043e Add recent work widget 2020-03-06 13:51:18 +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 0ae5e51cb3 Merge branch 'features/dashboard' into ai-sci-4375-end-point-to-task-create 2020-02-28 14:37:27 +01:00
aignatov-bio a28d729aeb Add end point 2020-02-24 17:09:10 +01:00
aignatov-bio cf4dbd5ff4 Add calendar widget 2020-02-20 17:02:38 +01:00
Oleksii Kriuchykhin 9d0d75acc5 Add API endpoints for new column types [SCI-4276] 2020-02-18 15:13:46 +01:00
aignatov-bio a438f6b4f0 Finished filters 2020-02-17 10:47:10 +01:00
aignatov-bio 485597a9ef Add front-end part 2020-02-14 12:07:40 +01:00
aignatov-bio 98d7092a51 Change root page 2020-02-13 13:51:49 +01:00
aignatov-bio 5c0a769f87 General dashboard layout 2020-02-13 13:50:29 +01:00
Mojca Lorber 2727614603 Clean up controllers for manage repository columns 2020-02-04 16:05:16 +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 d9b9243da7 Merge branch 'develop' into features/new-column-types 2020-01-07 16:03:33 +01:00
Urban Rotnik 400c109592 Refactor StatusesJS for new dropdown 2019-12-23 14:34:11 +01:00
aignatov-bio 7fc9c0d1e4 Adding frontend for checklist edit mode 2019-12-10 15:58:59 +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 3ab1967703 Add Edit renderer for Statuses 2019-12-02 11:03:05 +01:00
Urban Rotnik fe4aa12ced Add DateTime columns CRUD endpoints 2019-11-29 10:19:14 +01:00
Urban Rotnik 9e0d0d74ea Remove check in routes 2019-11-29 10:19:08 +01:00
Urban Rotnik 7ab12baef9 Add API endpoint for StatusItems 2019-11-29 10:19:07 +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
Urban Rotnik 5930bdd794 Add StatusColumnsController 2019-11-29 10:16:44 +01:00
Oleksii Kriuchykhin f5abb7c767 Add connected accounts section to settings [SCI-4106] 2019-11-27 23:16:25 +01:00
Oleksii Kriuchykhin 6b20a10473 Refactor Azure configuration [SCI-4098] 2019-11-26 15:09:40 +01:00
Anton Ignatov fc70ce24f8 Refactor side filters for global activities 2019-11-18 13:59:54 +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 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
aignatov-bio a9690482d1 Add autosave feature to text fields 2019-11-12 11:26:18 +01:00
Anton Ignatov 63d62734ee Fix routes for addons installer 2019-09-17 16:11:40 +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
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 267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
Luka Murn 084cdcdd6b Remove old archive endpoint, controller logic 2019-08-21 13:17:19 +02:00
Oleksii Kriuchykhin c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
Urban Rotnik 32783576c1 Add controller action 'multiple_update' 
Add controller action, add update permission activity, add JS for handling ajax req
 2019-08-09 14:15:50 +02:00
Urban Rotnik 2648521924 Invite modal with form 2019-08-09 14:15:49 +02:00
Urban Rotnik 5456c1e38a Add basic controller for TeamRepositories 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 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
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 ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov 57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
Oleksii Kriuchykhin a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Oleksii Kriuchykhin 9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +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
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
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
Anton Ignatov a843a016a0 Fix markup and naming 2019-06-19 15:19:47 +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
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
Oleksii Kriuchykhin 84a2ad4487 Refactor the async thumbnail reloading (spinner) [SCI-3461] 2019-05-21 17:29:33 +02:00
Anton Ignatov 259b75a6ba Merge branch 'master' into features/marvinjs-integration 2019-05-16 09:28:48 +02:00
Oleksii Kriuchykhin 4b1c4bd140 Fix handling of proccessing step attachments [SCI-3381] 2019-05-13 17:12:06 +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
Anton Ignatov f80d881847 Fix markup 2019-04-28 19:11:41 +02:00
Anton Ignatov 260810fff8 Add editing mode for tinymce images 2019-04-28 16:16:31 +02:00
Anton Ignatov fe620c4a63 Add marvin model and controller 2019-04-26 22:59:38 +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
Urban Rotnik 11a7a975af Merge branch 'features/scinote-improvements' into master-with-note-section 2019-04-23 14:50:03 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio e2e299b424
Add dynamic generating filters for global activities [SCI-3228] (#1644) 
* Add dynamic generating filters

* Add url methods
 2019-04-09 09:08:27 +02:00
Jure Grabnar 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 08263ab64e
adding filters for task activities [SCI-3076] (#1553) 
* update task activity screen
 2019-03-28 10:55:48 +01:00
Miha Mencin 4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +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
Oleksii Kriuchykhin 0c2b7959b6 Fix smart annotations in RTE [SCI-3111] 2019-03-20 11:41:36 +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 89e968c410 Add tui.image-editor [SCI-2815] 2019-03-11 15:08:15 +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
Oleksii Kriuchykhin 61147b480c Add main global activities bussiness logic [SCI-3014] 2019-02-26 11:01:15 +01:00
Miha Mencin a93402d69f sci-2992 routes 2019-02-25 16:50:38 +01:00
Urban Rotnik 7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +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
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
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
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
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
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
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
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
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
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
Oleksii Kriuchykhin 02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +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
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 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
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
Oleksii Kriuchykhin 492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Zanz2 c8ed808920 merged with core-api 2018-09-26 12:17:49 +02:00
Oleksii Kriuchykhin ab3aeac26b Merge latest core-api branch [SCI-2718] 2018-09-24 16:49:27 +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
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
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
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 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
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
Oleksii Kriuchykhin ecde634a2c Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
Oleksii Kriuchykhin ef7e0ac489 Add GET inventory columns API endpoint [SCI-2615] 2018-08-08 17:31:37 +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 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
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
zmagod ca0c8cbb71 fixes typos, fixes pdf rendering 2018-05-17 11:21:34 +02:00
zmagod 4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +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
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
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
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
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
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
zmagod 9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +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
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
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
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
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
Oleksii Kriuchykhin 3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin 51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
Oleksii Kriuchykhin cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
zmagod baf69461f5 adds edit/create modal and related actions 2018-03-23 16:00:33 +01:00
zmagod 3be3c00574 adds manage columns page [fixes SCI-2218] 2018-03-22 09:35:36 +01:00
zmagod 62858bc14f Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-20 14:46:11 +01:00
zmagod 1ad8c259d1 add blank page for repositories [fixes SCI-2139] 2018-03-20 14:45:57 +01:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod 1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod c2eb6d6900 fixes hound adds specs to repository_list_items controller 2018-03-16 10:53:05 +01:00
zmagod d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
zmagod dd2f7dd417 Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration 2018-03-13 13:24:36 +01:00
zmagod fb66131e29 setup endpoint for repository_rows paging/search 2018-03-06 16:32:39 +01:00
mlorb f5949e9d10 refactor 2018-03-01 17:52:24 +01:00
mlorb e66eab7f57 fix typo 2018-03-01 09:45:52 +01:00
mlorb 9199f287ba fix hound 2018-03-01 09:18:36 +01:00
mlorb 08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
zmagod e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +01:00
zmagod 029d69b033 revert to old setting [fixes SCI-1967] 2018-01-29 15:42:22 +01:00
okriuchykhin 0b1f43c1c5
Merge pull request #954 from okriuchykhin/ok_SCI_1970 
Add health check endpoint to API controller [SCI-1970]
 2018-01-25 14:33:37 +01:00
zmagod f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
Oleksii Kriuchykhin 28be7c4fc4 Add health check endpoint to API controller [SCI-1970] 2018-01-22 16:52:48 +01:00
zmagod c07f54a0c7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-08 08:38:14 +01:00
mlorb a3a494c3a2 fix banana: remove dead code which strangely reappeared, probably with some rebasing 2017-12-14 14:18:15 +01:00
zmagod b106545d31 fixes per @duco 's request 2017-12-13 08:57:50 +01:00
zmagod b6a5ab5e6c fix request 2017-12-01 17:29:46 +01:00
zmagod 52b278fe78 adds premissions service to FE 2017-12-01 17:15:15 +01:00
Oleksii Kriuchykhin 84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +01:00
mlorb cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import 
Protocols io import
 2017-11-13 11:53:28 +01:00
zmagod 327e27e123 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576 2017-11-09 15:55:10 +01:00