Urban Rotnik
1706c14b97
Merge branch 'ur-SCI-prepare-osx-local-env'
2019-01-18 16:44:37 +01:00
mlorb
d2108ac3ea
fix hound
2019-01-18 16:16:00 +01:00
Urban Rotnik
6cf4717ab3
Add envirnoments to run app without docker, reorder Gemfile
...
- Reorder Gemfile into alphabet order (rule by Rubocop)
- Add extra ENV variable for custom DB settings locally
- Add extra ENV for disable spoof check on Paperclip
2019-01-18 16:01:09 +01:00
mlorb
7fdef4d3ec
Change experiment cards look and feel
2019-01-18 15:57:44 +01:00
Oleksii Kriuchykhin
fdf7db425b
Merge branch 'master' into features/templates
2019-01-18 14:41:21 +01:00
Alex Kriuchykhin
849d5c7509
Merge pull request #1451 from jbargu/jg_sci_2937_team_export
...
Extract the experiments export & import code from team_exporter/team_importer
2019-01-18 14:40:44 +01:00
Alex Kriuchykhin
30155a2010
Merge pull request #1456 from okriuchykhin/release-1.15.3
...
Update VERSION to 1.15.3
2019-01-18 10:56:40 +01:00
Oleksii Kriuchykhin
b6d291d658
Update VERSION to 1.15.3
2019-01-18 10:53:57 +01:00
Miha Mencin
7ade88cf92
SCI-2936 code style final
2019-01-18 09:38:04 +01:00
Miha Mencin
70b1852d64
SCI-2936 code style
2019-01-18 09:33:45 +01:00
Miha Mencin
2271e453df
SCI-2936 minor refactor and code styling
2019-01-18 09:25:32 +01:00
Miha Mencin
f6230b2c9a
SCI-2936 added down method, make code more readable
2019-01-17 18:10:45 +01:00
Miha Mencin
4a6459000f
SCI-2936 added migration
2019-01-17 17:54:15 +01:00
Alex Kriuchykhin
f765bd5d91
Merge pull request #1454 from okriuchykhin/ok_SCI_2965
...
Improve export all modal messages in case of unlimited exports [SCI-2965]
2019-01-17 17:29:37 +01:00
Oleksii Kriuchykhin
1861f86b2c
Improve export all modal messages in case of unlimited exports [SCI-2965]
2019-01-17 17:27:32 +01:00
Alex Kriuchykhin
966c729a9c
Merge pull request #1453 from okriuchykhin/ok_SCI_2776_v2
...
Fix issue with caching in inventories dropdown [SCI-2776]
2019-01-17 15:14:28 +01:00
Oleksii Kriuchykhin
e62e1873b0
Fix issue with caching in inventories dropdown [SCI-2776]
2019-01-17 15:04:20 +01:00
Alex Kriuchykhin
88cea198f0
Merge pull request #1452 from okriuchykhin/ok_SCI_2950
...
Fix binary files in Export All archive [SCI-2950]
2019-01-16 17:29:48 +01:00
Oleksii Kriuchykhin
4f9eb7e165
Fix binary files in Export All archive [SCI2950]
2019-01-16 17:07:05 +01:00
Jure Grabnar
761932282b
Fix Hound formatting
...
Closes SCI-2937
2019-01-16 16:11:38 +01:00
Jure Grabnar
d1f966ee05
Add importing of the experiment templates
2019-01-16 15:54:03 +01:00
Miha Mencin
0766ee96a7
Merge pull request #1447 from okriuchykhin/ok_SCI_2875_v2
...
Fix task tags update on canvas cards [SCI-2875]
2019-01-16 12:44:50 +01:00
Alex Kriuchykhin
c771db246b
Merge pull request #1449 from okriuchykhin/ruby_245_update
...
Update Ruby to 2.4.5 and add jemalloc package
2019-01-16 10:32:37 +01:00
Jure Grabnar
5b496a85d3
Experiment exporting works
2019-01-16 08:37:05 +01:00
Jure Grabnar
0184c97c61
Refactor TeamExporter into ModelExporter
2019-01-16 08:00:01 +01:00
Oleksii Kriuchykhin
1d4fc7172d
Update Ruby to 2.4.5 and add jemalloc package
2019-01-15 17:10:10 +01:00
Jure Grabnar
ff17a7e367
Fix S3_BUCKET not being defined
2019-01-14 16:49:08 +01:00
Oleksii Kriuchykhin
3a4b992f4e
Code style fixies []SCI-2875]
2019-01-14 16:31:23 +01:00
Matej Zrimšek
a5c1cf4450
Switch user's team if he's no longer a member of the currently selected one
2019-01-12 23:39:31 +01:00
Matej Zrimšek
838455af0d
Fix protocols.io Date handling at import
2019-01-12 19:28:45 +01:00
Oleksii Kriuchykhin
89240659a7
Fix task tags update on canvas cards [SCI-2875]
2019-01-11 17:20:39 +01:00
Alex Kriuchykhin
b530cea771
Merge pull request #1438 from okriuchykhin/ok_SCI_2776
...
Add counters to task inventories dropdown [SCI-2776]
2019-01-11 16:27:22 +01:00
Alex Kriuchykhin
be514fd62d
Merge pull request #1445 from okriuchykhin/ok_SCI_2931
...
Fix image URLs in export all document [SCI-2931]
2019-01-11 12:03:06 +01:00
Luka Murn
a096175d0c
Remove test folder (apart from mailer) & update addon generator
2019-01-11 11:27:31 +01:00
Oleksii Kriuchykhin
132f46b136
Improve error handling in task inventories dropdown [SCI-2776]
2019-01-10 21:11:20 +01:00
Oleksii Kriuchykhin
ec28db6f4f
Fix image URLs in export all document [SCI-2931]
2019-01-10 14:19:40 +01:00
Alex Kriuchykhin
c2b38af91e
Merge pull request #1439 from okriuchykhin/ok_SCI_2888
...
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
2019-01-10 11:05:07 +01:00
Alex Kriuchykhin
8ea37c541b
Merge pull request #1436 from okriuchykhin/ok_SCI_2904
...
Disable edit button for unsupported WOPI formats [SCI-2904]
2019-01-10 11:04:26 +01:00
Jure Grabnar
dc79a6dc9e
Merge pull request #1442 from jbargu/jg_edit_step_help_2891
...
After edit step in app help does not appear any more
2019-01-09 17:19:33 +01:00
Alex Kriuchykhin
aef96f81ce
Merge pull request #1441 from okriuchykhin/ok_SCI_2868
...
Update rack version to 2.0.6 [SCI-2868]
2019-01-09 11:29:57 +01:00
mlorb
06b1e5cf20
Allow org. administrators to invite them onto all projects
2019-01-08 16:30:52 +01:00
Jure Grabnar
fe46f9c9fe
Reinit tooltips after cancel/save step
...
Closes SCI-2891.
2019-01-08 15:36:44 +01:00
Matej Zrimšek
8070b7f8b5
Fix Date and Time display formats on JS side
2019-01-08 08:07:24 +01:00
Matej Zrimšek
b64df7d8cc
Fix additional Date and Time display formats
2019-01-08 06:29:37 +01:00
Oleksii Kriuchykhin
7ccb42f493
Update rack version to 2.0.6 [SCI-2868]
2019-01-07 11:38:33 +01:00
Luka Murn
00a3b8b94e
Merge pull request #1440 from biosistemika/release-1.15.2
...
Merge release-1.15.2 into master
2019-01-07 11:12:38 +01:00
Luka Murn
dcba2e74f5
Update VERSION to 1.15.2
2019-01-07 10:54:28 +01:00
Oleksii Kriuchykhin
6a64b23f90
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
2019-01-04 10:44:38 +01:00
Alex Kriuchykhin
8ffe5dafee
Merge pull request #1437 from okriuchykhin/ok_SCI_2907
...
Change sample date in date format settings [SCI-2907]
2019-01-03 16:10:19 +01:00
Oleksii Kriuchykhin
5ea5b76d39
Change sample date in date format settings [SCI-2907]
2019-01-03 14:15:41 +01:00
