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
4295 commits 31 branches 181 tags 166 MiB
Commit graph

4295 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ff485cb75d Update wording on 'save protocol to protocol repository' modal 2018-06-06 16:38:04 +02:00
Luka Murn
e0a3b5a941 Fix Save PDF to repository modal window 2018-06-06 16:29:07 +02:00
Luka Murn
b6c4f724db Update text when no experiments are found for moving tasks 2018-06-06 16:10:55 +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
Luka Murn
1bc869d4ca
Update VERSION to 1.14.2 2018-06-05 10:23:00 +02:00
Luka Murn
3823eb8c74
Merge pull request #1191 from ZmagoD/zd_SCI_2486 
fixes project duplication [fixes SCI-2486]
 2018-06-05 09:49:34 +02:00
zmagod
2def874ffd fixes project duplication [fixes SCI-2486] 2018-06-05 09:44:03 +02:00
Zmago Devetak
fad67d7730
Merge pull request #1185 from ZmagoD/zd_SCI_2468 
Limits the max. amount of rows when importing into inventories [fixes…
 2018-06-04 16:29:33 +02:00
Luka Murn
4092e0da44
Update VERSION to 1.14.1 2018-06-02 08:33:07 +02:00
zmagod
9b9143f145 add hook to tab pane 2018-06-01 16:46:27 +02:00
okriuchykhin
04accc8fc8
Merge pull request #1190 from okriuchykhin/ok_SCI_2478 
Fix project_tree for non admin users [SCI-2478]
 2018-06-01 16:40:05 +02:00
Oleksii Kriuchykhin
8de0e282e3 Fix project_tree for non admin users [SCI-2478] 2018-06-01 16:38:49 +02:00
zmagod
997748561b adds missing js changes 2018-06-01 16:14:50 +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
mlorb
d19fd276e9
Merge pull request #1187 from mlorb/ml-sci-2452 
Reposition the arrow for opening/closing of Navigation [SCI-2452]
 2018-06-01 14:14:35 +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
c6cf5f1aab
Update VERSION to 1.14.0 2018-05-31 15:15:47 +02:00
zmagod
9abf50e7c5 Limits the max. amount of rows when importing into inventories [fixes SCI-2468] 2018-05-31 10:45:31 +02:00
zmagod
3da098cb60 fixes the issue with extraction of text from file [fixes SCI-2417] 2018-05-31 09:42:57 +02:00
Luka Murn
58e6701b0a
Merge pull request #1181 from Ducz0r/lm-sci-2471-fix 
Fix inventory rows without files not being saved bug [SCI-2471]
 2018-05-30 18:33:50 +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
zmagod
e0908fb85f adds asset_text_data to global search options 2018-05-30 18:18:09 +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
mlorb
8b79424a13
Merge pull request #1180 from mlorb/ml-sci-2390 
Fix align bullet with a file name [SCI-2390]
 2018-05-30 17:46:27 +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
Luka Murn
68f5a6bebd Fix inventory rows without files not being saved bug 
Closes SCI-2471.
 2018-05-30 14:41:20 +02:00
mlorb
858b95d851 fix align bullet with a file name 2018-05-30 13:58:16 +02:00
okriuchykhin
3253cac86f
Merge pull request #1178 from okriuchykhin/ok_SCI_2462 
Add user id tracking when discarding repository [SCI-2462]
 2018-05-30 10:23:17 +02:00
Luka Murn
b2fc130a83
Merge pull request #1179 from Ducz0r/lm-fix-clean-repositories-script 
Fix the clean repositories script so it does not crash
 2018-05-29 16:40:20 +02:00
Luka Murn
e74d9eef7b Fix the clean repositories script so it does not crash 2018-05-29 16:38:25 +02:00
Zmago Devetak
332ddd9c10
Merge pull request #1177 from ZmagoD/zd_SCI_2420 
fixes bug with empty submit of repository row [fixes SCI-2420]
 2018-05-29 15:38:45 +02:00
Oleksii Kriuchykhin
6cf9149baa Add user id tracking when discarding repository [SCI-2462] 2018-05-29 15:33:02 +02:00
Luka Murn
b8ce934976
Update sciNote logo in README.md 2018-05-29 15:03:59 +02:00
zmagod
b74598a748 fixes bug with empty submit of repository row [fixes SCI-2420] 2018-05-29 14:47:40 +02:00
Zmago Devetak
6fa0674171
Merge pull request #1176 from ZmagoD/zd_SCI_2395 
fixes items assign flash message [fixes SCI-2395]
 2018-05-29 13:14:52 +02:00
zmagod
89046e9787 fixes items assign flash message [fixes SCI-2395] 2018-05-29 12:54:41 +02:00
okriuchykhin
6deaa7235b
Merge pull request #1136 from okriuchykhin/ok_SCI_2396 
Handle situation with smart annotations and zero inventories [SCI-2396]
 2018-05-28 17:23:29 +02:00
Luka Murn
cc5b4b75cc Merge branch 'ux-release-1' 2018-05-28 15:59:53 +02:00
Zmago Devetak
147e74b4a5
Merge pull request #1164 from ZmagoD/zd_SCI_2448 
adds discard gem, move deletion of repositories in a rake task to run…
 2018-05-28 15:04:54 +02:00