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 |
|
okriuchykhin
|
5b1951e01e
|
Merge pull request #1044 from okriuchykhin/ok_SCI_2117
Remove Power Up button [SCI-2117]
|
2018-03-20 09:53:17 +01:00 |
|
okriuchykhin
|
d906baff61
|
Merge pull request #1039 from okriuchykhin/ok_SCI_1697
Improve connections between repository models [SCI-1697]
|
2018-03-19 16:42:55 +01:00 |
|
Zmago Devetak
|
8349b08575
|
Merge pull request #1012 from ZmagoD/zd_SCI_2024_fix_custom_repositores_import
Fix custom repositories import so it supports "list of values" custom column types [fixes SCI-2024]
|
2018-03-19 16:41:11 +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 |
|
Zmago Devetak
|
dc22e05b02
|
Merge pull request #1037 from ZmagoD/zd_SCI_2142
Implement/update flash messages/alerts with regards to new navigation [fixes SCI-2142]
|
2018-03-16 17:22:33 +01:00 |
|
zmagod
|
a9dfcd9681
|
refactor
|
2018-03-16 16:38:59 +01:00 |
|
zmagod
|
311b2dac5a
|
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2142
|
2018-03-16 16:21:47 +01:00 |
|
Zmago Devetak
|
5c77306688
|
Merge pull request #1033 from ZmagoD/zd_SCI_2095
re-structure top navigation bar [fixes SCI-2116]
|
2018-03-16 16:08:32 +01:00 |
|
zmagod
|
86a8afd907
|
refactor
|
2018-03-16 15:56:12 +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 |
|
Oleksii Kriuchykhin
|
9371d77762
|
Improve connections between repository models [SCI-1697]
|
2018-03-16 13:12:33 +01:00 |
|
zmagod
|
a6a25bbe08
|
add floating alert message
|
2018-03-13 16:33:48 +01:00 |
|
zmagod
|
b67a54e2d1
|
Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2024_fix_custom_repositores_import
|
2018-03-13 15:25:57 +01:00 |
|
Zmago Devetak
|
f778415321
|
Merge pull request #1014 from ZmagoD/zd_SCI_2025
Fix custom repositories export so it supports "list of values" custom column types [fixes SCI-2025]
|
2018-03-13 15:20:46 +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
|
3957c4c54c
|
fix failing spec
|
2018-03-13 15:03:48 +01:00 |
|
zmagod
|
5b56f3dbd6
|
fix hound
|
2018-03-13 14:47:35 +01:00 |
|
okriuchykhin
|
503617b42c
|
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025
|
2018-03-13 14:44:20 +01:00 |
|
okriuchykhin
|
f14931f6a8
|
Update with latest changes on branch
|
2018-03-13 14:37:12 +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 |
|
okriuchykhin
|
262c21d145
|
Merge pull request #1036 from okriuchykhin/ok_SCI_2078
Implement importable selector for repository columns [SCI-2078]
|
2018-03-13 13:14:53 +01:00 |
|
okriuchykhin
|
dfb0d923b5
|
Merge pull request #1030 from okriuchykhin/ok_SCI_2016
Add annotations migrations and optimize queries [SCI-2016]
|
2018-03-13 13:07:31 +01:00 |
|
okriuchykhin
|
9f5513ff3d
|
Merge pull request #1035 from okriuchykhin/ok_SCI_2079
Fix repository export to support file columns [SCI-2079]
|
2018-03-13 13:05:43 +01:00 |
|
Oleksii Kriuchykhin
|
be1ead22e0
|
Implement importable selector for repository columns [SCI-2078]
|
2018-03-13 11:36:05 +01:00 |
|
zmagod
|
32d2d218ba
|
fix failing specs
|
2018-03-13 11:24:16 +01:00 |
|
zmagod
|
51af74071c
|
remove comments and activity modal
|
2018-03-13 10:52:53 +01:00 |
|
zmagod
|
d8cf3b1f07
|
mark non-working scenario as WIP
|
2018-03-13 10:46:48 +01:00 |
|
Oleksii Kriuchykhin
|
21c07371c9
|
Fix repository export to support file columns [SCI-2079]
|
2018-03-13 10:40:27 +01:00 |
|
zmagod
|
8fe173e831
|
re-structure top navigation bar
|
2018-03-12 16:27:35 +01:00 |
|
mlorb
|
3b9ad2f86f
|
Merge pull request #1028 from mlorb/ml-sci-2144
Add file custom column type to db [SCI-2144]
|
2018-03-12 15:18:02 +01:00 |
|
zmagod
|
e218cae453
|
refactor global activities in separate page [fixes SCI-2141]
|
2018-03-12 11:01:23 +01:00 |
|
mlorb
|
34f5c2c7ac
|
fix validation in asset model and change formatted method in repository_asset_value model
|
2018-03-12 10:50:45 +01:00 |
|
Zmago Devetak
|
a61231e005
|
Merge pull request #1031 from ZmagoD/zd_SCI_2140
update bootstrap to v 3.3.7 [fixes SCI-2140]
|
2018-03-12 09:45:04 +01:00 |
|
zmagod
|
41db1a9ab3
|
update bootstrap to v 3.3.7
|
2018-03-12 08:57:02 +01:00 |
|
Oleksii Kriuchykhin
|
ac009a29cb
|
Add annotations migrations and optimize queries [SCI-2016]
|
2018-03-11 22:06:44 +01:00 |
|
Zmago Devetak
|
d50bc5fde9
|
Merge pull request #998 from ZmagoD/zd_SCI_2014
migration script for migrating samples -> custom repositories [SCI-2014]
|
2018-03-09 17:19:12 +01:00 |
|
okriuchykhin
|
e0834a57cf
|
Merge pull request #1027 from okriuchykhin/ok_SCI_2163
Hide delete button for guest users in repository [SCI-2163]
|
2018-03-09 17:16:58 +01:00 |
|
mlorb
|
64e26e1c60
|
add file custom column type to db
|
2018-03-09 17:04:54 +01:00 |
|
zmagod
|
26c5c8bf46
|
fix failing test
|
2018-03-09 16:59:17 +01:00 |
|
okriuchykhin
|
707d2a048f
|
Merge pull request #1024 from okriuchykhin/ok_SCI_2145
Fix sample record creation [SCI-2145]
|
2018-03-09 16:52:38 +01:00 |
|
okriuchykhin
|
7cbfa5936a
|
Merge pull request #1026 from okriuchykhin/ok_SCI_2148
Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]
|
2018-03-09 16:42:33 +01:00 |
|
okriuchykhin
|
10505ec4e4
|
Merge pull request #1025 from okriuchykhin/ok_SCI_2146
Fix user management on project [SCI-2146]
|
2018-03-09 16:42:16 +01:00 |
|
Oleksii Kriuchykhin
|
853e1f7657
|
Fix nil case [SCI-2145]
|
2018-03-09 16:41:23 +01:00 |
|
okriuchykhin
|
f8fb5cca75
|
Merge pull request #1023 from okriuchykhin/ok_SCI_2108
Refactor search to support repository list items [SCI-2108]
|
2018-03-09 16:23:34 +01:00 |
|
Oleksii Kriuchykhin
|
cd9260f439
|
Hide delete button for guest users in repository [SCI-2163]
|
2018-03-09 16:19:36 +01:00 |
|
Oleksii Kriuchykhin
|
66c1901f96
|
Fix migration for better search [SCI-2108]
|
2018-03-09 15:46:38 +01:00 |
|
zmagod
|
22eb4121f0
|
follow @okriuchykhin 's suggestions
|
2018-03-09 15:44:42 +01:00 |
|
Oleksii Kriuchykhin
|
e4d974aa58
|
Add uniqueness validation for SamplesTable [SCI-2148][SCI-2149]
|
2018-03-09 15:34:06 +01:00 |
|