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 |
|
zmagod
|
0baa7a1f99
|
fix hound
|
2018-03-09 14:43:12 +01:00 |
|
zmagod
|
4f951f6679
|
adds unit specs for datatable service [fixes SCI-2068]
|
2018-03-09 14:22:00 +01:00 |
|
Oleksii Kriuchykhin
|
940469e41b
|
Fix user management on project [SCI-2146]
|
2018-03-09 12:08:34 +01:00 |
|
Oleksii Kriuchykhin
|
804d313f90
|
Fix sample record creation [SCI-2145]
|
2018-03-09 11:52:28 +01:00 |
|
Oleksii Kriuchykhin
|
1765d83cd1
|
Refactor search to support repository list items [SCI-2108]
|
2018-03-09 11:05:43 +01:00 |
|
okriuchykhin
|
160935cde0
|
Merge pull request #1022 from okriuchykhin/ok_SCI_2136
Fix manage repository permissions [SCI-2136]
|
2018-03-09 10:15:24 +01:00 |
|
okriuchykhin
|
d0d5481a29
|
Merge pull request #1021 from okriuchykhin/ok_SCI_2131
Fix notification for user removal from a team [SCI-2131]
|
2018-03-09 10:15:09 +01:00 |
|
zmagod
|
26883af386
|
fix assigned ordering
|
2018-03-08 17:36:10 +01:00 |
|
okriuchykhin
|
a306e65093
|
Merge pull request #1016 from okriuchykhin/ok_SCI_2130
Fix edit project's users modal [SCI-2130]
|
2018-03-07 14:04:26 +01:00 |
|
Oleksii Kriuchykhin
|
bd9f5c1cda
|
Fix manage repository permissions [SCI-2136]
|
2018-03-07 13:41:57 +01:00 |
|
Oleksii Kriuchykhin
|
1082f7f93c
|
Fix notification for user removal from a team [SCI-2131]
|
2018-03-07 13:20:17 +01:00 |
|
okriuchykhin
|
cae726f5c3
|
Merge pull request #1020 from okriuchykhin/ok_SCI_2055
Fix invite users link on task card [SCI-2055]
|
2018-03-07 09:41:23 +01:00 |
|
okriuchykhin
|
c0cfa6e7fe
|
Merge pull request #1019 from okriuchykhin/ok_SCI_2134
Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133]
|
2018-03-06 18:10:05 +01:00 |
|
Oleksii Kriuchykhin
|
186780e68f
|
Fix invite users link on task card [SCI-2055]
|
2018-03-06 17:56:01 +01:00 |
|
okriuchykhin
|
0051271541
|
Merge pull request #1018 from okriuchykhin/ok_SCI_2135
Fix sample's custom column permissions [SCI-2135]
|
2018-03-06 17:43:55 +01:00 |
|
Oleksii Kriuchykhin
|
156a639e4c
|
Remove extra permission checks from WOPI buttons [SCI-2134][SCI-2133]
|
2018-03-06 17:36:40 +01:00 |
|
Oleksii Kriuchykhin
|
b5eb821cfa
|
Fix sample's custom column permissions [SCI-2135]
|
2018-03-06 16:40:25 +01:00 |
|
zmagod
|
fb66131e29
|
setup endpoint for repository_rows paging/search
|
2018-03-06 16:32:39 +01:00 |
|
Oleksii Kriuchykhin
|
ca66858063
|
Fix edit project's users modal [SCI-2130]
|
2018-03-06 15:49:30 +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 |
|