scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-10 17:36:33 +08:00
Code Issues Projects Releases Packages Wiki Activity
6549 commits 44 branches 180 tags 166 MiB
Commit graph

122 commits

Author SHA1 Message Date
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
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