Luka Murn
|
19e30b4e95
|
Merge pull request #1143 from Ducz0r/lm-sci-2320-fix
Write tests for repository table state [SCI-2320]
|
2018-05-16 09:49:00 +02:00 |
|
Zmago Devetak
|
b771149477
|
Merge pull request #1133 from ZmagoD/zd_SCI_2337
fixes error message for invalid file type [fixes SCI-2337]
|
2018-05-16 08:26:11 +02:00 |
|
Luka Murn
|
63b7b937bb
|
Fix a bug with table order not updating properly with col deletion
|
2018-05-15 20:44:15 +02:00 |
|
mlorb
|
f01cfc2968
|
fix hound
|
2018-05-14 12:08:45 +02:00 |
|
mlorb
|
ed27a7a62a
|
some extra restyling/unifying off app
|
2018-05-11 18:02:17 +02:00 |
|
mlorb
|
b5649f0574
|
Merge branch 'ux-release-1' into ml-sci-2336-v1
|
2018-05-10 13:59:57 +02:00 |
|
zmagod
|
3db7cc437b
|
fixes error message for invalid file type [fixes SCI-2337]
|
2018-05-10 13:52:01 +02:00 |
|
Luka Murn
|
8650edbbb9
|
Merge pull request #1129 from Ducz0r/lm-fix-repositories-index
Fix merge conflict introduced in when merging master->ux-release-1
|
2018-05-10 11:19:38 +02:00 |
|
okriuchykhin
|
3b4d9fe744
|
Merge pull request #1132 from okriuchykhin/ok_SCI_2301
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
|
2018-05-10 10:46:25 +02:00 |
|
okriuchykhin
|
ed8237484b
|
Merge pull request #1131 from okriuchykhin/ok_SCI_2379
Re-init file preview modal after column visability change [SCI-2379]
|
2018-05-10 10:45:56 +02:00 |
|
Zmago Devetak
|
0a4deeaa35
|
Merge pull request #1112 from ZmagoD/zd_SCI_2261
propagate assigned repository items in workflow [fixes SCI-2261]
|
2018-05-10 09:57:49 +02:00 |
|
zmagod
|
0fe499d4a1
|
adds the update action to repository records last_modified_by field when downstreaming assigned records
|
2018-05-10 09:04:12 +02:00 |
|
Oleksii Kriuchykhin
|
8ec643c54b
|
Move REPOSITORIES_LIMIT from constants to env variables [SCI-2301]
|
2018-05-09 18:03:16 +02:00 |
|
Oleksii Kriuchykhin
|
fa1fea634c
|
Re-init file preview modal after column visability change [SCI-2379]
|
2018-05-09 17:41:52 +02:00 |
|
mlorb
|
13f9ec30b8
|
fix hound
|
2018-05-09 13:56:32 +02:00 |
|
mlorb
|
7df40e56c7
|
UI/UX restyle - fixes throughout application part one
|
2018-05-08 16:33:42 +02:00 |
|
Luka Murn
|
f8295b60c9
|
Fix merge conflict introduced in when merging master->ux-release-1
Bug was introduced in merge commit
cb6fe50832 and resulted in import
into inventories not working.
|
2018-05-08 09:41:40 +02:00 |
|
Zmago Devetak
|
a6275062b7
|
Merge pull request #1126 from ZmagoD/zd_SCI_2344
adds new string truncation method [fixes SCI-2344]
|
2018-05-07 16:30:12 +02:00 |
|
Zmago Devetak
|
ee307886df
|
Merge pull request #1124 from ZmagoD/zd_SCI_2347
fix the missing icons on task card [fixes SCI-2347]
|
2018-05-04 09:34:49 +02:00 |
|
zmagod
|
fa30278153
|
change dropdown lenght
|
2018-05-03 16:25:59 +02:00 |
|
zmagod
|
0177dc811b
|
fixes per @mojca 's request
|
2018-05-03 16:21:29 +02:00 |
|
zmagod
|
abbc0995f2
|
fix css
|
2018-05-03 14:51:49 +02:00 |
|
zmagod
|
60e5aa8716
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2142_v2
|
2018-05-03 14:49:06 +02:00 |
|
Zmago Devetak
|
d744f24b85
|
Merge pull request #1118 from ZmagoD/zd_SCI_2323
sign_out user after 7 days [fixes SCI-2323]
|
2018-05-03 14:36:44 +02:00 |
|
Zmago Devetak
|
19d5c687ef
|
remove unneeded :rememberable module
|
2018-05-03 14:35:59 +02:00 |
|
Zmago Devetak
|
9ce071693d
|
Merge pull request #1116 from ZmagoD/zd_SCI_2310
parse smart annotations in repository export [fixes SCI-2310]
|
2018-05-03 14:34:29 +02:00 |
|
zmagod
|
0b721d86b1
|
adds new string truncation method [fixes SCI-2344]
|
2018-05-03 14:24:23 +02:00 |
|
Zmago Devetak
|
4fe4fea4fc
|
Merge pull request #1122 from ZmagoD/zd_SCI_2339
repository when sorting/searching bug fix [SCI-2339]
|
2018-05-03 12:05:39 +02:00 |
|
mlorb
|
d2c0ae241e
|
Merge pull request #1121 from mlorb/ml-sci-2244
Update buttons positions and wording throughout app [SCI-2244]
|
2018-05-03 11:05:15 +02:00 |
|
mlorb
|
ca022fead7
|
rename inventories buttons
|
2018-05-03 10:39:50 +02:00 |
|
zmagod
|
f04677600b
|
fix the missing icons on task card [fixes SCI-2347]
|
2018-05-03 10:05:40 +02:00 |
|
zmagod
|
0584453575
|
fixes per @okriuchykhin 's request
|
2018-04-26 17:18:03 +02:00 |
|
mlorb
|
f97477f3f0
|
some extra button styling
|
2018-04-26 15:19:05 +02:00 |
|
mlorb
|
763d934aa7
|
fix buttons again
|
2018-04-26 15:02:24 +02:00 |
|
zmagod
|
e9642cadad
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304
|
2018-04-26 14:26:30 +02:00 |
|
zmagod
|
ca539cdce8
|
remove samples from search
|
2018-04-26 14:25:02 +02:00 |
|
zmagod
|
8dac887f10
|
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2261
|
2018-04-26 14:18:41 +02:00 |
|
zmagod
|
24acd5c779
|
fixes per @duco 's request
|
2018-04-26 14:13:46 +02:00 |
|
mlorb
|
88d5ba369d
|
Merge branch 'ux-release-1' into ml-sci-2244
|
2018-04-26 14:07:03 +02:00 |
|
Luka Murn
|
cb6fe50832
|
Merge branch 'master' into ux-release-1
Conflicts:
app/assets/javascripts/repositories/index.js
|
2018-04-26 11:38:54 +02:00 |
|
zmagod
|
23f8f35a2c
|
a shotgun surgery that fixes searching/filtering of repository_rows [fixes SCI-2339]
|
2018-04-26 11:05:02 +02:00 |
|
Zmago Devetak
|
ac10f9fdb1
|
Merge pull request #1117 from ZmagoD/zd_SCI_2187
remove task description info from canvas task card [fixes SCI-2187]
|
2018-04-26 09:42:47 +02:00 |
|
Zmago Devetak
|
a6b2bb0228
|
Merge pull request #1120 from ZmagoD/zd_SCI_2338
add permission check to repostiory show action [fixes SCI-2338]
|
2018-04-26 09:41:43 +02:00 |
|
mlorb
|
9e11f3b220
|
update buttons positions and wording throughout app
|
2018-04-25 13:57:12 +02:00 |
|
Luka Murn
|
cd04596c62
|
Merge pull request #1111 from Ducz0r/lm-sci-2276-fix
Update the code for repository table states so it (hopefully) causes less errors [SCI-2276]
|
2018-04-25 12:37:27 +02:00 |
|
zmagod
|
12365b3f0f
|
add permission check to repostiory show action [fixes SCI-2338]
|
2018-04-25 11:56:30 +02:00 |
|
Luka Murn
|
bd6f97fabc
|
Add initializer to include helpers in all assets (including .js)
|
2018-04-25 10:51:19 +02:00 |
|
zmagod
|
4d6e995481
|
add dismiss buttons back
|
2018-04-25 10:43:16 +02:00 |
|
zmagod
|
c026044322
|
fixes flash message [fixes SCI-2142]
|
2018-04-25 07:32:49 +02:00 |
|
zmagod
|
796e7c9822
|
sign_out user after 7 days [fixes SCI-2323]
|
2018-04-24 15:42:31 +02:00 |
|