Commit graph

3567 commits

Author SHA1 Message Date
zmagod
8f09e1f7a4 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 13:08:31 +02:00
mlorb
b7a14215bc
Merge pull request #1050 from mlorb/ml-sci-2120-v2
Refactor project navigation [SCI-2120]
2018-03-26 12:56:19 +02:00
mlorb
0092be08cc refactor links 2018-03-26 12:11:59 +02:00
zmagod
3efe06a410 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-03-26 12:02:24 +02:00
mlorb
3c09150c7b
Merge pull request #1054 from mlorb/ml-sci-2238
Re-implement About sciNote modal [SCI-2238]
2018-03-26 11:00:50 +02:00
mlorb
1797afa718
Merge branch 'ux-release-1' into ml-sci-2238 2018-03-26 10:44:43 +02:00
mlorb
70e0d8bd1d
Merge pull request #1052 from mlorb/ml-sci-2125
Implement new Help dropup in navigation [SCI-2125]
2018-03-26 09:22:39 +02:00
mlorb
83741358d1 fix locales 2018-03-23 16:19:06 +01:00
mlorb
eee597b315 fix naming 2018-03-23 15:56:38 +01:00
mlorb
2e81359ebb re-implement About sciNote modal 2018-03-23 15:14:49 +01:00
mlorb
9aa87a17e5 remove help helper 2018-03-23 14:26:53 +01:00
mlorb
faaecec2ff implement new Help dropup in navigation 2018-03-23 14:08:27 +01:00
okriuchykhin
12765e446d
Merge pull request #1048 from okriuchykhin/ok_SCI_2220
Refactor existing columns management to control only Column visibility and order [SCI-2220]
2018-03-23 11:57:39 +01:00
mlorb
bc06542ed7 refactor project navigation 2018-03-22 11:41:33 +01:00
Oleksii Kriuchykhin
36302ad6e8 Refactor existing columns management to control only Column visibility and order [SCI-2220] 2018-03-21 16:56:36 +01:00
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
9cf9bf94c0 fix merge conflict 2018-03-20 14:30:07 +01:00
mlorb
884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +01:00
mlorb
e0926ddc3c code refactoring 2018-03-20 13:53:11 +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
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
zmagod
064bd88584 fix assigned query 2018-03-19 17:49:09 +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
fad4001273 fix edit row action 2018-03-16 12:27:19 +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
9fd845c478 fix failing cucumber tests 2018-03-14 17:55:04 +01:00
mlorb
9de998e85c code left-side menu bar 2018-03-14 14:33:34 +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