Urban Rotnik
|
88f54b16d7
|
Add 2fa fields to user
|
2020-06-24 17:58:58 +02:00 |
|
Oleksii Kriuchykhin
|
7ea577d8d4
|
Merge branch 'features/inventory-archiving' into develop
|
2020-06-24 14:04:54 +02:00 |
|
Urban Rotnik
|
2f4bf95373
|
Revert scrope
|
2020-06-24 11:42:59 +02:00 |
|
Urban Rotnik
|
91af7135c1
|
Update scopes for repository items
|
2020-06-23 18:24:46 +02:00 |
|
Urban Rotnik
|
6de322498b
|
Delegate archived methods to parent repository
|
2020-06-23 17:16:02 +02:00 |
|
Mojca Lorber
|
be19190ff1
|
Revert default_scope for active repositories
|
2020-06-22 14:57:35 +02:00 |
|
Urban Rotnik
|
83bd8c3ad4
|
Add default scope for non archived repositories
|
2020-06-16 09:18:22 +02:00 |
|
Urban Rotnik
|
15342cd8f2
|
Fix update_canvas
|
2020-06-15 10:52:35 +02:00 |
|
Urban Rotnik
|
446a2db186
|
Export and import checklist items with delimiter
|
2020-06-01 17:19:33 +02:00 |
|
aignatov-bio
|
10fdd0c1c7
|
Merge branch 'develop' into features/new-task-layout
|
2020-04-23 14:07:40 +02:00 |
|
Oleksii Kriuchykhin
|
837437309e
|
Fix failing tests [SCI-4516]
|
2020-04-09 17:11:58 +02:00 |
|
Oleksii Kriuchykhin
|
3c53be1f9a
|
Add start date to the task [SCI-4504]
|
2020-03-31 14:17:14 +02:00 |
|
aignatov-bio
|
6d41d4d112
|
Fix tests
|
2020-03-31 14:16:31 +02:00 |
|
Miha Mencin
|
ecd49cb1e7
|
fix format and export_format mess
|
2020-03-18 09:57:57 +01:00 |
|
Miha Mencin
|
24b979aa6f
|
fix CR comments
|
2020-03-18 09:53:47 +01:00 |
|
Miha Mencin
|
c89503f691
|
SCI-4464 fix the import of the dates, some tests
|
2020-03-17 21:20:50 +01:00 |
|
Oleksii Kriuchykhin
|
675b578272
|
Add used space calculation method to the team model [SCI-4459]
|
2020-03-17 16:56:55 +01:00 |
|
Mojca Lorber
|
8dac5effbe
|
Another fix
|
2020-03-13 14:57:26 +01:00 |
|
Mojca Lorber
|
c716a52aae
|
Fix bug with date format when importing to inventory
|
2020-03-12 12:19:25 +01:00 |
|
Oleksii Kriuchykhin
|
9d0d75acc5
|
Add API endpoints for new column types [SCI-4276]
|
2020-02-18 15:13:46 +01:00 |
|
Alex Kriuchykhin
|
da26d8a018
|
Merge pull request #2304 from okriuchykhin/ok_SCI_4204
Refactor repository cell cloning to support all data types [SCI-4204]
|
2020-01-15 13:04:50 +01:00 |
|
Oleksii Kriuchykhin
|
66def56af9
|
Fix test for checklist value [SCI-4204]
|
2020-01-15 10:21:14 +01:00 |
|
Oleksii Kriuchykhin
|
522ae12f08
|
Merge branch 'develop' into ok_SCI_3988
|
2020-01-07 17:07:22 +01:00 |
|
Oleksii Kriuchykhin
|
1b902ff4b3
|
Merge branch 'develop' into ok_SCI_3988
|
2020-01-07 15:26:30 +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
|
2e88f194bc
|
Fix tests
|
2019-12-20 14:58:14 +01:00 |
|
aignatov-bio
|
dc91893d7e
|
Refactor checklist column data structure
|
2019-12-18 14:10:41 +01:00 |
|
Urban Rotnik
|
d35f7119b7
|
Moved delete action to service
|
2019-12-10 14:29:37 +01:00 |
|
Urban Rotnik
|
82b93bf9a4
|
Fix failing tests
|
2019-12-10 14:29:35 +01:00 |
|
Urban Rotnik
|
b68aadf506
|
Update params nesting
|
2019-12-10 14:29:35 +01:00 |
|
Urban Rotnik
|
0c990ef8cf
|
Add functions for creating new cells with values
|
2019-12-10 14:29:34 +01:00 |
|
Urban Rotnik
|
5b710241e1
|
Add delete condition to update_data method on CellValues
|
2019-12-10 14:29:33 +01:00 |
|
Urban Rotnik
|
79a50860b6
|
Add methods update_data, data_changed, formatted for all types off ColumnValues
|
2019-12-10 14:29:29 +01:00 |
|
aignatov-bio
|
09079fbcda
|
Fix naming and tests
|
2019-12-09 13:48:36 +01:00 |
|
aignatov-bio
|
643abc3fd7
|
Fixes 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
|
eca0c84bbd
|
Fix tests
|
2019-12-06 14:20:37 +01:00 |
|
Urban Rotnik
|
f39af1916f
|
Split DateTime and DateTimeRange column types, rename DateType table
|
2019-11-29 10:19:16 +01:00 |
|
Urban Rotnik
|
2a20ad68a3
|
Add range column to RepositoryColumn
|
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
|
c00a837105
|
Add models for RepositoryStatus column type
|
2019-11-29 10:16:43 +01:00 |
|
Oleksii Kriuchykhin
|
b2862b6c9e
|
Remove Paperclip DB columns and fix experiment templates [SCI-3988]
|
2019-11-18 14:16:28 +01:00 |
|
aignatov-bio
|
b1f9e7f1ca
|
Fix global activities jsonb field [SCI-3830] (#2030)
* Fix global activities jsonb field
* Fix tests
|
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
|
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 |
|
Oleksii Kriuchykhin
|
9d2ac4179e
|
Fix failing tests [SCI-3908]
|
2019-10-04 13:02:18 +02: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 |
|
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
|
786716974b
|
Add validation for team on TeamRepository
|
2019-08-09 14:15:50 +02:00 |
|
Urban Rotnik
|
1a77702fa7
|
Add uniq index for Repository and Team in TeamRepositories
|
2019-08-09 14:13:00 +02:00 |
|
Urban Rotnik
|
f569411bc7
|
Add TeamRepository model
|
2019-08-09 14:12:59 +02:00 |
|
Oleksii Kriuchykhin
|
973efa55e1
|
Merge branch 'master' into ok_SCI_3678
|
2019-08-08 11:17:07 +02:00 |
|
Anton Ignatov
|
84fe10df47
|
Fix tests for models and tema import/export
|
2019-07-26 12:40:36 +02:00 |
|
Luka Murn
|
83bb89fdf5
|
Cherry-picked commit from ZZ (and LM)'s various changes
|
2019-07-26 10:13:14 +02:00 |
|
Miha Mencin
|
ab9b7a7429
|
Merge pull request #1902 from biosistemika/release-1.16.6
Merge 'release-1.16.6' into 'master'
|
2019-07-08 12:49:40 +02:00 |
|
aignatov-bio
|
291563c80e
|
Fix tests for 1.16.6 release (#1903)
* Fix tests for 1.16.6 release
|
2019-07-08 11:09:24 +02:00 |
|
Urban Rotnik
|
bbe0062bfd
|
Small fixes for factories
|
2019-06-10 12:24:05 +02:00 |
|
Urban Rotnik
|
965b7eb58b
|
Add missing factories
|
2019-06-10 12:24:04 +02:00 |
|
Urban Rotnik
|
f19eeba8dc
|
Add factory valid check for User's associations
|
2019-06-10 12:24:04 +02:00 |
|
Urban Rotnik
|
ba340f7bee
|
Add valid factory check for Table, Tag, Team
|
2019-06-10 12:24:03 +02:00 |
|
Urban Rotnik
|
9348886fb1
|
Minior changes in SystemNotifications tests
|
2019-06-10 12:24:03 +02:00 |
|
Urban Rotnik
|
15cbd8864c
|
Add valid factory check to Steps models
|
2019-06-10 12:24:03 +02:00 |
|
Urban Rotnik
|
1e60102a7d
|
Add valid factory check for Sample(s) models
|
2019-06-10 12:24:02 +02:00 |
|
Urban Rotnik
|
c66aa29227
|
Add valid factory check for Result(s) models
|
2019-06-10 12:24:02 +02:00 |
|
Urban Rotnik
|
3adf2bb736
|
Add factories and validation tests for repositories and related models
Repositories, cells, columns, values (date, text, asset, list), rows, items
|
2019-06-10 12:24:02 +02:00 |
|
Urban Rotnik
|
a7558d83be
|
Add valid factory check for Project, MyModules, notification, protocol
|
2019-06-10 12:24:01 +02:00 |
|
Urban Rotnik
|
3348b81b14
|
Checklist, checklist_item, activity, experiment spec and factories updated
|
2019-06-10 12:24:01 +02:00 |
|
Urban Rotnik
|
6321c0f5c0
|
Assets spec and factories updated
|
2019-06-10 12:24:01 +02:00 |
|
Anton Ignatov
|
652fba0e23
|
Merge branch 'master-with-note-section'
|
2019-05-13 11:08:11 +02:00 |
|
Urban Rotnik
|
62bc0520e9
|
Update method last_sync_timestamp from Last to First user
|
2019-05-08 08:38:11 +02:00 |
|
Urban Rotnik
|
2364c2653f
|
Add bulk insert for UserSystemNotifications, New service for sending emails
|
2019-05-08 08:38:10 +02:00 |
|
Anton Ignatov
|
d36160386f
|
Merge branch 'master' into master-with-note-section
|
2019-05-07 13:26: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 |
|
Oleksii Kriuchykhin
|
260782e233
|
Update tests for new rich text enabled fileds [SCI-3264]
|
2019-04-24 13:45:29 +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 |
|
Anton Ignatov
|
aa2dab2014
|
Merge branch 'features/note-section' into master-with-note-section
|
2019-04-23 10:31:37 +02:00 |
|
aignatov-bio
|
6ac620feb3
|
Migration for old tinymce assets [SCI-3176] (#1663)
* adding rake task
* Addign test for update images
* Adding tests for tiny mce model
|
2019-04-19 15:24:54 +02:00 |
|
Urban Rotnik
|
22af36dd2d
|
Fix for exports_left, fix for some edge cases
|
2019-04-16 09:59:02 +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
|
e6102c72c7
|
Adding missed activities [SCI-3253] (#1614)
* Adding missed activties
* Adding test for activities
|
2019-04-02 11:50:37 +02:00 |
|
Urban Rotnik
|
b91f08fe99
|
Add activity for copying Inventory and Invetory item
|
2019-04-01 15:40:00 +02:00 |
|
Jure Grabnar
|
ebc2d8ee75
|
Fix experiment_spec test using the old variable
Closes SCI-3244
|
2019-04-01 12:50:35 +02:00 |
|
Mojca Lorber
|
f06358b2ae
|
Implement missing tests for global activities (task and protocol activities)
|
2019-03-27 11:24:44 +01:00 |
|
Urban Rotnik
|
fe35c805b7
|
Add model breadcrumbs, update activities_helper
|
2019-03-19 14:01:06 +01:00 |
|
Urban Rotnik
|
c65d1af18d
|
Fix failing tests
|
2019-03-13 09:53:34 +01:00 |
|
Urban Rotnik
|
3f18166320
|
Add Task and TaskTags 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
|
b8e84b5685
|
Add logic for saving message items values and types
|
2019-03-11 08:37:22 +01:00 |
|
Urban Rotnik
|
5a123d26ac
|
Activity model update
|
2019-02-26 07:15:05 +01:00 |
|
Urban Rotnik
|
3ad6cee766
|
Fix tests, remove nullable field
|
2019-02-25 16:50:38 +01:00 |
|
Urban Rotnik
|
5b5c6c7122
|
Changes to Activity model
|
2019-02-25 16:49:55 +01:00 |
|
Miha Mencin
|
bcd0b433b6
|
Merge pull request #1514 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-21 16:38:58 +01:00 |
|
aignatov-bio
|
5f78d83f9c
|
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513)
* fix dropdown apperance
* Remove search and fix duplicate bug
* Fix specs for new method
|
2019-02-21 16:15:13 +01:00 |
|
aignatov-bio
|
5fdba554d2
|
Merge pull request #1510 from biosistemika/features/system-notifications
Features/system notifications
|
2019-02-20 17:22:57 +01:00 |
|
Urban Rotnik
|
82ea31e275
|
Add validation limits for system notification fields
|
2019-02-20 16:05:15 +01:00 |
|
Urban Rotnik
|
7b6c6c414d
|
Merge branch 'master' into features/templates
|
2019-02-19 14:46:15 +01:00 |
|
Urban Rotnik
|
f7c7335bf0
|
Change test to pass on Travis
|
2019-02-19 11:23:01 +01:00 |
|