mlorb
|
86c325c9e6
|
Merge pull request #1480 from mlorb/ml-sci-2940
Update the Demo Project generation [SCI-2940]
|
2019-02-14 08:14:29 +01:00 |
|
mlorb
|
71e4cc4dbd
|
Merge branch 'master' into ml-sci-2940
|
2019-02-13 14:35:03 +01:00 |
|
Mojca Lorber
|
0adb8b2b61
|
Fix failing tests
|
2019-02-13 14:31:26 +01:00 |
|
Mojca Lorber
|
16f99afbc0
|
Minor fixes
|
2019-02-13 12:20:14 +01:00 |
|
mlorb
|
8bad68c854
|
Merge pull request #1457 from mlorb/ml-sci-2933
Change experiment cards look and feel [SCI-2933]
|
2019-02-12 11:49:24 +01:00 |
|
Mojca Lorber
|
3b4a894124
|
fix hound
|
2019-02-12 11:24:44 +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 |
|
Alex Kriuchykhin
|
dc7fdaa191
|
Merge pull request #1486 from okriuchykhin/ok_SCI_3023
Improve error logging in protocol import [SCI-3023]
|
2019-02-07 15:58:07 +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 |
|
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 |
|
Mojca Lorber
|
227aeb284c
|
change mydemo projects data
|
2019-02-05 11:15:16 +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
|
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 |
|
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 |
|
Mojca Lorber
|
089ec64398
|
fix experiment card look on Matejs request
|
2019-01-28 16:59:40 +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 |
|