mlorb
|
9de998e85c
|
code left-side menu bar
|
2018-03-14 14:33:34 +01:00 |
|
Zmago Devetak
|
d7679dcb99
|
Merge pull request #1032 from ZmagoD/zd_SCI_2141
refactor global activities in separate page [fixes SCI-2141]
|
2018-03-13 15:20:14 +01:00 |
|
zmagod
|
dd2f7dd417
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into samples_to_repositories_table_migration
|
2018-03-13 13:24:36 +01:00 |
|
Oleksii Kriuchykhin
|
be1ead22e0
|
Implement importable selector for repository columns [SCI-2078]
|
2018-03-13 11:36:05 +01:00 |
|
zmagod
|
e218cae453
|
refactor global activities in separate page [fixes SCI-2141]
|
2018-03-12 11:01:23 +01:00 |
|
mlorb
|
64e26e1c60
|
add file custom column type to db
|
2018-03-09 17:04:54 +01:00 |
|
Oleksii Kriuchykhin
|
1765d83cd1
|
Refactor search to support repository list items [SCI-2108]
|
2018-03-09 11:05:43 +01:00 |
|
mz3944
|
bb21f6543c
|
Merge pull request #1004 from mz3944/mz-SCI-2011
Wrapping up the permissions [SCI-2011]
|
2018-03-06 07:10:40 +01:00 |
|
mlorb
|
5e44859ce0
|
Merge pull request #1010 from mlorb/ml-sci-1826
Sign up with linkedIn account [SCI-1826]
|
2018-03-05 13:24:36 +01:00 |
|
Zmago Devetak
|
50ccec5007
|
Merge pull request #1009 from ZmagoD/zd_SCI_2066
add info modal for repository items [fixes SCI-2066]
|
2018-03-05 12:49:29 +01:00 |
|
mz3944
|
f40b0bd095
|
Merge pull request #1006 from mz3944/mz-SCI-2065
Extend description for adding files to step/result [SCI-2065]
|
2018-03-04 13:34:37 +01:00 |
|
zmagod
|
2b55cd7090
|
rename variables
|
2018-03-02 14:14:27 +01:00 |
|
mlorb
|
f5949e9d10
|
refactor
|
2018-03-01 17:52:24 +01:00 |
|
Luka Murn
|
070450f813
|
Merge branch 'release-1.12.11'
Conflicts:
config/initializers/extends.rb
|
2018-03-01 14:04:57 +01:00 |
|
mlorb
|
e66eab7f57
|
fix typo
|
2018-03-01 09:45:52 +01:00 |
|
mlorb
|
9199f287ba
|
fix hound
|
2018-03-01 09:18:36 +01:00 |
|
mlorb
|
08439e7f58
|
sign up with linkedIn account
|
2018-02-28 18:12:21 +01:00 |
|
zmagod
|
e3ca782996
|
add info modal for repository items [fixes SCI-2066]
|
2018-02-27 16:21:46 +01:00 |
|
Oleksii Kriuchykhin
|
aa933ad1f4
|
Add extendable file types mappings for icons [PIP-46]
|
2018-02-26 14:23:02 +01:00 |
|
Matej Zrimšek
|
48bdd84163
|
Updated file upload text, to notify user of another approach to uploading files.
|
2018-02-22 14:18:53 +01:00 |
|
okriuchykhin
|
0503aa054d
|
Merge pull request #999 from okriuchykhin/smtp_auth_method
Allow setting of SMTP auth method through ENV variable
|
2018-02-15 13:40:20 +01:00 |
|
Oleksii Kriuchykhin
|
00fcf5404b
|
Allow setting of SMTP auth method through ENV variable
|
2018-02-14 17:02:28 +01:00 |
|
Matej Zrimšek
|
68206cb591
|
Added missing checks for whether task/experiment/project is active for experiment level permissions. Minor code refactoring and restyling.
|
2018-02-14 14:39:08 +01:00 |
|
Zmago Devetak
|
027297d46a
|
Merge pull request #985 from ZmagoD/zd_SCI_2008
fixes bug with assets upload on task result page,
|
2018-02-12 11:40:44 +01:00 |
|
okriuchykhin
|
5a94b40d9c
|
Merge pull request #978 from okriuchykhin/ok_SCI_2003
Improve files handling in protocol cloning [SCI-2003]
|
2018-02-12 11:01:59 +01:00 |
|
zmagod
|
6b7ff11bcf
|
setup models for repository list column [fixes SCI-2015]
|
2018-02-07 15:28:28 +01:00 |
|
Luka Murn
|
b5ac4494d5
|
Uncommit load_addons_specs.rb
|
2018-02-06 16:58:15 +01:00 |
|
zmagod
|
bd1345d560
|
fixes bug with assets upload on task result page,
adds ctrl+v listener to upload images from clipboard, adds image preview modal
|
2018-02-06 15:39:19 +01:00 |
|
Luka Murn
|
5281d0792e
|
Comment load_addons_specs.rb out
|
2018-02-06 08:48:33 +01:00 |
|
Luka Murn
|
4ddc7dfa85
|
Comment react-hijack code
|
2018-02-06 08:00:29 +01:00 |
|
Oleksii Kriuchykhin
|
16e1d072b9
|
Improve files handling in protocol clonning [SCI-2003]
|
2018-02-01 15:44:08 +01:00 |
|
zmagod
|
2684d2b515
|
fix typo
|
2018-02-01 15:34:40 +01:00 |
|
zmagod
|
952173fbd6
|
escape if no feature folder present
|
2018-02-01 14:03:36 +01:00 |
|
zmagod
|
c6d585bc57
|
adds spec/features loader [fixes SCI-1998]
|
2018-02-01 13:37:52 +01:00 |
|
Zmago Devetak
|
ccab688728
|
Merge pull request #975 from ZmagoD/zd_SCI_2001
Zd sci 2001
|
2018-01-31 14:42:41 +01:00 |
|
okriuchykhin
|
df66a3b410
|
Merge pull request #973 from okriuchykhin/ok_SCI_1975
Allow optional tagging for logs [SCI-1975]
|
2018-01-31 13:31:01 +01:00 |
|
Luka Murn
|
d4183aa253
|
Fix a typo
|
2018-01-31 08:20:42 +01:00 |
|
Oleksii Kriuchykhin
|
bdc60b9d53
|
Allow optional tagging for logs [SCI-1975]
|
2018-01-30 18:24:01 +01:00 |
|
zmagod
|
029d69b033
|
revert to old setting [fixes SCI-1967]
|
2018-01-29 15:42:22 +01:00 |
|
Luka Murn
|
f752f82658
|
Fix canaid initializer so it only uses required Gems' permissions
This should make sure that other addons that are located in
/addons folder, but not actually required by the core,
do not cause trouble.
|
2018-01-26 16:24:28 +01:00 |
|
Zanz2
|
e484f0569b
|
Merge pull request #960 from Zanz2/fixed_styling_after_merge
Fixed some styling bugs that happened after the merge
|
2018-01-26 08:19:29 +01:00 |
|
okriuchykhin
|
0b1f43c1c5
|
Merge pull request #954 from okriuchykhin/ok_SCI_1970
Add health check endpoint to API controller [SCI-1970]
|
2018-01-25 14:33:37 +01:00 |
|
zanzdebian
|
8bd8c34c4d
|
Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button)
|
2018-01-25 13:45:35 +01:00 |
|
mlorb
|
ab2955c9bb
|
Merge pull request #956 from mlorb/ml-sci-1491
Add notification for previous task has been completed [SCI-1491]
|
2018-01-25 11:35:19 +01:00 |
|
Zmago Devetak
|
4716fc7752
|
Merge pull request #955 from biosistemika/decoupling
Decoupling
|
2018-01-25 11:33:06 +01:00 |
|
Mojca Lorber
|
ac8b1769be
|
add notification for previous task has been completed
|
2018-01-23 15:53:33 +01:00 |
|
okriuchykhin
|
a2896031ab
|
Merge pull request #951 from okriuchykhin/ok_SCI_1949
Allow first user seeding from env variables [SCI-1949]
|
2018-01-23 14:02:54 +01:00 |
|
zmagod
|
f8a3fca2db
|
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
|
2018-01-23 11:06:33 +01:00 |
|
Oleksii Kriuchykhin
|
28be7c4fc4
|
Add health check endpoint to API controller [SCI-1970]
|
2018-01-22 16:52:48 +01:00 |
|
zmagod
|
246146c71e
|
adds Delayed::Worker initializer [fixes SCI_1948]
|
2018-01-19 16:30:29 +01:00 |
|