scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-19 15:41:30 +08:00
Code Issues Projects Releases Packages Wiki Activity
14953 commits 31 branches 181 tags 166 MiB
Commit graph

157 commits

Author SHA1 Message Date
aignatov-bio
6245e19069
Merge pull request #2718 from biosistemika/master 
Merge master to develop
 2020-07-09 12:56:31 +02:00
Oleksii Kriuchykhin
3af20c96c7 Fix tests and checklist item validation [SCI-4776] 2020-07-03 16:48:32 +02:00
Oleksii Kriuchykhin
dc481cf236 Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776] 2020-07-03 16:48:29 +02:00
Urban Rotnik
e89bf58e1c Refactory restore inventory service 2020-06-23 08:24:52 +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
26db4f3515 Add Archive and Restore service 2020-06-09 18:50:36 +02:00
Oleksii Kriuchykhin
837437309e Fix failing tests [SCI-4516] 2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin
9d0d75acc5 Add API endpoints for new column types [SCI-4276] 2020-02-18 15:13:46 +01:00
Oleksii Kriuchykhin
4799e6a1eb Fix failing tests [ok_SCI_4197] 2020-01-10 11:09:47 +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
d1f23d008a Fix tests 2019-11-29 10:19:16 +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
Urban Rotnik
24033bec7a Add API endpoint for Task creation 2019-11-18 11:11:37 +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
Urban Rotnik
0ce331227c Update permission and model to share repository over all teams 2019-08-13 14:07:24 +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
Jure Grabnar
c3fd810691 Remove sample_custom_field factory 2019-08-06 23:30:05 +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
Urban Rotnik
0d43ecdfab Import protocol service after object is built 2019-06-17 12:24:11 +02:00
Oleksii Kriuchykhin
109793c7fb Upgrade to Rails 5.2.3 and add ActiveStorage [SCI-3539] 2019-06-13 12:10:44 +02:00
Urban Rotnik
bbe0062bfd Small fixes for factories 2019-06-10 12:24:05 +02:00
Urban Rotnik
1bae169ab0 Delete duplicaed user_project factory 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
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
2364c2653f Add bulk insert for UserSystemNotifications, New service for sending emails 2019-05-08 08:38:10 +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
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
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
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
cfe2888bea Repository columns 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
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
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
aignatov-bio
fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-19 13:51:18 +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
mlorb
71e4cc4dbd
Merge branch 'master' into ml-sci-2940 2019-02-13 14:35:03 +01:00
Mojca Lorber
0adb8b2b61 Fix failing tests 2019-02-13 14:31:26 +01:00
Urban Rotnik
8ebb7561d9 Add last_time_changed_at columnd to SystemNotifications 2019-01-31 16:44:20 +01:00
Oleksii Kriuchykhin
cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Urban Rotnik
3e2c9934d0 Add SystemNotification model 
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
 2019-01-29 11:40:26 +01:00
Urban Rotnik
4cf12d12d1 Refactor 'move_experiment' method into service object 
Jira Ticket: SCI-2926
 2019-01-28 11:45:36 +01:00
Oleksii Kriuchykhin
05edfae766 Fix failing tests [SCI-2939] 2019-01-25 14:13:00 +01:00
Urban Rotnik
f1d59e65f3 Add module and rename service object 2019-01-18 16:56:33 +01:00
Urban Rotnik
d738169120 Refactor FactoryBot factories 2019-01-18 16:56:33 +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
Oleksii Kriuchykhin
e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin
0db9ef44e2 Add experiment, task, result READ endpoints tests [SCI-2742] 2018-10-15 16:27:22 +02:00
Oleksii Kriuchykhin
af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Luka Murn
0bd3c81e39 Fix /users, /users/:id/identities endpoints 2018-10-07 13:07:27 +02:00
Oleksii Kriuchykhin
363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +02:00
Oleksii Kriuchykhin
afef8bc0b1 Fix failing tests [SCI-2687] 2018-08-24 15:37:23 +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
Oleksii Kriuchykhin
298b866df4 Fix failing tests [SCI-2611][SCI-2612] 2018-08-07 14:58:02 +02:00
zmagod
589389fa8e fixex failing specs 2018-04-25 11:00:22 +02:00
zmagod
c23eacfe13 fixes for_admin action/ test visible_by functlion 2018-04-19 12:41:00 +02:00
okriuchykhin
503617b42c
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025 2018-03-13 14:44:20 +01:00
mlorb
3b9ad2f86f
Merge pull request #1028 from mlorb/ml-sci-2144 
Add file custom column type to db [SCI-2144]
 2018-03-12 15:18:02 +01:00
mlorb
64e26e1c60 add file custom column type to db 2018-03-09 17:04:54 +01:00
zmagod
fca01bd54f refactor repository export [fixes SCI-2025] 2018-03-05 15:54:04 +01:00
zmagod
c53df21946 adds specs for sample_to_repository migration service 2018-02-15 16:56:38 +01:00
zmagod
ae99c92516 follow @okriuchykhin 's suggestions 2018-02-09 16:28:21 +01:00
zmagod
557aeca049 refactor relations 2018-02-09 14:11:56 +01:00
zmagod
6b7ff11bcf setup models for repository list column [fixes SCI-2015] 2018-02-07 15:28:28 +01:00
zmagod
88d7429041 1. fixes failing unit and integration tests 
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
 2018-01-23 14:54:15 +01:00
zmagod
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +01:00
zmagod
1d3881b649 fixes bug with duplicated activities and wrong date separators [fixes SCI-1866] 2018-01-03 13:48:59 +01:00
zmagod
219ef3baf6 setup new pagination for activities 2017-12-14 14:02:40 +01:00
zmagod
3d22a5404d add scenic gem, teams datatables sql view 2017-10-26 16:59:00 +02:00
zmagod
edf4443995 added notification alert [fixes SCI-1566] 2017-10-02 14:51:54 +02:00