scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 15:13:21 +08:00
Code Issues Projects Releases Packages Wiki Activity
6143 commits 31 branches 181 tags 166 MiB
Commit graph

1822 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Jure Grabnar
553ac4c360 Refactor code according to PR review 
PR review: https://github.com/biosistemika/scinote-web/pull/1304

Closes: [SCI-2640], [SCI-2642], [SCI-2643], [SCI-2644].
 2018-09-30 16:37:18 +02:00
Oleksii Kriuchykhin
2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +02:00
Oleksii Kriuchykhin
f8388d4bcd Merge branch 'ok_SCI_2729' into ok_SCI_2730 2018-09-25 10:26:46 +02:00
Oleksii Kriuchykhin
80e73bfb97 Implement Projects view - navigation bar (tabs) [SCI-2729] 2018-09-24 16:25:04 +02:00
Luka Murn
63b4f7d909
Merge pull request #1274 from Zanz2/zz_in_app_tooltips_help_sci2662 
Added Tooltips (bootstrap popovers) for various elements in scinote [SCI-2662]
 2018-09-24 16:23:53 +02:00
Luka Murn
2396149c57
Merge pull request #1273 from Zanz2/zz_tooltip_settings_enable_sci2663 
Added toggle checkbox for tooltips help in prefferences [SCI-2663]
 2018-09-24 16:23:28 +02:00
Jure Grabnar
7877d559a3 Update email/notification, type: deliver 
Closes [SCI-2643], [SCI-2644].
 2018-09-23 18:45:13 +02:00
Oleksii Kriuchykhin
84428b37c2 Add project view JSON endpoints [SCI-2728] 2018-09-21 10:39:20 +02:00
Zanz2
22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Oleksii Kriuchykhin
49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Zanz2
0efaf827b8
Merge pull request #1285 from Zanz2/zz_refactor_icons_sci_2445_v2 
Replaced image icon with paperclip on scinote [SCI-2712]
 2018-09-11 09:36:47 +02:00
Luka Murn
586a442abc Refactor the settings page, rename setting to tooltips_enabled 2018-09-05 16:36:32 +02:00
Zanz2
1bed2c2a3c Partially fixed according to pull request review, added comments to code review 2018-08-31 12:11:51 +02:00
Zanz2
d4aa5e60a2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zz_tooltip_settings_enable_sci2663 
Merging to update db, so i dont have to docker-clean my whole environment 2 times to switch between this branch and up to date ones
 2018-08-31 11:42:26 +02:00
Zanz2
15c124f3fd replaced image icon with paperclip, to represent files, removed all image icons 2018-08-27 13:07:18 +02:00
Alex Kriuchykhin
151d1cf44d
Merge pull request #1270 from okriuchykhin/ok_SCI_2651 
Refactor invite users modal initialization [SCI-2651]
 2018-08-23 14:34:42 +02:00
Alex Kriuchykhin
75a48291e1
Merge pull request #1272 from okriuchykhin/ok_SCI_2654 
Fix report elements sorting [SCI-2654]
 2018-08-22 14:20:54 +02:00
Zanz2
0ed62b7375 refactored according to PR review 2018-08-21 11:35:22 +02:00
Zanz2
2d1d4c78bc
Merge branch 'master' into zz_in_app_tooltips_help_sci2662 2018-08-21 11:27:01 +02:00
Zanz2
36cca3d6aa Implemented popover tooltips in all specified places, and fixed a bug where old popovers were open on page switch with ajax 2018-08-21 11:11:25 +02:00
Zanz2
880582de25 Added just a data attribute, so i dont have to add it on other branch 2018-08-21 09:59:49 +02:00
Zanz2
9a482eab2e Checkbox now gets styled properly and defaults to true 2018-08-21 09:02:54 +02:00
Zanz2
beb1d02914 Made fiew part for toggler, now debugging why checkbox doenst render properly and why it defaults to false always 2018-08-20 15:57:09 +02:00
Oleksii Kriuchykhin
62d99a4372 Fix report elements sorting [SCI-2654] 2018-08-20 14:46:23 +02:00
Zanz2
91f112dc38 Saving minor changes, deleted comments, stuck at drag n drop 2018-08-20 13:45:43 +02:00
Oleksii Kriuchykhin
6795b08a91 Refactor invite users modal initialization [SCI-2651] 2018-08-20 13:13:34 +02:00
Zanz2
1159a32ce2 Implemented all except 2 tooltips, debbugging why they dont work now 2018-08-20 13:03:30 +02:00
Zanz2
8c492e1491 started implementing tooltips, and upgraded behaviour, also trying to fix some bugs with data content attribute 2018-08-17 16:03:49 +02:00
Oleksii Kriuchykhin
ecde634a2c Add OAuth2 provider [SCI-2515] 2018-08-17 13:17:59 +02:00
Zanz2
e1cadfc75e saving work, removed testing buttons 2018-08-17 11:52:10 +02:00
Zanz2
637c7dfb19 modified styling and behaviour of popovers (tooltips) also made relevant text changes, except for last one in epic 2018-08-17 11:33:44 +02:00
Zanz2
a09834db6a testing, made new popover designs 2018-08-16 16:10:19 +02:00
Zanz2
d2373980d4 Testing out new popover 2018-08-16 15:07:59 +02:00
Zanz2
dfcaa40f1a
Merge branch 'master' into zz_refactor_icons_sci_2445_v2 2018-08-14 13:33:43 +02:00
Zanz2
45a4c1c598 changed the icons as per last comment in jira issue 2018-08-14 13:26:48 +02:00
mlorb
a6dd577b4e fix time zone selector 2018-08-08 11:43:18 +02:00
Oleksii Kriuchykhin
38c36ab798 Fix modals handling with Turbolinks [SCI-2253] 2018-08-02 11:25:14 +02:00
Oleksii Kriuchykhin
5c999300b5 Fix avatar upload validators [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
10b86a9d05 Add data hook to settings/team page [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
Luka Murn
f23cc36803
Merge pull request #1224 from ZmagoD/zd_SCI_2429 
fixes setting sidebar teams link[fixes SCI-2429]
 2018-07-13 14:55:24 +02:00
Luka Murn
de29ab1b11
Merge pull request #1234 from ZmagoD/zd_SCI_2581 
adds missing js in experiment canvas view [fixes SCI-2581]
 2018-07-13 14:54:59 +02:00
Oleksii Kriuchykhin
3aceb12f03 Fix delete button in inventories [SCI-2594] 2018-07-08 21:59:02 +02:00
Oleksii Kriuchykhin
a169639b3c Fix uploaded file max size validation in JS [SCI-2590] 2018-07-05 15:23:26 +02:00
zmagod
185657c626 adds missing js in experiment canvas view [fixes SCI-2581] 2018-07-05 14:36:54 +02:00
zmagod
eb75f6c03d fixes bug with checkAvailableColumns function [fixes SCI-2578] 2018-06-29 10:28:46 +02:00
Zmago Devetak
7fd3eec195
Merge pull request #1219 from ZmagoD/zd_SCI_2415 
move maximum file size limit to an ENV variable [fixes SCI-2415]
 2018-06-26 18:43:16 +02:00
Luka Murn
9637af51e6
Merge pull request #1207 from Ducz0r/lm-fix-sign-in-halt-layout 
Fix the sign in halt layout
 2018-06-26 17:51:18 +02:00
zmagod
1a15ac7acf fixes setting sidebar teams link[fixes SCI-2429] 2018-06-26 13:09:56 +02:00
zmagod
db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
zmagod
2f141e9217 disable buttons on new/edit repository_item action [fixes SCI-2410] 2018-06-15 11:37:01 +02:00
okriuchykhin
801d0a4a22
Merge pull request #1212 from okriuchykhin/ok_SCI_2377 
Add hooks to new report modal [SCI-2377]
 2018-06-14 15:48:43 +02:00
Oleksii Kriuchykhin
13c374d9b3 Add hooks to new report modal [SCI-2377] 2018-06-14 15:26:06 +02:00
zmagod
bb62fc3715 adds data-hook 2018-06-14 12:42:49 +02:00
Zmago Devetak
29fe58de80
Merge pull request #1208 from ZmagoD/zd_SCI_2408 
adds an additional check if some other user has added/removed reposit…
 2018-06-13 11:30:43 +02:00
Zmago Devetak
2eb6613c6a
Merge pull request #1206 from ZmagoD/zd_SCI_2442 
make manage columns page more responsive [fixes SCI-2442]
 2018-06-13 11:14:35 +02:00
Zmago Devetak
6cab1746cd
Merge pull request #1202 from ZmagoD/zd_SCI_2392 
prevents asset preview modal to close on click [fixes SCI-2392]
 2018-06-13 08:41:41 +02:00
Luka Murn
9a4fdd166e Merge branch 'lm-sci-2431-fix' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-sci-2431-fix 
Conflicts:
	app/views/projects/index.html.erb
 2018-06-12 17:44:42 +02:00
zmagod
f8ac083d39 adds an additional check if some other user has added/removed repository columns [fixes SCI-2408] 2018-06-12 15:28:03 +02:00
Luka Murn
a66d65fb28 Fix the sign in halt layout 
... so it's not dependant on common addon any more.
 2018-06-12 14:47:15 +02:00
zmagod
1cff4a5060 make manage columns page more responsive [fixes SCI-2442] 2018-06-12 10:22:48 +02:00
zmagod
32a09f9780 prevents asset preview modal to close on click [fixes SCI-2392] 2018-06-11 13:03:11 +02:00
okriuchykhin
acd6efae57
Merge pull request #1200 from okriuchykhin/ok_SCI_2212 
Add result content hook [SCI-2212]
 2018-06-11 09:28:30 +02:00
Zmago Devetak
6ba5c587f7
Merge pull request #1189 from ZmagoD/zd_SCI_2211 
add data-hook, refactor add user to project modal to support addons
 2018-06-08 15:23:26 +02:00
Zmago Devetak
a7dc4f8933
Merge pull request #1194 from ZmagoD/add_data_hook 
adds data-hook to copy_to_protocol_repository button [fixes SCI-2439]
 2018-06-08 14:49:48 +02:00
Oleksii Kriuchykhin
87925271e8 Add result content hook [SCI-2212] 2018-06-08 14:22:03 +02:00
Luka Murn
bfaedab4b4 Fix buttons style on tags modal 
Closes SCI-2397.
 2018-06-08 13:43:23 +02:00
zmagod
86c4093bf2 adds data-hook to copy_to_protocol_repository button [fixes SCI-2439] 2018-06-08 09:41:04 +02:00
Luka Murn
eb29c50379 Fix asset link preview, fix inventory item modal window styling 2018-06-08 09:01:59 +02:00
Luka Murn
dbceac7aa4 Style inventories secondary navigation section 2018-06-08 08:31:22 +02:00
zmagod
51e024e3d7 adds data-hooks to reports and search results [fixes SCI-2374] 2018-06-07 14:29:40 +02:00
zmagod
c0b659a252 adds data-hook to repositories/show page 2018-06-07 10:50:48 +02:00
Luka Murn
b324a2dab3 Restyle activities page 2018-06-07 09:29:47 +02:00
Luka Murn
0417af716b Remove new experiment button from canvas, change edit canvas btn 2018-06-06 17:41:07 +02:00
zmagod
43a60b632a adds datahook to experiment card [fixes SCI-2373] 2018-06-06 17:28:04 +02:00
Luka Murn
c07fa5adc2 Update blank page for projects 2018-06-06 17:23:22 +02:00
Luka Murn
e0a3b5a941 Fix Save PDF to repository modal window 2018-06-06 16:29:07 +02:00
zmagod
9b9143f145 add hook to tab pane 2018-06-01 16:46:27 +02:00
zmagod
84170f6de0 add data-hook, refactor add user to project modal to support addons 2018-06-01 16:13:22 +02:00
okriuchykhin
5ba60d9f8f
Merge pull request #1188 from okriuchykhin/ok_SCI_2478 
Improve sidebar rendering performance [SCI-2478]
 2018-06-01 15:17:34 +02:00
Luka Murn
4ba07fb082
Merge pull request #1186 from Ducz0r/lm-sci-2477-fix 
Move sign-in flow layout to core [SCI-2477]
 2018-06-01 15:08:44 +02:00
Oleksii Kriuchykhin
58d8414f92 Code fixes for sidebar [SCI-2478] 2018-06-01 15:05:12 +02:00
Oleksii Kriuchykhin
2ddc0fb561 Improve sidebar rendering performance [SCI-2478] 2018-06-01 13:49:02 +02:00
mlorb
0a8bfdb860 Reposition the arrow for opening/closing of Navigation 2018-06-01 13:18:49 +02:00
Luka Murn
20ffa57583 Move sign-in flow layout to core 
Closes SCI-2477.
 2018-06-01 09:11:48 +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
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
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
8b527d8a5b Restyle left side menu bar so it also works with lower heights 2018-05-27 15:24:49 +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
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
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
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
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
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
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
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
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
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
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
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
zmagod
4573655ec8 adds save PDF report to inventory feature [fixes SCI-2371] 2018-05-16 09:31:19 +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
dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +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
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
mlorb
7df40e56c7 UI/UX restyle - fixes throughout application part one 2018-05-08 16:33:42 +02:00
zmagod
ed6098ece6 adds deface hook in support dropdown [fixes SCI-2331] 2018-05-07 13:09:33 +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
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
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
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
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
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
3a4df069d7 remove task description info from canvas task card [fixes SCI-2187] 2018-04-24 15:11:48 +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
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
d023db16af Update the destroy_column action so it properly updates all states 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
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
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
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
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
mlorb
c149b3cc2a refactoring 2018-04-19 15:12:26 +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
66cc76f640 add view label in locales 2018-04-19 12:49:32 +02:00
zmagod
9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +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
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
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
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
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
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
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
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
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
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
mlorb
b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
zmagod
218f421dff fixes smart annotation avatar bug in pdf reports[fixes SCI-2282] 2018-04-05 15:31:25 +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
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
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
Oleksii Kriuchykhin
3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +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
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
Oleksii Kriuchykhin
51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +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
f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +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
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
mlorb
4bf9369bc5 refactor buttons 2018-03-29 13:58:14 +02:00
zmagod
7c1390ece2 implement sidebar toggle [fixes SCI-2232] 2018-03-28 14:12:11 +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
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
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
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
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
884eef9d07 Merge remote-tracking branch 'upstream/ux-release-1' into ml-sci-2118 2018-03-20 14:25:59 +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
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
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
d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
mlorb
9fd845c478 fix failing cucumber tests 2018-03-14 17:55:04 +01:00
mlorb
9de998e85c code left-side menu bar 2018-03-14 14:33:34 +01:00
zmagod
a6a25bbe08 add floating alert message 2018-03-13 16:33:48 +01:00
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
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
zmagod
51af74071c remove comments and activity modal 2018-03-13 10:52:53 +01:00
zmagod
8fe173e831 re-structure top navigation bar 2018-03-12 16:27:35 +01:00
zmagod
e218cae453 refactor global activities in separate page [fixes SCI-2141] 2018-03-12 11:01:23 +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
Oleksii Kriuchykhin
cd9260f439 Hide delete button for guest users in repository [SCI-2163] 2018-03-09 16:19:36 +01:00
Oleksii Kriuchykhin
940469e41b Fix user management on project [SCI-2146] 2018-03-09 12:08:34 +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
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
186780e68f Fix invite users link on task card [SCI-2055] 2018-03-06 17:56:01 +01:00
zmagod
fb66131e29 setup endpoint for repository_rows paging/search 2018-03-06 16:32:39 +01:00
Oleksii Kriuchykhin
ca66858063 Fix edit project's users modal [SCI-2130] 2018-03-06 15:49:30 +01:00
mz3944
bb21f6543c
Merge pull request #1004 from mz3944/mz-SCI-2011 
Wrapping up the permissions [SCI-2011]
 2018-03-06 07:10:40 +01:00
Matej Zrimšek
c5b0a6525b Some additional permission calls fixes, minor refactoring. 2018-03-06 06:56:35 +01:00
Zanz2
c5728c4018
Merge branch 'master' into null_step_crash_sci2043 2018-03-05 16:37:24 +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
Matej Zrimšek
53f75f3cd6 Minor permissions and their calls refactoring and fixing. 2018-03-04 14:49:41 +01:00
zmagod
2b55cd7090 rename variables 2018-03-02 14:14:27 +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
mlorb
08439e7f58 sign up with linkedIn account 2018-02-28 18:12:21 +01:00
zmagod
e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +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
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
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
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
95501eb046 saving work for later 2018-02-15 20:01:36 +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
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
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
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
8ef6c8f91f Refactored remaining experiment level permissions (and everything below it). 2018-02-14 14:39:07 +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
7938c2e036 Minor code style changes. 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
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
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
zmagod
ace78cfb58 fixes errors with form id duplicates [fixes SCI-2039] 2018-02-09 14:54:16 +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
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
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
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
zmagod
695e9d90d2 fixes user dropdown [fixes SCI-2033] 2018-02-07 08:43:42 +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
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
dac59cf4d0 Refactored to PR, deleted unrelated things 2018-02-06 09:06:33 +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
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
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
Oleksii Kriuchykhin
7a769bbfde Update notification settings accessor names and update Rubocop config [SCI-1968] 2018-01-29 16:15:12 +01:00
zmagod
029d69b033 revert to old setting [fixes SCI-1967] 2018-01-29 15:42:22 +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
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
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
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
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
Zmago Devetak
1e407bd9c5
removes unneeded classes 2018-01-25 11:00: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
f8a3fca2db Merge branch 'master' of https://github.com/biosistemika/scinote-web into decoupling 2018-01-23 11:06:33 +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
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
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
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
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
zmagod
0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin
86853e8fc1 Fix repository item export [SCI-1945] 2018-01-17 10:39:01 +01: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
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
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
Zanz2
3c6d37ce64 Fixed according to PR review 2018-01-11 18:37:36 +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
eb8124ea5a follow @duco 's suggestions 2018-01-05 17:08:00 +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
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
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
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
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
mlorb
abced181d5 refactor manage repository rows permissions again because of addons 2018-01-04 11:53:58 +01:00
mlorb
0c519b8f03 refactor manage sample elements permissions again because of addons 2018-01-03 16:37:02 +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
Oleksii Kriuchykhin
2e275d6d67 Add project/task path with tooltips to activities [SCI-1869] 2017-12-28 15:13:39 +01:00
Zanz2
83e1b04c7a Fixed pull request 2017-12-24 01:49:04 +01:00
Oleksii Kriuchykhin
917c2cf28e Fix experiment workflow image update indicator [SCI-1872] 2017-12-22 13:12:52 +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
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
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
72023c7dfe refactor update/delete sample permissions 2017-12-14 14:18:17 +01:00
mlorb
f801ed8eb6 refactor view/export samples permission 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
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
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
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
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
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
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
Oleksii Kriuchykhin
c4fe2b1c11 Fix jsPlumb library loading [SCI-1839] 2017-12-01 10:48:07 +01:00
zmagod
7442684846 fix protocol preview, remove unneeded functions, fix copy paste tokens 2017-11-28 14:16:20 +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
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
zmagod
d200e355ed follow @Ducz0r 's suggestions 2017-11-24 11:45:07 +01:00
Zanz2
dc5904aed9 Fixed this jira issue and added workarounds for bugs 2017-11-24 01:45:40 +01:00
Zanz2
764e5259d1 Fixed last review, and a bug i found 2017-11-22 23:38:22 +01:00
zmagod
afbeafb137 adds RTE images import, disables turbolinks on edit step actions 2017-11-22 16:28:14 +01:00
Zanz2
f577bf93b5 Fixed pull request review 2017-11-21 19:20:15 +01:00
Oleksii Kriuchykhin
fe8b7d26c1 Improve server side assets validation display for steps [SCI-1747] 2017-11-21 13:48:06 +01:00
Zanz2
d8c809ffd0 Reviewed pull request 2017-11-20 23:19:34 +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
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
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
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
84f4aba213 Pull latest master into gilson-iot-rails4 2017-11-15 15:15:26 +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
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
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
Mojca Lorber
be74338d9f add explanation when copying custom repositories 2017-11-13 16:30:42 +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
fa2c0fe556 merging 2017-11-09 18:55:17 +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
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
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
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
Zanz2
aa03a889c7 Fixed PR review 2017-11-03 16:28:15 +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
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
zmagod
e17f945d8a fix typos 2017-11-02 16:41:29 +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
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
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
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
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
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
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
zmagod
f76dc29e61 fix change user role [fixes SCI-1669] 2017-10-23 15:48:12 +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
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