scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 23:15:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
4467 commits 43 branches 185 tags 169 MiB
Commit graph

1045 commits

Author SHA1 Message Date
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
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
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
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
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
zmagod
db1944cc90 move maximum file size limit to an ENV variable [fixes SCI-2415] 2018-06-19 14:15:14 +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
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
zmagod
b7ecf09963 fixes repository table on sidebar toggle [fixes SCI-2384] 2018-06-08 10:58:28 +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
mlorb
0a8bfdb860 Reposition the arrow for opening/closing of Navigation 2018-06-01 13:18:49 +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
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
zmagod
b74598a748 fixes bug with empty submit of repository row [fixes SCI-2420] 2018-05-29 14:47:40 +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
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
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
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
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
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
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