Oleksii Kriuchykhin
|
445098fe45
|
Fix protocols in team export service [SCI-3037]
|
2019-02-12 10:56:15 +01:00 |
|
mlorb
|
61eb79bcfc
|
Merge pull request #1490 from mlorb/ml-sci-2938-v2
Add templates after protocol_keyword_team rake task was run [SCI-2938]
|
2019-02-11 16:22:29 +01:00 |
|
Mojca Lorber
|
78a29c4141
|
add templates after protocol_keyword_team rake task was run
|
2019-02-11 16:15:56 +01:00 |
|
mlorb
|
5d6d59a348
|
Merge pull request #1489 from mlorb/ml-sci-2938
Add templates [SCI-2938]
|
2019-02-11 14:07:47 +01:00 |
|
Mojca Lorber
|
087832c29d
|
add templates
|
2019-02-11 14:02:49 +01:00 |
|
Jure Grabnar
|
2ad63e09fd
|
Merge pull request #1483 from jbargu/jg_sci_2946
Test experiment import [SCI-2946]
|
2019-02-10 15:26:20 +01:00 |
|
Jure Grabnar
|
c5780927a8
|
Change a test to work with multiple tests run at the same time
|
2019-02-06 22:07:54 +01:00 |
|
Jure Grabnar
|
6ae82401f3
|
Add test experiment.json file
|
2019-02-06 21:06:56 +01:00 |
|
Jure Grabnar
|
0fa403d6b0
|
Refactor tests fro experiment import
Closes [SCI-2946]
|
2019-02-06 14:27:43 +01:00 |
|
Jure Grabnar
|
55fdd201b2
|
Add additional checks
|
2019-02-05 14:27:42 +01:00 |
|
Jure Grabnar
|
0a3146fbe6
|
Add checking of experiment basics
|
2019-02-05 14:27:42 +01:00 |
|
Jure Grabnar
|
e180d5e100
|
Add test skeleton for importing
|
2019-02-05 14:27:42 +01:00 |
|
Alex Kriuchykhin
|
1bd6d2a032
|
Merge pull request #1464 from okriuchykhin/ok_SCI_2939
Add templates business logic [SCI-2939]
|
2019-01-30 11:21:42 +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 |
|
Luka Murn
|
1f7bca485a
|
Merge pull request #1471 from biosistemika/master
Merge master into features/templates
|
2019-01-29 10:14:09 +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 |
|
Oleksii Kriuchykhin
|
f7b73c617a
|
Fix code styling [SCI-2939]
|
2019-01-28 15:37:24 +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 |
|
Oleksii Kriuchykhin
|
05edfae766
|
Fix failing tests [SCI-2939]
|
2019-01-25 14:13:00 +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 |
|
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 |
|
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 |
|