Mojca Lorber
|
087832c29d
|
add templates
|
2019-02-11 14:02:49 +01:00 |
|
aignatov-bio
|
de75ec4600
|
Merge pull request #1485 from biosistemika/ai-sci-3006-inventory-order-bug
[SCI-3006] After changing order of inventory columns item can not be edited, deleted, copied
|
2019-02-11 13:50:13 +01:00 |
|
aignatov-bio
|
16164477ac
|
Merge pull request #1487 from biosistemika/ai-sci-3005-user-counter-card-not-updated
User counter on task card is not updated [SCI-3005]
|
2019-02-11 13:49:49 +01:00 |
|
Alex Kriuchykhin
|
b7d7e4bf10
|
Merge pull request #1488 from okriuchykhin/ok_SCI_3030
Fix TinyMCE images in protocol import [SCI-3030]
|
2019-02-11 13:41:01 +01:00 |
|
Alex Kriuchykhin
|
11e0ccc24a
|
Merge pull request #1479 from okriuchykhin/ok_SCI_2967
Optionally disable Tika background mode through env variable [SCI-2967]
|
2019-02-11 12:56:31 +01:00 |
|
Oleksii Kriuchykhin
|
2ff5199be0
|
Fix TinyMCE images in protocol import [SCI-3030]
|
2019-02-07 16:58:38 +01:00 |
|
Anton Ignatov
|
c389b7ab06
|
remove console.log from js
|
2019-02-07 14:26:15 +01:00 |
|
Anton Ignatov
|
c6ab6da381
|
Fixed counter bug SCI-3005
|
2019-02-07 14:23:37 +01:00 |
|
Oleksii Kriuchykhin
|
3376fd012c
|
Improve error loggin in protocol import [SCI-3023]
|
2019-02-07 14:00:24 +01:00 |
|
Anton Ignatov
|
4145b2565c
|
Fixed bug with order in inventories SCI-3006
|
2019-02-07 11:34:04 +01:00 |
|
Oleksii Kriuchykhin
|
fdff69f22e
|
Add comment for Tika start up code [SCI-2967]
|
2019-02-07 11:06:25 +01:00 |
|
Jure Grabnar
|
0fa403d6b0
|
Refactor tests fro experiment import
Closes [SCI-2946]
|
2019-02-06 14:27:43 +01:00 |
|
Matej Zrimšek
|
f68adf1e5e
|
Fix workflow image loading for moved experiments [SCI-3003]
|
2019-02-06 07:51:43 +01:00 |
|
Mojca Lorber
|
227aeb284c
|
change mydemo projects data
|
2019-02-05 11:15:16 +01:00 |
|
Oleksii Kriuchykhin
|
13c4bd25af
|
Optionally disable Tika background mode through env variable [SCI-2967]
|
2019-02-04 16:47:29 +01:00 |
|
Oleksii Kriuchykhin
|
a033e9b207
|
Fix Lato font loading [SCI-2969]
|
2019-02-04 15:36:17 +01:00 |
|
Oleksii Kriuchykhin
|
19f1585352
|
Add test for templates service [SCI-2944]
|
2019-02-01 18:06:36 +01:00 |
|
Miha Mencin
|
e84ab5b550
|
Merge pull request #1475 from biosistemika/mm-sci-2982-user-variables-bug
SciNoteSCI-2982 Investigate (plus, fix) the User.variables on my.scinote.net
|
2019-02-01 09:46:19 +01:00 |
|
mz3944
|
a315808d58
|
Merge pull request #1473 from mz3944/mz-SCI-2918
In html project export there is formula instead of result in table [SCI-2918]
|
2019-02-01 04:49:14 +01:00 |
|
Urban Rotnik
|
8ebb7561d9
|
Add last_time_changed_at columnd to SystemNotifications
|
2019-01-31 16:44:20 +01:00 |
|
Miha Mencin
|
d2dfe68e46
|
Changing double quotes to single quotes
|
2019-01-31 10:31:03 +01:00 |
|
Miha Mencin
|
3ec62758fe
|
SCI-2982, handle the empty json condition
|
2019-01-31 09:43:41 +01:00 |
|
Matej Zrimšek
|
ac78c7d21b
|
Process Handsontable formulas in project HTML files in team export [SCI-2918]
|
2019-01-31 07:39:17 +01:00 |
|
Urban Rotnik
|
6f7fcb0831
|
Refactor method clone_experiment_as_template into service object
[SCI-2925]
|
2019-01-31 07:13:40 +01:00 |
|
mz3944
|
2ae56eb13f
|
Merge pull request #1448 from mz3944/mz-SCI-2929
Can not switch team [SCI-2929]
|
2019-01-31 04:43:39 +01:00 |
|
Oleksii Kriuchykhin
|
cc57a8d4ef
|
Fix template project name generation [SCI-2939]
|
2019-01-30 10:56:22 +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 |
|
Luka Murn
|
1f7bca485a
|
Merge pull request #1471 from biosistemika/master
Merge master into features/templates
|
2019-01-29 10:14:09 +01:00 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +01:00 |
|
Oleksii Kriuchykhin
|
f7b73c617a
|
Fix code styling [SCI-2939]
|
2019-01-28 15:37:24 +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 |
|
Miha Mencin
|
b67cee2e65
|
Merge pull request #1462 from biosistemika/SCI-2928-turbolinks-bug
SCI-2928 moving team modal js file to application.js.erb in order to …
|
2019-01-25 11:54:14 +01:00 |
|
Urban Rotnik
|
16e9a56874
|
Add recaptcha to invitation modal
SCI-2935
|
2019-01-25 11:27:01 +01:00 |
|
Urban Rotnik
|
247bae8a9f
|
Refactor export_all_counter increasing/reseting logic
- Remove daily task
- Add method to user Model
|
2019-01-25 11:16:31 +01:00 |
|
Oleksii Kriuchykhin
|
bd2efa55ac
|
Add templates business logic [SCI-2939]
|
2019-01-25 10:55:08 +01:00 |
|
mlorb
|
a297ef2094
|
Merge pull request #1443 from mlorb/ml-sci-2914
Allow org. administrators to invite them onto all projects [SCI-2914]
|
2019-01-24 16:24:57 +01:00 |
|
Mojca Lorber
|
fa1dff6352
|
refactor Demo project generation
|
2019-01-24 13:40:53 +01:00 |
|
mz3944
|
79d35de794
|
Merge pull request #1435 from mz3944/mz-SCI-2912
An error at archiving experiment with locked task [SCI-2912]
|
2019-01-24 05:27:58 +01:00 |
|
Miha Mencin
|
126a031498
|
SCI-2928 moving team modal js file to application.js.erb in order to run the first time when page is loaded
|
2019-01-23 15:30:23 +01:00 |
|
mz3944
|
f6c8af105d
|
Merge pull request #1434 from mz3944/mz-SCI-2903
Fix (unite) Date and Time display formats [SCI-2903]
|
2019-01-21 09:50:34 +01:00 |
|
Urban Rotnik
|
f1d59e65f3
|
Add module and rename service object
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
47cc6a9d10
|
Refactor workflow_image_generation and move to service class
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
686f10cbd0
|
Refactor instance method 'ordered_modules' to scope
|
2019-01-18 16:56:33 +01:00 |
|
Urban Rotnik
|
1b70f42817
|
Refactor 'Experiment.modules_without_group' to Module's scope
|
2019-01-18 16:54:00 +01:00 |
|
mlorb
|
d2108ac3ea
|
fix hound
|
2019-01-18 16:16:00 +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 |
|
Oleksii Kriuchykhin
|
1861f86b2c
|
Improve export all modal messages in case of unlimited exports [SCI-2965]
|
2019-01-17 17:27:32 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Oleksii Kriuchykhin
|
534866467b
|
Add counters to task inventories dropdown [SCI-2776]
|
2019-01-03 14:11:00 +01:00 |
|
Oleksii Kriuchykhin
|
2769add4d9
|
Disable edit button for unsupported WOPI formats [SCI-2904]
|
2018-12-31 18:10:12 +01:00 |
|
Matej Zrimšek
|
c84457e1ed
|
Prevent archiving of experiments with at least one locked task
|
2018-12-23 21:17:51 +01:00 |
|
Matej Zrimšek
|
b74105abc2
|
Fix Date and Time display formats
|
2018-12-23 20:30:09 +01:00 |
|
Luka Murn
|
1c8407e4f4
|
Merge pull request #1433 from okriuchykhin/ok_SCI_2864
Additional fix for export all S3 path [SCI-2864]
|
2018-12-20 13:27:50 +01:00 |
|
Oleksii Kriuchykhin
|
2fa4f42883
|
Additional fix for export all S3 path [SCI-2864]
|
2018-12-20 13:22:56 +01:00 |
|
Luka Murn
|
faf6601962
|
Merge pull request #1432 from okriuchykhin/ok_SCI_2864
Fix S3 zip exports path [SCI-2864]
|
2018-12-20 11:08:48 +01:00 |
|
Oleksii Kriuchykhin
|
c880f3fd84
|
Fix S3 zip exports path [SCI-2864]
|
2018-12-20 11:07:19 +01:00 |
|
Luka Murn
|
ac5c809d20
|
Add force_encoding to export all report view template
|
2018-12-18 21:03:10 +01:00 |
|
Luka Murn
|
cb1cfe2ef3
|
Merge pull request #1429 from Ducz0r/lm-sci-2902-fix-2
Fix assets include in export all report to work on production env [SCI-2902]
|
2018-12-18 09:14:44 +01:00 |
|
Luka Murn
|
097e871228
|
Fix assets include in export all report to work on production env
Closes SCI-2902.
|
2018-12-18 09:10:55 +01:00 |
|
Oleksii Kriuchykhin
|
3610960ee3
|
Fix ajax calls duplication [SCI-2916]
|
2018-12-17 20:59:22 +01:00 |
|
mlorb
|
5ebcd1dfe1
|
Merge pull request #1423 from mlorb/ml-sci-2911
Fix export projects getting fired multiple times [SCI-2911]
|
2018-12-17 11:26:40 +01:00 |
|
mlorb
|
37f1d66268
|
Merge pull request #1421 from mlorb/ml-sci-2800-v2
Fix tooltip style [SCI-2800]
|
2018-12-17 11:25:31 +01:00 |
|
Luka Murn
|
8935e4c7c1
|
Merge pull request #1426 from Ducz0r/lm-add-queue-to-export-all-jobs
Add team_zip_export job queue to export all delayed jobs
|
2018-12-16 22:16:10 +01:00 |
|
Alex Kriuchykhin
|
94e6143ac0
|
Merge pull request #1425 from okriuchykhin/ok_SCI_2907
Use fixed date example in date format drop down [SCI-2907]
|
2018-12-16 20:11:58 +01:00 |
|
Alex Kriuchykhin
|
a6bfa38ceb
|
Merge pull request #1424 from okriuchykhin/ok_SCI_2909
Change color of the selected element in the side navigation [SCI-2909]
|
2018-12-16 20:11:41 +01:00 |
|
Alex Kriuchykhin
|
ab0924c8e6
|
Merge pull request #1415 from okriuchykhin/ok_SCI_2864
Use built-in methods for Postgres extensions enabling [SCI-2864]
|
2018-12-16 19:45:56 +01:00 |
|
Alex Kriuchykhin
|
8a348b8504
|
Merge pull request #1422 from okriuchykhin/ok_SCI_2910
Improve rendering speed of inventory table [SCI-2910]
|
2018-12-16 19:45:29 +01:00 |
|
Alex Kriuchykhin
|
abdf64a8c7
|
Merge pull request #1420 from okriuchykhin/ok_SCI_2894
Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]
|
2018-12-16 19:44:50 +01:00 |
|
Luka Murn
|
7ba9628cfb
|
Add team_zip_export job queue to export all delayed jobs
|
2018-12-13 18:40:56 +01:00 |
|
Oleksii Kriuchykhin
|
23f8602872
|
Use fixed date example in date format dropdown [SCI-2907]
|
2018-12-13 17:53:04 +01:00 |
|
Oleksii Kriuchykhin
|
97bde075b2
|
Change color of the selected element in the side navigation [SCI-2909]
|
2018-12-13 16:50:22 +01:00 |
|
mlorb
|
55cab34eb4
|
fix export projects getting fired miltiple times
|
2018-12-13 16:46:08 +01:00 |
|