Commit graph

5430 commits

Author SHA1 Message Date
Alex Kriuchykhin
6e088ebf3b
Merge pull request #1724 from okriuchykhin/ok_SCI_3402
Switch from package-lock.json to yarn.lock [SCI-3402]
2019-05-13 10:29:33 +02:00
Alex Kriuchykhin
2a7f70929a
Merge pull request #1717 from okriuchykhin/ok_SCI_3368
Improve clean up of Export All files [SCI-3368]
2019-05-09 13:37:56 +02:00
Alex Kriuchykhin
1414085656
Merge pull request #1740 from okriuchykhin/ok_SCI_3403
Improve HTML data escaping in JSON endpoints [SCI-3403]
2019-05-09 13:37:17 +02:00
Oleksii Kriuchykhin
40550f92c9 Improve HTML data escaping in JSON endpoints [SCI-3403] 2019-05-08 17:38:24 +02:00
Urban Rotnik
d5e2398f5c
Merge pull request #1699 from urbanrotnik/ur-sci-3346-global-activities-fix
Bulk insert for SystemNotifications, updated ordering [SCI-3346]
2019-05-08 09:17:56 +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
Urban Rotnik
357c6e6b98 Change ordering by created_at instead by last_time_changed_at 2019-05-08 08:37:34 +02:00
Oleksii Kriuchykhin
8239ab9c6b Fix TravisCI tests [SCI-3402] 2019-05-07 17:27:23 +02:00
Alex Kriuchykhin
66a563e032
Merge pull request #1733 from okriuchykhin/ok_SCI_3351
Fix deletion of unconfirmed users [SCI-3351]
2019-05-07 16:43:05 +02:00
Oleksii Kriuchykhin
84712de9ca Fix failing tests [SCI-3368] 2019-05-07 16:42:06 +02:00
Oleksii Kriuchykhin
8461949bed Fix deletion of inconfirmed users [SCI-3351] 2019-05-07 16:02:45 +02:00
Oleksii Kriuchykhin
0147b3e3d7 Switch from package-lock.json to yarn.lock [SCI-3402] 2019-05-06 14:04:41 +02:00
Alex Kriuchykhin
f75c642884
Merge pull request #1721 from okriuchykhin/ok_SCI_3401
Update Ruby to 2.5.5, Rails to 5.1.7 and Devise to 4.6.2 [SCI-3401]
2019-05-06 12:58:23 +02:00
Alex Kriuchykhin
49a790c50a
Merge pull request #1698 from okriuchykhin/ok_SCI_3182
Switch to memory_store for caching in production [SCI-3182]
2019-05-06 09:59:25 +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
mlorb
9f0983de77
Merge pull request #1706 from mlorb/ml-sci-3350
Change ownership of inventory items, when a user leaves a team [SCI-3350]
2019-04-30 10:39:14 +02:00
Oleksii Kriuchykhin
1b792e2b7e Improve clean up of Export All files [SCI-3368] 2019-04-30 00:43:34 +02:00
Mojca Lorber
5fd4c47388 Move change owner functionality to RepositoryRow 2019-04-29 14:02:02 +02:00
Alex Kriuchykhin
c735607930
Merge pull request #1701 from okriuchykhin/ok_SCI_3391
Fix sorting by user name with search parameter in inventories [SCI-3391]
2019-04-26 15:39:48 +02:00
Alex Kriuchykhin
5d85ac0a95
Merge pull request #1702 from okriuchykhin/ok_SCI_3390
Fix loading more activities on task page [SCI-3390]
2019-04-26 15:39:31 +02:00
mlorb
12564bd070
Merge pull request #1686 from mlorb/ml-sci-3324
Add activity for importing inventory items [SCI-3324]
2019-04-26 15:20:40 +02:00
Mojca Lorber
9e04eb8ea1 Fixes upon Urbans request 2019-04-26 11:34:53 +02:00
Mojca Lorber
eac90109f7 Change ownership of inventory items, when a user leaves a team 2019-04-26 10:47:08 +02:00
Oleksii Kriuchykhin
66631ba26c Fix loading more activities on task page [SCI-3390] 2019-04-25 23:50:00 +02:00
Oleksii Kriuchykhin
3c1774d330 Fix sorting by user name with search parameter in inventories [SCI-3391] 2019-04-25 16:29:41 +02:00
Urban Rotnik
09d1946b19
Merge pull request #1655 from urbanrotnik/ur-overcommit-config-update
Enable ScssLint
2019-04-25 14:56:56 +02:00
Oleksii Kriuchykhin
8bec85c7b9 Switch to memory_store for caching in production [SCI-3182] 2019-04-24 19:17:31 +02:00
Jure Grabnar
1da1558849
Merge pull request #1683 from jbargu/jg_3179
Archived results are now separated in exported project
2019-04-19 18:26:22 +02:00
aignatov-bio
6968060078
Fix user order bug (#1687) 2019-04-19 15:24:13 +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
Miha Mencin
be31cc373d
Update Version
to 1.16.2
2019-04-18 10:22:35 +02:00
aignatov-bio
1da0a3c6ef
Merge pull request #1685 from aignatov-bio/ai-disable-zoom
disable zoom
2019-04-18 09:15:27 +02:00
Anton Ignatov
f1d801117d disable zoom 2019-04-18 09:11:27 +02:00
Alex Kriuchykhin
8fa6bbc0ab
Merge pull request #1679 from okriuchykhin/ok_SCI_3177
Improve experiment preview image generation [SCI-3177]
2019-04-17 20:35:29 +02:00
aignatov-bio
f6c04c252e
Merge pull request #1684 from aignatov-bio/ai-fix-ie-zoom-out
Remove minimum zoom size
2019-04-17 18:58:38 +02:00
Anton Ignatov
f6ecea42cf Remove minimum zoom size 2019-04-17 18:51:52 +02:00
Miha Mencin
7e699ce648
Update Version
to 1.16.1
2019-04-17 18:17:05 +02:00
Jure Grabnar
1295c0583a Archived results are now separated in exported project
Closes SCI-3179
2019-04-17 16:37:21 +02:00
Alex Kriuchykhin
5799065036
Merge pull request #1681 from okriuchykhin/schema_update
Update schema.rb file
2019-04-17 15:39:23 +02:00
Oleksii Kriuchykhin
4014f19665 Update schema.rb file 2019-04-17 14:57:38 +02:00
Oleksii Kriuchykhin
96cf7b4de2 Fix failing tests [SCI-3177] 2019-04-17 12:58:47 +02:00
Alex Kriuchykhin
b4cf665c21
Merge pull request #1673 from okriuchykhin/ok_SCI_3294
Fix team export/import for new activities [SCI-3294]
2019-04-17 12:49:45 +02:00
Oleksii Kriuchykhin
f9832013b0 Improve experiment preview image generation [SCI-3177] 2019-04-17 12:06:46 +02:00
Urban Rotnik
12bfb7e51c
Merge pull request #1678 from urbanrotnik/ur-sci-3355-notifications-dropdown-problem-with-1-team
Fix navigationJS team switch when have only 1 team [SCI-3355]
2019-04-17 10:15:53 +02:00
Urban Rotnik
3f037ef517 Fix navigationJS team switch when have only 1 team 2019-04-17 09:58:18 +02:00
Urban Rotnik
782d1dfc2d
Merge pull request #1677 from urbanrotnik/ur-sci-3345-export-all-counter-fix-2
Exports left after export [SCI-3345]
2019-04-16 14:44:48 +02:00
Urban Rotnik
4f8faba84e Exports left after export fix 2019-04-16 14:21:47 +02:00