mz3944
108d8474f1
Merge pull request #1481 from mz3944/mz-SCI-3003
...
Experiment image is not updated after move of an experiment to another project [SCI-3003]
2019-02-07 04:42:36 +01:00
Matej Zrimšek
f68adf1e5e
Fix workflow image loading for moved experiments [SCI-3003]
2019-02-06 07:51:43 +01:00
Alex Kriuchykhin
7eb53d6408
Merge pull request #1478 from okriuchykhin/ok_SCI_2969
...
Fix Lato font loading [SCI-2969]
2019-02-04 17:21:49 +01:00
Oleksii Kriuchykhin
a033e9b207
Fix Lato font loading [SCI-2969]
2019-02-04 15:36:17 +01:00
Miha Mencin
688406cb2f
correct headings
2019-02-04 15:07:40 +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
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
293eef01c1
Merge branch 'ur-SCI-2925-copy-experiment-refactor'
2019-01-31 07:23:06 +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
Miha Mencin
0767d8308a
Merge pull request #1469 from biosistemika/pull-request-template-file
...
Pull request template file
2019-01-29 09:09:08 +01:00
Miha Mencin
22dcfa6195
changed titles to h3
2019-01-29 09:08:52 +01:00
Urban Rotnik
ed388db723
Merge branch 'ur-SCI-2926'
2019-01-28 11:58:35 +01:00
Miha Mencin
9926712267
Pull request template file
...
**What was done:**
Added initial template file
2019-01-28 11:51:35 +01:00
Urban Rotnik
4cf12d12d1
Refactor 'move_experiment' method into service object
...
Jira Ticket: SCI-2926
2019-01-28 11:45:36 +01:00
Miha Mencin
846fd1fb30
Merge pull request #1468 from biosistemika/SCI-2936-change-indexes-to-bigint
...
Write a DB migration to convert index columns to bigint
2019-01-28 11:44:46 +01:00
Miha Mencin
4acd2a592d
Adding previously forgotten schema file
2019-01-28 11:25:35 +01:00
Alex Kriuchykhin
52dec610b1
Merge pull request #1466 from biosistemika/release_1_15_3
...
Add libssl-1.0 to docker images [SCI-2970]
2019-01-25 17:00:03 +01:00
Alex Kriuchykhin
bbfae1dfac
Merge pull request #1465 from okriuchykhin/ok_SCI_2970
...
Add libssl-1.0 to docker images [SCI-2970]
2019-01-25 16:19:49 +01:00
Oleksii Kriuchykhin
c521e537c3
Add comments to docker files [SCI-2970]
2019-01-25 14:31:32 +01:00
Miha Mencin
344cb55a68
Merge pull request #1455 from biosistemika/SCI-2936-change-indexes-to-bigint
...
SCI-2936 Write a DB migration to convert index columns to bigint
2019-01-25 14:28:24 +01:00
Miha Mencin
713ece6ba6
Merge branch 'master' of github.com:biosistemika/scinote-web into SCI-2936-change-indexes-to-bigint
2019-01-25 14:08:01 +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
b85386802c
Merge branch 'ur-SCI-2935-add-recaptcha-to-invite-users-modal'
2019-01-25 11:30:50 +01:00
Urban Rotnik
16e9a56874
Add recaptcha to invitation modal
...
SCI-2935
2019-01-25 11:27:01 +01:00
Urban Rotnik
99568612b1
Merge branch 'ur-SCI-2968-refactor-export-all-counter-reset-logic'
...
SCI-2968
2019-01-25 11:24:51 +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
173c4fc701
Add libssl-1.0 to docker images [SCI-2970]
2019-01-25 11:05:01 +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
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
Miha Mencin
58f06ac570
Merge pull request #1459 from Ducz0r/lm-fix-cucumber-tests
...
Fix the Cucumber tests so they pass
2019-01-21 17:20:42 +01:00
Luka Murn
208ef0bfe1
Fix the Cucumber tests so they pass
...
With the change of factories, single Cucumber test stopped
working due to text in the test being dependant on a now randomly
(Faker) defined value.
2019-01-21 15:06:39 +01:00
Luka Murn
38d303b658
Merge pull request #1446 from Ducz0r/lm-remove-test-folder
...
Remove test folder
2019-01-21 14:07:22 +01:00
Miha Mencin
6e16a63dcd
implementing suggestion from alex, now table and indices names are hardoced
2019-01-21 11:02:33 +00: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
Luka Murn
f9f907015d
Remove test_helper.rb from addon generator
2019-01-18 17:54:27 +01:00
Urban Rotnik
30d0fcdf00
Merge branch 'ur-SCI-2924' (Refactor generate_workflow_image into service)
2019-01-18 17:01:23 +01:00
Urban Rotnik
f1d59e65f3
Add module and rename service object
2019-01-18 16:56:33 +01:00
Urban Rotnik
b41dc0a4d5
Specs for workflow_image_fenerator
...
fix SCI-2924
2019-01-18 16:56:33 +01:00
Urban Rotnik
d738169120
Refactor FactoryBot factories
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
457e9990c5
Add overcommit gem for git hooks (rubocop)
2019-01-18 16:56:28 +01:00
Urban Rotnik
1b70f42817
Refactor 'Experiment.modules_without_group' to Module's scope
2019-01-18 16:54:00 +01:00
Urban Rotnik
1706c14b97
Merge branch 'ur-SCI-prepare-osx-local-env'
2019-01-18 16:44:37 +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
