Zmago Devetak
147e74b4a5
Merge pull request #1164 from ZmagoD/zd_SCI_2448
...
adds discard gem, move deletion of repositories in a rake task to run…
2018-05-28 15:04:54 +02:00
Zmago Devetak
ad5114090f
Merge pull request #1165 from ZmagoD/zd_SCI_2433
...
fixes tast description/due-date modal [fixes SCI-2433]
2018-05-28 13:10:15 +02:00
okriuchykhin
0e6c89c3de
Merge pull request #1166 from okriuchykhin/ok_SCI_2342
...
Fix WOPI controller to support repositories [SCI-2342]
2018-05-28 13:07:17 +02:00
okriuchykhin
2e79af3412
Merge pull request #1174 from okriuchykhin/ok_SCI_2458
...
Fix left menu word breaking [SCI-2458]
2018-05-28 13:06:26 +02:00
Luka Murn
80323eaf67
Merge branch 'lm-improve-sidebar-toggle' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-improve-sidebar-toggle
...
Conflicts:
app/assets/javascripts/sidebar_toggle.js.erb
2018-05-28 12:39:24 +02:00
Luka Murn
e611e76fae
Fix Hound errors
2018-05-28 11:53:49 +02:00
mlorb
2bce62cab8
Merge branch 'ux-release-1' into ml-sci-2405
2018-05-28 11:43:14 +02:00
mlorb
f791234ec7
changes on Zmago's request
2018-05-28 11:36:37 +02:00
Zmago Devetak
9513efa3f3
Merge pull request #1173 from ZmagoD/zd_SCI_2451
...
fixes sidebar animation [fixes SCI-2451]
2018-05-28 11:18:07 +02:00
Oleksii Kriuchykhin
f0362a0c02
Fix left menu word breaking [SCI-2458]
2018-05-28 10:42:07 +02:00
Zmago Devetak
792b134737
Merge pull request #1170 from ZmagoD/zd_SCI_2437
...
adds flash_message div in manage repository column page
2018-05-28 10:32:06 +02:00
zmagod
485993f2f6
fixes sidebar animation [fixes SCI-2451]
2018-05-28 10:28:35 +02:00
mlorb
099cc29abb
fix tests
2018-05-28 09:29:46 +02:00
Luka Murn
b3ae1d8fa6
Remove some dead code, make sidebar toggle animated
2018-05-27 16:24:47 +02:00
Luka Murn
b86edf20a5
Remove auto-toggling of navigation sidebar depending on width
2018-05-27 15:44:15 +02:00
Luka Murn
8b527d8a5b
Restyle left side menu bar so it also works with lower heights
2018-05-27 15:24:49 +02:00
Luka Murn
6e6b6803e6
Remove session-stored toggle state of navigation bar
2018-05-27 15:24:11 +02:00
Luka Murn
ce4883522a
Merge pull request #1171 from biosistemika/lm-change-login-btn-to-primary
...
Change login button color to green
2018-05-25 17:15:57 +02:00
Luka Murn
0fc278a74c
Merge pull request #1169 from biosistemika/lm-remove-report-sidebar-file
...
Delete _report_sidebar.html.erb
2018-05-25 17:15:27 +02:00
mlorb
f02363dfce
fix error if user is not assigned to any teams
2018-05-25 17:14:22 +02:00
Luka Murn
23d8dc0b31
Change login button color to green
...
What it says, change it to `btn-primary`.
2018-05-25 17:05:00 +02:00
zmagod
6512970b9c
adds flash_message div in manage repository column page
2018-05-25 14:36:15 +02:00
zmagod
c683cfdbd7
triggers the delayed job in the controller action, fixes smart annotations
2018-05-25 11:41:43 +02:00
Luka Murn
c76b926387
Delete _report_sidebar.html.erb
...
This file is no longer needed from my research.
2018-05-25 11:04:05 +02:00
Luka Murn
fe3ddb7c65
Update code so it works
2018-05-25 08:50:27 +02:00
Oleksii Kriuchykhin
46d6accf78
Fix search in repositories [SCI-2428]
2018-05-24 17:14:40 +02:00
Oleksii Kriuchykhin
b019ab8f61
Fix WOPI controller to support repositories [SCI-2342]
2018-05-24 16:51:25 +02:00
zmagod
10351bbf83
fixes tast description/due-date modal [fixes SCI-2433]
2018-05-24 16:44:10 +02:00
Zmago Devetak
280a926554
Merge pull request #1159 from ZmagoD/zd_SCI_2372
...
adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]
2018-05-24 16:05:56 +02:00
zmagod
06f1daf7a9
rename data-hook
2018-05-24 16:02:56 +02:00
zmagod
bbbe06e491
fixes reports index for guest users
2018-05-24 15:28:54 +02:00
zmagod
1f8db7bc49
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2340
2018-05-24 15:00:59 +02:00
zmagod
b13e39a0d9
adds discard gem, move deletion of repositories in a rake task to run in background worker [fixes SCI-2448]
2018-05-24 14:39:25 +02:00
Luka Murn
c9f3de9f27
Improve toggle
2018-05-24 13:39:04 +02:00
mlorb
c5e62207eb
fix bug with protocol preview does not open on protocols containing files
2018-05-24 11:51:27 +02:00
mlorb
f972676f8d
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix
...
Update software with new logo & new brand [SCI-2416]
2018-05-23 15:47:17 +02:00
mlorb
3368e3b963
Merge branch 'ux-release-1' into ml-sci-2271
2018-05-23 14:06:54 +02:00
mlorb
2bb2f8d193
Merge pull request #1161 from mlorb/ml-sci-2350
...
move the open/close arrow to the bottom of left menu [SCI-2350]
2018-05-23 14:01:12 +02:00
mlorb
00657a78a5
Merge pull request #1162 from mlorb/ml-sci-2440-v2
...
fix toggle button on inventory page [SCI-2440]
2018-05-23 14:01:02 +02:00
okriuchykhin
7b08529e39
Merge pull request #1156 from okriuchykhin/ok_SCI_2342
...
Enable editing office online files in inventories [SCI-2342]
2018-05-23 12:59:12 +02:00
okriuchykhin
f61f069c95
Merge pull request #1157 from okriuchykhin/ok_SCI_2432
...
Init selectpicker for move workflow to another experiment modal [SCI-2432]
2018-05-23 12:58:58 +02:00
mlorb
5e689f6b4d
fix toggle button on inventory page
2018-05-23 11:20:42 +02:00
mlorb
79f1a1c0ad
fix padding and change label colors
2018-05-23 11:13:28 +02:00
mlorb
7b5ec4ae3f
move the open/close arrow to the bottom of left menu
2018-05-23 09:44:46 +02:00
mlorb
c4ecfc4d38
Change icons throughout sciNote - navigation, project, task cards
2018-05-22 16:55:58 +02:00
zmagod
e97a98f189
adds data-hook in save_PDF_to_inventory modal [fixes SCI-2372]
2018-05-22 14:18:40 +02:00
Luka Murn
31a1641b42
Merge pull request #1155 from Ducz0r/lm-sci-2436-fix
...
Update new repository row code so file columns work again [SCI-2436]
2018-05-22 09:27:32 +02:00
mlorb
e3fc0237c1
Merge pull request #1153 from mlorb/ml-sci-2440
...
Final button colour changes [SCI-2440]
2018-05-21 16:29:04 +02:00
Oleksii Kriuchykhin
39b74d6f8a
Init selectpicker for move workflow to another experiment modal [SCI-2432]
2018-05-21 16:12:39 +02:00
Oleksii Kriuchykhin
5c41527b92
Enable editing office online files in inventories [SCI-2342]
2018-05-21 15:48:48 +02:00
Luka Murn
69d1f0511f
Rename sciNote -> SciNote (app/ folder)
2018-05-21 15:19:11 +02:00
Luka Murn
cea18a44d5
Rename sciNote -> SciNote (app/javascript folder)
2018-05-21 15:18:30 +02:00
Luka Murn
6135081a71
Update new repository row code so file columns work again
...
Also fix backend code a bit (so update & create of repository rows
are more similar in their behavior), and fix line in JS:
_initSelectPicker() was called a reduntant amount of times when
editing repository row.
Closes SCI-2436.
2018-05-21 14:46:30 +02:00
zmagod
ba2aafae39
fix access to public reports [fixes SCI-2340]
2018-05-21 14:45:18 +02:00
Zmago Devetak
2ac04ee476
Merge pull request #1150 from ZmagoD/zd_SCI_2426
...
migrations that fixes the bug with smart annotations [fixes SCI-2426]
2018-05-21 14:15:47 +02:00
Zmago Devetak
67127b4d89
Merge pull request #1151 from ZmagoD/zd_SCI_2344_v2
...
shorten project name [fixes SCI-2344]
2018-05-21 14:15:24 +02:00
Luka Murn
91673afbf3
Merge pull request #1149 from Ducz0r/lm-remove-unnecessary-save-on-notifications
...
Remove unnecessary save on notifications
2018-05-21 13:53:23 +02:00
okriuchykhin
6dbb5bc583
Merge pull request #1152 from okriuchykhin/ok_SCI_2403
...
Change remove file button appearence [SCI-2403]
2018-05-18 17:34:56 +02:00
mlorb
0fccc71fc3
fix load protocol wording and UI-style
2018-05-18 16:57:18 +02:00
mlorb
c2cf52bb34
add another toggle button
2018-05-18 16:34:01 +02:00
mlorb
81392362ac
Final button colour changes
2018-05-18 16:24:24 +02:00
Oleksii Kriuchykhin
b79b0b79cf
Change remove file button appearence [SCI-2403]
2018-05-18 14:51:45 +02:00
zmagod
5514683f96
shorten project name [fixes SCI-2344]
2018-05-18 14:12:12 +02:00
zmagod
b8098093ee
migrations that fixes the bug with smart annotations [fixes SCI-2426]
2018-05-18 13:57:52 +02:00
Luka Murn
5e90ae7383
Remove uneccesary save when setting notification settings on user
...
These methods should behave as the rest of setters on
ActiveRecords, ergo setting the model state, but not saving it.
The save is called at the end of the action inside the controller
anyway, so this save is redundant.
2018-05-18 13:43:04 +02:00
mlorb
876717e355
add pointer cursor to arrow
2018-05-18 13:34:52 +02:00
mlorb
64cbddb9a0
UI/UX restyle - update colours for navigation
2018-05-18 10:41:32 +02:00
Zmago Devetak
c3d247faae
Merge pull request #1128 from ZmagoD/zd_SCI_2331
...
adds deface hook in support dropdown [fixes SCI-2331]
2018-05-18 09:31:02 +02:00
zmagod
8a99d35a8d
removes datatables.noSearchHidden plugin
2018-05-18 09:24:36 +02:00
zmagod
cf4c33bf92
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
2018-05-17 15:22:43 +02:00
zmagod
38b0cb742c
removes empty space
2018-05-17 15:21:45 +02:00
mlorb
7bda68b9f4
Merge pull request #1146 from mlorb/ml-sci-2336-v3
...
Add locales [SCI-2336]
2018-05-17 13:29:47 +02:00
zmagod
e019767e90
refactor save_pdf_to_inventory_item service
2018-05-17 13:17:19 +02:00
zmagod
b125863baf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2371
2018-05-17 11:25:33 +02:00
zmagod
ca0c8cbb71
fixes typos, fixes pdf rendering
2018-05-17 11:21:34 +02:00
mlorb
933a98c1f6
fix smart anotation color
2018-05-17 11:01:15 +02:00
Zmago Devetak
5184170a90
Merge pull request #1147 from ZmagoD/zd_SCI_2399
...
fixes ajax error in repositories [fixes SCI-2399]
2018-05-16 20:34:56 +02:00
Zmago Devetak
f73bd18989
Merge pull request #1145 from ZmagoD/zd_SCI_2407
...
fixes column name in columns visibility dropdown tooltip [fixes SCI-2…
2018-05-16 20:34:40 +02:00
zmagod
87369ae16b
fixes ajax error in repositories [fixes SCI-2399]
2018-05-16 15:08:50 +02:00
okriuchykhin
e9d6b26ec6
Merge pull request #1141 from okriuchykhin/ok_SCI_2403
...
Add clear file selector button to repository edit [SCI-2403]
2018-05-16 14:55:53 +02:00
zmagod
b1b259fdbe
fixes column name in columns visibility dropdown tooltip [fixes SCI-2407]
2018-05-16 14:37:58 +02:00
mlorb
06ce285ae2
add locales
2018-05-16 14:32:15 +02:00
Zmago Devetak
8a92f1a499
Merge pull request #1127 from ZmagoD/zd_SCI_2307_v3
...
Adds custom method that generates smart annotations name for repository
2018-05-16 13:23:25 +02:00
Zmago Devetak
9d2303c777
Merge pull request #1115 from ZmagoD/zd_SCI_2321
...
fixes images preview in repository/library [fixes SCI-2321]
2018-05-16 12:05:33 +02:00
zmagod
98baa77846
fixes cursor icon
2018-05-16 12:02:46 +02:00
mlorb
f59ea8c7a6
Merge pull request #1137 from mlorb/ml-sci-2336-v2
...
UI/UX restyle - fixes throughout application - part 2 [SCI-2336]
2018-05-16 11:30:54 +02:00
Oleksii Kriuchykhin
c8094f196c
Add margin to clear button and fix case with new file in the cell [SCI-2403]
2018-05-16 11:25:43 +02:00
zmagod
7e3dbcd92f
hound
2018-05-16 10:43:25 +02:00
zmagod
712a3c7ff6
fixes css, changes spinner in preview modal
2018-05-16 10:40:49 +02:00
Oleksii Kriuchykhin
be5d481cdc
Add clear file selector button to repository edit [SCI-2403]
2018-05-16 10:32:50 +02:00
okriuchykhin
19ed711ce2
Merge pull request #1142 from okriuchykhin/ok_SCI_2411
...
Fix pagination in global search inside repositories [SCI-2411]
2018-05-16 10:19:05 +02:00
okriuchykhin
62f0c21a79
Merge pull request #1140 from okriuchykhin/ok_SCI_2391
...
Re-init file preview modal after inventory row editing [SCI-2391]
2018-05-16 10:18:13 +02:00
okriuchykhin
3e2b455d2c
Merge pull request #1139 from okriuchykhin/ok_SCI_2385
...
Fix task resore permissions [SCI-2385]
2018-05-16 10:17:51 +02:00
okriuchykhin
a7547b9775
Merge pull request #1138 from okriuchykhin/ok_SCI_2404
...
Disable some validations in repository import to improve speed [SCI-2404]
2018-05-16 10:17:10 +02:00
okriuchykhin
ffddf3fd94
Merge pull request #1135 from okriuchykhin/ok_SCI_2394
...
Fix editing of inventory rows with existing files [SCI-2394]
2018-05-16 10:16:26 +02:00
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
zmagod
4573655ec8
adds save PDF report to inventory feature [fixes SCI-2371]
2018-05-16 09:31:19 +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
Oleksii Kriuchykhin
0ca0884937
Fix pagination in global search inside repositories [SCI-2411]
2018-05-15 17:48:48 +02:00
mlorb
cea7f5a3f7
some extra style unification
2018-05-15 17:10:31 +02:00
mlorb
5f462165b5
change font and alerts colors
2018-05-15 14:16:34 +02:00
Oleksii Kriuchykhin
95b8821cc9
Re-init file preview modal after inventory row editing [SCI-2391]
2018-05-15 12:57:36 +02:00
Oleksii Kriuchykhin
1d0536b064
Fix task resore permissions [SCI-2385]
2018-05-15 11:51:53 +02:00
Oleksii Kriuchykhin
39d594b0da
Disable some validations in repository import to improve speed [SCI-2404]
2018-05-15 11:14:43 +02:00
mlorb
dfe65ccaed
UI/UX restyle - fixes throughout application - part 2
2018-05-14 18:33:57 +02:00
Oleksii Kriuchykhin
addf4cfe5e
Handle situation with smart annotations and zero inventories [SCI-2396]
2018-05-14 15:34:23 +02:00
Oleksii Kriuchykhin
a92abc5995
Fix editing of inventory rows with existing files [SCI-2394]
2018-05-14 14:26:01 +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
zmagod
e5c3fb6af2
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321
2018-05-10 10:38:56 +02:00
zmagod
4bc01c44e9
add file name to loading image
2018-05-10 10:37:48 +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
38869ec037
adds title on disabled download file link
2018-05-10 09:47:10 +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
zmagod
ed6098ece6
adds deface hook in support dropdown [fixes SCI-2331]
2018-05-07 13:09:33 +02:00
zmagod
3e10ff7fc5
add custom method that generates smart annotations name from repository name [fixes SCI-2307]
2018-05-04 10:44:23 +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
zmagod
66b676b5ce
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2321
2018-04-26 17:04:36 +02:00
zmagod
0afe461962
fixes download link
2018-04-26 17:00:51 +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
zmagod
3a4df069d7
remove task description info from canvas task card [fixes SCI-2187]
2018-04-24 15:11:48 +02:00
zmagod
7d26ce561c
parse smart annotations in repository export [fixes SCI-2310]
2018-04-24 14:53:49 +02:00
zmagod
c2d19fee52
fixes images preview in repository/library [fixes SCI-2321]
2018-04-24 13:11:55 +02:00
Zmago Devetak
1e4a975304
Merge pull request #1113 from ZmagoD/zd_SCI_2307_v2
...
rename smart annotations icons [fixes SCI-2307]
2018-04-24 10:11:30 +02:00
zmagod
503ad1ba20
removes samples from views [fixes SCI-2304]
2018-04-24 08:26:55 +02:00
Zmago Devetak
096167c125
Merge pull request #1101 from ZmagoD/zd_SCI_2124
...
adds new reports index page [fixes SCI-2124]
2018-04-23 12:42:24 +02:00
zmagod
efd1e470f6
rename smart annotations icons [fixes SCI-2307]
2018-04-23 12:38:54 +02:00
zmagod
199a2a23bf
fixes per @mlorb 's request
2018-04-23 12:26:21 +02:00
zmagod
824962c084
propagate assigned repository items in workflow [fixes SCI-2261]
2018-04-23 11:33:16 +02:00
Luka Murn
c0da83c5de
Add some additional nil guards
2018-04-20 12:31:22 +02:00
Luka Murn
d023db16af
Update the destroy_column action so it properly updates all states
2018-04-20 12:31:22 +02:00
Luka Murn
caab0cf55c
Update the ordering upon table load
2018-04-20 12:31:22 +02:00
Luka Murn
21e7e7057e
Refactor all the methods into two new services
2018-04-20 12:31:22 +02:00
Luka Murn
d8ca42aa0c
Refactor repository_table_state and its class methods
2018-04-20 12:31:22 +02:00
Luka Murn
5e2622ecfc
Change default repository state to Ruby representation
...
Also remove some dead code from repositories datatables
2018-04-20 12:31:22 +02:00
zmagod
e96b690a5b
removes reports link from secondary navigation, fix bug with turbolinks
2018-04-20 11:57:52 +02:00
Zmago Devetak
645e9a19d8
Merge pull request #1108 from ZmagoD/zd_SCI_2313
...
fix file preview [SCI-2313]
2018-04-20 10:38:23 +02:00
Zmago Devetak
76c4202664
Merge pull request #1110 from ZmagoD/zd_SCI_2311
...
fixes controller action in manage_columns
2018-04-20 10:36:31 +02:00
zmagod
dafa29d4bf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124
2018-04-20 10:33:15 +02:00
Zmago Devetak
e94f1ad6aa
Merge pull request #1109 from ZmagoD/zd_SCI_2297_v3
...
add permission to column management [fixes SCI-2297]
2018-04-20 09:57:30 +02:00
zmagod
74f23ee461
fixes controller action in manage_columns
2018-04-20 09:53:15 +02:00
mlorb
3249d5db0d
Merge pull request #1100 from mlorb/ml-sci-2303
...
Update reports show page to work with new navigation [SCI-2303]
2018-04-20 09:50:35 +02:00
zmagod
078645332b
add permission to column management [fixes SCI-2297]
2018-04-20 09:34:12 +02:00
zmagod
2a5c4daa9d
fix file preview [SCI-2313]
2018-04-20 09:29:08 +02:00
Zmago Devetak
487fb1fb48
Merge pull request #1106 from ZmagoD/zd_SCI_2239_v2
...
Zd sci 2239 v2
2018-04-19 18:00:19 +02:00
mlorb
ab4a66756e
Merge pull request #1107 from mlorb/ml-sci-2314
...
Fix file preview background [SCI-2314]
2018-04-19 17:59:01 +02:00
Zmago Devetak
6b4d786acc
Merge pull request #1105 from ZmagoD/zd_SCI_2307
...
change repository icon
2018-04-19 17:58:48 +02:00
mlorb
72c79013de
fix file preview background
2018-04-19 17:40:24 +02:00
Zmago Devetak
93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259
...
set limit on maximum number of dropdown list items [fixes SCI-2259]
2018-04-19 17:17:54 +02:00
Zmago Devetak
1290435372
Merge pull request #1086 from ZmagoD/zd_SCI_2207
...
enables copying of repository items [fixes SCI-2207]
2018-04-19 17:13:43 +02:00
mlorb
ea4d3f815b
add back needed code
2018-04-19 16:51:37 +02:00
mlorb
d7eccac289
Merge pull request #1099 from mlorb/ml-sci-2167
...
Remove breadcrumbs throughout application [SCI-2167]
2018-04-19 16:11:37 +02:00
zmagod
a948710576
fixes alert label [fixes SCI-2239]
2018-04-19 15:51:36 +02:00
zmagod
bb3e1b4dcf
change repository icon
2018-04-19 15:39:24 +02:00
zmagod
f555e8cea4
fix error message
2018-04-19 15:32:14 +02:00
mlorb
8753df7ce3
Merge pull request #1103 from mlorb/ml-sci-2309
...
Fix top navigation style [SCI-2309]
2018-04-19 15:16:27 +02:00
mlorb
50a4ae6163
Merge pull request #1104 from mlorb/ml-sci-2312
...
Fix blocked buttons edit and eye icon [SCI-2312]
2018-04-19 15:15:25 +02:00
mlorb
c149b3cc2a
refactoring
2018-04-19 15:12:26 +02:00
mlorb
5f93da27f2
Merge pull request #1102 from mlorb/ml-sci-2308
...
Fix screen responsiveness [SCI-2308]
2018-04-19 14:55:49 +02:00
mlorb
56e00740c1
fix blocked buttons edit and eye icon
2018-04-19 14:40:46 +02:00
mlorb
58bdce557d
Merge pull request #1098 from mlorb/ml-sci-2306
...
Fix project navigation to work with archived pages and… [SCI-2306]
2018-04-19 14:17:32 +02:00
Zmago Devetak
540dff25e7
Merge pull request #1091 from ZmagoD/zd_SCI_2254
...
adds correct preview images to files [fixes SCI-2254]
2018-04-19 14:04:24 +02:00
zmagod
ce52eb851b
add validation to dropdown items
2018-04-19 14:02:42 +02:00
mlorb
c1832969b4
fix top navigation style
2018-04-19 13:26:10 +02:00
zmagod
f3af8f4524
switch current_team to repository.team
2018-04-19 13:04:16 +02:00
zmagod
66cc76f640
add view label in locales
2018-04-19 12:49:32 +02:00
zmagod
c23eacfe13
fixes for_admin action/ test visible_by functlion
2018-04-19 12:41:00 +02:00
mlorb
4f0c2a8122
fix screen responsiveness
2018-04-18 17:06:47 +02:00
zmagod
9d282d1800
adds new reports index page [fixes SCI-2124]
2018-04-18 16:47:52 +02:00
mlorb
57f09029f5
return needed code
2018-04-18 16:22:36 +02:00
mlorb
cc34376253
update reports show page to work with new navigation
2018-04-18 14:40:53 +02:00
mlorb
c08d72be36
remove breadcrumbs throughout application
2018-04-17 17:00:04 +02:00
mlorb
600ec99c82
fix project navigation to work with archived pages and correct current team
2018-04-17 13:52:43 +02:00
mlorb
04a20ab7ec
change links
2018-04-16 17:05:22 +02:00
Zmago Devetak
f90589d714
Merge pull request #1095 from ZmagoD/zd_SCI_2300
...
fixes archive button [fixes SCI-2300]
2018-04-16 16:19:21 +02:00
Zmago Devetak
a0f549e935
Merge pull request #1093 from ZmagoD/zd_SCI_2296
...
hides the create new inventory button for non admin users [fixes SCI-…
2018-04-16 16:18:15 +02:00
Zmago Devetak
8803a7ca15
Merge pull request #1092 from ZmagoD/zd_SCI_2297
...
adds edit repository item permission to normal user [fixes SCI-2297]
2018-04-16 16:18:05 +02:00
mlorb
dceef349a4
fix bug and some refectoring
2018-04-16 14:10:49 +02:00
zmagod
9baaad25b6
add current_user to cloned created_by, last_modified_by field
2018-04-16 12:38:25 +02:00
zmagod
a2d8285f35
fixes archive button but [fixes SCI-2300]
2018-04-16 09:22:10 +02:00
mlorb
2627efe402
implement file column type when editing & creating new rows in inventories DataTables
2018-04-13 17:21:17 +02:00
zmagod
bef166ff30
hides the create new inventory button for non admin users [fixes SCI-2296]
2018-04-13 13:39:58 +02:00
zmagod
0adc06b1a1
adds edit repository item permission to normal user [fixes SCI-2297]
2018-04-13 13:11:29 +02:00
zmagod
4f21833373
changes per @duco 's request
2018-04-13 11:47:33 +02:00
Zmago Devetak
0815111cae
Merge pull request #1090 from ZmagoD/zd_SCI_2293
...
fixes edin/destory button on repository page after redirected from co…
2018-04-13 09:58:01 +02:00
zmagod
9812a9f160
adds correct preview images to files [fixes SCI-2254]
2018-04-13 09:43:14 +02:00
Zmago Devetak
f5127bad99
Merge pull request #1088 from ZmagoD/zd_SCI_2290
...
remove catched views [fixes SCI-2290]
2018-04-13 08:24:28 +02:00
zmagod
f2c314cc85
fix indentation
2018-04-12 17:12:45 +02:00
zmagod
3c5ce09bcd
fixes edin/destory button on repository page after redirected from columns_management page [fixes SCI-2293]
2018-04-12 17:09:53 +02:00
Zmago Devetak
478115bbb0
Merge pull request #1082 from ZmagoD/zd_SCI_2257
...
refactor update protocol keywords action [fixes SCI-2257]
2018-04-12 16:52:04 +02:00
zmagod
d084998906
remove unneeded label in destroy repository record modal [fixes SCI-2292]
2018-04-12 15:00:41 +02:00
zmagod
5f5829bbe4
fix indentation
2018-04-12 14:49:51 +02:00
zmagod
123f3b796b
remove catched views [fixes SCI-2290]
2018-04-12 14:48:14 +02:00
Luka Murn
fa603b54b8
Merge pull request #930 from okriuchykhin/ok_SCI_1860
...
Remove tutorial [SCI-1860]
2018-04-12 14:46:20 +02:00
Luka Murn
09c60d2468
Fixes per @Ducz0r's request
2018-04-12 14:38:22 +02:00
zmagod
b4deb232c0
rename variable: not_in_repository => display_image_tag
2018-04-12 13:40:17 +02:00
Luka Murn
9bf8b5d864
Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
...
Conflicts:
Makefile
app/assets/javascripts/projects/index.js.erb
app/assets/stylesheets/themes/scinote.scss
config/locales/en.yml
2018-04-12 13:16:46 +02:00
zmagod
6291857bbf
enables copying of repository items [fixes SCI-2207]
2018-04-11 17:17:19 +02:00
zmagod
23653d1d95
refactor
2018-04-11 09:29:08 +02:00
zmagod
233e73c709
adds asset preview link to repository row modal and to table row item [fixes SCI-2110]
2018-04-10 17:06:53 +02:00
zmagod
e4b49e62a3
fixes import limit
2018-04-10 15:45:51 +02:00
zmagod
ea4bd8831f
fixes bug with CSRF on file upload, fixes turbolink issues with remote form submition [fixes SCI-2284]
2018-04-10 13:19:53 +02:00
Zmago Devetak
eca69cfc75
Merge pull request #1080 from ZmagoD/zd_SCI_2076
...
add asset field preview/sort/search in repository table [fixes SCI-2076]
2018-04-09 14:29:45 +02:00
mlorb
a10f671184
Merge pull request #1081 from mlorb/ml-sci-2123
...
Refactor settings into the new navigation bar [SCI-2123]
2018-04-09 13:21:16 +02:00
zmagod
b12f6f1b92
set limit on maximum number of dropdown list items [fixes SCI-2259]
2018-04-09 12:50:25 +02:00
mlorb
8a35ce5c58
add locales
2018-04-09 10:53:03 +02:00
mlorb
80fe1dd73b
fix travis
2018-04-06 17:16:04 +02:00
Zmago Devetak
bdb6554870
Merge pull request #1049 from ZmagoD/zd_SCI_2218_2219
...
adds manage columns page
2018-04-06 17:06:28 +02:00
zmagod
58b6eb908e
fix duplications
2018-04-06 17:02:10 +02:00
zmagod
024032faff
refactor update protocol keywords action [fixes SCI-2257]
2018-04-06 15:41:50 +02:00
mlorb
70dfe66b2d
refactoring
2018-04-06 14:20:40 +02:00
zmagod
cf7761daaa
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into ok_SCI_2223
2018-04-06 12:56:39 +02:00
zmagod
b51ad84ee5
add asset field preview/sort/search in repository table [fixes SCI-2076]
2018-04-06 12:03:39 +02:00
Zmago Devetak
e30b2261a8
Merge pull request #1077 from ZmagoD/zd_SCI_2279
...
fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]
2018-04-05 16:52:16 +02:00
Zmago Devetak
71531ebf12
refactor
2018-04-05 16:46:09 +02:00
mlorb
b8e91e91a1
refactor settings into the new navigation bar
2018-04-05 16:30:02 +02:00
Zmago Devetak
cafe042494
Merge pull request #1079 from ZmagoD/zd_SCI_2282
...
fixes smart annotation avatar bug in pdf reports[fixes SCI-2282]
2018-04-05 16:12:23 +02:00
zmagod
218f421dff
fixes smart annotation avatar bug in pdf reports[fixes SCI-2282]
2018-04-05 15:31:25 +02:00
Luka Murn
386ede0400
Add special middleware for handling of Rails 5.1 WOPI errors
...
Closes SCI-2266.
2018-04-05 13:26:08 +02:00
zmagod
c0cc6c293a
fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]
2018-04-05 13:15:32 +02:00
zmagod
030ce271be
fixes name validations
2018-04-05 10:47:47 +02:00
zmagod
515c95061c
fixes delete column action
2018-04-05 09:56:09 +02:00
zmagod
afc2a35557
move import export to dropdown
2018-04-05 09:32:34 +02:00
zmagod
a8a19df06d
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-04-05 08:51:58 +02:00
zmagod
d47337fbf3
remove destroy column modal
2018-04-05 08:51:21 +02:00
okriuchykhin
e608d629c7
Merge pull request #1068 from okriuchykhin/ok_SCI_2217
...
Refactor file preview modal [SCI-2217]
2018-04-05 00:18:43 +02:00
Oleksii Kriuchykhin
9720063fb3
Fix tests [SCI-2217]
2018-04-05 00:06:11 +02:00
zmagod
525a1c15ca
fixes hound
2018-04-04 16:40:07 +02:00
mlorb
58433f4218
fix merge bananas
2018-04-04 16:36:26 +02:00
zmagod
0c05c60ebf
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-04-04 16:06:38 +02:00
Zmago Devetak
ab48e4f527
Merge pull request #1072 from ZmagoD/zd_SCI_2239
...
change export model wording [fixes SCI-2239]
2018-04-04 15:40:18 +02:00
Zmago Devetak
d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206
...
add ID column to repository [fixes SCI-2206]
2018-04-04 15:39:59 +02:00
Zanz2
cff2f933a0
removed byebug :D
2018-04-04 15:19:00 +02:00
Zanz2
ec743a7420
fixed the issue
2018-04-04 15:16:31 +02:00
zmagod
6e255a4657
fixes failing specs
2018-04-04 14:44:32 +02:00
Oleksii Kriuchykhin
3b7977ee3b
Merge latest changes from ux-release-1 [SCI-2217]
2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin
8ee98b7cf0
Update Capybara and dependencies [SCI-2217]
2018-04-04 14:13:37 +02:00
zmagod
5eb007f4d2
fixes per @mlorb 's request
2018-04-04 13:22:14 +02:00
zmagod
38b84edfb0
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121
2018-04-04 12:59:41 +02:00
zmagod
e630d3113f
add ID column to repository [fixes SCI-2206]
2018-04-04 11:55:11 +02:00
Zanz2
4259fa44f9
Merge pull request #1069 from Zanz2/remotipart_workaround
...
Remotipart workaround [SCI-2270]
2018-04-04 11:27:30 +02:00
Zanz2
7f36ab3e5e
deleted require and gemfile entry for remotipart
2018-04-04 11:12:39 +02:00
Zmago Devetak
685255afbc
Merge pull request #1065 from ZmagoD/zd_SCI_2222
...
refactor smart annotation parser, adds repository item to smart annot…
2018-04-04 11:07:29 +02:00
zmagod
8a156ad91e
change method name
2018-04-03 13:05:25 +02:00
mlorb
11c0f5e5a1
Merge pull request #1067 from mlorb/ml-sci-2243
...
Style Guide - refactor colors, typography and buttons [SCI-2243]
2018-04-03 11:30:02 +02:00
zmagod
3d5137b56f
change export model wording [fixes SCI-2239]
2018-04-03 11:22:23 +02:00
mlorb
e5e92eb215
fix the rest of the constants
2018-04-03 10:28:39 +02:00
zmagod
7dfec94ffc
remove samples from smart annotations
2018-04-03 09:43:12 +02:00
Oleksii Kriuchykhin
d8d2d75631
Fix repository rows permissions [SCI-2265]
2018-04-02 20:48:44 +02:00
Oleksii Kriuchykhin
51860652c1
Refactor smart annotations modal [SCI-2223]
2018-04-02 20:38:56 +02:00
Zanz2
2fab3e4caa
Overlooked a small change #2
2018-04-02 20:05:06 +02:00
Zanz2
25619e5e01
Overlooked a small change
2018-04-02 20:02:59 +02:00
Zanz2
1606982966
found a hackish fix by doing a manual ajax call and some other things with jquery
2018-04-02 19:56:25 +02:00
Oleksii Kriuchykhin
b7c31d704f
Merge branch 'zd_SCI_2222' of git://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_2222
2018-04-01 11:10:18 +02:00
mlorb
6a20c37449
fix travis againnnnn
2018-03-30 17:16:18 +02:00
Oleksii Kriuchykhin
f656ad1561
Fix fa icons [SCI-2217]
2018-03-30 17:03:44 +02:00
mlorb
5f0d33d75e
fix travis again
2018-03-30 16:47:23 +02:00
Zmago Devetak
f5f6fa4a4f
Merge pull request #1066 from ZmagoD/zd_SCI_2235
...
updated repository import modal html [fixes SCI-2235]
2018-03-30 14:32:53 +02:00
okriuchykhin
a6d45fea0a
Merge pull request #1059 from okriuchykhin/ok_SCI_2205
...
Add repository name to record info modal [SCI-2205]
2018-03-30 14:02:53 +02:00
Oleksii Kriuchykhin
cc855cda86
Fix translations [SCI-2205]
2018-03-30 12:48:34 +02:00
okriuchykhin
5e0cf58bc5
Merge pull request #1058 from okriuchykhin/ok_SCI_2111
...
Implement search in file repository cells and improve performance [SCI-2111]
2018-03-30 12:39:47 +02:00
Oleksii Kriuchykhin
cc5d8550b1
Refactor file preview modal [SCI-2217]
2018-03-30 11:50:28 +02:00
mlorb
10b5e1de84
refactor typography
2018-03-30 09:54:57 +02:00
zmagod
802e917e69
updated repository import modal html [fixes SCI-2235]
2018-03-30 09:47:27 +02:00
zmagod
fd88104fe2
adds manage repository link in repository actions dropdown
2018-03-29 17:10:57 +02:00
zmagod
56b0900619
Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219
2018-03-29 16:42:10 +02:00
zmagod
01a548e8b3
fix hound
2018-03-29 16:11:21 +02:00
zmagod
659a088058
refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222]
2018-03-29 15:55:26 +02:00
mlorb
4bf9369bc5
refactor buttons
2018-03-29 13:58:14 +02:00
okriuchykhin
31c68ab4bc
Merge pull request #1062 from okriuchykhin/ok_SCI_2201
...
Rescale Linkedin buttons [SCI-2201]
2018-03-28 15:23:05 +02:00
zmagod
7c1390ece2
implement sidebar toggle [fixes SCI-2232]
2018-03-28 14:12:11 +02:00
mlorb
22afa61b11
refactor colors
2018-03-28 13:54:01 +02:00
Luka Murn
c07dc98cc8
Fix Office Online editing of files [SCI-2264]
...
Office Online files could not be edited. I believe the reason
was that in Rails 5.1, `render nothing: true` was removed. So
I replaced this in `wopi_controller` with `render body: nil`.
Hopefully this will do the trick.
Closes SCI-2264.
2018-03-28 13:22:30 +02:00
okriuchykhin
13fed0411b
Merge pull request #1063 from biosistemika/release-1.12.11
...
merge release 1.12.11 branch to master
2018-03-27 16:19:57 +02:00
Oleksii Kriuchykhin
1ed0b16d12
Rescale Linkedin buttons [SCI-2201]
2018-03-27 15:00:28 +02:00
Oleksii Kriuchykhin
31aed55ffc
Disable turbolinks on tasks navigation [SCI-2251]
2018-03-26 17:55:51 +02:00
okriuchykhin
145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]"
2018-03-26 17:38:48 +02:00
Oleksii Kriuchykhin
fac5875cfd
Add repository name to record info modal [SCI-2205]
2018-03-26 16:18:09 +02:00
okriuchykhin
784a4723cc
Merge pull request #1056 from okriuchykhin/ok_SCI_2251
...
Update turbolinks and fix repository table init [SCI-2251]
2018-03-26 14:23:30 +02:00
okriuchykhin
fc06f8c60b
Merge pull request #1055 from okriuchykhin/ok_SCI_2250
...
Skip asset if file is missing in protocol export [SCI-2250]
2018-03-26 14:19:49 +02:00
Oleksii Kriuchykhin
5dc01a3d42
Fix code style [SCI-2251]
2018-03-26 13:59:45 +02:00
Oleksii Kriuchykhin
07070df1b4
Fix users profile edit form [SCI-2251]
2018-03-26 13:47:12 +02:00
okriuchykhin
b1fcdb7474
Merge pull request #1057 from okriuchykhin/ok_SCI_2249
...
Fix sample assign permissions [SCI-2249]
2018-03-26 13:24:38 +02:00
Oleksii Kriuchykhin
e42fc3117b
Implement search in file repository cells and improve performance [SCI-2111]
2018-03-26 13:19:09 +02:00
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
Zmago Devetak
2310439088
Merge pull request #1045 from ZmagoD/zd_SCI_2197
...
fixes import protocol bug for guest user [fixes SCI-2197]
2018-03-26 13:08:01 +02:00
zmagod
c61efb0624
rename before_acton hook
2018-03-26 13:07:00 +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
zmagod
9e1f285c9e
adds missing labels [fixes SCI-2219]
2018-03-26 11:28:14 +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
Oleksii Kriuchykhin
aa69624f9f
Fix sample assign permissions [SCI-2249]
2018-03-25 20:10:32 +02:00
Oleksii Kriuchykhin
83c7539156
Update turbolinks and fix repository table init [SCI-2251]
2018-03-25 19:44:58 +02:00
Oleksii Kriuchykhin
ecd3c73772
Skip asset if file is missing in protocol export [SCI-2250]
2018-03-25 13:36:24 +02:00
mlorb
83741358d1
fix locales
2018-03-23 16:19:06 +01:00
zmagod
baf69461f5
adds edit/create modal and related actions
2018-03-23 16:00:33 +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
5589b27883
improve message for deleting sample/report items
2018-03-23 14:39:09 +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
mlorb
bc06542ed7
refactor project navigation
2018-03-22 11:41:33 +01:00
zmagod
3be3c00574
adds manage columns page [fixes SCI-2218]
2018-03-22 09:35:36 +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
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
okriuchykhin
2356b78044
Merge pull request #1042 from okriuchykhin/ok_SCI_2201
...
Use larger LinkedIn sign-in button [SCI-2201]
2018-03-19 16:23:22 +01:00
zmagod
c46da5cc67
fixes import protocol bug for guest user [fixes SCI-2197]
2018-03-19 16:10:28 +01:00
Oleksii Kriuchykhin
acbd40e0d1
Remove Power Up button [SCI-2117]
2018-03-18 22:12:29 +01:00
Oleksii Kriuchykhin
a105e61d48
Remove tutorial [SCI-1860]
2018-03-18 13:18:05 +01:00
Oleksii Kriuchykhin
37f675b32a
Use larger LinkedIn sign-in button [SCI-2201]
2018-03-18 12:18:33 +01:00
zmagod
3131ed0948
adds permission check to archived project actions dropdown [fixes SCI-2194]
2018-03-16 17:30:49 +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
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
Oleksii Kriuchykhin
27a605d974
Fix failing test [SCI-2148][SCI-2149]
2018-03-16 11:05:38 +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
Oleksii Kriuchykhin
f3385adb06
Merge branch 'master' into ok_SCI_2148
2018-03-16 10:21:02 +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
Zanz2
bf34d82791
refactored to PR
2018-03-13 17:42:26 +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
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
Oleksii Kriuchykhin
269f7d74fa
Add explicit ordering to samples_tables [SCI-2148][SCI-2149]
2018-03-13 13:16:34 +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
Oleksii Kriuchykhin
be1ead22e0
Implement importable selector for repository columns [SCI-2078]
2018-03-13 11:36:05 +01:00
zmagod
51af74071c
remove comments and activity modal
2018-03-13 10:52:53 +01:00
Oleksii Kriuchykhin
21c07371c9
Fix repository export to support file columns [SCI-2079]
2018-03-13 10:40:27 +01:00
Oleksii Kriuchykhin
f5ecbecaf3
Fix bugs [SCI-1849]
2018-03-12 17:00:44 +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
Oleksii Kriuchykhin
60e3a836be
Fix typo in regex [SCI-1849]
2018-03-11 22:11:12 +01:00
Oleksii Kriuchykhin
ac009a29cb
Add annotations migrations and optimize queries [SCI-2016]
2018-03-11 22:06:44 +01:00
Zanz2
97c01c386b
pushing fix
2018-03-10 22:48:25 +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
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
Oleksii Kriuchykhin
853e1f7657
Fix nil case [SCI-2145]
2018-03-09 16:41:23 +01:00
Oleksii Kriuchykhin
cd9260f439
Hide delete button for guest users in repository [SCI-2163]
2018-03-09 16:19:36 +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
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
Oleksii Kriuchykhin
c933030b94
Add team export/import scripts [SCI-1849]
2018-03-06 11:26: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
Matej Zrimšek
c5b0a6525b
Some additional permission calls fixes, minor refactoring.
2018-03-06 06:56:35 +01:00
Zanz2
8f5dd3df38
Merge pull request #1003 from Zanz2/table_missing_scrollbar_sci1818
...
Table missing scrollbar [SCI-1818]
2018-03-05 17:13:06 +01:00
Zanz2
1e6f1acef5
fixed according to pr
2018-03-05 17:02:37 +01:00
Zanz2
451d14c2e9
Added 4 to constants too, then fixed line too long error
2018-03-05 16:48:18 +01:00
Zanz2
c5728c4018
Merge branch 'master' into null_step_crash_sci2043
2018-03-05 16:37:24 +01:00
Zanz2
e3e7514049
removed redundant return
2018-03-05 16:15:33 +01:00
Zanz2
554b31e0aa
Added constants
2018-03-05 16:09:06 +01:00
Zanz2
bd19c89212
Merge pull request #1013 from Zanz2/step_reorder_fix
...
quick fix for if previous guid is unknown format [Protocols.io import]
2018-03-05 15:59:46 +01:00
zmagod
fca01bd54f
refactor repository export [fixes SCI-2025]
2018-03-05 15:54:04 +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
mlorb
a19b672a83
change validation again
2018-03-05 13:12:44 +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
Matej Zrimšek
61d1f5374d
Additionaly removed some unneeded code, related to the previous commit.
2018-03-04 15:24:43 +01:00
Matej Zrimšek
fa7710fb80
Forgot to remove unneeded code form permissions after the previous refactoring.
2018-03-04 15:17:46 +01:00
Matej Zrimšek
53f75f3cd6
Minor permissions and their calls refactoring and fixing.
2018-03-04 14:49:41 +01:00
Matej Zrimšek
5724f8ed4d
Minor permissions refactoring, including putting the same checks for multiple permissions before the specific ones, hence preventing further evaluation if those permissions are not met.
2018-03-04 14:19:17 +01:00
mz3944
c04a153652
Merge pull request #1005 from mz3944/mz-SCI-2064
...
At adding file to task, cancel button does not respond [SCI-2064]
2018-03-04 13:34:50 +01:00
Zanz2
ba67446eee
quick fix for if previous guid is unknown format
2018-03-03 22:26:00 +01:00
Zanz2
5bcda7f6de
fixed pr
2018-03-02 23:02:35 +01:00
Zanz2
350f12bdbc
using dig method now
2018-03-02 22:29:51 +01:00
mlorb
d19ca7fbdc
change validation
2018-03-02 16:32:46 +01:00
zmagod
4642d049fa
fix hound
2018-03-02 14:16:31 +01:00
zmagod
2b55cd7090
rename variables
2018-03-02 14:14:27 +01:00
zmagod
0996745781
refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024]
2018-03-02 13:39:22 +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
zmagod
83ba412c48
remove unneeded comment
2018-03-01 11:51:39 +01:00
mlorb
08439e7f58
sign up with linkedIn account
2018-02-28 18:12:21 +01:00
zmagod
29a1073a50
refactor queries
2018-02-27 16:34:51 +01:00
zmagod
e3ca782996
add info modal for repository items [fixes SCI-2066]
2018-02-27 16:21:46 +01:00
zmagod
6908368506
refactor
2018-02-27 10:43:57 +01:00
zmagod
3aa28f6d11
assign repository row to task
2018-02-27 10:40:52 +01:00
zmagod
83db7ed01d
adds rake task to migrate the samples in custom repositories and tests [fixes SCI-2014]
2018-02-26 17:21:58 +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
96a6779d55
Fixed misspelled permission call.
2018-02-22 14:08:12 +01:00
Matej Zrimšek
ff9dff5c10
Fixed reports permissions check calls. Fixed Hound warnings.
2018-02-22 13:51:22 +01:00
Matej Zrimšek
1904099954
Put permissions helper methods inside utility module.
2018-02-21 20:22:13 +01:00
Zanz2
29aea1ebd2
refactored according to PR
2018-02-21 16:17:53 +01:00
mlorb
4d69636dbe
Merge pull request #1002 from mlorb/ml-sci-2031_v2
...
Fix bug with load older activities button not working [SCI-2031]
2018-02-20 13:19:20 +01:00
Zanz2
9c2a2956e3
Merge branch 'table_missing_scrollbar_sci1818' of github.com:Zanz2/scinote-web into table_missing_scrollbar_sci1818
...
Merging Biosis master with branch that resizes small tables to atleast 5x5
2018-02-19 17:40:13 +01:00
Matej Zrimšek
b8b9707c06
Fixed protocol and archive permission calls, fixed result permissions; module group managing is now also allowed on newly created groups; other permission call fixes and some refactoring.
2018-02-19 14:51:14 +01:00
mlorb
d2dcb765b4
fix bug with load older activities button not working
2018-02-16 15:42:10 +01:00
Zanz2
5c93bd9676
Tables now have fixed 200 px height, which solves various issues and the scrollbar clipping to the bottom
2018-02-16 14:14:51 +01:00
Zanz2
673901fb01
Merge pull request #984 from Zanz2/yellow_flashv3_SCI1834
...
Fixed tables getting cut when certain attributes are at max length [SCI-1834]
2018-02-16 12:52:51 +01:00
Matej Zrimšek
7b07e7b347
Fixed protocol in repository permissions, and refactored it a bit.
2018-02-16 12:04:11 +01:00
Matej Zrimšek
6ba226d514
Added missing '?' to the canaid permission calls that were missing it.
2018-02-16 11:12:30 +01:00
Matej Zrimšek
5bda53eebf
Overall refactoring of all canaid permissions and code related to their calls.
2018-02-16 10:54:06 +01:00
Matej Zrimšek
4fe669ca9a
Removed permissions helper and updated the remaining calls to its methods with the new canaid gem permissions.
2018-02-16 10:53:22 +01:00
Zanz2
b9db39f87d
removing last commit
2018-02-16 00:00:53 +01:00
Zanz2
fab9180b7b
fixed small oversight
2018-02-15 23:40:09 +01:00
Zanz2
c963c948a1
Fixed main issue, bad step structure now gets fixed to empty template
2018-02-15 23:28:20 +01:00
Zanz2
95501eb046
saving work for later
2018-02-15 20:01:36 +01:00
zmagod
5922aa21a8
adds fetch_all_team_samples method/spec
2018-02-15 17:38:45 +01:00
zmagod
c53df21946
adds specs for sample_to_repository migration service
2018-02-15 16:56:38 +01:00
Zanz2
ad8f93b57f
Merge pull request #991 from Zanz2/missplaced_authors_sci1808
...
protocols io authors are now real authors, not user that added the protocol [SCI-1808]
2018-02-15 16:53:39 +01:00
mlorb
9797712561
Merge pull request #997 from mlorb/ml-sci-2045
...
Fix bug with user getting the notification at completing the step, when notifications are switched off [SCI-2045]
2018-02-15 14:51:40 +01:00
Zmago Devetak
e0510ab448
Merge pull request #995 from ZmagoD/zd_SCI_2040
...
fixed bug with assigned repository items [fixes SCI-2040]
2018-02-15 13:05:30 +01:00
Zmago Devetak
0583979cf9
Merge pull request #993 from ZmagoD/zd_SCI_2039
...
fixes errors with form id duplicates [fixes SCI-2039]
2018-02-15 11:10:43 +01:00
zmagod
78e902f316
fixes few Hound alerts
2018-02-15 11:06:59 +01:00
zmagod
e0ac8e8f91
extract helper methods in service
2018-02-15 09:36:09 +01:00
Matej Zrimšek
ac5b65b121
Added some additional comments for checking if project is active in permissions.
2018-02-14 14:39:10 +01:00
Matej Zrimšek
09c5e23adf
Fixed permission checks for completing step and checking step checkboxes. Disabled turbolinks for comments since it can cause issues. Minor code styling changes.
2018-02-14 14:39:10 +01:00
Matej Zrimšek
d571ab2ed8
Fixed comments permissions for experiment level.
2018-02-14 14:39:10 +01:00
Matej Zrimšek
6b1fee4d30
Added/joined repository record assignment to task with sample assignmment to task.
2018-02-14 14:39:10 +01:00
Matej Zrimšek
f21c794a95
Fixed permission error when accessing samples page.
2018-02-14 14:39:09 +01:00
Matej Zrimšek
4c87fb4a55
Fixed permission error when restoring task.
2018-02-14 14:39:09 +01:00
Matej Zrimšek
946f516171
Fixed permission error when moving a freshly cloned task.
2018-02-14 14:39:09 +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
Matej Zrimšek
d55734e501
Added additional permission checks for moving tasks. Added forgotten enclosing tag in a view.
2018-02-14 14:39:07 +01:00
Matej Zrimšek
d7108f5a35
Fixed Hound warnings.
2018-02-14 14:39:07 +01:00
Matej Zrimšek
8ef6c8f91f
Refactored remaining experiment level permissions (and everything below it).
2018-02-14 14:39:07 +01:00
Matej Zrimšek
879eda2d8f
Minor experiment level permissions refactoring.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
0706d16020
Readded module level archive, move, clone and manag permissions. Corrected their usage and add the permissions check in some additional places.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
1182ce5da1
Fixed experiment level permission checks in the controllers.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
7938c2e036
Minor code style changes.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
c5b798017e
Minor Hound warning fixes.
2018-02-14 14:19:22 +01:00
Matej Zrimšek
d6e7ef465c
Grouped remaining permissions for experiment, protocol, task, and partially step levels. [SCI-1964]
2018-02-14 14:19:22 +01:00
Matej Zrimšek
854333b0e6
Grouped permissions for experiment with canaid gem (WIP).
2018-02-14 14:19:00 +01:00
Matej Zrimšek
70fdae567c
Forgot to add check whether project is active for archive project permission. Added some additional comments for checking if project is active in permissions.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
c09ffa4043
Project permissions comments change.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
d058c371d4
Readded project archive permission.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
900446557b
Fixed mistyped permission checker.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
e36ec69ca9
Project level permissions refactoring (mostly names).
2018-02-14 13:16:32 +01:00
Matej Zrimšek
93536afcd5
Renamed permission 'update_project' to 'manage_project'. Some permissions fixes; added them in some places where they were missing.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
13e9a2a132
Corrected some project level permissions; minor refactoring.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
e5799ee6dc
Some permission fixes.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
a21343a819
Fixing and refactoring project permissions in controllers.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
279da20060
Fixed Hound warnings.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
d423700e84
Used permissions where they were missing.
2018-02-14 13:16:32 +01:00
Matej Zrimšek
321ddc2916
Grouped existing project permissions and used 'canaid' gem.
2018-02-14 13:09:45 +01:00
mlorb
8d0ac93c80
add check to start work on next task notification if recent changes notification is switched off
2018-02-13 11:01:45 +01:00
zmagod
18eab358c7
generate custom repository when user is created [fixes SCI-2020]
2018-02-13 10:44:50 +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
e7fb1bc716
Merge pull request #967 from okriuchykhin/ok_SCI_1966
...
Merge gilson-iot-rails4 to master [SCI-1966]
2018-02-12 11:02:17 +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
Zmago Devetak
ccba5d3eb3
Merge pull request #992 from ZmagoD/zd_SCI_2015
...
setup models for repository list column [fixes SCI-2015]
2018-02-12 10:59:20 +01:00
zmagod
27b7aff3ea
fixed bug with assigned repository items [fixes SCI-2040]
2018-02-12 10:49:35 +01:00
zmagod
36595d33f4
fix name scope
2018-02-12 09:09:56 +01:00
zmagod
d12f8403e4
add reference to repository column
2018-02-12 09:05:41 +01:00
zmagod
ae99c92516
follow @okriuchykhin 's suggestions
2018-02-09 16:28:21 +01:00
zmagod
ace78cfb58
fixes errors with form id duplicates [fixes SCI-2039]
2018-02-09 14:54:16 +01:00
zmagod
557aeca049
refactor relations
2018-02-09 14:11:56 +01:00
zmagod
7c13c5a1f4
fixes typo, follows @okriuchykhin 's suggestions
2018-02-09 11:38:52 +01:00
Zanz2
128f15f984
Merge pull request #990 from Zanz2/code_formatting_sci1822
...
Commands in protocols io steps are now properly formatted like code [SCI-1822]
2018-02-08 08:52:44 +01:00
Zanz2
49a4d9cf23
Tables now no longer have huge whitespace below them, it is now fixed 300 pixels and when its too big the table gets a scrollbar
2018-02-07 15:50:42 +01:00
zmagod
6b7ff11bcf
setup models for repository list column [fixes SCI-2015]
2018-02-07 15:28:28 +01:00
Zanz2
60aa1a0953
Authors are now displayed as actual authors, not the person that added the protocol, and the created at date from protocols io is in protocol info, like it was before
2018-02-07 15:12:03 +01:00
Zanz2
a6356d2420
Fixed newline styling, now code is styled in newlines, and since \n doesnt work i change it to <br> with gsub and that allows code to be written into multiple lines
2018-02-07 14:46:25 +01:00
Zmago Devetak
e400514020
Merge pull request #981 from ZmagoD/zd_SCI_2026
...
fixes bug with step table update [fixes SCI-2026]
2018-02-07 14:35:15 +01:00
Zmago Devetak
b33d09536e
Merge pull request #987 from ZmagoD/zd_SCI_2033
...
fixes user dropdown [fixes SCI-2033]
2018-02-07 14:34:37 +01:00
Zanz2
efaf5ad721
Commands now get styled like code
2018-02-07 13:51:22 +01:00
Zanz2
ef0733b886
Merge pull request #988 from Zanz2/red_error_msg_sci1993
...
Accidentally deleted this off master, identical to the branch before [SCI-1993]
2018-02-07 13:08:45 +01:00
Zanz2
a6e93b8e35
Fixed hound line too long
2018-02-07 13:04:02 +01:00
mlorb
edbcdc6bf4
Merge pull request #986 from mlorb/ml-sci-2031
...
Fix error on task activity [SCI-2031]
2018-02-07 11:39:14 +01:00
Zanz2
367eff6401
re-pushing this, this got merged into master already but i accidentally deleted it when merging two branches
2018-02-07 11:17:53 +01:00
Zanz2
e56c0bb100
Tables are now always atleast 5x5, like in scinote when creating new table
2018-02-07 10:55:44 +01:00
Zanz2
f7f46a094e
Fixed PR and a mistake i made
2018-02-07 09:53:49 +01:00
Zanz2
167cbc98e5
Merge branch 'master' into yellow_flashv3_SCI1834
2018-02-07 09:42:56 +01:00
Zanz2
80735f2412
Fixed the bug with big text difference in preview and imported protocol
2018-02-07 09:26:45 +01:00
zmagod
695e9d90d2
fixes user dropdown [fixes SCI-2033]
2018-02-07 08:43:42 +01:00
Luka Murn
4389c110cf
Merge pull request #982 from biosistemika/lm-remove-component-loader
...
Remove component loader (so builds pass)
2018-02-06 17:02:08 +01:00
mlorb
e151c963e1
fix error on task activity
2018-02-06 16:34:16 +01:00
zmagod
2ad4eb3488
fix bug with checklists
2018-02-06 16:15:10 +01:00
zmagod
75cc9d11df
fix error on checklists
2018-02-06 16:06:15 +01:00
Zanz2
a37d4f3cde
there are always now atleast 5 rows, like in edit table in repository, so it adds empty rows if there are not atleast 5 originally
2018-02-06 15:46:03 +01:00
Zmago Devetak
25a42658c8
Merge pull request #980 from ZmagoD/zd_SCI_2009
...
adds nil check in step_table_element for table name [fixes SCI-2009]
2018-02-06 15:44:56 +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
Zanz2
a2df9777f6
Merge pull request #983 from Zanz2/gen_rep_empty_sci-2000
...
fixed empty table name unable to generate reports bug [SCI-2000]
2018-02-06 14:34:31 +01:00
Zanz2
83e9550feb
Merge pull request #966 from Zanz2/images_not_imported_SCI1807
...
Images not imported [SCI-1807]
2018-02-06 14:33:35 +01:00
Zanz2
f9c6eafe49
most protocol attributes, and step description and step expected result now dont get cut tables when they are at max character limit
2018-02-06 12:04:24 +01:00
Zanz2
9b5ddc6789
moved code from older branch to new master
2018-02-06 11:03:17 +01:00
Zanz2
748af2cbf7
Fixed the issue, table name defaults to empty string space now
2018-02-06 10:29:49 +01:00
Zanz2
dac59cf4d0
Refactored to PR, deleted unrelated things
2018-02-06 09:06:33 +01:00
Luka Murn
4ddc7dfa85
Comment react-hijack code
2018-02-06 08:00:29 +01:00
zmagod
b48fa3f231
fixes bug with step table update [fixes SCI-2026]
2018-02-05 17:32:38 +01:00
zmagod
ad742ac2d1
adds nil check in ste_table_element for table name [fixes SCI-2009]
2018-02-05 16:27:04 +01:00
zmagod
25dcfe66ae
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1960
2018-02-01 16:04:05 +01:00
Oleksii Kriuchykhin
16e1d072b9
Improve files handling in protocol clonning [SCI-2003]
2018-02-01 15:44:08 +01:00
okriuchykhin
def08a3faa
Merge pull request #971 from okriuchykhin/ok_SCI_1968
...
Update notification settings accessor names and update Rubocop config [SCI-1968]
2018-01-31 15:40:09 +01:00
zmagod
366b67ca1c
fixes per @mojca 's request
2018-01-31 15:18:18 +01:00
mlorb
39fc52ddf4
Merge pull request #972 from mlorb/ml-sci-1997
...
Fix type error at changing task at navigation bar after setting due date [SCI-1997]
2018-01-31 15:13:28 +01:00
Zmago Devetak
ccab688728
Merge pull request #975 from ZmagoD/zd_SCI_2001
...
Zd sci 2001
2018-01-31 14:42:41 +01:00
zmagod
b1684dbd5b
removed unneeded hook
2018-01-31 14:40:19 +01:00
zmagod
34f5076b04
fixes failin specs [fixes SCI-2001]
2018-01-31 12:05:45 +01:00
mlorb
553039b7b4
fix type error at changing task at navigation bar after seting due date
2018-01-30 13:29:54 +01:00
Oleksii Kriuchykhin
7a769bbfde
Update notification settings accessor names and update Rubocop config [SCI-1968]
2018-01-29 16:15:12 +01:00
mlorb
775b8b3201
fix bug with ajax error caused to the other user when deleting column in custom repository
2018-01-29 16:01:33 +01:00
zmagod
029d69b033
revert to old setting [fixes SCI-1967]
2018-01-29 15:42:22 +01:00
Zanz2
0607579d06
Fixes the database error i was having on home machine too, wasnt exclusive to me
2018-01-27 14:57:07 +01:00
Zanz2
70a972c264
Fixed pr and small oversight
2018-01-27 14:33:01 +01:00
Zanz2
2a287193b7
Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_fix
2018-01-27 13:50:35 +01:00
Zanz2
e8f6dc0d24
Merge pull request #962 from Zanz2/missing_error_SCI1993
...
A red error messagge is now displayed when not selecting protocol [SCI-1993]
2018-01-26 16:00:15 +01:00
Zanz2
1d4ce42f23
fixed according to PR
2018-01-26 15:29:13 +01:00
Zanz2
98b3ddbdb0
Merge branch 'master' into images_not_imported_SCI1807
2018-01-26 15:13:40 +01:00
Zanz2
a15e624b06
Merge pull request #965 from Zanz2/sub_prot_2short_SCI1995
...
Changed sub protocol name length limit to limit of protocol titles on scinote [SCI-1995]
2018-01-26 15:08:03 +01:00
Oleksii Kriuchykhin
7c14800570
Change base class for API controller [SCI-1966]
2018-01-26 13:34:38 +01:00
Zanz2
e041426a09
Merge pull request #964 from Zanz2/steps_order_SCI1816
...
Steps order fix [SCI-1816]
2018-01-26 11:32:28 +01:00
Zanz2
48b48c945c
Refactored hound errors, now that rubocop works
2018-01-26 11:17:49 +01:00
okriuchykhin
94f604ae17
Merge pull request #961 from okriuchykhin/ok_SCI_1994
...
Actually return 404 when requested asset doesn't exist [SCI-1994]
2018-01-26 11:14:59 +01:00
Zanz2
020e9ddc16
Merge branch 'images_not_imported_SCI1807' of https://github.com/Zanz2/scinote-web into images_not_imported_SCI1807
2018-01-26 11:08:47 +01:00
Zanz2
a48fc168a9
deleted un needed function
2018-01-26 11:05:19 +01:00
Zanz2
6f56f829da
Now protocols name from attached protocol is shortened based on title limit length (255 characters),also has same limitations as scinote title
2018-01-26 10:49:38 +01:00
Zanz2
4ee51959eb
fixed hound
2018-01-26 09:56:59 +01:00
Zanz2
4ed1555ebb
small fix, ordering
2018-01-26 09:45:41 +01:00
Zanz2
346f9feaef
Refactored pull request, but also just did a quick fix on a bug where special characters in titles of steps (% & #) got escaped by sanitize helper, now the string gets sanitized first, then the special characters get unescaped by CGI. unescape html
2018-01-26 09:34:58 +01:00
Zanz2
24e772d7e5
Merge branch 'steps_order_SCI1816' of https://github.com/Zanz2/scinote-web into steps_order_SCI1816
2018-01-26 08:26:38 +01:00
Zanz2
e484f0569b
Merge pull request #960 from Zanz2/fixed_styling_after_merge
...
Fixed some styling bugs that happened after the merge
2018-01-26 08:19:29 +01:00
Zanz2
fc541147c8
A red error messagge is now displayed when selecting no protocol and pressing upload on protocols io import, and after the modal is closed the messagge is gone
2018-01-25 15:54:38 +01:00
okriuchykhin
0b1f43c1c5
Merge pull request #954 from okriuchykhin/ok_SCI_1970
...
Add health check endpoint to API controller [SCI-1970]
2018-01-25 14:33:37 +01:00
Oleksii Kriuchykhin
7dd9121072
Actually return 404 when requested asset doesn't exist [SCI-1994]
2018-01-25 14:30:04 +01:00
zanzdebian
8bd8c34c4d
Fixed some styling bugs that happened after the merge, its using new function now, with old style, ( the old style turns the mouse cursor into a hand when it hovers over button)
2018-01-25 13:45:35 +01:00
mlorb
ab2955c9bb
Merge pull request #956 from mlorb/ml-sci-1491
...
Add notification for previous task has been completed [SCI-1491]
2018-01-25 11:35:19 +01:00
Zmago Devetak
4716fc7752
Merge pull request #955 from biosistemika/decoupling
...
Decoupling
2018-01-25 11:33:06 +01:00
Zmago Devetak
1e407bd9c5
removes unneeded classes
2018-01-25 11:00:48 +01:00
Zmago Devetak
4b2098c0c4
removes unneeded permissions
2018-01-24 16:34:48 +01:00
zmagod
76b08e6ac9
add permissions in views
2018-01-24 13:59:57 +01:00
Zanz2
00ac774fde
Made images now display in protocol description, before_start, warning,guidelines, manuscript_citation, and also in Step description and step expected result
2018-01-24 13:40:13 +01:00
zmagod
9b836d04fa
fixes per @mlorb 's request
2018-01-24 13:21:53 +01:00
Zanz2
7fe1c20ebe
Finished the protocol reorder functions and implemented them
2018-01-24 09:31:43 +01:00
Zanz2
96253c1089
Made some functions to help solve reordering of the protocols io steps
2018-01-23 18:40:23 +01:00
Mojca Lorber
ac8b1769be
add notification for previous task has been completed
2018-01-23 15:53:33 +01:00
zmagod
88d7429041
1. fixes failing unit and integration tests
...
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues
Signed-off-by: zmagod <zmago_devetak@yahoo.com>
2018-01-23 14:54:15 +01:00
okriuchykhin
a2896031ab
Merge pull request #951 from okriuchykhin/ok_SCI_1949
...
Allow first user seeding from env variables [SCI-1949]
2018-01-23 14:02:54 +01:00
zmagod
f8a3fca2db
Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling
2018-01-23 11:06:33 +01:00
zmagod
259880c441
add permission helpers for view project and experiment
2018-01-23 08:52:10 +01:00
Oleksii Kriuchykhin
28be7c4fc4
Add health check endpoint to API controller [SCI-1970]
2018-01-22 16:52:48 +01:00
zmagod
ee7c646b1d
update user settings controllers to new permission system [fixes SCI-1960]
2018-01-22 16:42:26 +01:00
okriuchykhin
73b56beae9
Merge pull request #950 from okriuchykhin/ok_SCI_1329
...
Clear selected rows when changing pages on samples table[SCI-1329]
2018-01-22 15:07:38 +01:00
Oleksii Kriuchykhin
959eddacda
Clear selected rows when changing pages on samples table[SCI-1329]
2018-01-18 17:41:35 +01:00
Oleksii Kriuchykhin
df28503ec1
Fix fetching protocol name in protocol import [SCI-1951]
2018-01-18 17:25:20 +01:00
Oleksii Kriuchykhin
d1a515da90
Allow first user seeding from env variables [SCI-1949]
2018-01-18 16:23:33 +01:00
zmagod
2857857c24
fixes bug with navbar[SCI-1950]
2018-01-18 13:29:47 +01:00
Zmago Devetak
7b28bfa6d4
Merge pull request #937 from ZmagoD/feat/external-components-loader
...
Enable loading of external React components
2018-01-18 11:13:40 +01:00
okriuchykhin
aef80f86b5
Merge pull request #934 from okriuchykhin/ok_SCI_1931
...
Fix protocol import button [SCI-1931]
2018-01-18 10:30:19 +01:00
Adrian Oprea
f2f624cfa6
Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader
...
* 'decoupling' of github.com:biosistemika/scinote-web:
fix(AboutScinoteModal): Enable react optimizations
Fix addons display in info modal [SCI-1875]
Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version.
2018-01-18 10:24:36 +02:00
Adrian Oprea
12fd630d0c
fix(AboutScinoteModal): Enable react optimizations
...
Children generated within a loop or by an iterator need to be passed
a unique `key` property so React can properly watch their updates and
perform the necessary actions.
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-18 09:59:37 +02:00
Oleksii Kriuchykhin
91468faaf9
Fix addons display in info modal [SCI-1875]
2018-01-17 18:30:55 +01:00
Adrian Oprea
6d84790bdb
Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader
...
* 'decoupling' of github.com:biosistemika/scinote-web: (21 commits)
fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
Remove Addons info test from core [SCI-1875]
Remove skip_on_import from repository_cell [SCI-1939]
fixes bug with comment actions dropdown [fixes SCI-1938]
fixes first element in global activities logs[fixes SCI-1866]
Fix task repository row selector [SCI-1940]
Fix repository item export [SCI-1945]
Fix samples import [SCI-1946]
adds first date to _list.html.erb view
Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
Fix repository records import [SCI-1939]
Fix export samples button [SCI-1936]
refactor
adds additional tests for permissions controller
fix HOC to recive objects
fixes flow, and before_action in permissions_controller
fixes per @duco 's request
remove unneeded import
add permissions endpoint on the API
fix request
...
2018-01-17 18:14:41 +02:00
Zmago Devetak
b4b6fddca3
Merge pull request #945 from ZmagoD/zd_SCI_1944
...
fixes bug in the invitation_controller with full_name sanitization [f…
2018-01-17 17:02:34 +01:00
Adrian Oprea
157969aa5e
HACK: Comment out code which returns invalid data
...
It seems like the backend is returning a weird response when queried for
addons. Once the backend issue is identified and fixed this should be
uncommented.
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 17:54:35 +02:00
okriuchykhin
8394055fba
Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2
...
Remove Addons caption if no addons in info modal and fix linter packages
2018-01-17 15:33:43 +01:00
zmagod
488dba378e
fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
2018-01-17 15:06:43 +01:00
Zmago Devetak
26f7a94392
Merge pull request #943 from ZmagoD/zd_SCI_1866_v2
...
fixes first element both in Rails part an React part off the application
2018-01-17 14:12:52 +01:00
Zmago Devetak
b9e56c49ef
Merge pull request #944 from ZmagoD/zd_SCI_1938
...
fixes bug with comment actions dropdown [fixes SCI-1938]
2018-01-17 13:42:36 +01:00
Adrian Oprea
b559f3cbd4
refactor(Navigation): Use identifier instead of screenName
...
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 14:40:33 +02:00
Adrian Oprea
4b9013bcab
refactor(massageConfiguration): Create response only when we have addons
...
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 14:39:42 +02:00
okriuchykhin
38aaaa011c
Merge pull request #936 from okriuchykhin/ok_SCI_1939
...
Fix repository records import [SCI-1939]
2018-01-17 12:55:11 +01:00
Oleksii Kriuchykhin
819febb05b
Remove skip_on_import from repository_cell [SCI-1939]
2018-01-17 12:54:32 +01:00
zmagod
5371f5a139
fixes bug with comment actions dropdown [fixes SCI-1938]
2018-01-17 12:54:21 +01:00
okriuchykhin
8ccb361525
Merge pull request #940 from okriuchykhin/ok_SCI_1946
...
Fix samples import [SCI-1946]
2018-01-17 12:51:35 +01:00
okriuchykhin
1692bdade7
Merge pull request #941 from okriuchykhin/ok_SCI_1945
...
Fix repository item export [SCI-1945]
2018-01-17 12:50:22 +01:00
okriuchykhin
2c2914f691
Merge pull request #942 from okriuchykhin/ok_SCI_1940
...
Fix task repository row selector [SCI-1940]
2018-01-17 12:50:11 +01:00
zmagod
0922ee21a7
fixes first element in global activities logs[fixes SCI-1866]
2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin
74a62c41eb
Fix task repository row selector [SCI-1940]
2018-01-17 11:21:41 +01:00
Oleksii Kriuchykhin
86853e8fc1
Fix repository item export [SCI-1945]
2018-01-17 10:39:01 +01:00
Oleksii Kriuchykhin
3c8d8e2fbb
Fix samples import [SCI-1946]
2018-01-16 17:50:33 +01:00
Adrian Oprea
d71f6161e4
feat(Navigation): Enhance navigation with addons
...
Use the withExtras HOC to add external functionality without embedding that knowledge in the core.
2018-01-16 17:24:11 +02:00
Adrian Oprea
d7b63f5941
feat(massageConfiguration): Add data-transformation function
...
The meta-configuration structure imposes we change the way `react-hijack` parses and pulls its data. Because that work is both error-prone and also time-consuming, we chose to implement a function that would "massage" the data so it fits the current way react-hijack expects it.
2018-01-16 17:23:15 +02:00
Adrian Oprea
583efbc9c4
refactor(componentLoader): Add component path at module level
...
Instead of forcing this knowledge on the add-on, we inserted it here. The benefit is that we are able to point the core to whatever directory we choose, without modifying each addon in turn.
2018-01-16 17:19:56 +02:00
Adrian Oprea
350862b0cc
feat: Re-export availableAddons
...
This will probably be removed and the config will be exported through the main entrypoint.
2018-01-16 17:18:46 +02:00
Adrian Oprea
f6f2bc4c3d
feat: Create availableAddons empty config
...
This configuration is populated on build-time with the available extras which expose a `client/` directory containing React code.
2018-01-16 17:17:39 +02:00
zmagod
a931a1bc15
adds first date to _list.html.erb view
2018-01-16 14:03:22 +01:00
Oleksii Kriuchykhin
b59815c611
Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
2018-01-16 11:11:50 +01:00
Adrian Oprea
894e0afd0a
feat(componentLoader): Add external component loader module
...
For render hijacking to work, imports need to be peformed at core level.
This loader ensures that Webpack is able to resolve the paths to the
external components' code, without the need for extra loaders or custom
built plugins.
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-16 10:14:35 +02:00
Oleksii Kriuchykhin
a64012237e
Fix repository records import [SCI-1939]
2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin
79e1eaf145
Fix export samples button [SCI-1936]
2018-01-15 13:54:08 +01:00
Oleksii Kriuchykhin
deabd39a98
Fix protocol import button [SCI-1931]
2018-01-15 13:43:09 +01:00
okriuchykhin
00927be287
Merge pull request #932 from okriuchykhin/ok_SCI_1915
...
Improve XLSX parsing with Roo [SCI-1915]
2018-01-12 14:57:17 +01:00
Zmago Devetak
ebd354e4d5
Merge pull request #900 from ZmagoD/zd_SCI_1854
...
adds premissions service to FE
2018-01-12 14:24:28 +01:00
Zanz2
b105920d4e
Merge pull request #901 from Zanz2/code_refactor
...
Protocols.io code beautification and refactoring [SCI-1929]
2018-01-12 12:34:00 +01:00
zmagod
371491c259
refactor
2018-01-12 11:38:52 +01:00
Zanz2
3c6d37ce64
Fixed according to PR review
2018-01-11 18:37:36 +01:00
Oleksii Kriuchykhin
2ddb0ea009
Improve XLSX parsing with Roo [SCI-1915]
2018-01-11 17:52:57 +01:00
mlorb
aba426091c
add render 403 for create team permission
2018-01-10 10:47:45 +01:00
mlorb
6c4514f550
add create_teams permission checks
2018-01-09 15:28:27 +01:00
zmagod
0d7c116de1
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854
2018-01-09 10:03:02 +01:00
zmagod
c5379896c0
fix HOC to recive objects
2018-01-08 16:28:20 +01:00
Zmago Devetak
4e4cae9a48
Merge pull request #927 from ZmagoD/zd_SCI_1867
...
fix import protocol preview [fixes SCI-1867]
2018-01-08 14:21:44 +01:00
Zmago Devetak
0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866
...
Wrong date at activity
2018-01-08 14:20:26 +01:00
zmagod
c07f54a0c7
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854
2018-01-08 08:38:14 +01:00
zmagod
7af4816ce8
removes js brakepoint
2018-01-05 17:13:39 +01:00
zmagod
455534ef9a
fixes list keys
2018-01-05 17:11:38 +01:00
zmagod
eb8124ea5a
follow @duco 's suggestions
2018-01-05 17:08:00 +01:00
mlorb
fd6dfbd561
rename create_teams
2018-01-05 16:47:48 +01:00
mlorb
e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797
...
Permissions - refactor organization & team level permissions (core) [SCI-1797]
2018-01-05 16:03:55 +01:00
mlorb
efb4ce289c
fix and/or use
2018-01-05 15:52:41 +01:00
zmagod
3fae267547
fix import protocol preview [fixes SCI-1867]
2018-01-05 15:30:11 +01:00
mlorb
99185871c4
fix naming things
2018-01-05 15:15:50 +01:00
mlorb
70ae14a9b8
refactor manage repository permissions again because of addons
2018-01-05 11:17:01 +01:00
mlorb
ec851caa80
refactor manage repository column permissions again because of addons
2018-01-05 10:43:59 +01:00
zmagod
be014000ab
fixes flow-types
2018-01-05 09:59:08 +01:00
zmagod
862b73cae7
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1866
2018-01-05 09:13:43 +01:00
zmagod
0d72851bb5
fixes bug with displaying assign/unassign button [fixes SCI-1870]
2018-01-04 17:20:17 +01:00
okriuchykhin
4cdbecc3bc
Merge pull request #923 from okriuchykhin/ok_SCI_1869
...
Add project/task path with tooltips to activities [SCI-1869]
2018-01-04 16:44:35 +01:00
Oleksii Kriuchykhin
53f4db9352
Code refactoring [SCI-1869]
2018-01-04 14:56:16 +01:00
okriuchykhin
b0f8c36677
Merge pull request #917 from okriuchykhin/ok_SCI_1870
...
Fix adding users to a task [SCI-1870]
2018-01-04 14:14:05 +01:00
okriuchykhin
e49ffb61d4
Merge pull request #914 from okriuchykhin/ok_SCI_1873
...
Fix repositories [SCI-1873]
2018-01-04 13:33:30 +01:00
mlorb
abced181d5
refactor manage repository rows permissions again because of addons
2018-01-04 11:53:58 +01:00
Oleksii Kriuchykhin
070711917e
Code fixes [SCI-1873]
2018-01-04 11:25:34 +01:00
zmagod
e0e3ef9359
fixes flow, and before_action in permissions_controller
2018-01-03 17:23:50 +01:00
okriuchykhin
d149facd50
Merge pull request #922 from okriuchykhin/ok_SCI_1875
...
Fix about modal [SCI-1875]
2018-01-03 17:00:29 +01:00
mlorb
0c519b8f03
refactor manage sample elements permissions again because of addons
2018-01-03 16:37:02 +01:00
okriuchykhin
3d3b1d3a44
Merge pull request #921 from okriuchykhin/ok_SCI_1648
...
Fix assign repository record button in tasks when one record is selected [SCI-1648]
2018-01-03 16:28:34 +01:00
okriuchykhin
ac7746ae91
Merge pull request #916 from okriuchykhin/ok_SCI_1871
...
Fix canvas update [SCI-1871]
2018-01-03 15:47:10 +01:00
okriuchykhin
ff62a36788
Merge pull request #910 from okriuchykhin/ok_SCI_1838
...
Change invite users to project link to new settings page [SCI-1838]
2018-01-03 14:47:26 +01:00
okriuchykhin
b8fa3c4d51
Merge pull request #905 from okriuchykhin/ok_SCI_1865
...
Add icons for different notification types in recent notification dropdown [SCI-1865]
2018-01-03 14:23:53 +01:00
zmagod
1d3881b649
fixes bug with duplicated activities and wrong date separators [fixes SCI-1866]
2018-01-03 13:48:59 +01:00
mlorb
dc68b3068b
fix Rails 5.1 bug with params
2018-01-03 13:19:56 +01:00
Oleksii Kriuchykhin
2e275d6d67
Add project/task path with tooltips to activities [SCI-1869]
2017-12-28 15:13:39 +01:00
Zanz2
7bad722553
Made small oversight and fixed it
2017-12-24 02:06:14 +01:00
Zanz2
83e1b04c7a
Fixed pull request
2017-12-24 01:49:04 +01:00
Oleksii Kriuchykhin
89230bd730
Fix about modal [SCI-1875]
2017-12-22 18:27:20 +01:00
Oleksii Kriuchykhin
27008be50e
Fix assign repository record button in tasks when one record is selected [SCI-1648]
2017-12-22 18:05:22 +01:00
okriuchykhin
0a6d0d1a47
Merge pull request #918 from okriuchykhin/ok_SCI_1893
...
Fix invite users dropdown [SCI-1893]
2017-12-22 16:58:49 +01:00
Oleksii Kriuchykhin
917c2cf28e
Fix experiment workflow image update indicator [SCI-1872]
2017-12-22 13:12:52 +01:00
Oleksii Kriuchykhin
afb579bef1
Fix invite users dropdown [SCI-1893]
2017-12-21 16:49:10 +01:00
mlorb
0774b6f7e6
refactor manage samples permissions again, so that addons permissions can be added
2017-12-20 16:05:05 +01:00
Oleksii Kriuchykhin
49ae9bcd55
Fix adding users to a task [SCI-1870]
2017-12-20 13:44:21 +01:00
Oleksii Kriuchykhin
66869fe4cf
Fix canvas update [SCI-1871]
2017-12-20 11:44:11 +01:00
Oleksii Kriuchykhin
512ee07bde
Fix repositories [SCI-1873]
2017-12-19 17:53:45 +01:00
Oleksii Kriuchykhin
1a81a99ff0
Remove Creek XLSX parser gem as it causes conflicts [SCI-1891]
2017-12-19 16:17:11 +01:00
Luka Murn
cf291bf887
Merge branch 'gilson-iot-rails4'
...
Conflicts:
Gemfile.lock
2017-12-19 10:56:39 +01:00
Zanz2
53561ffd84
Refactored according to PR
2017-12-15 20:39:15 +01:00
mlorb
bd7eda1506
fix failing tests
2017-12-14 14:18:18 +01:00
mlorb
2936770c01
refactor can view team users ATWHO permission
2017-12-14 14:18:18 +01:00
mlorb
5c790287ec
refactor again manage user team permissions
2017-12-14 14:18:18 +01:00
mlorb
7c1ae6bc82
refactor manage repository permissions
2017-12-14 14:18:18 +01:00
mlorb
2918a9833d
refactor manage repository column permissions
2017-12-14 14:18:18 +01:00
mlorb
3f5e9e60b7
refactor view repository permission
2017-12-14 14:18:18 +01:00
mlorb
079ac7a4d3
refactor manage repository row permissions
2017-12-14 14:18:18 +01:00
mlorb
740ecc674b
refactor view repositories permission
2017-12-14 14:18:18 +01:00
mlorb
3ca51f097f
refactor manage sample permissions again by removing authorship and refactor manage sample elements permissions
2017-12-14 14:18:17 +01:00
mlorb
e577b363b2
byTheWay fix of Rails 5.1 bug
2017-12-14 14:18:17 +01:00
mlorb
29f9414839
refactor create project permission
2017-12-14 14:18:17 +01:00
mlorb
72023c7dfe
refactor update/delete sample permissions
2017-12-14 14:18:17 +01:00
mlorb
b09377cd8d
refactor update sample permission
2017-12-14 14:18:17 +01:00
mlorb
f801ed8eb6
refactor view/export samples permission
2017-12-14 14:18:16 +01:00
mlorb
0d37f9c85a
refactor clone protocol permission
2017-12-14 14:18:16 +01:00
mlorb
f6d36ae6a2
refactor update protocol type in repository
2017-12-14 14:18:16 +01:00
mlorb
806fcbce36
refactor update protocol in repository permission
2017-12-14 14:18:16 +01:00
mlorb
e0d1ae174e
refactor read protocol in repository permission
2017-12-14 14:18:15 +01:00
mlorb
a3a494c3a2
fix banana: remove dead code which strangely reappeared, probably with some rebasing
2017-12-14 14:18:15 +01:00
mlorb
ccc2451494
refactor create sample permissions
2017-12-14 14:18:15 +01:00
mlorb
43c01b74b1
refactor create protocol permission
2017-12-14 14:18:14 +01:00
mlorb
11a3cd196c
add create, update team permission and refactor 422 respond handling in controllers
2017-12-14 14:18:14 +01:00
mlorb
8893fd668d
add create, update, delete user_team permission
2017-12-14 14:18:14 +01:00
mlorb
a0b2d3f5ef
refactor read_team permission
2017-12-14 14:18:14 +01:00
zmagod
219ef3baf6
setup new pagination for activities
2017-12-14 14:02:40 +01:00
Oleksii Kriuchykhin
4ff6e87fed
Change invite users to project link to new settings page [SCI-1838]
2017-12-14 11:22:28 +01:00
Oleksii Kriuchykhin
7bdc22ee80
Remove default property [SCI-1865]
2017-12-13 17:28:05 +01:00
Oleksii Kriuchykhin
6986d11cfe
Add Flow types for notifications [SCI-1865]
2017-12-13 17:25:25 +01:00
zmagod
249d3d7698
fixes current timezone setup for activities
2017-12-13 16:48:31 +01:00
okriuchykhin
2fa7591f36
Merge pull request #903 from okriuchykhin/ok_SCI_1864
...
Rename notifications settings accessor [SCI-1864]
2017-12-13 12:57:56 +01:00
Oleksii Kriuchykhin
baf3151bb0
Fix notification settings accessors [SCI-1864]
2017-12-13 11:59:53 +01:00
zmagod
b106545d31
fixes per @duco 's request
2017-12-13 08:57:50 +01:00
Oleksii Kriuchykhin
ea63864b33
Add icons for different notification types in recent notification dropdown [SCI-1865]
2017-12-12 17:05:08 +01:00
Zmago Devetak
00be4460cc
Merge pull request #806 from ZmagoD/disable_tiny_mce_asset_unless_step
...
Fixes bug with embedded images [SCI-1624]
2017-12-12 09:53:24 +01:00
Zanz2
1fc8b2a2b2
quick fix un-needed styling
2017-12-10 01:45:47 +01:00
Zanz2
11dc3be9d4
It is now possible to scroll down preview modal
2017-12-10 01:41:21 +01:00
Zanz2
d0a9198408
Fixed the styling
2017-12-10 01:20:08 +01:00
Oleksii Kriuchykhin
6256acdfea
Rename notifications settings accessor [SCI-1864]
2017-12-07 13:59:33 +01:00
Luka Murn
86ac07c69f
Merge pull request #902 from biosistemika/rails-5.1
...
Merge rails-5.1 into decoupling-settings-page
2017-12-07 09:25:11 +01:00
okriuchykhin
b3b0e367e8
Merge pull request #889 from okriuchykhin/ok_SCI_1747
...
Improve server side assets validation display for steps [SCI-1747]
2017-12-04 14:12:43 +01:00
zmagod
52e5cf7be8
remove unneeded import
2017-12-04 13:27:24 +01:00
zmagod
e01e7bebbf
add permissions endpoint on the API
2017-12-04 13:25:48 +01:00
Zanz2
b0012ab936
Simplified repeating method calls
2017-12-03 16:50:06 +01:00
Zanz2
fcbd956d6e
Finished code beautification
2017-12-03 01:17:49 +01:00
Zanz2
835ac6910f
Code refactor part 1
2017-12-02 00:29:47 +01:00
Zmago Devetak
205d3b3d8f
Merge pull request #894 from ZmagoD/zd_SCI_1650
...
Adds task to copy images [fixes SCI-1650]
2017-12-01 17:32:09 +01:00
zmagod
b6a5ab5e6c
fix request
2017-12-01 17:29:46 +01:00
zmagod
52b278fe78
adds premissions service to FE
2017-12-01 17:15:15 +01:00
Oleksii Kriuchykhin
373d7e8aa6
Clear selected files after successful upload [SCI-1747]
2017-12-01 11:51:22 +01:00
Oleksii Kriuchykhin
c4fe2b1c11
Fix jsPlumb library loading [SCI-1839]
2017-12-01 10:48:07 +01:00
okriuchykhin
16729ccd7d
Merge pull request #898 from okriuchykhin/ok_SCI_1838
...
Fix assignment of users to projects [SCI-1838]
2017-11-30 11:16:07 +01:00
okriuchykhin
9ed73702c5
Merge pull request #896 from okriuchykhin/ok_SCI_1837
...
Fix Ajax calls with redirect [SCI-1837]
2017-11-30 11:00:26 +01:00
Oleksii Kriuchykhin
194054d973
Fix assignment of users to projects [SCI-1838]
2017-11-29 22:55:10 +01:00
Oleksii Kriuchykhin
7bb52191cd
Fix Ajax calls with redirect [SCI-1837]
2017-11-29 16:13:28 +01:00
Oleksii Kriuchykhin
745dac09a7
Improve clean-up of dropped files [SCI-1747]
2017-11-28 16:48:47 +01:00
Oleksii Kriuchykhin
6964ed2dbb
Add initialization of the selectpicker on experiments actions [SCI-1840]
2017-11-28 16:34:30 +01:00
zmagod
7442684846
fix protocol preview, remove unneeded functions, fix copy paste tokens
2017-11-28 14:16:20 +01:00
Oleksii Kriuchykhin
e35031dd9a
Small code fixies [SCI-1747]
2017-11-28 11:34:57 +01:00
zmagod
e233fbe1d8
fix image removing from tinymce
2017-11-28 11:01:07 +01:00
Zanz2
bb8aef3b73
Merge pull request #893 from Zanz2/step_desc_2small_SCI-1833
...
Fixed validations lengths and added workarounds for bugs [SCI-1833]
2017-11-24 17:55:20 +01:00
zmagod
e69e9f6794
remove unneeded comment and add tiny_mce_asset regex in a constant
2017-11-24 17:04:01 +01:00
zmagod
066c782cd2
Merge branch 'master' of https://github.com/biosistemika/scinote-web into disable_tiny_mce_asset_unless_step
2017-11-24 16:29:32 +01:00
Zmago Devetak
027f4a5921
Merge pull request #890 from ZmagoD/zd_SCI_1651
...
export and import RTE images
2017-11-24 16:28:28 +01:00
Zmago Devetak
728f656472
update protocols_exporter.rb
2017-11-24 15:23:19 +01:00
Zmago Devetak
3cd7e6fdde
fix open method
2017-11-24 15:19:58 +01:00
Zanz2
0e574b2f15
removed un needed limits
2017-11-24 11:49:57 +01:00
zmagod
d200e355ed
follow @Ducz0r 's suggestions
2017-11-24 11:45:07 +01:00
Zanz2
e7e37939a9
quick fix to expected result losing html
2017-11-24 11:18:12 +01:00
Zanz2
dc5904aed9
Fixed this jira issue and added workarounds for bugs
2017-11-24 01:45:40 +01:00
mlorb
9e7b75a880
Merge pull request #892 from mlorb/ml-sci-1215_v2
...
Make background gray for paperclip images [SCI-1215]
2017-11-23 17:32:09 +01:00
Mojca Lorber
0ffe476a54
make background gray for paperclip images
2017-11-23 14:35:42 +01:00
mlorb
c46d630f0b
Merge pull request #891 from mlorb/ml-sci-1617
...
Add copying of TinyMce assets when cloning the protocol [SCI-1617]
2017-11-23 14:31:29 +01:00
Luka Murn
00fe267a2a
Minor codestyle fixes
2017-11-23 11:33:39 +01:00
Zanz2
764e5259d1
Fixed last review, and a bug i found
2017-11-22 23:38:22 +01:00
Mojca Lorber
fe5828fa97
add copying of TinyMce assets when cloning the protocol
2017-11-22 16:47:21 +01:00
zmagod
afbeafb137
adds RTE images import, disables turbolinks on edit step actions
2017-11-22 16:28:14 +01:00
Zanz2
692ed62d6d
made case statement nicer
2017-11-21 21:27:19 +01:00
Zanz2
f577bf93b5
Fixed pull request review
2017-11-21 19:20:15 +01:00
zmagod
91fec89cab
adds tiny_mce_assets to protocol export
2017-11-21 16:30:48 +01:00
Oleksii Kriuchykhin
fe8b7d26c1
Improve server side assets validation display for steps [SCI-1747]
2017-11-21 13:48:06 +01:00
Zanz2
8226322e92
Fixed open html tags on truncate
2017-11-21 11:42:42 +01:00
Zanz2
529d988cc3
closing html tags
2017-11-21 11:15:09 +01:00
Zanz2
d8c809ffd0
Reviewed pull request
2017-11-20 23:19:34 +01:00
Zanz2
e943df9176
fixed small rubocop error
2017-11-20 01:02:02 +01:00
Zanz2
cf66d94d45
Reworked functions into one function, defined all protocols.io attributes as dynamic constants, applied length checking to all protocols.io attribute fields
2017-11-20 00:59:32 +01:00
Zanz2
99b16f339d
New maximums, functions reworked
2017-11-17 15:16:17 +01:00
Zanz2
a6009806c4
Fixed some oversights
2017-11-17 02:56:16 +01:00
Zanz2
fa25a6785b
Made the propper files and functionality for the text truncation to function
2017-11-17 02:43:32 +01:00
Zanz2
b2e1623cf1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784
2017-11-16 20:04:12 +01:00
Zanz2
c44465817d
Added the functions and put in limitations from my validations files, changed controller name, added some locals
2017-11-16 20:03:44 +01:00
Luka Murn
d715eb06ef
Add team & project role-related helper functions to User model
...
This will be required later once we start using Canaid.
2017-11-16 15:50:30 +01:00
Zanz2
1b540a75a1
Fixed to use .megabytes
2017-11-16 15:17:13 +01:00
Zanz2
e782f13a7d
Merge branch 'master' of github.com:Zanz2/scinote-web into size_limit_small_SCI-1810
2017-11-16 15:14:01 +01:00
okriuchykhin
42f2d7e685
Merge pull request #883 from okriuchykhin/ok_SCI_1819
...
Allow import of the sample with missing non mandatory fields [SCI-1819]
2017-11-16 11:03:08 +01:00
mlorb
6c80c338e4
Merge pull request #880 from mlorb/ml-sci-1316
...
Change text for avatar size on my profile page [SCI-1316]
2017-11-16 10:43:23 +01:00
Zanz2
41c1193a78
Fixed unit error;Now when comparing file size, both are in bytes
2017-11-16 01:34:38 +01:00
Zanz2
4d65ad59fe
Merge pull request #878 from Zanz2/protocol_description_fix
...
Found a bug; i forot to include protocol description in new preview modal
2017-11-16 01:11:52 +01:00
Oleksii Kriuchykhin
f202687291
Allow import of the sample with missing non mandatory fields [SCI-1819]
2017-11-15 16:40:14 +01:00
Oleksii Kriuchykhin
84f4aba213
Pull latest master into gilson-iot-rails4
2017-11-15 15:15:26 +01:00
Mojca Lorber
ff998a6c98
change text for avatar size on my profile page
2017-11-15 14:21:04 +01:00
mlorb
47784e09a8
Merge pull request #867 from mlorb/ml-sci-1434
...
Add explanation when copying custom repositories [SCI-1434]
2017-11-15 11:34:02 +01:00
mlorb
06fc0eac5e
Merge pull request #868 from mlorb/ml-sci-1215
...
Fix preview for images with transparent background [SCI-1215]
2017-11-15 11:28:57 +01:00
mlorb
288e3ddcbd
Merge pull request #877 from mlorb/ml-sci-1190
...
Fix bug when removing all keywords in protocol [SCI-1190]
2017-11-15 11:22:18 +01:00
Zanz2
c3f6c2b34a
Found a bug where i forot to include protocol description in preview modal and fixed it
2017-11-14 19:46:51 +01:00
Zanz2
bc00c4a28b
Merge pull request #874 from Zanz2/supported_file_1794
...
Made button green and added .json to supported file [SCI-1794]
2017-11-14 19:12:45 +01:00
Mojca Lorber
c2a5b52767
fix bug when removing all keywords in protocol
2017-11-14 15:04:37 +01:00
Zanz2
6b9a10ffe4
Made validations for JSON format and .txt and .json files
2017-11-14 12:02:17 +01:00
Zanz2
7ec8d7c2b2
Made button green and added .json to supported file
2017-11-14 11:46:19 +01:00
Zanz2
f35ab78849
Added some code to make the two seperate jira issues work together (protocol info and scinote tables
2017-11-14 00:56:39 +01:00
Mojca Lorber
f75a2710d5
fix preview for images with transparent background
2017-11-13 18:03:14 +01:00
Mojca Lorber
be74338d9f
add explanation when copying custom repositories
2017-11-13 16:30:42 +01:00
Zmago Devetak
fe128dc53b
Merge pull request #865 from ZmagoD/zd_SCI_1761
...
fixes password validations [fixes SCI-1761]
2017-11-13 13:09:46 +01:00
mlorb
cd6799d571
Merge pull request #866 from biosistemika/protocols-io-import
...
Protocols io import
2017-11-13 11:53:28 +01:00
Zanz2
b265beb386
Merge pull request #864 from Zanz2/move_desc
...
Move protocol.io protocol description to step 1 of protocols [SCI-1695]
2017-11-13 10:07:01 +01:00
Zanz2
23d3ffa5a4
Fixed PR
2017-11-12 15:48:45 +01:00
Zanz2
e26adc2905
Quick formatting fix
2017-11-12 15:41:50 +01:00
Zanz2
e7384ac38d
Code review fixes, made seperate helper file
2017-11-12 15:31:04 +01:00
zmagod
26912a14d6
fixes password validations [fixes SCI-1761]
2017-11-10 12:59:37 +01:00
mlorb
fd743ec2d5
fix error with event not defined and add flowtype to ESLint
2017-11-10 09:30:55 +01:00
Zanz2
fa2c0fe556
merging
2017-11-09 18:55:17 +01:00
mlorb
dfb2689fbf
Merge pull request #860 from mlorb/ml-sci-1730
...
Fix team table does not retain the number of teams per page bug [SCI-1730]
2017-11-09 17:53:19 +01:00
Zanz2
812fa3f1d5
Hopefully this will resolve my merge problems
2017-11-09 17:42:17 +01:00
zmagod
327e27e123
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1576
2017-11-09 15:55:10 +01:00
Zanz2
a40a63ae50
Made code more aesthetic
2017-11-09 15:38:06 +01:00
mlorb
b3e39697d5
Merge pull request #857 from mlorb/ml-sci-1575
...
Implement login feature integration tests [SCI-1575]
2017-11-09 13:48:57 +01:00
mlorb
b0fe792f9c
fix ESLint class-methods-use-this error
2017-11-09 13:33:41 +01:00
mlorb
c7f5d6ed8c
add state for number of teams per page
2017-11-09 13:29:14 +01:00
Zmago Devetak
7386974d64
Merge pull request #850 from ZmagoD/zd_SCI_1731
...
add scenic gem, teams datatables sql view
2017-11-09 11:37:20 +01:00
Zanz2
518eb09110
Deleted un needed error flash
2017-11-09 10:49:44 +01:00
Zanz2
4b837dbe9d
Forgot flash fail messagges, now added them for file too big and general error
2017-11-09 10:49:44 +01:00
Zanz2
feb686b4ac
Fixed alignement
2017-11-09 10:49:44 +01:00
Zanz2
8b247770ef
Added the success flash alert
2017-11-09 10:49:44 +01:00
Zanz2
9086cd8b6b
Jira branch code
2017-11-09 10:49:44 +01:00
zmagod
e0b6683a44
create view directory per @Ducz0r 's request
2017-11-09 10:06:53 +01:00
mlorb
4e92065ea0
Merge pull request #855 from mlorb/ml-sci-1633-v2
...
Fix bug with import css styles [SCI-1633]
2017-11-09 09:49:37 +01:00
zmagod
9eac014f1a
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731
2017-11-09 09:05:22 +01:00
zmagod
e2af987b80
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1568
2017-11-09 08:35:39 +01:00
zmagod
33ebe1f748
integration tests for forgot_password [fixes SCI-1576]
2017-11-08 16:23:52 +01:00
zmagod
b036452d8c
adds background worker to cucumber tests
2017-11-08 11:59:01 +01:00
Luka Murn
dfa1c83c9f
Merge branch 'lm-add-flow-to-validation' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-add-flow-to-validation
...
Conflicts:
flow-typed/npm/lodash_v4.x.x.js
2017-11-08 09:33:29 +01:00
Luka Murn
0412c6f283
Update code per @ZmagoD's request
2017-11-07 17:30:15 +01:00
mlorb
157b1968cc
implement login's feature integration tests
2017-11-07 17:18:41 +01:00
zmagod
f43492adff
trigger an alert to on canvas save if page reload [fixes SCI-1610]
2017-11-07 15:08:26 +01:00
mlorb
df835fccb4
fix bug with import css styles
2017-11-07 11:09:30 +01:00
zmagod
3255d5cf7c
code cleanup
2017-11-06 15:37:09 +01:00
zmagod
54e360bb52
fixes team switch
2017-11-06 15:14:17 +01:00
mlorb
126f278308
Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json
...
Scinote protocols IO base branch
2017-11-06 14:53:01 +01:00
mlorb
bd569b9746
small changes
2017-11-06 11:34:25 +01:00
Zanz2
4354363215
rubocop refactor css
2017-11-03 16:46:03 +01:00
Zanz2
ac26b17ddf
Rubocop refactor
2017-11-03 16:45:15 +01:00
Zanz2
aa03a889c7
Fixed PR review
2017-11-03 16:28:15 +01:00
mlorb
21e3c653eb
add integration tests for single team feature
2017-11-03 10:48:09 +01:00
zmagod
5bc38414d1
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1731
2017-11-03 09:56:44 +01:00
Zmago Devetak
460bcd4980
Merge pull request #844 from ZmagoD/zd_SCI_1669
...
Refactor all API server calls from react to go through the services
2017-11-03 09:19:02 +01:00
Zanz2
096ee00e07
removed unnecessary html
2017-11-03 01:28:20 +01:00
Zanz2
6a4c38bbee
Fixed table elements render bugs, now renders after shown event
2017-11-03 01:04:50 +01:00
Zmago Devetak
b1f4d578f0
Merge pull request #848 from ZmagoD/zd_SCI_1726_add_team_member_bug_fix
...
fixes user invitation button [fixes SCI-1726]
2017-11-02 16:50:42 +01:00
zmagod
618880aa30
follows @Ducz0r 's remarks
2017-11-02 16:49:09 +01:00
zmagod
e17f945d8a
fix typos
2017-11-02 16:41:29 +01:00
zmagod
5ded818291
fixes failing cucumber tests
2017-11-02 16:24:11 +01:00
zmagod
5538805faa
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1669
2017-11-02 14:39:07 +01:00
zmagod
2118b31762
adds about sciNote modal
2017-11-02 13:23:57 +01:00
Luka Murn
329dd4f1b0
Onboard Flow onto validation components.
2017-10-30 14:13:36 +01:00
Zanz2
6fc1afe4c1
Trying to fix this messy table preview
2017-10-30 01:57:42 +01:00
Zanz2
de9a3a1d0d
Preview tables are now functional but with inline javascript , ugly styling and a few major bugs (they dont display fully until you click on them, and i dug deep on the handson table wiki and hot table wiki for issues like this, and while they exist, idk how to implement the solutions because they use angular js mostly
2017-10-28 23:57:29 +02:00
Zanz2
a167db11da
Scinote table elements code
2017-10-28 20:20:19 +02:00
Zanz2
c291caaae3
Debbuging preive hot tables
2017-10-28 16:59:36 +02:00
Zanz2
2413dc251a
Added new preview tables code
2017-10-28 02:19:22 +02:00
zmagod
e5a01f7a57
adds integration tests for about sciNote modal
2017-10-27 16:37:42 +02:00
okriuchykhin
2e0bf91467
Merge pull request #831 from biosistemika/revert-830-revert-820-lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675], vol. 2
2017-10-27 11:14:39 +02:00
zmagod
3158fc4a8a
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1723
2017-10-27 10:47:10 +02:00
zmagod
e0323a0a46
fixes failing tests
2017-10-27 09:35:39 +02:00
Zanz2
a732c8afa7
Code for protocol repository scinote table elements view
2017-10-26 17:28:27 +02:00
zmagod
3d22a5404d
add scenic gem, teams datatables sql view
2017-10-26 16:59:00 +02:00
zmagod
d2ed415a25
Fixes per @okriuchykhin 's request
2017-10-26 10:42:18 +02:00
Zanz2
79e0a11054
Fixed before start and link not displaying in protocol description
2017-10-25 17:39:01 +02:00
Zanz2
a645bcb32d
fixed oversight;Changed double quote to single
2017-10-25 17:21:05 +02:00
zmagod
5e6a4bb69a
adds environment variable that disables/enables the creation of new team when user sign up
2017-10-25 15:29:04 +02:00
zmagod
c36fcb1fa4
fixes user invitation button [fixes SCI-1726]
2017-10-25 11:31:32 +02:00
Luka Murn
be2c3b807f
Merge pull request #845 from Ducz0r/lm-sci-1670
...
Input validation extracting to reusable service [SCI-1670]
2017-10-25 09:42:33 +02:00
Zanz2
19b9da2e83
deleted comment
2017-10-24 19:44:34 +02:00
Zanz2
49501b3d3d
Finished review refactor
2017-10-24 19:24:53 +02:00
zmagod
62dfd6a713
adds wait_for_ajax function to cucumber tests [fixes SCI-1723]
2017-10-24 15:39:06 +02:00
Luka Murn
a60e4c28bb
Hound is love, Hound is life
2017-10-24 13:58:59 +02:00
Luka Murn
cbe3e67402
Codestyle refactor
2017-10-24 13:57:33 +02:00
Luka Murn
0eea1e3def
Fixes per @ZmagoD's request
2017-10-24 13:49:33 +02:00
mlorb
324ecf1bb4
Merge pull request #843 from mlorb/ml-sci-1574
...
Add integration test for signup.feature [SCI-1574]
2017-10-24 10:05:28 +02:00
Luka Murn
998519066c
Remove unneeded localized Strings
2017-10-24 10:00:10 +02:00
Luka Murn
823ed75898
Add file validators, refactor a bit
2017-10-24 09:40:55 +02:00
Luka Murn
c026b60790
Update Profile page to use validation
2017-10-23 18:04:20 +02:00
Luka Murn
ceb11c143f
Change edit team name & description modals to use new validation
2017-10-23 17:55:28 +02:00
Luka Murn
463d17ace1
Add first version of reusable validation form elements
...
Implemented on new team page.
2017-10-23 17:55:28 +02:00
zmagod
f76dc29e61
fix change user role [fixes SCI-1669]
2017-10-23 15:48:12 +02:00
zmagod
545cf50993
removes modalContaine, move leaveTeamModal under teams
2017-10-23 15:02:04 +02:00
Luka Murn
82f982e983
Merge branch 'rails-5.1' into decoupling-settings-page
...
Conflicts:
Gemfile
Gemfile.lock
2017-10-23 10:59:10 +02:00
zmagod
7d6d95630d
add flow and fix api request in updateTeamNameModal component
2017-10-23 10:11:39 +02:00
zmagod
7cf43a299a
adds flow in updateTeamDescriptionModal
2017-10-23 09:59:05 +02:00
Luka Murn
6c2c5aff17
Additional fixes required by latest merge from master
2017-10-23 09:51:13 +02:00
Luka Murn
8254153bb9
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile
Gemfile.lock
app/models/connection.rb
app/models/experiment.rb
app/models/my_module.rb
2017-10-23 08:57:57 +02:00
Zmago Devetak
a0eaec214b
Merge pull request #821 from ZmagoD/zd_SCI_1572
...
Implement integration test: profile.feature + initial setup
2017-10-20 20:17:37 +02:00
mlorb
550c5ad6f6
add integration test for signup.feature
2017-10-20 14:48:47 +02:00
Zanz2
03e40017e4
Updated local
2017-10-19 19:58:18 +02:00
okriuchykhin
44733fefda
Merge pull request #839 from okriuchykhin/ok_SCI_1609
...
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
2017-10-19 16:26:36 +02:00
zmagod
e3e3f4c75d
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688
2017-10-19 16:06:40 +02:00
Zmago Devetak
a677ef06c7
Merge pull request #837 from ZmagoD/zd_SCI_1703
...
adds page titles [fixes SCI-1703]
2017-10-19 15:50:16 +02:00
zmagod
09e4e23e3d
fixes typos
2017-10-19 15:48:21 +02:00
zmagod
7943bfda13
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688
2017-10-19 14:01:26 +02:00
zmagod
5e5d7ea2dd
fix page title locales
2017-10-19 12:50:33 +02:00
zmagod
fb0ba702e1
add HOC for page title
2017-10-19 12:37:17 +02:00
Oleksii Kriuchykhin
631b41cdaa
Improve error handling in file uploads [SCI-1609][SCI-1612][SCI-1551]
2017-10-19 11:38:23 +02:00
zmagod
92061628a0
adds @Ducz0r suggestions
2017-10-19 10:35:53 +02:00
Zanz2
ae9ac46472
Put the two blocks of code into seperate partials
2017-10-19 00:13:35 +02:00
zmagod
063ac4ea0b
increase polling interval [fixes SCI-1705]
2017-10-18 16:35:02 +02:00
zmagod
d324ea3c12
fixes flow error
2017-10-18 16:28:19 +02:00
zmagod
a6ea56540f
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688
2017-10-18 16:21:59 +02:00
zmagod
0a46d50e4b
split custom types in multiple files
2017-10-18 16:14:45 +02:00
Zmago Devetak
6702265b1e
Merge pull request #835 from ZmagoD/zd_SCI_1706
...
disables invite user button if no emails present [fixes SCI-1706]
2017-10-18 15:48:48 +02:00
zmagod
3558e20454
follow @Ducz0r suggestions
2017-10-18 15:37:13 +02:00
zmagod
2f68a90eff
adds page titles [fixes SCI-1703]
2017-10-18 15:23:46 +02:00
mlorb
a7ebaaed87
Merge pull request #824 from mlorb/ml-sci-1700
...
Fixes closing of notification modal window [SCI-1700]
2017-10-18 15:01:59 +02:00
zmagod
d2c3827289
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1688
2017-10-18 14:15:28 +02:00
Zmago Devetak
10d5b573ee
Merge pull request #834 from ZmagoD/zd_SCI_1684
...
fixes accept invitation bug [fixes SCI-1684]
2017-10-18 14:10:08 +02:00
Zmago Devetak
fd755eedf0
Merge pull request #832 from ZmagoD/zd_SCI_1560
...
adds label under protocols keywords input [fixes SCI-1560]
2017-10-18 14:06:13 +02:00
zmagod
5afd65d2b1
fixes active tab bug, opt-in flow [fixes SCI-1688]
2017-10-18 13:59:52 +02:00
mlorb
5e9a1408f2
fix banana bug
2017-10-18 13:41:58 +02:00
zmagod
6a5bafd07b
fix hound
2017-10-18 08:42:48 +02:00
zmagod
3179a7abf5
disables invite user button if no emails present [fixes SCI-1706]
2017-10-18 08:37:58 +02:00
Zanz2
67b09adaeb
Fixed last few rubocop errors
2017-10-17 19:43:46 +02:00
Zanz2
6cf775a4b1
Refactored code, made html render on preview too
2017-10-17 19:27:20 +02:00
okriuchykhin
8e90e041b9
Merge pull request #825 from okriuchykhin/ok_SCI_1665
...
Optimize memory usage in samples/repositories import [SCI-1665]
2017-10-17 17:26:00 +02:00
zmagod
c554bc5c18
fixes accept invitation bug [fixes SCI-1684]
2017-10-17 16:00:26 +02:00
mlorb
6c6aa53904
add new team to redux
2017-10-17 15:52:18 +02:00
Oleksii Kriuchykhin
cd0aba1896
Change any? to empty? [SCI-1665]
2017-10-17 15:23:54 +02:00
Oleksii Kriuchykhin
c8d2ae70fa
Move duplicated code to service [SCI-1665]
2017-10-17 14:46:16 +02:00
zmagod
30d091dc65
adds label under protocols keywords input [fixes SCI-1560]
2017-10-17 14:10:56 +02:00
mlorb
a4a2c79959
Merge pull request #829 from mlorb/ml-sci-1691
...
Fixes some text style and default input values [SCI-1691]
2017-10-17 13:45:07 +02:00
mlorb
67585a4c6e
Merge pull request #827 from mlorb/ml-sci-1702
...
Add search to one team page [SCI-1702]
2017-10-17 13:43:01 +02:00
mlorb
1a15c5fa4f
Merge pull request #823 from mlorb/ml-sci-1636-v2
...
Removes focus from "add team members" button after… [SCI-1636]
2017-10-17 13:28:35 +02:00
mlorb
7f3c34b930
Merge pull request #822 from mlorb/ml-sci-1633
...
Fixes time zone style [SCI-1633]
2017-10-17 13:21:02 +02:00
Luka Murn
4e06b5c397
Revert "Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]""
2017-10-17 13:17:49 +02:00
Luka Murn
4d8f2665d3
Revert "Add Add-ons page to User -> Settings -> Account [SCI-1675]"
2017-10-17 13:10:02 +02:00
mlorb
21b13f0e2c
fixes some text style and default input values
2017-10-17 10:57:14 +02:00
zmagod
952c4e8195
fixes bug with remove user modal [fixes SCI-1699]
2017-10-17 09:55:04 +02:00
zmagod
6fe48a07ae
fix hound, add custom hook for webpacker:compile
2017-10-16 17:02:35 +02:00
zmagod
c5978f2d86
adds cucumber test for profile page [fixes SCI-1572]
2017-10-16 16:21:52 +02:00
okriuchykhin
66e9e60c9d
Merge pull request #826 from okriuchykhin/ok_SCI_1689
...
Use case insensitive sample types and groups in import [SCI-1689]
2017-10-16 13:32:04 +02:00
mlorb
b92fd6be35
add search to one team page
2017-10-16 13:10:46 +02:00
Luka Murn
2fb2b90da3
Merge pull request #820 from Ducz0r/lm-sci-1675
...
Add Add-ons page to User -> Settings -> Account [SCI-1675]
2017-10-16 13:05:43 +02:00
Oleksii Kriuchykhin
d266034406
Use case insensitive sample types and groups in import [SCI-1689]
2017-10-13 17:15:51 +02:00
mlorb
dafa4a6f1f
fixes closing of notification modal window
2017-10-13 10:46:58 +02:00
Zanz2
e72c1bebcb
deleted comments
2017-10-12 19:18:22 +02:00
Zanz2
8d0d6f0502
refactored methods
2017-10-12 19:10:16 +02:00
okriuchykhin
db9a031581
Merge pull request #813 from okriuchykhin/ok_SCI_1642
...
Refactor canvas [SCI-1642]
2017-10-12 17:45:34 +02:00
Zanz2
21036a1081
Deleted unnecesarry if's
2017-10-12 17:22:02 +02:00
Zanz2
414a15872c
Made seperate method for steps mapping
2017-10-12 17:15:43 +02:00
zmagod
bdc1051cbb
cleanup
2017-10-12 17:05:04 +02:00
zmagod
e5ebedb428
fix errors with polyfill
2017-10-12 16:49:33 +02:00
gazvoda
88f03a0706
Merge pull request #735 from gazvoda/lg-SCI-1249-v2
...
Truncate checklist items in activity modal [fixes SCI-1249]
2017-10-12 15:58:05 +02:00
mlorb
f19c0defd6
remove focus from add team members button after the invite users modal closes
2017-10-12 15:28:00 +02:00
mlorb
ed80d849aa
remove double css file import and move data-tables style to the component
2017-10-12 14:54:40 +02:00
mlorb
6cc3c2df95
fixes time zone styling
2017-10-12 14:45:08 +02:00
Oleksii Kriuchykhin
56f52ebfa7
Optimize memory usage in samples/repositories import [SCI-1665]
2017-10-12 14:43:25 +02:00
zmagod
dccf4e34ff
fix cucumber settings
2017-10-12 13:50:48 +02:00
Zanz2
5d667f146e
Moved .js form reset and made a standalone description method
2017-10-11 17:59:09 +02:00
Oleksii Kriuchykhin
9a8e33c6d7
Small fixes [SCI-1642]
2017-10-11 17:24:31 +02:00
zmagod
3740e89ca0
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1572
2017-10-11 15:20:09 +02:00
zmagod
abe0b8adcc
tweak tweak
2017-10-11 15:20:03 +02:00
Luka Murn
fe89b942e7
Add Add-ons page to User -> Settings -> Account
...
Closes SCI-1675.
2017-10-11 14:15:37 +02:00
zmagod
f71ff8589d
changes testing image
2017-10-11 09:51:20 +02:00
okriuchykhin
0d3cb3a129
Merge pull request #814 from okriuchykhin/ok_GIOT_55
...
Remove GIOT sign-in button [GIOT-55]
2017-10-10 17:04:34 +02:00
mlorb
8bd698e5c3
Merge pull request #817 from mlorb/ml-sci-1632
...
Fixes buttons on my profile page [SCI-1632]
2017-10-10 16:30:50 +02:00
mlorb
7ca29b50a2
Merge pull request #816 from mlorb/ml-sci-1636
...
Fixes style errors on one team page [SCI-1636]
2017-10-10 16:23:50 +02:00
Zmago Devetak
e99791bd29
Merge pull request #819 from ZmagoD/fix_webpacker_production_configuration
...
fixes webpack production build
2017-10-10 15:08:28 +02:00
zmagod
f12a645fa3
fix hound
2017-10-10 15:01:25 +02:00
zmagod
f00c36998d
removes unneeded style component
2017-10-10 14:51:46 +02:00
zmagod
a35ba0239a
fixes flow types
2017-10-10 14:48:46 +02:00
Zmago Devetak
d1c3d00c84
Merge pull request #807 from ZmagoD/zd_SCI_1629
...
adds bootstrap and font-awesome in webpacker build fixes the missing …
2017-10-10 14:09:52 +02:00
zmagod
c014742a88
fixes webpack production build
2017-10-10 14:08:23 +02:00
mlorb
fd859d7b7f
fixes buttons on my profile page
2017-10-10 13:25:44 +02:00
mlorb
7dae772822
fixes style errors on one team page
2017-10-10 11:32:13 +02:00
mlorb
25e6eb4511
Merge pull request #812 from mlorb/ml-sci-1634
...
Fix a few style error on All teams page [SCI-1634]
2017-10-09 14:59:57 +02:00
Oleksii Kriuchykhin
f8334b3d5b
Add editable field to task in tasks tree API call [GIOT-44]
2017-10-09 14:38:33 +02:00
mlorb
1049e0730e
implements @ZmagoD comments
2017-10-09 13:59:32 +02:00
Oleksii Kriuchykhin
bd26052110
Remove GIOT sign-in button [GIOT-55]
2017-10-09 11:56:46 +02:00
zmagod
fc585ebe11
refactor GlobalActivitiesModal constructor
2017-10-09 10:58:40 +02:00
zmagod
943339345a
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628
2017-10-09 10:41:36 +02:00
zmagod
2d1c849106
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629
2017-10-09 09:43:29 +02:00
zmagod
d85233cb2c
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566
2017-10-09 09:30:06 +02:00
zmagod
0a8ef8cd9d
removed unneeded import
2017-10-09 09:23:25 +02:00
zmagod
2a64d23a6e
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1567
2017-10-09 09:14:58 +02:00
Zanz2
8720222ac2
Added sanitising for all input, this escapes javascript too as far as i know (sanitize_input function from sanitize helper)
2017-10-07 22:45:01 +02:00
Zanz2
183c93d21b
Refactoring to git review specifications
2017-10-07 22:13:31 +02:00
Zanz2
9655c98566
Github review refactor
2017-10-07 20:47:05 +02:00
Zanz2
3a8092b663
Refactor and threw out useless comments
2017-10-07 18:05:09 +02:00
Zanz2
d52400f741
Refactored code according to review
2017-10-07 17:58:23 +02:00
Zanz2
2b9563ec6d
Added preview text to en.yml
2017-10-07 17:45:23 +02:00
Zanz2
f5b2ad0d34
Refactor github code review
2017-10-07 16:07:04 +02:00
Zanz2
66e5004e60
Changed import text to be inside en.yml, as said in the code review, deleted some blank lines
2017-10-07 15:56:43 +02:00
lenart
de3c18509f
Variable name changes, added comments to code [fixes SCI-1249]
2017-10-06 17:12:15 +02:00
zmagod
811b206392
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1641
2017-10-06 17:05:07 +02:00
zmagod
839eaf8e03
downgrade to react 15 since bootstrap-react is not fully compatible
2017-10-06 17:02:14 +02:00
zmagod
3321fc495c
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1628
2017-10-06 15:54:52 +02:00
zmagod
8dfb5e2260
implements @mlorb suggestions
2017-10-06 15:22:01 +02:00
Oleksii Kriuchykhin
6820511ea0
Further canvas optimizations [SCI-1642]
2017-10-06 12:43:27 +02:00
zmagod
c3562e08e9
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1566
2017-10-06 10:46:47 +02:00
zmagod
5a31df7204
adds @Ducz0r suggestions
2017-10-06 10:45:22 +02:00
zmagod
dea69014d0
fixes bug with password confirmation
2017-10-06 09:54:17 +02:00
Zanz2
48f03d6dfb
hound blank line fix
2017-10-05 18:41:58 +02:00
Zanz2
fc1cd73e1d
fixed hound blank line
2017-10-05 18:38:44 +02:00
Zanz2
9fd67019e0
Deleted unused file
2017-10-05 18:09:07 +02:00
Zanz2
64b72f4ad4
Fixed a bug, where if the url get query is nil (if you go directly to /protocols, it doesnt get the public type from url, now when it is nil it just defaults to public
2017-10-05 17:31:49 +02:00
Oleksii Kriuchykhin
b26b963e54
Optimize update canvas SQL and remove module group name [SCI-1642]
2017-10-05 16:19:25 +02:00
zmagod
c20f0c2d8a
fixes user_controller specs, adds user model specs for settings
2017-10-05 15:53:05 +02:00
zmagod
a020e23286
follow suggestions of @Ducz0r
2017-10-05 13:56:56 +02:00
zmagod
754627efe7
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
2017-10-05 11:08:31 +02:00
zmagod
524e8bffbf
fixes sign out action on settings page, clean the redux store, handles redirect to sign in page if session is terminated [fixes SCI-1567]
2017-10-05 10:07:50 +02:00
mlorb
7db4bd1f5f
fix a few style error on All teams page
2017-10-05 10:05:55 +02:00
mlorb
91e2a6bab2
Merge pull request #787 from mlorb/ml-sci-1561
...
Fix bug with tinyMCE text validaton [SCI-1561]
2017-10-05 08:39:22 +02:00
okriuchykhin
2c5d913048
Merge pull request #804 from okriuchykhin/ok_SCI_1482
...
Improve memory utilization in PDF report generator [SCI-1482]
2017-10-04 17:51:28 +02:00
mlorb
fcea55c2a1
Merge pull request #808 from mlorb/ml-sci-1631
...
Fix rounded style of buttons and fix invite users to a team style errors [SCI-1631]
2017-10-04 14:57:45 +02:00
zmagod
14bae8def5
trigger redirect to root page on team switch [fixes SCI-1641]
2017-10-04 14:42:38 +02:00
zmagod
4380a65caf
fixes activities key [fixes SCI-1628]
2017-10-04 13:45:52 +02:00
zmagod
e9568bcd47
optin flow in activities modal
2017-10-04 11:35:32 +02:00
zmagod
84f279de22
setup flow
2017-10-04 09:16:17 +02:00
mlorb
83f06361f2
fix rounded style of buttons and fix invite users to a team style errors
2017-10-03 17:33:30 +02:00
zmagod
ce6613ac63
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1629
2017-10-03 16:05:45 +02:00
zmagod
55332e2957
adds bootstrap and font-awesome in webpacker build fixes the missing icons bug [fixes SCI-1629]
2017-10-03 16:01:33 +02:00
Luka Murn
f8fc2737d5
Merge pull request #803 from Ducz0r/lm-sci-1599
...
Add global flash notifications/alerts [SCI-1599]
2017-10-03 11:15:27 +02:00
Luka Murn
2964579638
Fix Zmago's comments
2017-10-03 11:14:47 +02:00
Luka Murn
8ba7ed5884
Change the generation to be done using Redux (instead of this.window...)
2017-10-02 19:25:04 +02:00
zmagod
ef1025e0ee
fixes hound
2017-10-02 18:11:54 +02:00
zmagod
3dc3ed906f
fixes bug with embedded images [fixes SCI.1624]
2017-10-02 18:06:42 +02:00
zmagod
182e3dcc37
added colors constants
2017-10-02 14:56:49 +02:00
zmagod
edf4443995
added notification alert [fixes SCI-1566]
2017-10-02 14:51:54 +02:00
Oleksii Kriuchykhin
6824f9a8bc
Improve memory utulization in PDF report generator [SCI-1482]
2017-10-02 11:29:22 +02:00
Luka Murn
cbf2e3cc3f
Hound is love, Hound is life
2017-09-28 20:07:11 +02:00
Luka Murn
a0db8fcf9d
Some codestyle fixes
2017-09-28 19:49:25 +02:00
Luka Murn
6951755a92
Add animation, multiple alerts, make them float
2017-09-28 19:39:17 +02:00
zmagod
9de8592858
fixed edit image on hover action
2017-09-28 17:13:04 +02:00
zmagod
f492234f89
fixes hound allerts
2017-09-28 17:00:11 +02:00
zmagod
cb4bacc372
refactor preferences page [fixes SCI-1564]
2017-09-28 16:53:51 +02:00
zmagod
c8c8afdd1d
update react-bootstrap
2017-09-28 15:00:54 +02:00
mlorb
c358f8fa0c
write unit tests for invite users
2017-09-28 14:49:33 +02:00
Luka Murn
f6c7e854ad
Update main application, slight refactor
2017-09-27 17:59:04 +02:00
Luka Murn
a46f50af21
Remove FlashMessages component
2017-09-27 17:34:45 +02:00
Luka Murn
82d672293a
First WIP version of FlashMessages & Alert components
2017-09-27 17:29:04 +02:00
zmagod
26b526d61b
adds getter and setters for user settings
2017-09-27 14:38:52 +02:00
zmagod
66269d68ff
fixed image upload
2017-09-27 09:17:09 +02:00
zmagod
e2aa0d7515
fixes user profile
2017-09-26 17:29:11 +02:00
Zanz2
b23ca33e73
Deleted todo-list comments :D
2017-09-26 16:46:17 +02:00
Zanz2
c72cf6320a
Finished rubocop refactoring
2017-09-26 16:19:09 +02:00
Zanz2
3074acbc0d
Made javascript code nicer
2017-09-26 13:31:24 +02:00
Zanz2
055746bfd9
Rubocop beautified code v2
2017-09-26 13:21:48 +02:00
Zanz2
ad1847256c
Rubocop beautified code
2017-09-26 13:20:55 +02:00
Zanz2
8d961c934a
Rubocop refactored part of the controller code
2017-09-26 13:17:00 +02:00
Zanz2
2bfe8f0b95
Testing why rubocop gives errors
2017-09-25 15:27:24 +02:00
Zanz2
79e065a811
Fixed a mistake in the fix that made it not render the preview
2017-09-25 14:39:43 +02:00
Zanz2
292c1e3c31
Fixed bug, seems like unconssistent indexes instead of hash values can also happen in steps that arent first
2017-09-25 14:14:27 +02:00
Zanz2
11b2ef3112
Made code nicer, hopefully not unintentionally breaking something
2017-09-25 13:53:32 +02:00
Luka Murn
05e627e976
Fix missing value in delayed_uploader_tutorial
...
Closes OPENSCI-26.
2017-09-22 17:10:53 +02:00
zmagod
1a7f8fc857
added frontend validations
2017-09-22 16:59:38 +02:00
Zanz2
549346bb0a
Deleted a warning that was out of place
2017-09-22 16:13:06 +02:00
Zanz2
dd4d4072e8
Made code more aesthetic
2017-09-22 16:02:56 +02:00
Zanz2
6ebdea5dce
Fixed old workaround with inconsistent protocols.io json formatting and made the workaround nicer (now its only one if statement, instead of one whole block of duplicated code)
2017-09-22 15:12:29 +02:00
Zanz2
4051c0b06b
Deleted old unused files i spotted on github
2017-09-22 13:28:38 +02:00
Zanz2
6a07aa28e4
Accidentally removed this line after reviewing git changes, adding it back
2017-09-22 13:11:49 +02:00
Zanz2
deef790951
added validations to controllers (file too big, names too big), some javascript error messagges, and fixed some nil exceptions in controllers appending nil strings to descriptions
2017-09-22 11:56:50 +02:00
mlorb
4ef7b57f31
fix error handeling
2017-09-22 09:57:41 +02:00
mlorb
9d96bf668a
fix error handeling, refactoring
2017-09-21 16:42:56 +02:00
Zanz2
1dbb03e22d
Added all the fields into description of protocol steps and protocol itself, need to make protocols description format nicer
2017-09-21 16:05:33 +02:00
Zanz2
df8cbc2741
vastly improved protocol preview styling to look more like documentation specifications
2017-09-21 13:46:52 +02:00
zmagod
39025769ec
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1564
2017-09-21 13:45:27 +02:00
zmagod
ed2beefc08
fixed profile info inputs
2017-09-21 13:42:49 +02:00
mlorb
ac3601bd2e
hound
2017-09-21 10:56:17 +02:00
mlorb
55772a80ab
fix hound and refactor
2017-09-21 10:45:36 +02:00
mlorb
48c8922604
adds invite users modal
2017-09-21 10:45:35 +02:00
Zanz2
8da72eb64a
made code look nicer
2017-09-21 09:29:13 +02:00
Zanz2
f48833c47a
added format .js response which hides the preview modal and refreshes the page with protocolsDatatable.ajax.reload();
2017-09-21 08:40:05 +02:00
Luka Murn
e078ae4f77
Merge branch 'rails-5.1' into decoupling-settings-page
2017-09-21 08:36:09 +02:00
Luka Murn
beae1b05d8
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile
Gemfile.lock
2017-09-21 08:27:38 +02:00
Luka Murn
5429f6bbbd
Fix @ZmagoD's remarks
2017-09-21 08:06:11 +02:00
Zanz2
d59234a1e3
minor changes, working on refresh after submit
2017-09-20 16:04:52 +02:00
Zanz2
72c707ae88
protocol importing into database works, still need to decide how to add other fields from protocols.io to step description and protocol description, but that can be added easily, and need to make it refresh after submit
2017-09-20 15:31:10 +02:00
zmagod
c636ca4276
refactor user preferences and profile page
2017-09-20 11:17:59 +02:00
Luka Murn
416ccf905d
Minor fix
2017-09-20 10:53:38 +02:00
Zanz2
7b85d74a23
added jquery code to reset file selector selected file after it is canceled in the preview modal
2017-09-20 09:32:31 +02:00
Zanz2
3812b2e64b
Removed on modal hide refresh, no longer needed, works without data gets updated without refresh since its not passed by javascript locals anymore
2017-09-20 08:58:00 +02:00
Zanz2
ea8f3e822d
Removed all the html bug workarounds since it is now fixed (strip tags and remove " now gone
2017-09-20 08:38:34 +02:00
Luka Murn
6e993f41b8
Indentation error
2017-09-19 16:59:19 +02:00
Luka Murn
869c3593a3
Hound is love, Hound is life
2017-09-19 16:56:39 +02:00
Luka Murn
decdce17fa
Fix rebasing problems
2017-09-19 16:47:55 +02:00
Luka Murn
44877a13a5
Refactor services on backend. New team page is now working
2017-09-19 16:32:21 +02:00
Luka Murn
80c05e50ec
Semi-working version of create new team form
2017-09-19 16:30:26 +02:00
Zanz2
ed64ce814a
i think i finally solved it, i found the issue being a certain file upload gem forcing textbox to .js files (remotipart), i tracked down their github issues and found a user that made a fix to this bug, copied his code ant it works, turns out it was a & symbol type escaped string breaking the javascript
2017-09-19 16:07:54 +02:00
Zanz2
7aba782639
optimised code so i dont need javascript locals anymore and working to fix infamous html tags bug where second modal doesnt show
2017-09-19 15:02:16 +02:00
Luka Murn
df44976fc6
Save input values into component state
2017-09-19 14:07:17 +02:00
Luka Murn
0108d9ea19
Finish new team GUI
2017-09-19 14:04:46 +02:00
Luka Murn
28cb9643d9
Blank new team page with breadcrumbs
2017-09-19 14:04:46 +02:00
zmagod
40af99c57f
fix hound v2
2017-09-19 13:36:51 +02:00
zmagod
8416ccc5c2
fixes hound alerts
2017-09-19 13:33:43 +02:00
zmagod
88928be2d3
fixes profile page route, moves source files out of packs folder, restructure React app architecture [fixes SCI-1622]
2017-09-19 13:08:08 +02:00
zmagod
015026926d
refactor
2017-09-18 15:46:24 +02:00
zmagod
f0a8275559
fixes merge conflicts
2017-09-18 15:36:33 +02:00
zmagod
b9492daa69
fixes changeTeam method
2017-09-18 15:16:07 +02:00
zmagod
d1477179b2
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1499
2017-09-18 15:10:52 +02:00
Toni Dezman
39c9b708bd
Merge pull request #780 from programmertoni/td_SCI_1565
...
Td sci 1565
2017-09-18 11:37:19 +02:00
zmagod
40359c5c73
fixed edit name modal
2017-09-15 16:34:05 +02:00
Zanz2
f861b1fc52
Configured the controller,the main task ahead is to figure out how to import all of the data i have available
2017-09-15 15:52:55 +02:00
zmagod
83647d81b4
adds edit team name modal
2017-09-15 14:00:48 +02:00
Zanz2
d85e02730d
Addes steps, basic functionality is working, still need to style and fix bugs and upload to database etc
2017-09-15 12:19:58 +02:00
Zanz2
175aa16a7d
Made submit form on preview, need to route it propperly, made text scroller for step importing that only works with my own sample protocol i created on protocols.io with every attribute set, trying to debug why it does this
2017-09-14 15:52:44 +02:00
Zanz2
5d6cc341ed
added first half of inputs, working on scroller next, page now refreshes after you cancel out of import window, to update the data, will look for alternate way after im done
2017-09-14 14:42:04 +02:00
zmagod
1a00b53034
adds user_team tests
2017-09-14 13:11:19 +02:00
Toni Dezman
d38f4343f2
Decupling redux part 1
2017-09-14 11:46:49 +02:00
Zanz2
d6d1f9d490
changed second modal preview styling to fit its specifications
2017-09-14 11:46:41 +02:00
Zanz2
29b9d50363
Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer
2017-09-14 11:30:53 +02:00
zmagod
705d07f60e
adds remove team action
2017-09-13 17:11:51 +02:00
Zanz2
9fc91aac32
added protocols io upload preview modal
2017-09-13 16:04:16 +02:00
Zanz2
b7432b336a
added file upload popup modal, rails routes and controller functions, deleted old standalone model and controller
2017-09-13 15:15:08 +02:00
zmagod
1b3b3dfea9
adds team members update role functionality
2017-09-12 17:30:13 +02:00
Žan Žagar
706031dacb
added model and controler, model should go to services while the controller should go to protocols controller
2017-09-12 15:25:22 +02:00
Žan Žagar
2a7a2b8fa1
Changed some minor button text and fixed a local error
2017-09-12 09:26:22 +02:00
Žan Žagar
62350d0d42
Changed the styling so first option isnt outlined like button, but now mouse cursor wont change to hand when hovering over; will leave this small bug for fixing later
2017-09-11 16:03:33 +02:00
Žan Žagar
9b640c5df8
Dropdown menu works, need to add backend code for the second button
2017-09-11 15:28:48 +02:00
Žan Žagar
0f4dadefa9
prvi (star gumb) v dropdownu sedaj deluje
2017-09-11 15:23:09 +02:00
Žan Žagar
f668f60237
dodav moj stil gumba, ki ga opredeli kot link (padding 0, border 0), za dropdown meni
2017-09-11 15:22:22 +02:00
Žan Žagar
31e8c107fd
dodav na pravi branch te file
2017-09-11 14:35:00 +02:00
Toni Dezman
1cd9cd92fc
adds global spinner
2017-09-11 14:30:49 +02:00
Jure Grabnar
b4a13dffe3
init commit, dodav na protocols index gumb z dropdown
2017-09-11 13:07:22 +02:00
Mojca Lorber
a0f7030a70
fix bug with tinyMCE text validaton
2017-09-07 14:54:12 +02:00
Toni Dezman
67d617deb5
adds hound_bot's and zmagos suggestions
2017-09-07 13:40:53 +02:00
Mojca Lorber
0e14420193
fix bugs with importing samples
2017-09-06 14:41:14 +02:00
Toni Dezman
185039bc99
adds suggestions from code review
2017-09-04 15:00:26 +02:00
zmagod
9c01ab414c
refactor leave team
2017-09-01 17:10:43 +02:00
Oleksii Kriuchykhin
fc0e2d2172
Add validation for uid uniqness [GIOT-29]
2017-09-01 17:00:13 +02:00
Oleksii Kriuchykhin
a927c2832d
Improve error logging [GIOT-31]
2017-09-01 16:36:45 +02:00
zmagod
91d2d8a935
adds team details view
2017-08-31 15:56:55 +02:00
Toni Dezman
4034400c42
Merge branch 'decoupling-settings-page' into td_SCI_1565
2017-08-31 11:42:15 +02:00
Toni Dezman
8b61fe563c
user preferences APIs
2017-08-31 11:23:44 +02:00
zmagod
1325732b0c
adds specs for team controller actions
2017-08-30 16:18:21 +02:00
Toni Dezman
2e6a942152
api for timezone
2017-08-30 14:59:17 +02:00
Oleksii Kriuchykhin
c3fceb90df
Backport API to Rails-4 [SCI-1579]
2017-08-30 13:30:41 +02:00
zmagod
ee054f91b8
adds bullet gem [fixes SCI-1578]
2017-08-30 09:29:45 +02:00
Toni Dezman
c82dfa502a
adds errors in client_api for users_controller
2017-08-29 13:14:52 +02:00
zmagod
ec86691659
fixed tests
2017-08-29 12:04:00 +02:00
zmagod
c54dd9473e
adds controller spec for leave team [fixes SCI-1497]
2017-08-29 11:56:46 +02:00
zmagod
478bd491ff
added pagination and sorting to team tables
2017-08-28 17:05:09 +02:00
zmagod
5ea464b675
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1497
2017-08-28 09:36:29 +02:00
zmagod
0cc00f292a
adds leave button to modal
2017-08-28 09:36:21 +02:00
Toni Dezman
ea9a195f09
email and password action/redusers work
2017-08-26 14:07:31 +02:00
Toni Dezman
eb0641d76a
InputEnabled submits form with ENTER
2017-08-26 13:04:36 +02:00
zmagod
7b5b4c957c
adds formated messages in modal
2017-08-25 16:40:23 +02:00
zmagod
db16da7bd6
adds custom query to fetch teams data
2017-08-25 16:07:37 +02:00
Toni Dezman
ccd14f6b50
adds apis for full_name and initials input fields
2017-08-25 14:45:02 +02:00
Toni Dezman
989be6563f
Merge branch 'decoupling-settings-page' into td_SCI_1565
2017-08-25 09:06:38 +02:00
zmagod
34be62a648
Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1493_v3
2017-08-25 08:58:20 +02:00
zmagod
782daabce1
first run
2017-08-25 08:54:32 +02:00
Toni Dezman
e4a704d063
namespaces client_api/users/user_controller.rb
2017-08-25 08:21:52 +02:00
Toni Dezman
4ea4c30e29
extracts route magic strings to routes constants
2017-08-25 08:20:40 +02:00
Toni Dezman
3c6f66ebd3
Merge branch 'decoupling-settings-page' into td_SCI_1494_v2
2017-08-24 10:23:30 +02:00
Toni Dezman
8a7154fa47
changes disabled switches code
2017-08-24 09:37:06 +02:00
Toni Dezman
de5136f9cb
fixes navigation container
2017-08-24 09:22:37 +02:00
Toni Dezman
309e52b806
extracts navigation to <MainNav /> component
2017-08-24 08:56:17 +02:00
Toni Dezman
12db6e790f
removes styles from time-zone and changes clicking on switches
2017-08-24 08:35:55 +02:00
Toni Dezman
b02117ea67
implements code review suggestions
2017-08-23 11:20:10 +02:00
Luka Murn
39bb8ecdab
Fix code
2017-08-23 10:54:54 +02:00
Toni Dezman
1dfd7a0cee
adds i18n and 404 page
2017-08-22 15:54:47 +02:00
zmagod
94403a545c
add labels to navigation items [fixes SCI-1493]
2017-08-22 14:00:28 +02:00
zmagod
3a2a1205e3
style global activities
2017-08-22 13:20:06 +02:00
Toni Dezman
42d5e67581
moves components to nicer folder structure
2017-08-22 12:56:29 +02:00
Toni Dezman
bda9704e10
changess to settings/app.jsx
2017-08-22 10:11:47 +02:00
Toni Dezman
d1583a86f5
adds SettingsProfile
2017-08-22 10:08:16 +02:00
Toni Dezman
b29df328d9
some additional styles
2017-08-22 09:49:23 +02:00
Toni Dezman
dc746cbf6f
a lot of styles for Settings page
2017-08-22 09:49:02 +02:00
Toni Dezman
5352791d46
styles to icons in Notifications
2017-08-22 09:47:36 +02:00
Toni Dezman
3c20ef5fea
fixes TimeZone dropdown position: relative issue
2017-08-22 09:47:20 +02:00
Toni Dezman
3e6d45e82f
adds Notification Switches
2017-08-22 09:46:59 +02:00
Toni Dezman
dd5c329ef1
makes redux work with Notifications
2017-08-22 09:46:44 +02:00
Toni Dezman
522262f9fe
adds timezone
2017-08-22 09:46:29 +02:00
Toni Dezman
52b1603b92
adds MyStatistics logic
2017-08-22 09:44:51 +02:00
Toni Dezman
086be89a5d
logic for MyProfile component is finished
2017-08-22 09:43:45 +02:00
Toni Dezman
a3d126b073
adds Redux and few fields
2017-08-22 09:41:47 +02:00
Toni Dezman
0de080485e
adds avatar and editable inputs
2017-08-22 09:39:50 +02:00
Luka Murn
b70b609109
Update styling of data grid a bit
2017-08-21 17:55:45 +02:00
Luka Murn
f4f0cd234f
Add support for sorting to both tables
2017-08-21 15:37:49 +02:00
Luka Murn
abcd74e681
Initial commit, including react-bootstrap-table and react-data-grid
2017-08-21 15:37:49 +02:00
zmagod
685cb42aac
fixes repository, protocols link, adds csfr token to request headers
2017-08-21 15:30:54 +02:00
zmagod
1f45123d51
removes unneeded comments
2017-08-21 13:34:39 +02:00
zmagod
c5e32c4ea0
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into merge-rails-5.1-branch
2017-08-21 09:52:14 +02:00
Luka Murn
ec7b7ffe08
You are my sunshine, my only sunshine,
...
You make me happy when skies are grey
You never know, Hound, how much I love you
Please don't take my Hound away
2017-08-10 14:42:58 +02:00
Luka Murn
9227ea5854
Finish the user settings jsonb, also fix references throughout app
...
Closes SCI-1475.
2017-08-10 14:29:01 +02:00
Luka Murn
c62002381b
Add default settings migration and concern
2017-08-10 11:30:57 +02:00
Zmago Devetak
1d9d473caf
Merge pull request #768 from ZmagoD/zd_SCI_1493_v2
...
Copy sciNote header functionality into Settings React.js part 2
2017-08-09 16:16:25 +02:00
zmagod
b90348eabf
adds numeric.js to constants
2017-08-09 16:01:03 +02:00
zmagod
790ae9d685
moved files to app/ folder
2017-08-09 15:21:02 +02:00
zmagod
7630f6af3d
styled notifications dorpdown
2017-08-09 14:49:29 +02:00
zmagod
007f50a158
adds main stylesheet for global styles
2017-08-09 12:46:04 +02:00
zmagod
bd352869a3
adds user account dropdown
2017-08-09 09:08:13 +02:00
zmagod
226458a3f0
adds recent notifications
2017-08-08 15:44:28 +02:00
Zmago Devetak
4be39a8580
Merge pull request #762 from ZmagoD/zd_SCI_1493
...
Copy navbar to React
2017-08-07 14:07:55 +02:00
Luka Murn
85634b2fb6
Add 'off' before setting export button to 'on'
2017-08-07 14:04:39 +02:00
zmagod
be42cd2204
refactor
2017-08-07 13:51:22 +02:00
Luka Murn
13eae287bb
Revert "Add core API using JWT authentication and tests for it [SCI-1507]"
2017-08-07 11:54:45 +02:00
Luka Murn
c6448264d0
Revert "Td sci 1492"
2017-08-07 11:47:21 +02:00
zmagod
be29db2f78
changed folder name
2017-08-07 11:13:09 +02:00
zmagod
0a7c6300b0
fixes eslint
2017-08-07 09:31:24 +02:00
Luka Murn
ae5bccf709
Merge branch 'master' into rails-5.1
...
Conflicts:
Gemfile.lock
app/datatables/repository_datatable.rb
app/models/repository_cell.rb
2017-08-07 08:45:53 +02:00
Oleksii Kriuchykhin
35b643f34e
Fix typo in config and code style improvements [SCI-1507]
2017-08-04 10:19:56 +02:00
Oleksii Kriuchykhin
e958410261
Add core API using JWT authentication and tests for it [SCI-1507]
2017-08-03 17:00:14 +02:00
zmagod
c314bae28d
add team switch js/controller
2017-08-03 16:03:15 +02:00
zmagod
2e83322f76
fixes global activities
2017-08-03 11:17:09 +02:00
zmagod
6ef19725f1
adds redux
2017-08-02 17:27:05 +02:00
Matej Zrimšek
d90ca1b934
Fixed slow exporting of repositories - JS listeners which triggered function responsible for providing export data was bound more than once. [SCI-1481]
2017-08-02 16:49:53 +02:00
lenart
6c5bc32f24
Revert incorrect changes from previous commit [SCI-1249]
2017-08-02 16:00:23 +02:00
lenart
e781dfc6a6
Truncate activity taking smart annotations into account fixes [SCI-1249]
2017-08-02 15:51:32 +02:00
zmagod
caae1e2fe8
adds intl, router, bootstrap to npm modules
2017-07-31 10:42:40 +02:00
Toni Dezman
9a1cf53046
Merge pull request #758 from programmertoni/td_SCI_1492
...
Td sci 1492
2017-07-29 05:44:47 +02:00
Toni Dezman
f76512f364
adds hound recomendations for react/settings_controller.rb
2017-07-28 12:53:15 +02:00
Matej Zrimšek
07fea16d26
Fix permissions for editing and deleting custom repository custom columns. [SCI-1524]
2017-07-28 12:01:11 +02:00
Toni Dezman
ffda8b259b
adds Redux and changes to index.jsx page
2017-07-28 10:52:25 +02:00
zmagod
b69ec22dfe
fixes failing tests [fixes SCI-1470]
2017-07-28 10:14:50 +02:00
Toni Dezman
1673d43993
adds react/settings controller and react/layout
2017-07-27 15:26:03 +02:00
Toni Dezman
d781ff9b2d
removes unnecessary code from packs/settings/index.jsx
2017-07-27 14:22:28 +02:00
Toni Dezman
0f4286d5d1
adds Settings index react page
2017-07-27 14:21:27 +02:00
zmagod
416ab8eee3
Merge branch 'rails-5.1' of https://github.com/biosistemika/scinote-web into zd_SCI_1400
2017-07-26 16:20:09 +02:00
okriuchykhin
af4b310754
Add ordering for column mappings in repositories
2017-07-26 13:35:54 +02:00
Oleksii Kriuchykhin
6a43483a2f
Fix adding and editing repository items [SCI-1519]
2017-07-26 11:22:26 +02:00
okriuchykhin
38f254ae9b
Merge pull request #749 from ZmagoD/zd_SCI_1487
...
don't hide modal [fixes SCI-1487]
2017-07-25 14:35:10 +02:00
zmagod
dfc8ea7fbf
don't hide modal [fixes SCI-1487]
2017-07-25 14:33:41 +02:00
okriuchykhin
532153b9cb
Merge pull request #747 from okriuchykhin/ok_SCI_101
...
Improve samples import speed [SCI-101]
2017-07-25 14:10:45 +02:00
Oleksii Kriuchykhin
efd03db6db
Further samples import improvement [SCI-101]
2017-07-25 10:56:07 +02:00
Matej Zrimšek
ad0dce921b
Fixed error when adding a value to a blank custom repository custum column cell. [SCI-1516]
2017-07-24 18:12:41 +02:00
Oleksii Kriuchykhin
67b0c78593
Improve samples import speed [SCI-101]
2017-07-24 17:33:13 +02:00
Oleksii Kriuchykhin
6d56e6b72e
Remove redundant self [SCI-1487]
2017-07-20 11:51:42 +02:00
Oleksii Kriuchykhin
6c33b46f6a
Improve import of repository records plus tsv file import fixes [SCI-1487]
2017-07-20 11:44:10 +02:00
Zmago Devetak
7b898666da
Merge pull request #745 from ZmagoD/zd_SCI_1485
...
refactor repositories js files [fixes SCI-1485]
2017-07-19 11:17:52 +02:00
Oleksii Kriuchykhin
ece27b2652
Fix importing files with empty header cells and error messages improvements [SCI-1484]
2017-07-18 14:54:35 +02:00
zmagod
a2b7bcda4c
refactor repositories js files [fixes SCI-1485]
2017-07-17 15:05:28 +02:00
Oleksii Kriuchykhin
036ee390ed
Fix error messages in repository import and uploading files starting with hyphen[SCI-1484]
2017-07-14 16:19:03 +02:00
Zmago Devetak
77893e6bcb
Merge pull request #743 from ZmagoD/zd_SCI_1483
...
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 12:01:42 +02:00
zmagod
506e47a595
fixes sorting of assigned column [fixes SCI-1483]
2017-07-14 09:45:36 +02:00
Oleksii Kriuchykhin
ba35717243
Fix babel and eslint config [SCI-1461]
2017-07-13 14:11:01 +02:00
Mojca Lorber
739f8b5b4e
remove redundant rollback call
2017-07-13 13:49:26 +02:00
Mojca Lorber
ec76873e95
fix sorting by assigned causes ajax error
2017-07-13 11:41:19 +02:00
Oleksii Kriuchykhin
b8e93ee883
Add Webpacker and React [SCI-1461]
2017-07-12 16:41:55 +02:00
Zmago Devetak
69919359f1
Merge pull request #738 from ZmagoD/zd_SCI_1452
...
fixes issue with smart annotations in repositories [fixes SCI-1452]
2017-07-12 14:50:29 +02:00
Nbernot
2a3e830a3c
Merge pull request #732 from biosistemika/business_users
...
Business users [SCI-1428, SCI-1447]
2017-07-11 13:34:56 +02:00
Nbernot
d746ae2549
Removes parentheses around if conditions
2017-07-11 13:33:47 +02:00
Luka Murn
73a4cd1e4f
Merge pull request #737 from Ducz0r/lm-sci-1450
...
Add versioning modal & support to sciNote [SCI-1450]
2017-07-11 09:47:51 +02:00
zmagod
baaec67399
fixes issue with smart annotations in repositories [fixes SCI-1452]
2017-07-10 16:22:32 +02:00
Oleksii Kriuchykhin
a6b80589f2
Fix default order of the columns in repositories [SCI-1445]
2017-07-10 15:32:18 +02:00
Luka Murn
3e80f761b8
Add "about" modal, prepare hooks, VERSION system for addons
...
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
2017-07-10 15:27:50 +02:00
Luka Murn
16e672b9d8
Add VERSION file where the sciNote Core version is stored
2017-07-10 09:26:35 +02:00
lenart
58e2575c75
Truncate checklist items in activity modal [fixes SCI-1249]
2017-07-07 15:56:16 +02:00
Luka Murn
9f60ece25f
Merge branch 'master' into rails-5.1
...
Conflicts:
app/models/repository.rb
app/models/repository_row.rb
app/views/projects/index.html.erb
app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
zmagod
750c82a80f
setup testing tools [fixes SCI-1400]
2017-07-06 09:07:05 +02:00
Nejc Bernot
d917cf3340
Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST
2017-07-05 11:52:36 +02:00
Nejc Bernot
803934e07d
Changes the host for the download and redirect paths
2017-07-05 10:23:10 +02:00
Nejc Bernot
91fe7fe4ad
Changes the completely NOT ruby code
2017-07-04 17:13:59 +02:00
Luka Murn
e3b9c1c644
Woops, almost forgot on this one
2017-07-04 15:00:14 +02:00
Luka Murn
8d68769d09
Hound is Love, Hound is Life
2017-07-04 14:47:58 +02:00
Luka Murn
91cddce8a6
Fixes DEPRECATION WARNING-s for Rails 5.1.2
...
This just fixes the warning messages occured during click-through
of the application. I didn't systematically search code for all
potential problems (I couldn't find the list of all deprecations
anyway).
Closes SCI-1427.
2017-07-04 14:35:51 +02:00
Nejc Bernot
bd9904adb3
Adds support for business servers
...
If the WOPI_BUSINESS_USERS environmental variable is set and true, indicates to Office online that all users are business users when trying to view/edit files
2017-07-04 14:27:43 +02:00
Zmago Devetak
53a1dd14b7
Merge pull request #718 from ZmagoD/zd_SCI_1129_v3
...
Fixes error message [fixes SCI-1129]
2017-07-04 11:16:36 +02:00
Zmago Devetak
5f4006fe4a
Merge pull request #723 from ZmagoD/zd_SCI_1408
...
Fixes bugs on canvas [fixes SCI-1408]
2017-07-04 11:16:04 +02:00
okriuchykhin
75c887ce7d
Merge pull request #721 from okriuchykhin/ok_SCI_1412
...
Fix activities [SCI-1412]
2017-07-04 10:59:08 +02:00
okriuchykhin
2e24e6b73a
Merge pull request #725 from okriuchykhin/ok_SCI_1409
...
Fix datatables [SCI-1409]
2017-07-03 15:47:19 +02:00
mlorb
1b2884c1b7
Merge pull request #722 from mlorb/ml-sci-1396
...
Fix bugs on projects page [SCI-1396]
2017-07-03 15:37:16 +02:00
Oleksii Kriuchykhin
b234c07c13
Fix datatables [SCI-1409]
2017-07-03 15:33:50 +02:00
zmagod
311270ff49
refactor
2017-07-03 15:32:02 +02:00
Zmago Devetak
76ab8d0d3c
Merge pull request #728 from ZmagoD/testing-addons
...
Testing addons
2017-07-03 15:11:33 +02:00
okriuchykhin
4740564a40
Merge pull request #727 from okriuchykhin/ok_SCI_1445
...
Fix ordering of the columns after adding the new ones [SCI-1445]
2017-07-03 11:55:24 +02:00
Oleksii Kriuchykhin
4c6690e59b
Fix ordering of the columns after adding the new ones [SCI-1445]
2017-07-03 11:53:15 +02:00
lenart
74e723d5d5
Changed data hook name and form id [SCI-1430]
2017-07-03 11:28:35 +02:00
Oleksii Kriuchykhin
5c39b90b2d
Fix activities button misbehaviour with turbolinks [SCI-1412]
2017-06-30 16:33:52 +02:00
zmagod
bc33883c3c
first run fixing addons
2017-06-30 10:23:28 +02:00
lenart
8ec458db91
Added data hook and form id for GA tracking [SCI-1430]
2017-06-30 10:06:54 +02:00
Mojca Lorber
a3514bdaf0
fix restore action from archives pages
2017-06-29 16:14:25 +02:00
Mojca Lorber
4fb07e1e4f
fix edit comments
2017-06-29 13:33:59 +02:00
Mojca Lorber
2ab74c8979
add user variable
2017-06-29 12:56:14 +02:00
zmagod
68cfac4a38
adds images into assets folder
2017-06-29 11:04:31 +02:00
zmagod
fd13921720
fixes repeat tutorial [fixes SCI-1410]
2017-06-29 11:00:50 +02:00
zmagod
bef5a085c4
Fixes bugs on canvas [fixes SCI-1408]
2017-06-29 10:29:41 +02:00
okriuchykhin
f56e972ce6
Merge pull request #720 from okriuchykhin/ok_SCI_1411
...
Fix global search [SCI-1411]
2017-06-29 09:55:56 +02:00
Mojca Lorber
21b4ba7627
fix bugs on projects page
2017-06-28 17:15:09 +02:00
Oleksii Kriuchykhin
e474cda03a
Fix activities [SCI-1412]
2017-06-28 16:49:50 +02:00
Oleksii Kriuchykhin
21cce4baa0
Fix global search [SCI-1411]
2017-06-28 15:44:18 +02:00
Zmago Devetak
502eb5c211
fixes tabs
2017-06-28 15:40:15 +02:00
zmagod
d8a3fdea20
fixes hound
2017-06-28 15:29:10 +02:00
zmagod
525c9770ac
fixes experiment page [fixes SCI-1395]
2017-06-28 15:21:32 +02:00
zmagod
a9f38962bc
Fixes error message [fixes SCI-1129]
2017-06-28 11:17:50 +02:00
Matej Zrimšek
4dbf5b0f53
Fixed sample types page load error, when viewing them on a task level. [SCI-1419]
2017-06-27 16:28:25 +02:00
zmagod
71aa05bb0e
refactor
2017-06-27 14:58:49 +02:00
mlorb
025050a7cd
Merge pull request #716 from mlorb/ml-sci-1420
...
Add tooltips to navigation bar [SCI-1420]
2017-06-27 14:52:07 +02:00
Mojca Lorber
d03be76f35
add tooltips to archive buttons
2017-06-27 14:48:45 +02:00
Mojca Lorber
0160956377
put all titles on links
2017-06-27 14:21:06 +02:00
Mojca Lorber
6bfb5e125c
add tooltips to navigation bar
2017-06-27 13:46:49 +02:00
okriuchykhin
d126391940
Merge pull request #710 from okriuchykhin/ok_SCI_1356
...
Add global search in custom repositories [SCI-1356]
2017-06-27 13:41:53 +02:00
Oleksii Kriuchykhin
69231060b0
Fix checking of my_modules presence [SCI-1356]
2017-06-27 13:39:08 +02:00
Zmago Devetak
6c541602e7
Merge pull request #715 from ZmagoD/zd_SCI_1328_v2
...
fixes smart annotations bug in reports [fixes SCI-1328]
2017-06-27 13:34:29 +02:00
Oleksii Kriuchykhin
4060ba2ac3
Code style fixes [SCI-1356]
2017-06-27 13:23:51 +02:00
mz3944
ca59ac5e36
Merge pull request #714 from mz3944/mz-SCI-1402
...
Missing error message when not selecting name in case of import repository file [SCI-1402]
2017-06-27 11:54:26 +02:00
zmagod
7b9410f02f
fixes smart annotations bug in reports [fixes SCI-1328]
2017-06-27 11:26:32 +02:00
okriuchykhin
ee2cc006af
Merge pull request #712 from okriuchykhin/ok_SCI_1404
...
Fix naming of repository items in modal and messages [SCI-1404]
2017-06-27 09:22:43 +02:00
okriuchykhin
8ae479b370
Merge pull request #713 from okriuchykhin/ok_SCI_1399
...
Remove spinner after samples import error [SCI-1399]
2017-06-27 09:22:21 +02:00
Oleksii Kriuchykhin
938896981d
Remove spinner after samples import error [SCI-1399]
2017-06-26 16:51:58 +02:00
Matej Zrimšek
f847b44067
Error is displayed and import is prevented in case repository name column is not mapped, when importing repository items from file. [SCI-1402]
2017-06-26 16:50:40 +02:00
Oleksii Kriuchykhin
84556cf744
Fix naming of repository items in modal and messages [SCI-1404]
2017-06-26 16:03:02 +02:00
Oleksii Kriuchykhin
f2f57de264
Fix changing protocol ownership logic when removing user from the team [SCI-1415]
2017-06-26 15:30:18 +02:00
Oleksii Kriuchykhin
fc72453a5b
Fix hound warning [SCI-1356]
2017-06-23 16:19:59 +02:00
Oleksii Kriuchykhin
e038bc58fa
Add global search in custom repositories [SCI-1356]
2017-06-23 16:12:56 +02:00
zmagod
819f47b450
setup sciNote for Rails 5.1
2017-06-23 15:19:08 +02:00
zmagod
75507107fd
migrate to 4.2.9
2017-06-23 08:50:12 +02:00
Zmago Devetak
f9e04e80b4
Merge pull request #705 from ZmagoD/zd_SCI_1393
...
removes imported repository row if the row value is not valid [fixes …
2017-06-22 17:50:02 +02:00
Zmago Devetak
cffac82e88
Merge pull request #704 from ZmagoD/zd_SCI_1392
...
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 17:47:15 +02:00
Zmago Devetak
514c6c0d53
Merge pull request #706 from ZmagoD/zd_SCI_1385
...
fixes row dupplication [fixes SCI-1385]
2017-06-22 17:47:00 +02:00
zmagod
7367435c6d
refactor
2017-06-22 17:32:12 +02:00
zmagod
2dd9b6ff19
fix update repository_row
2017-06-22 17:29:17 +02:00
zmagod
590135b9b3
refactor
2017-06-22 17:26:11 +02:00
zmagod
1690d8ebe3
removed reload on hide modal
2017-06-22 16:47:50 +02:00
zmagod
2b2f513366
fixes export pdf error on production
2017-06-22 16:40:50 +02:00
zmagod
e7328c2e20
fixes row dupplication [fixes SCI-1385]
2017-06-22 16:01:37 +02:00
zmagod
703be13fb0
removes imported repository row if the row value is not valid [fixes SCI-1393]
2017-06-22 15:21:36 +02:00
zmagod
a2e1aa5b36
fixes bug with long text in parse records modal [fixes SCI-1392]
2017-06-22 14:43:01 +02:00
Mojca Lorber
1ba32e19cb
allign no. of pages and showing entries per page
2017-06-22 14:23:03 +02:00
zmagod
28129ebb73
refactor
2017-06-21 17:39:20 +02:00
zmagod
bad52ceff1
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1336
2017-06-21 15:56:07 +02:00
zmagod
18fd5b00ba
fix hound
2017-06-21 15:01:55 +02:00
zmagod
f66fb49b56
adds import records to repositories [fixes SCI-1336]
2017-06-21 14:45:50 +02:00
mz3944
568e41f5fa
Merge pull request #701 from mz3944/mz-SCI-1383
...
Removed empty first column of repository export file [SCI-1383]
2017-06-21 10:57:46 +02:00
Matej Zrimšek
d907819de5
Removed byebug calls. [SCI-1383]
2017-06-21 10:49:00 +02:00
mz3944
d19bfc8fd8
Merge pull request #700 from mz3944/mz-SCI-1386
...
Fixed tooltip not showing on mouse over truncated cell text [SCI-1386]
2017-06-21 10:40:37 +02:00
mz3944
2ad27289c9
Merge pull request #699 from mz3944/mz-SCI-1378
...
Change repository icon on reports [SCI-1378]
2017-06-21 10:40:16 +02:00
mz3944
4d5136270a
Merge pull request #698 from mz3944/mz-SCI-1384
...
Fixed AJAX error when deleting custom columns in repository table [SCI-1384]
2017-06-21 10:39:53 +02:00
zmagod
f64e1ac713
fix locales
2017-06-21 09:31:39 +02:00
Matej Zrimšek
47407ef40c
Removed empty first column of repository export file. [SCI-1383]
2017-06-20 18:40:41 +02:00
Matej Zrimšek
ce97d18e78
Fixed tooltip not showing on mouse over truncated cell text. [SCI-1386]
2017-06-20 17:51:51 +02:00
Matej Zrimšek
d49524a26f
Set correct repository icon on reports and done some needed refactoring with this. [SCI-1378]
2017-06-20 16:10:50 +02:00
Oleksii Kriuchykhin
115ce91d8d
Handle column mappings in task repository [SCI-1381]
2017-06-20 15:58:52 +02:00
Matej Zrimšek
6c7987681c
Updating repository table state of every user belonging to the team of the repository, when custom column is removed or added. [SCI-1384]
2017-06-20 14:52:41 +02:00
Oleksii Kriuchykhin
9a9f8b9c41
Fix total number of records in task repository [SCI-1381]
2017-06-19 16:45:57 +02:00
mlorb
14429a270c
Merge pull request #689 from mlorb/ml_sci_1354
...
Truncate and display text in tooltip in custom repository fields [SCI-1354]
2017-06-19 15:50:38 +02:00
Mojca Lorber
730c4738d5
fix tooltip in edit mode
2017-06-19 15:49:31 +02:00
Mojca Lorber
39dd6daabb
small fixes
2017-06-19 15:30:38 +02:00
mlorb
122ac7971f
Merge pull request #692 from mlorb/ml_sci_1348
...
Fix cog position on repositories page [SCI-1348]
2017-06-19 15:16:01 +02:00
mlorb
9a7669bf2a
remove empty line
2017-06-19 15:15:27 +02:00
mlorb
ff02c45f5f
Merge pull request #695 from mlorb/ml_sci_1353
...
Retain the same word case in repositories dropdown [SCI-1353]
2017-06-19 14:48:58 +02:00
mlorb
733f6267db
Merge pull request #696 from mlorb/ml_sci_1380
...
Fix ordering of repositories on task [SCI-1380]
2017-06-19 14:28:00 +02:00
mlorb
7cbc8a2f95
Merge pull request #694 from mlorb/ml_sci_1347
...
Fix flash when deleting samples of other users [SCI-1347]
2017-06-19 14:19:57 +02:00
mlorb
beaba6a92b
Merge pull request #693 from mlorb/ml_sci_1351_v3
...
Fix error msg when editing empty cell in repositories [SCI-1351]
2017-06-19 14:19:27 +02:00
zmagod
70fa681519
split the import service
2017-06-19 14:05:37 +02:00
Mojca Lorber
4c3036af87
fix ordering of repositoris on task
2017-06-19 10:53:18 +02:00
Mojca Lorber
f77b1aa4e8
retain the same word case in repositories dropdown
2017-06-19 10:32:12 +02:00
Mojca Lorber
9b941fe374
fix flash when deleting samples of other users
2017-06-16 17:12:04 +02:00
mz3944
e027a871e9
Merge pull request #691 from mz3944/mz-SCI-1357-v2
...
Repository management - filter on custom columns [SCI-1357]
2017-06-16 16:04:47 +02:00
Matej Zrimšek
6b284d8c89
Filtering and sorting of records didn't work when sorting on custom columns in repository datatable. [SCI-1357]
2017-06-16 16:02:31 +02:00
mlorb
49ce08f1f5
Merge pull request #688 from mlorb/ml_sci_1375
...
Fix no repository name in activity bug [SCI-1375]
2017-06-16 15:13:42 +02:00
Mojca Lorber
1b683bc70e
fix error msg when editing empty cell in repositories
2017-06-16 15:09:04 +02:00
Matej Zrimšek
1f0eeeaecb
Optimized repository cells search by replacing Rails select statement with raw SQL statement. [SCI-1357]
2017-06-16 14:31:31 +02:00
okriuchykhin
05ea00a5d3
Merge pull request #690 from okriuchykhin/ok_SCI_1346_v2
...
Fix bug when reordering column to the first position in repositories [SCI-1346]
2017-06-16 14:29:08 +02:00
Mojca Lorber
b6f146f177
fix cog position on repositories page
2017-06-16 11:54:31 +02:00
Oleksii Kriuchykhin
94d74b8101
Make assigned column always visible in repositories [SCI-1346]
2017-06-16 11:47:41 +02:00
Mojca Lorber
a195c9a5af
truncate and display text in tooltip in custom repository fields
2017-06-15 15:08:33 +02:00
Luka Murn
3df034ff21
Merge pull request #687 from mz3944/mz-SCI-1357
...
Repository management - filter on custom columns [SCI-1357]
2017-06-15 13:30:42 +02:00
Mojca Lorber
ea455d3596
fix no repository name in activity bug
2017-06-15 09:43:10 +02:00
Matej Zrimšek
bae1e298d7
Fixed repositories search to only search the current repository. [SCI-1357]
2017-06-14 19:49:08 +02:00
Matej Zrimšek
092e82c722
Date search fix for repositories. [SCI-1357]
2017-06-14 19:36:15 +02:00
Matej Zrimšek
e38947b1f8
Minor repository search refactoring. [SCI-1357]
2017-06-14 19:28:53 +02:00
Matej Zrimšek
be4a8d494a
Search functionality added to custom columns of custom repositories. [SCI-1357]
2017-06-14 19:28:12 +02:00
mlorb
6e203d2f15
Merge pull request #685 from mlorb/ml_sci_1373
...
Fix bug with audit trail - ajax error [SCI-1373]
2017-06-14 17:59:34 +02:00
Zmago Devetak
ab24414bfe
Merge pull request #686 from ZmagoD/zd_SCI_1371
...
fixes bug with sorting columns [fixes SCI-1371]
2017-06-14 17:59:24 +02:00
zmagod
5d6fba7153
fixes bug with sorting columns [fixes SCI-1371]
2017-06-14 17:35:41 +02:00
okriuchykhin
374270bb10
Merge pull request #684 from okriuchykhin/ok_SCI_1349
...
Fix sorting in repositories when only assigned selected [SCI-1349]
2017-06-14 15:15:03 +02:00
Mojca Lorber
107aa76e55
fix bug with audit trail - ajax error
2017-06-14 14:48:22 +02:00
Oleksii Kriuchykhin
13fdbf8850
Fix sorting in repositories when only assigned selected [SCI-1349]
2017-06-14 14:29:59 +02:00
Mojca Lorber
e6ec184dba
fix multiple errors handling on fields in repositories tables
2017-06-14 13:09:23 +02:00
zmagod
2d3b5f4308
refactor
2017-06-14 10:55:24 +02:00
okriuchykhin
da87a41c86
Merge pull request #680 from okriuchykhin/ok_SCI_1365
...
Remove row selection after assign/unassign in repositories [SCI-1365]
2017-06-14 10:19:09 +02:00
zmagod
6dd85d6c39
fixes drag'n drop bug in results on safari [fixes SCI-1370]
2017-06-14 09:45:49 +02:00
zmagod
cee052fc19
added service object
2017-06-14 09:11:20 +02:00
Matej Zrimšek
cea6d15d3e
Fixed Hound warning. [SCI-1351]
2017-06-13 18:15:47 +02:00
Matej Zrimšek
1bc46fe0cb
Reverted the part of the repository row controller code that didn't needed changes. [SCI-1351]
2017-06-13 18:12:42 +02:00
Mojca Lorber
849b269d87
fix errors in repo table
2017-06-13 16:56:34 +02:00
Oleksii Kriuchykhin
2e98433abc
Remove row selection after assign/unassign in repositories [SCI-1365]
2017-06-13 16:56:28 +02:00
okriuchykhin
97a94ff4a3
Merge pull request #679 from okriuchykhin/ok_SCI_1345
...
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 15:47:44 +02:00
mlorb
074a47aae1
Merge pull request #675 from mlorb/ml_sci_1272
...
Fix permissions [SCI-1272]
2017-06-13 10:51:04 +02:00
Oleksii Kriuchykhin
2d693a3fb7
Fix repository view permissions for team guests [SCI-1345]
2017-06-13 10:33:08 +02:00
Luka Murn
2e2f07bf58
Merge pull request #668 from Ducz0r/lm-sci-1335
...
Fix sidebar for repositories [SCI-1335]
2017-06-13 09:37:33 +02:00
Zmago Devetak
f3f1a68070
Merge pull request #667 from ZmagoD/zd_SCI_1338
...
fixes long column names in repository dropdown [fixes SCI-1338]
2017-06-13 09:33:04 +02:00
Zmago Devetak
19adddbfdb
Merge pull request #666 from ZmagoD/zd_SCI_1337
...
truncate long repository names [fixes SCI-1337]
2017-06-13 09:32:43 +02:00
Zmago Devetak
21577cd0e9
Merge pull request #664 from ZmagoD/zd_SCI_1315
...
removes the delete function of uncompleted steps [fixes SCI-1315]
2017-06-13 09:32:26 +02:00
Oleksii Kriuchykhin
4b0d7acabe
Fix search when viewing only assigned repository records [SCI-1342]
2017-06-13 09:11:27 +02:00
Luka Murn
c3d289291f
Fix case statement
...
Closes SCI-1335.
2017-06-13 09:09:07 +02:00
okriuchykhin
d88de4009a
Merge pull request #674 from okriuchykhin/ok_SCI_1346
...
Fix reordering columns to the first position [SCI-1346]
2017-06-13 09:01:10 +02:00
okriuchykhin
56c3b891a5
Merge pull request #673 from okriuchykhin/ok_SCI_1350
...
Fix row selection info after record deletion [SCI-1350]
2017-06-13 09:00:48 +02:00
okriuchykhin
05c77e7298
Merge pull request #672 from okriuchykhin/ok_SCI_1341
...
Fix row selecton after column reorder in repositories [SCI-1341]
2017-06-13 09:00:33 +02:00
mlorb
d0d7dc7468
Merge pull request #677 from mlorb/ml_sci_1344
...
Change custom repositories icon [SCI-1344]
2017-06-13 08:57:22 +02:00
Zmago Devetak
6cdf37041f
Merge pull request #663 from ZmagoD/zd_SCI_1328
...
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-13 08:57:09 +02:00
Luka Murn
28f78a0c6c
Merge pull request #670 from Ducz0r/lm-sci-1340
...
Fix assigned repository rows in task display [SCI-1340]
2017-06-13 08:55:55 +02:00
zmagod
a865253a2e
first run
2017-06-13 08:10:10 +02:00
Mojca Lorber
faa6456e28
change custom repositories icon
2017-06-12 18:00:28 +02:00
Matej Zrimšek
e3db79b3cc
Added repository permissions check when exporting repository records. Minor repositories refactoring and code style fixing. [SCI-1275]
2017-06-12 17:49:42 +02:00
Mojca Lorber
9108102b42
fix permissions
2017-06-12 17:34:36 +02:00
Oleksii Kriuchykhin
248fd7be06
Fix reordering columns to the first position [SCI-1346]
2017-06-12 17:16:49 +02:00
Oleksii Kriuchykhin
c081cda5f3
Fix row selection info after record deletion [SCI-1350]
2017-06-12 10:23:18 +02:00
Oleksii Kriuchykhin
aa42ca6b8b
Fix row selecton after column reorder in repositories [SCI-1341]
2017-06-12 10:07:16 +02:00
Matej Zrimšek
4ea8972a6c
Fixed rebasing mistake. [SCI-1275]
2017-06-09 19:48:20 +02:00
Matej Zrimšek
514aa6214b
Repository records minor JS refactoring. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
29b721365a
Moved export form to proper place in the code. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
f46d8f6970
Refactored a bit repository records CSV export. Fixed the order of CSV rows to match the currently viewed datatable order. [SCI-1275]
2017-06-09 19:44:28 +02:00
Matej Zrimšek
773a55ffac
Fixed CSV export of repository records. [SCI-1275]
2017-06-09 19:44:28 +02:00
rekonder
4df8e1ffe3
Fixed bugs with duplicated generated csv, toggle columns and exportig right columns of selected repository
2017-06-09 19:44:28 +02:00
rekonder
ede744849b
Export repository [aj-SCI-1275]
2017-06-09 19:44:28 +02:00
Luka Murn
e26337d5ee
Merge pull request #671 from biosistemika/custom-repositories
...
Merge custom-repositories into master
2017-06-09 18:46:47 +02:00
Luka Murn
90ca6d9a76
Fix assigned repository rows in task display
...
Closes SCI-1340.
2017-06-09 13:50:13 +02:00
Luka Murn
481a48c953
Hound is love, Hound is life
2017-06-09 12:51:33 +02:00
Luka Murn
cfb734704e
Fix sidebar for repositories
...
Closes SCI-1335.
2017-06-09 12:49:23 +02:00
zmagod
d1977d0773
fixes long column names in repository dropdown [fixes SCI-1338]
2017-06-09 11:42:38 +02:00
zmagod
ee9eaea47c
truncate long repository names [fixes SCI-1337]
2017-06-09 11:20:57 +02:00
Zmago Devetak
4873624cec
Merge pull request #658 from ZmagoD/zd_SCI_1011
...
Multiple file upload with drag & drop capability in steps and results
2017-06-09 10:03:33 +02:00
zmagod
33b996ffee
refactor
2017-06-09 09:49:57 +02:00
Luka Murn
7bb1af3692
Minor JS fix
2017-06-08 15:28:26 +02:00
Luka Murn
c7c3c46d9d
Fix dropdown
2017-06-08 15:26:57 +02:00
Mojca Lorber
be52af4e4f
fix rename/delete/copy modals not working
2017-06-08 15:13:00 +02:00
Mojca Lorber
0004c2b7d5
fix selection of tab after redirection
2017-06-08 14:17:27 +02:00
zmagod
5f8606c9c5
removes the delete function of uncompleted steps [fixes SCI-1315]
2017-06-08 14:03:06 +02:00
Mojca Lorber
71c523c406
load tabs with javascript
2017-06-08 13:47:30 +02:00
zmagod
e45c2ce560
fixes bug with smart annotations in reports [fixes SCI-1328]
2017-06-08 13:41:27 +02:00
Luka Murn
810599bef2
Fix en.yml localization bug
2017-06-08 13:36:37 +02:00
Luka Murn
2ab31aba2f
Merge pull request #660 from Ducz0r/lm-sci-1270
...
Copy repository functionality [SCI-1270]
2017-06-08 11:45:57 +02:00
Luka Murn
27feb46d8f
Merge pull request #659 from Ducz0r/lm-sci-1279
...
Include repositories in reports [SCI-1279]
2017-06-08 11:24:21 +02:00
Luka Murn
61eb52f86f
Implement GUI for copying repositories
...
Closes SCI.1270.
2017-06-07 19:11:25 +02:00
Luka Murn
38361e4bb4
Setup initial GUI
2017-06-07 18:43:48 +02:00
Luka Murn
b94d2c5c03
Implement 'copy' method on Repository object
2017-06-07 18:28:07 +02:00
Luka Murn
0aee11d6d8
Hound is love, Hound is life #2
2017-06-07 18:26:32 +02:00
Luka Murn
42f7b4f68d
Hound is love, Hound is life
2017-06-07 18:22:15 +02:00
Matej Zrimšek
77a225ec31
Added toggle between assigned and all repository records. [SCI-1276]
2017-06-07 18:13:25 +02:00
Luka Murn
9e45d197df
Change some stuff for repos to work, fix some bugs
...
Closes SCI-1279.
2017-06-07 18:07:49 +02:00
Luka Murn
02dd6636ba
Allow saving & editing of reports with repository elements
...
Closes SCI-1279.
2017-06-07 16:55:00 +02:00
Luka Murn
b5f6d1da94
Allow custom repositories to be added to reports
2017-06-07 16:54:32 +02:00
Luka Murn
bb20d2661f
Add association between repository rows & my modules
2017-06-07 16:54:32 +02:00
Oleksii Kriuchykhin
c18bba9fbe
Fix rebase errors [SCI-1274]
2017-06-07 15:50:22 +02:00
Oleksii Kriuchykhin
ad8dd6d740
PR fixes [SCI-1274]
2017-06-07 15:23:25 +02:00
Oleksii Kriuchykhin
8b1190060e
Add custom repository table [SCI-1274]
2017-06-07 15:23:25 +02:00
Zmago Devetak
fcec42ae31
Merge pull request #645 from ZmagoD/zd_SCI_1278
...
generates samples csv file in background job [fixes SCI-1278]
2017-06-07 15:04:24 +02:00
zmagod
353c27da15
rename method
2017-06-07 13:51:16 +02:00
zmagod
c6bb20039b
adds drag'n drop feature in task results [fixes SCI-1011], [fixes SCI-1310] and [fixes SCI-285]
2017-06-07 13:29:39 +02:00
Mojca Lorber
51c4eeb106
renaming
2017-06-06 15:50:43 +02:00
Mojca Lorber
dde714d78f
fix hound
2017-06-06 13:33:57 +02:00
Mojca Lorber
39dda1ad5d
refactoring
2017-06-06 13:18:44 +02:00
ajugo
887d9a4f52
Samples - show all/show assigned [SCI-1277] ( #644 )
...
* Samples - show all/show assigned [SCI-1277]
* Some fixes in code
* Some minor fixes in code
* Omit present
* Correct missed present
* Fixing hound warnings
2017-06-06 12:46:56 +02:00
Mojca Lorber
acdea2198d
code changes after rebasing
2017-06-06 11:10:55 +02:00
Mojca Lorber
da98788031
small code fixes
2017-06-06 09:57:50 +02:00
Mojca Lorber
13bf4ad229
create new repository
2017-06-06 09:54:39 +02:00
Luka Murn
eb95ec74a3
Merge pull request #654 from Ducz0r/lm-sci-1323
...
Fix bug with protocol preview modal not working in protocol repo [SCI-1323]
2017-06-06 08:02:33 +02:00
Luka Murn
f382c04f01
Refactor JS code a bit
...
Closes SCI-1323.
2017-06-06 08:02:01 +02:00
Luka Murn
62d97f6e64
Merge pull request #655 from Ducz0r/lm-sci-1321
...
Fix bug with TinyMCE not working for steps with nil description [SCI-1321]
2017-06-06 07:59:24 +02:00
Luka Murn
f298ec54e7
Code beautification per @zmagod's request
...
Closes SCI-1321.
2017-06-06 07:58:46 +02:00
Matej Zrimšek
afce3010ef
After repository deletion, the next selected repository is the first one. [SCI-1269]
2017-06-05 17:56:09 +02:00
Luka Murn
8c7aebbb88
Fix bug with TinyMCE not working for steps with nil description
...
Closes SCI-1321.
2017-06-05 17:43:03 +02:00
Matej Zrimšek
419d638163
Renamed reposiotry edit and destroy permission helper. [fix 1269]
2017-06-05 17:36:26 +02:00
Luka Murn
1712fc0611
Fix bug with protocol preview modal not working in protocol repo
...
Closes SCI-1323.
2017-06-05 17:10:13 +02:00
mlorb
3dc83cfe05
Merge pull request #650 from mlorb/ml_sci_1286
...
Fix bug with titles truncate in activities [SCI-1286]
2017-06-05 16:27:44 +02:00
Mojca Lorber
27d3a5097b
fix hound
2017-06-05 16:07:21 +02:00
Matej Zrimšek
2c6ad4aa05
Refactored modal popups for repositories to make them general. [fix 1269]
2017-06-05 14:13:24 +02:00
zmagod
ab4961ddb1
adds overlay partial
2017-06-05 11:31:05 +02:00
zmagod
67d902db52
refactor
2017-06-05 10:43:58 +02:00
Matej Zrimšek
5aba15e220
Made repository names case insensitive. [fix 1269]
2017-06-05 10:38:04 +02:00
Matej Zrimšek
f012779780
Renamed before_action for repository edit and destroy action. [fix 1269]
2017-06-05 10:02:16 +02:00
Matej Zrimšek
d8d54232c3
After repository renaming user is redirected to the same repository. Removed the unimplemented repository copy dropdown option. [SCI-1269]
2017-06-02 19:08:51 +02:00
Matej Zrimšek
73aaef0949
Fixe repository rename modal submit button. Consistent variable renaming. [SCI-1269]
2017-06-02 17:52:04 +02:00
Matej Zrimšek
c82fd66146
Removed unneeded utility JS function. [SCI-1269]
2017-06-02 17:52:04 +02:00
Matej Zrimšek
5c9a453439
Added permissions for deleting and renaming of repositories. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
9a7048cc7a
Code formatting updated for repositories. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
f8258812ef
Repository remove and rename refactoring. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
21a72da84f
Added rename logic and improved remove logic. [SCI-1269]
2017-06-02 17:50:34 +02:00
Matej Zrimšek
cdaac6a01b
Added remove repository modal logic. [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
791bb934ca
Remove repository modal logic (WIP). [SCI-1269]
2017-06-02 17:50:33 +02:00
Matej Zrimšek
b92a760a5c
Added dropdown GUI for editing repository. [SCI-1269]
2017-06-02 17:47:28 +02:00
zmagod
1c021b11db
adds drag and drop files upload to steps [fixes SCI-1310]
2017-06-02 16:34:09 +02:00
ajugo
a9bd86352d
Step: wrong last columns of table [fixes SCI-405] ( #600 )
...
* Step: wrong last two columns of table after add table results [fixes SCI-405]
* Changing double quotes to single
* Adding empty line back
2017-06-01 15:52:02 +02:00
Mojca Lorber
7c2b657b0e
fix bug with special characters when truncating activities titles
2017-06-01 15:10:26 +02:00
Mojca Lorber
d88b21fb5e
truncate all titles in activities
2017-06-01 15:09:01 +02:00
okriuchykhin
c88fc84538
Merge pull request #633 from okriuchykhin/ok_SCI_960_v2
...
Add smart annotations in sample info modal [SCI-960]
2017-05-31 11:31:14 +02:00
Luka Murn
fcc3995049
Merge pull request #647 from biosistemika/master
...
Bring latest master changes into custom-repositories
2017-05-30 14:18:14 +02:00
zmagod
6e1f93dd11
minor fix
2017-05-29 14:47:05 +02:00
zmagod
b527afd12b
generates samples csv file in background job [fixes SCI-1278]
2017-05-29 14:42:55 +02:00
mz3944
689587c4fc
Merge pull request #643 from mz3944/mz-SCI-1305
...
Handled user removal from the team for user smart annotation [fixes SCI-1305]
2017-05-29 12:52:19 +02:00
Zmago Devetak
1df6265326
Merge pull request #627 from ZmagoD/zd_SCI_1280
...
prevent to duplicate new step [fixes SCI-1280]
2017-05-29 09:55:22 +02:00
mz3944
d83dcac894
Merge pull request #642 from mz3944/mz-SCI-1291
...
Fixed permission error while cloning workflows. [fixes SCI-1291]
2017-05-29 09:53:33 +02:00
zmagod
5806cb8e67
removes unneeded animateSpinner call
2017-05-29 09:10:11 +02:00
Matej Zrimšek
19ffd77d32
Requests failed if smart annotation referenced a user who was no longer in the team. [fixes SCI-1305]
2017-05-26 18:14:15 +02:00
Matej Zrimšek
853096634d
Fixed permission error while cloning workflows. [fixes SCI-1291]
2017-05-26 11:14:50 +02:00
Oleksii Kriuchykhin
157b1630b9
Add missing include for sinitize_input [SCI-1309]
2017-05-25 16:28:06 +02:00
Mojca Lorber
c3051421b2
change truncate function
2017-05-25 11:01:24 +02:00
Mojca Lorber
8540f88b7e
small fix - renaming of ids and hrefs
2017-05-25 10:06:48 +02:00
Oleksii Kriuchykhin
7310763184
Add missing include [SCI-1306]
2017-05-25 08:57:50 +02:00
mlorb
58ac457d38
fix merge bug
2017-05-23 11:32:02 +02:00
mlorb
872f712be8
Merge branch 'custom-repositories' into ml_sci_1266_v2
2017-05-23 11:05:25 +02:00
mz3944
6b8c8deb16
Merge pull request #634 from mz3944/mz-SCI-414
...
Uncompleted steps not added to Reports
2017-05-23 09:58:05 +02:00
mz3944
9fe3b717c8
Merge pull request #626 from mz3944/mz-SCI-487
...
Simplify "Add contents to report" popup
2017-05-23 09:57:39 +02:00
Oleksii Kriuchykhin
b223646f07
Small improvements [SCI-1273]
2017-05-23 08:53:53 +02:00
Mojca Lorber
a716a0b1db
change breadcrumbs on protocol managements page
2017-05-22 17:58:42 +02:00
Mojca Lorber
9ae615264d
add global repositories screen - tab control
2017-05-22 17:54:30 +02:00
Oleksii Kriuchykhin
e99e3edb7b
Add repositories dropdown to task navigation [SCI-1273]
2017-05-18 14:21:00 +02:00
ajugo
1abaefce4f
At importing large sample file, error flash message appears [fixes SCI-903] ( #625 )
...
* At importing large sample file, error flash message appears [fixes SCI-903]
* Changing double quotes to single
* Adding animatedSpinner
2017-05-18 09:19:44 +02:00
Matej Zrimšek
20265ddd69
Readded result content modal for report creation and updated checkbox hierarchy logic accordingly. [fixes SCI-487]
2017-05-17 18:18:57 +02:00
Oleksii Kriuchykhin
bbf6d38c50
Fix error handling in result_assets [SCI-1288]
2017-05-17 15:14:35 +02:00
Matej Zrimšek
f78c80b148
Added possibility to add uncompleted steps to report. [closes SCI-414]
2017-05-17 13:25:21 +02:00
Oleksii Kriuchykhin
7f713b4293
Add smart annotations in sample info modal [SCI-960]
2017-05-17 13:06:21 +02:00
Oleksii Kriuchykhin
85e81e9ea2
Improve repository models and migration [SCI-1267]
2017-05-17 10:04:07 +02:00
Oleksii Kriuchykhin
f28df506f9
Fix bug in counting search results for assets [SCI-1284]
2017-05-17 09:08:40 +02:00
Oleksii Kriuchykhin
0dc0c7d096
Add validation of text_value length [SCI-1267]
2017-05-16 15:57:21 +02:00
Oleksii Kriuchykhin
72a651c7de
Add migrations and models for custom repositories [SCI-1267]
2017-05-16 15:27:36 +02:00
zmagod
b21923cf98
prevent to duplicate new step [fixes SCI-1280]
2017-05-16 11:52:07 +02:00
gazvoda
f6bd39ec70
Merge pull request #604 from gazvoda/lg-SCI-1145
...
Added migration to remove updated_at from Activity [fixes SCI-1145]
2017-05-16 08:49:10 +01:00
Matej Zrimšek
2c6f888cbc
Replace present? with more efficient exitst? for report content adding modal. [fixes SCI-487]
2017-05-15 18:56:41 +02:00
Matej Zrimšek
79ec3b5e4c
Selected all checkboxes by default for result content adding modal and added disabling logic for dependent checkboxes. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Matej Zrimšek
901558c733
Made checkbox logic sitewide available and applied it to other content adding modals in report aswell. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Matej Zrimšek
ba693c65a8
Fixed adding contents to report logic and removed unneeded code. [fixes SCI-487]
2017-05-15 18:20:42 +02:00
Matej Zrimšek
dbb79ebab1
Refactoring of specific modals for adding content to report and fixing their inconsistencies. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
Matej Zrimšek
b97cb91840
Refactoring of modal for adding content to report. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
Matej Zrimšek
27cfd55ea5
Simplified popup modal for adding contents to report. [fixes SCI-487]
2017-05-15 17:43:12 +02:00
Zmago Devetak
18e11fde59
Merge pull request #616 from ZmagoD/zd_SCI_1248
...
Prevent double input fields (results)
2017-05-15 16:27:03 +02:00
Zmago Devetak
39203a16f4
Merge pull request #622 from ZmagoD/zd_SCI_1261
...
fixes remove user action on project [fixes SCI-1261]
2017-05-15 15:28:39 +02:00
Zmago Devetak
a151bbdd7d
Merge pull request #623 from ZmagoD/zd_SCI_974
...
adds persistence to experiments order in project overview [fixes SCI-…
2017-05-15 15:28:18 +02:00
zmagod
9bec7dd96e
Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_1248
2017-05-15 14:49:37 +02:00
okriuchykhin
16325db1c6
Merge pull request #621 from okriuchykhin/ok_SCI_1263
...
Fix sorting in reports [SCI-1263]
2017-05-15 09:57:35 +02:00
zmagod
c35e2a4860
adds persistence to experiments order in project overview [fixes SCI-974]
2017-05-15 09:54:37 +02:00
okriuchykhin
9f9691de59
Merge pull request #620 from okriuchykhin/ok_SCI_452
...
Disable turbolinks on search links to fix JS errors [SCI-452]
2017-05-12 17:02:29 +02:00
okriuchykhin
8e523782d9
Merge pull request #619 from okriuchykhin/ok_SCI_617
...
Fixes error when cloning experiments with long names [SCI-617]
2017-05-12 16:53:38 +02:00
okriuchykhin
a8bbc3c3ba
Merge pull request #615 from okriuchykhin/ok_SCI_1008
...
Fix task and step ordering in reports [SCI-1008]
2017-05-12 16:44:57 +02:00
zmagod
b6367981c7
fixes remove user action on project [fixes SCI-1261]
2017-05-12 16:18:53 +02:00
Oleksii Kriuchykhin
5a2d618b1d
Fix sorting in reports [SCI-1263]
2017-05-12 16:04:19 +02:00
zmagod
d34b2520b5
refactor results javascript, fixes bug with results archive [fixes SCI-1262] prevents duplicate request [fixes SCI-1248]
2017-05-12 15:59:58 +02:00
Oleksii Kriuchykhin
ad39d09a53
Disable turbolinks on search links to fix JS errors [SCI-452]
2017-05-12 13:23:29 +02:00