scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
5384 commits 70 branches 179 tags 165 MiB
Commit graph

1497 commits

Author SHA1 Message Date
Oleksii Kriuchykhin af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Oleksii Kriuchykhin ba58eec2e2 Merge latest features/export-all [SCI-2731] 2018-10-03 11:04:44 +02:00
Oleksii Kriuchykhin 53874c4680 Fix Hound config and CSS code styling [SCI-2730] 2018-10-03 10:39:22 +02:00
Oleksii Kriuchykhin 7d995189bd Fixies after code review [SCI-2730] 2018-10-02 14:24:44 +02:00
Luka Murn d71be76657 Fix minor styling & text on settings - preferences page 2018-10-02 13:59:19 +02:00
Luka Murn 9632d1cd01 Set tooltips initialization to comply with turbolinks 
Also add custom styling options as another data attribute.
 2018-10-02 13:49:19 +02:00
Luka Murn c12f77d1d1 Fix styling (ESLint) on tooltip_helper.js 2018-10-02 11:25:51 +02:00
Oleksii Kriuchykhin 492a5de19e Add Projects view - list/table view [SCI-2731] 2018-10-01 15:39:42 +02:00
Zanz2 ada98e9eaf
Merge pull request #1289 from Zanz2/step_save_table_too_long_bug_sci2719 
Fixed bug with table name of step not being length validated [SCI-2719]
 2018-09-28 14:37:08 +02:00
Zanz2 16f9728a05 fixed to not use gon gem 2018-09-28 14:26:05 +02:00
Zanz2 c6936bc71e fixed the implementation according to PR review, now validates all table names, when multiple are present, and uses gon gem 2018-09-28 13:13:25 +02:00
Oleksii Kriuchykhin 2508394924 Refactor Projects view - cards view [SCI-2730] 2018-09-27 10:43:44 +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
Zanz2 87d2b0db14 fixed accordign to pr review 2018-09-24 15:57:31 +02:00
Zanz2 b536aa6f3e
Merge pull request #1287 from Zanz2/zz_dropdown_blue_sci2672 
Fixed blue block in dropdown, now its a full line [SCI-2672]
 2018-09-23 11:27:00 +02:00
Zanz2 5b955da74c makes tooltip behaviour more reliable and less erratic 2018-09-16 21:34:36 +02:00
Zanz2 07757e382a fixed hound 2018-09-14 13:43:31 +02:00
Zanz2 22a565a684 Made fixes according to review 2018-09-14 13:07:09 +02:00
Luka Murn f9d771d01a
Add minor comment 2018-09-13 14:50:00 +02:00
Luka Murn 0ddc3e0968
Merge pull request #1303 from biosistemika/release-1.14.4 
Merge release-1.14.4 into master
 2018-09-13 14:47:17 +02:00
Zanz2 a9c0201fcc
Merge pull request #1277 from Zanz2/zz_export_items_unselectable_sci2629 
Fixed disabled export button after new inventory item save [SCI-2629]
 2018-09-13 11:35:07 +02:00
Luka Murn 99c156de94 Fix (hopefully) the TinyMCE files from being cached 
Closes SCI-2717.
 2018-09-12 15:28:21 +02:00
Zanz2 a0c6a0c407 changed name of data attribute 2018-09-07 15:33:38 +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 7d093fa11d Fixed the issue, tested for all 3 reported scenarios 2018-08-31 11:18:18 +02:00
Zanz2 67f4555584 Fixed the issue, tested all 3 scenarios 2018-08-31 11:04:20 +02:00
Zanz2 db610f146f fixed hound 2018-08-29 11:41:07 +02:00
Zanz2 c84ff3d9fe Small oversight fix 2018-08-29 11:37:07 +02:00
Zanz2 ed5a5e7390 Fixed blue block in dropdown, now its a full line 2018-08-29 11:33:20 +02:00
Luka Murn b71c5d14c6 Fix bootstrap-select to work with turbolinks 5.x 
This was causing invite users modal, among other things, to not
function correctly after visiting another redirect within SciNote
using Turbolinks 5.x.

Closes SCI-2707.
 2018-08-24 17:11:59 +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
Luka Murn 92eab25a07
Merge pull request #1261 from mlorb/ml-sci-2634 
fix editing of inventory items of hidden columns [SCI-2634]
 2018-08-21 16:59:37 +02:00
Luka Murn 92a4a54ae7 Slighty change the parameter parsing of removed file cells 2018-08-21 16:46:47 +02:00
Zanz2 6e4730619f Fixed the bug, disabled class in dropdown menu when there was no need 2018-08-21 14:29:34 +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 9a482eab2e Checkbox now gets styled properly and defaults to true 2018-08-21 09:02:54 +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
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 9fd02e71c9 initial popover/tooltip config 2018-08-16 13:04:42 +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
Zanz2 27e0d27862
Merge pull request #1248 from Zanz2/zz_checklist_duplicates_bug_sci_1621 
Fixes duplicate checkbox entries in activity log [SCI-1621]
 2018-08-09 11:50:34 +02:00
mlorb a6dd577b4e fix time zone selector 2018-08-08 11:43:18 +02:00
mlorb f52ccfd606 fix editing of inventory items of hidden columns 2018-08-07 11:47:26 +02:00
Oleksii Kriuchykhin 8f5d30ad1f Fix load protocol modal [SCI-2253] 2018-08-02 14:35:19 +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 812a3dcf7d Fix user profile edit form [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
Zanz2 c6ef14290a Fixes too many events getting bound to a onclick event, by removing them before attaching the event listener again 2018-07-17 11:41:42 +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 752fb8dcd8
Merge pull request #1238 from ZmagoD/zd_SCI_2511 
fixes smart annotation serch queries/dropdown item picker [fixes SCI-…
 2018-07-13 14:54:42 +02:00
Luka Murn 13aab686b1
Merge pull request #1242 from ZmagoD/zd_SCI_2492 
adds the ability to scroll to the active element in the navigation si…
 2018-07-13 14:54:30 +02:00
zmagod 1491c61d51 trim long file names [fixes SCI-2593] 2018-07-09 17:00:47 +02:00
zmagod 62d4796741 adds the ability to scroll to the active element in the navigation sidebar on page load [fixes SCI-2492] 2018-07-09 15:40:52 +02:00
Zmago Devetak a6a395e394
Merge pull request #1240 from ZmagoD/zd_SCI_2593 
fixes css for new repository item field field [fixes SCI-2593]
 2018-07-09 13:15:15 +02:00
zmagod 10d20a6555 fixes datatable header on add new item action 2018-07-09 13:12:48 +02:00
zmagod 6585eaa338 fixes hound 2018-07-09 12:55:25 +02:00
zmagod 14254fbde3 fixes per @mlorb 's request 2018-07-09 12:54:02 +02:00
zmagod dd00de928c fixes css for new repository item field field [fixes SCI-2593] 2018-07-09 10:33:19 +02:00
Oleksii Kriuchykhin 3aceb12f03 Fix delete button in inventories [SCI-2594] 2018-07-08 21:59:02 +02:00
zmagod e654725d9e fixes smart annotation serch queries/dropdown item picker [fixes SCI-2511] 2018-07-06 14:26:20 +02:00
Zmago Devetak db90736c62
Merge pull request #1237 from ZmagoD/zd_SCI_2512 
fixes list item height on columns management page [fixes SCI-2512]
 2018-07-06 10:47:29 +02:00
zmagod f1833b9bc1 fixes list item height on columns management page [fixes SCI-2512] 2018-07-06 09:28:03 +02:00
zmagod a55d0b9c85 fixes file name label in repository file field [fixes SCI-2592] 2018-07-05 16:59:59 +02:00
Oleksii Kriuchykhin a169639b3c Fix uploaded file max size validation in JS [SCI-2590] 2018-07-05 15:23:26 +02:00
zmagod fdedfec7d3 fixes bug with bootstrap-select 2018-07-04 17:38:16 +02:00
Zmago Devetak eb61f728b4
Merge pull request #1227 from ZmagoD/zd_SCI_2546 
Refactor inline row editing in repository
 2018-07-04 15:28:08 +02:00
zmagod 5b9b86a2d4 fixes per @Ducz0r 's request 2018-07-04 15:23:41 +02:00
zmagod c9dd8b356a fixes locale, fixes custom file upload style 2018-07-04 13:43:45 +02:00
zmagod 43903080ce code style fixes 2018-07-04 12:42:28 +02:00
zmagod 3eef4f87bf fixes hound alerts 2018-07-03 16:18:44 +02:00
zmagod 8b86891177 fixes file destroy button [fixes SCI-2546] 2018-07-03 15:25:37 +02:00
zmagod 28bac14667 first working version of the edit form object 2018-07-03 12:57:39 +02:00
zmagod c93e00b8c2 Merge branch 'master' of https://github.com/biosistemika/scinote-web into zd_SCI_2546 2018-07-03 09:13:54 +02:00
ZmagoD 1e66d25578 refactor list item dropdown 2018-07-02 17:05:52 +02:00
ZmagoD 23de3abd61 Fixes repository items edit action, adds additional event listener for file upload 2018-06-29 16:59:26 +02:00
nbernot 7aacc2b4a2 extract repository_item html form creation in to a separate 'class' 2018-06-29 14:28:06 +02:00
zmagod 0dbd2dc877 fixes typo 2018-06-29 10:29:39 +02:00
zmagod eb75f6c03d fixes bug with checkAvailableColumns function [fixes SCI-2578] 2018-06-29 10:28:46 +02:00
okriuchykhin 10554fecb4
Merge pull request #1223 from ZmagoD/zd_SCI_2566 
fixes tagsinput text-area on long input [fixes SCI-2566]
 2018-06-28 10:50:12 +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
zmagod 1a15ac7acf fixes setting sidebar teams link[fixes SCI-2429] 2018-06-26 13:09:56 +02:00
zmagod 4b81c2c4db fixes tagsinput text-area on long input [fixes SCI-2566] 2018-06-26 09:52:07 +02:00
zmagod db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +02:00
mlorb 0792ce46af fix firefox bug with browse buttons position 2018-06-19 13:39:03 +02:00
zmagod 5f1489a100 fix columns check [fixes SCI-2408] 2018-06-18 13:36:56 +02:00
zmagod 2f141e9217 disable buttons on new/edit repository_item action [fixes SCI-2410] 2018-06-15 11:37:01 +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 d457a66996
Merge pull request #1205 from ZmagoD/zd_SCI_2427 
enables tooltip on long column names [fixes SCI-2427]
 2018-06-13 11:14:29 +02:00
Zmago Devetak a8981d7039
Merge pull request #1201 from ZmagoD/zd_SCI_2421 
fixes bug with tinymce/at.js [fixes SCI-2421]
 2018-06-13 11:14:17 +02:00
Zmago Devetak 673410251d
Merge pull request #1197 from ZmagoD/zd_SCI_2384 
fixes repository table on sidebar toggle [fixes SCI-2384]
 2018-06-13 09:57:27 +02:00
Zmago Devetak 50c1a712d8
Merge pull request #1204 from ZmagoD/zd_SCI_2434 
fixes bug with repository items dropdown [fixes SCI-2434]
 2018-06-13 08:42:13 +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
Zmago Devetak e06ab02f68
Merge pull request #1192 from ZmagoD/zd_SCI_2435 
removes visibility toggle from Name column [fixes SCI-2435]
 2018-06-13 08:41:25 +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
zmagod 1cff4a5060 make manage columns page more responsive [fixes SCI-2442] 2018-06-12 10:22:48 +02:00
zmagod a8971b4e20 enables tooltip on long column names [fixes SCI-2427] 2018-06-11 15:22:56 +02:00
Zmago Devetak a174e186bb
removes unneeded code 2018-06-11 15:00:13 +02:00
zmagod 256e502982 fixes bug with repository items dropdown [fixes SCI-2434] 2018-06-11 14:57:27 +02:00
mlorb 1e1330847f remove unused code 2018-06-11 14:49:03 +02:00
mlorb 40f3365596 fix bug with truncating string 2018-06-11 14:47:25 +02:00
zmagod 32a09f9780 prevents asset preview modal to close on click [fixes SCI-2392] 2018-06-11 13:03:11 +02:00
zmagod 374a16abad fixes bug with tinymce/at.js [fixes SCI-2421] 2018-06-11 10:18:35 +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
Luka Murn bfaedab4b4 Fix buttons style on tags modal 
Closes SCI-2397.
 2018-06-08 13:43:23 +02:00
zmagod b7ecf09963 fixes repository table on sidebar toggle [fixes SCI-2384] 2018-06-08 10:58:28 +02:00
Luka Murn dbceac7aa4 Style inventories secondary navigation section 2018-06-08 08:31:22 +02:00
Luka Murn 4cdfe67115 Fix protocol management filter display (css) 2018-06-07 15:57:59 +02:00
Luka Murn b324a2dab3 Restyle activities page 2018-06-07 09:29:47 +02:00
zmagod a51ea399f4 removes unneeded empty lines 2018-06-05 16:39:22 +02:00
zmagod 66cac0b676 removes visibility toggle from Name column [fixes SCI-2435] 2018-06-05 16:36:36 +02:00
zmagod 997748561b adds missing js changes 2018-06-01 16:14:50 +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
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
Zmago Devetak 28abdf285e
Merge pull request #1183 from ZmagoD/zd_SCI_2451_v2 
fixes sidebar [fixes SCI-2451]
 2018-05-30 18:21:03 +02:00
mlorb c17a947969
Merge pull request #1182 from mlorb/ml-sci-2459 
Fix position of navigation bar is not saved [SCI-2459]
 2018-05-30 18:10:01 +02:00
mlorb 35badd8bb8 move variable declaration 2018-05-30 17:58:18 +02:00
zmagod e06ae9b543 fixes sidebar [fixes SCI-2451] 2018-05-30 16:53:08 +02:00
mlorb 100ddf127d fix position of navigation bar is not saved 2018-05-30 16:46:27 +02:00
mlorb 858b95d851 fix align bullet with a file name 2018-05-30 13:58:16 +02:00
zmagod b74598a748 fixes bug with empty submit of repository row [fixes SCI-2420] 2018-05-29 14:47:40 +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
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
zmagod 485993f2f6 fixes sidebar animation [fixes SCI-2451] 2018-05-28 10:28:35 +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
zmagod 6512970b9c adds flash_message div in manage repository column page 2018-05-25 14:36:15 +02:00
Luka Murn fe3ddb7c65 Update code so it works 2018-05-25 08:50:27 +02:00
Luka Murn c9f3de9f27 Improve toggle 2018-05-24 13:39:04 +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 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 c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +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
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
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 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
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
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 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 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
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 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 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 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
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
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
mlorb dfe65ccaed UI/UX restyle - fixes throughout application - part 2 2018-05-14 18:33:57 +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 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
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
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 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 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
zmagod f04677600b fix the missing icons on task card [fixes SCI-2347] 2018-05-03 10:05:40 +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 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
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 3a4df069d7 remove task description info from canvas task card [fixes SCI-2187] 2018-04-24 15:11:48 +02:00
zmagod c2d19fee52 fixes images preview in repository/library [fixes SCI-2321] 2018-04-24 13:11:55 +02:00
zmagod 824962c084 propagate assigned repository items in workflow [fixes SCI-2261] 2018-04-23 11:33:16 +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 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
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
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
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 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 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
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
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