Commit graph

762 commits

Author SHA1 Message Date
zmagod 81df97f008 add library sidebar and create new library button [fixes SCI-2121] 2018-03-21 09:22:55 +01:00
zmagod 62858bc14f Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-20 14:46:11 +01:00
zmagod 1ad8c259d1 add blank page for repositories [fixes SCI-2139] 2018-03-20 14:45:57 +01:00
mlorb 35afc06cbd
Merge pull request #1038 from mlorb/ml-sci-2118
Code left-side menu bar [SCI-2118]
2018-03-20 14:40:55 +01:00
Zmago Devetak 75d7ace8c7
Merge pull request #1017 from ZmagoD/zd_SCI_2068
Write server-side endpoints for custom repositories [SCI-2068]
2018-03-20 14:30:47 +01:00
mlorb 884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00
okriuchykhin 935715a8c1
Merge pull request #1043 from okriuchykhin/ok_SCI_2193
Rename record to item in repository row info modal [SCI-2193]
2018-03-20 09:53:34 +01:00
Oleksii Kriuchykhin acbd40e0d1 Remove Power Up button [SCI-2117] 2018-03-18 22:12:29 +01:00
Oleksii Kriuchykhin 79fd2fbb2f Rename record to item in repository row info modal [SCI-2193] 2018-03-18 13:51:40 +01:00
zmagod ee03115361 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2095 2018-03-16 15:32:40 +01:00
zmagod 1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod c2eb6d6900 fixes hound adds specs to repository_list_items controller 2018-03-16 10:53:05 +01:00
zmagod d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
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 8fe173e831 re-structure top navigation bar 2018-03-12 16:27:35 +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
zmagod 4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
Oleksii Kriuchykhin 1765d83cd1 Refactor search to support repository list items [SCI-2108] 2018-03-09 11:05:43 +01:00
zmagod fb66131e29 setup endpoint for repository_rows paging/search 2018-03-06 16:32:39 +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