Commit graph

204 commits

Author SHA1 Message Date
Urban Rotnik
fb8f69c3e4 Revert controllers spec 2020-08-27 13:49:32 +02:00
Mojca Lorber
6fefd4d945 Add factories for new task flows models 2020-08-27 13:38:32 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Urban Rotnik
025378cd0e Fix translations and JS 2020-07-23 15:53:46 +02:00
Alex Kriuchykhin
26cfa001c8
Merge pull request #2747 from urbanrotnik/ur-sci-4769-canvas-test
Add test for canvas_controller [SCI-4769]
2020-07-23 15:18:01 +02:00
Urban Rotnik
512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Urban Rotnik
3232b4d6bf Add test for canvas_controller 2020-07-21 13:49:59 +02:00
aignatov-bio
cadbc3e47b Fix tests 2020-07-14 11:20:06 +02:00
aignatov-bio
13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
Urban Rotnik
62a4a5f203 Add 2fa login 2020-07-01 12:46:26 +02:00
Mojca Lorber
22b71bc9cb Merge branch 'develop' into ml-sci-4261 2020-06-30 13:47:32 +02:00
Urban Rotnik
2f4bf95373 Revert scrope 2020-06-24 11:42:59 +02:00
aignatov-bio
593455537d Fix tests 2020-06-22 09:48:37 +02:00
mlorb
0a7c9aeb1a
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows
Archiving & restoring rows [SCI-4706]
2020-06-11 16:41:53 +02:00
Urban Rotnik
fabfd7ddaf Add controller action for Archive&Restore 2020-06-09 19:18:30 +02:00
aignatov-bio
37baa13f47 Fi tests 2020-06-09 14:37:45 +02:00
aignatov-bio
c0e984b316 Fix tests 2020-06-04 18:41:45 +02:00
aignatov-bio
f963608996 Add I18n and tests 2020-06-01 14:34:04 +02:00
Mojca Lorber
c673e27109 Merge branch 'develop' into ml-sci-4261 2020-05-28 08:18:24 +02:00
Oleksii Kriuchykhin
d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +02:00
aignatov-bio
ff2a7aa9b6 Fix spec markup 2020-05-05 09:47:55 +02:00
aignatov-bio
c2e456aa27 Fix activities and specs 2020-04-23 15:25:28 +02:00
Oleksii Kriuchykhin
bece39fbfb Fix failing tests [SCI-4408] 2020-03-16 18:30:17 +01:00
Mojca Lorber
2727614603 Clean up controllers for manage repository columns 2020-02-04 16:05:16 +01:00
Miha Mencin
0d3e8ac3e1 remove silly test 2020-01-27 15:04:53 +01:00
Urban Rotnik
400c109592 Refactor StatusesJS for new dropdown 2019-12-23 14:34:11 +01:00
Oleksii Kriuchykhin
56b002452e Fix tests for inventories [SCI-4166] 2019-12-19 11:38:26 +01:00
Urban Rotnik
508a9b4e3e RepositoryRows controller refactor 2019-12-10 14:29:35 +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
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
fe4aa12ced Add DateTime columns CRUD endpoints 2019-11-29 10:19:14 +01:00
Urban Rotnik
b2ce600820 Add delimiter column for repository_column 2019-11-29 10:19:10 +01:00
Mojca Lorber
305104f639 Refactor text inventory type 2019-11-29 10:17:53 +01:00
Urban Rotnik
f645ff52ab Refactor ColumnServices 2019-11-29 10:17:52 +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
Urban Rotnik
5930bdd794 Add StatusColumnsController 2019-11-29 10:16:44 +01:00
aignatov-bio
b9a34fa809 Fix placeholder for authors 2019-11-15 16:23:48 +01:00
aignatov-bio
1488f75e26 Add activities 2019-11-13 13:57:04 +01:00
Oleksii Kriuchykhin
0475394b08 Fix test [SCI-3881] 2019-09-16 13:03:41 +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
Oleksii Kriuchykhin
267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
Luka Murn
9ad2490285 Remove the deprecated archive endpoint controller rspec test 2019-08-21 16:00:04 +02:00
aignatov-bio
f94b8165dc
Fix marvinjs edit button and icon (#1985) 2019-08-21 11:15:57 +02:00
Urban Rotnik
786716974b Add validation for team on TeamRepository 2019-08-09 14:15:50 +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
171cdb319b Add ShareInventory activities 2019-08-09 14:13:01 +02:00
Urban Rotnik
5456c1e38a Add basic controller for TeamRepositories 2019-08-09 14:12:59 +02:00
Jure Grabnar
ed5eb39bb2 Fix tests for GET show on protocols.io 2019-07-10 19:20:40 +02:00
Jure Grabnar
6e1d4c205c Add tests for page_id for search service 2019-07-04 16:02:29 +02:00
Jure Grabnar
20134c9f8a
Features/protocolsio integration (#1893)
Features/protocolsio integration
2019-07-03 17:32:20 +02:00
Urban Rotnik
9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +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
6530786f17 Fix tests 2019-06-20 16:05:19 +02:00
aignatov-bio
a00ec02983
Add tests for edit WOPI activities [SCI-3238] (#1822)
* Add tests for edit wopi activities
2019-06-20 09:31:29 +02:00
Anton Ignatov
6f1f6e297c Fix tests 2019-06-19 15:40:27 +02:00
Urban Rotnik
88d96c0938 Use service in controller 2019-06-17 12:24:15 +02:00
Jure Grabnar
4f6397b5b9 Add form to external_sources#new action
Closes SCI-3532
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
eb0d677a36 Refactor pio_protocol -> built_protocol 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
Oleksii Kriuchykhin
2842ea381e Fix tests for health check endpoint [SCI-3522] 2019-05-31 16:48:10 +02:00
Anton Ignatov
7c55fcf0cf Merge branch 'master' into master-with-note-section 2019-04-30 12:07:59 +02:00
aignatov-bio
687b53feb1
Add new tag activtiies [SCI-3341] (#1712)
* Add new tag activtiies
2019-04-30 10:23:09 +02:00
Mojca Lorber
9e04eb8ea1 Fixes upon Urbans request 2019-04-26 11:34:53 +02:00
Mojca Lorber
208b7c9939 Fix hound 2019-04-19 13:56:21 +02:00
Mojca Lorber
36e7cfe5c4 Change failing tests 2019-04-19 13:37:52 +02:00
Mojca Lorber
b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +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
Mojca Lorber
f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Mojca Lorber
c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Mojca Lorber
7757096693 Results activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
1418abc8d7 Reports activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
d1e38e5bc9 Project activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber
70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik
c65d1af18d Fix failing tests 2019-03-13 09:53:34 +01:00
Urban Rotnik
b6a8556601 Add activities for exporting Projects, Inventory items 2019-03-12 09:15:06 +01:00
Urban Rotnik
e7b57aa4f7 Add creating activities for Team actions 2019-03-12 09:15:06 +01:00
Urban Rotnik
3f18166320 Add Task and TaskTags activities 2019-03-12 09:15:06 +01:00
Urban Rotnik
7a05e817ef Add new Protocol steps activities 2019-03-12 09:15:06 +01:00
Urban Rotnik
b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +01:00
Urban Rotnik
cfe2888bea Repository columns actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik
32422c00eb RepositoryRows actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik
2a7bbac733 Repository actions logging 2019-03-12 09:11:00 +01:00
Urban Rotnik
976831e7d3 Edit and Archive experiment activity logging 2019-03-12 09:11:00 +01:00
Urban Rotnik
b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Urban Rotnik
9ed3313f0f Create project activity refactored 2019-03-11 08:36:15 +01:00
aignatov-bio
5f78d83f9c
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513)
* fix dropdown apperance

* Remove search and fix duplicate bug

* Fix specs for new method
2019-02-21 16:15:13 +01:00
aignatov-bio
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
Urban Rotnik
4cf12d12d1 Refactor 'move_experiment' method into service object
Jira Ticket: SCI-2926
2019-01-28 11:45:36 +01:00
Jure Grabnar
13bc664902
Merge pull request #1367 from jbargu/jg_2746_health_unit_tests
Add unit tests for status/health API endpoints
2018-11-19 13:14:38 +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