scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 10:06:53 +08:00
Code Issues Projects Releases Packages Wiki Activity
4078 commits 44 branches 180 tags 166 MiB
Commit graph

4078 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zmago Devetak
e30b2261a8
Merge pull request #1077 from ZmagoD/zd_SCI_2279 
fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279]
 2018-04-05 16:52:16 +02:00
Zmago Devetak
71531ebf12
refactor 2018-04-05 16:46:09 +02:00
mlorb
b8e91e91a1 refactor settings into the new navigation bar 2018-04-05 16:30:02 +02:00
Zmago Devetak
cafe042494
Merge pull request #1079 from ZmagoD/zd_SCI_2282 
fixes smart annotation avatar bug in pdf reports[fixes SCI-2282]
 2018-04-05 16:12:23 +02:00
Luka Murn
3834241cd6
Merge pull request #1078 from Ducz0r/lm-sci-2266-fix 
Fix Office Online (WOPI) editing of files [SCI-2266]
 2018-04-05 15:37:51 +02:00
zmagod
218f421dff fixes smart annotation avatar bug in pdf reports[fixes SCI-2282] 2018-04-05 15:31:25 +02:00
Luka Murn
386ede0400 Add special middleware for handling of Rails 5.1 WOPI errors 
Closes SCI-2266.
 2018-04-05 13:26:08 +02:00
Luka Murn
159078170a Update Paperclip library to 5.3 version 2018-04-05 13:23:34 +02:00
zmagod
c0cc6c293a fixes tiny_mce pdf report in filesystem storage mode [fixes SCI-2279] 2018-04-05 13:15:32 +02:00
zmagod
030ce271be fixes name validations 2018-04-05 10:47:47 +02:00
zmagod
515c95061c fixes delete column action 2018-04-05 09:56:09 +02:00
zmagod
afc2a35557 move import export to dropdown 2018-04-05 09:32:34 +02:00
zmagod
a8a19df06d Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2218_2219 2018-04-05 08:51:58 +02:00
zmagod
d47337fbf3 remove destroy column modal 2018-04-05 08:51:21 +02:00
okriuchykhin
e608d629c7
Merge pull request #1068 from okriuchykhin/ok_SCI_2217 
Refactor file preview modal [SCI-2217]
 2018-04-05 00:18:43 +02:00
Oleksii Kriuchykhin
9720063fb3 Fix tests [SCI-2217] 2018-04-05 00:06:11 +02:00
Zanz2
9751610710
Merge pull request #1074 from Zanz2/upload_button_bug_SCI-2268 
Fixed the bug causing the button not to work [SCI-2268]
 2018-04-04 17:15:07 +02:00
mlorb
ab58354cbe
Merge pull request #1076 from mlorb/ml-sci-2220 
fix merge bananas
 2018-04-04 16:59:19 +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
Luka Murn
98d91c2da7
Merge pull request #1075 from Ducz0r/lm-remove-remotipart-from-gemfile-lock 
Remove remotipart from Gemfile.lock
 2018-04-04 16:01:32 +02:00
Luka Murn
dd961c408f Remove remotipart from Gemfile.lock 
This was forgotten when fixing SCI-2270.
 2018-04-04 15:56:08 +02:00
Zmago Devetak
ab48e4f527
Merge pull request #1072 from ZmagoD/zd_SCI_2239 
change export model wording [fixes SCI-2239]
 2018-04-04 15:40:18 +02:00
Zmago Devetak
d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206 
add ID column to repository [fixes SCI-2206]
 2018-04-04 15:39:59 +02:00
Zanz2
cff2f933a0 removed byebug :D 2018-04-04 15:19:00 +02:00
Zanz2
ec743a7420 fixed the issue 2018-04-04 15:16:31 +02:00
zmagod
77f80271dd fixes per @mojca 's request 2018-04-04 14:52:59 +02:00
zmagod
6e255a4657 fixes failing specs 2018-04-04 14:44:32 +02:00
Oleksii Kriuchykhin
3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
Oleksii Kriuchykhin
8ee98b7cf0 Update Capybara and dependencies [SCI-2217] 2018-04-04 14:13:37 +02:00
Zmago Devetak
c71a8a7506
Merge pull request #1047 from ZmagoD/zd_SCI_2139_2121 
adds libraries/repositories to sidebar navigation and blank page for no libraries/repositories
 2018-04-04 13:58:24 +02:00
zmagod
5eb007f4d2 fixes per @mlorb 's request 2018-04-04 13:22:14 +02:00
zmagod
38b84edfb0 Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2139_2121 2018-04-04 12:59:41 +02:00
zmagod
e630d3113f add ID column to repository [fixes SCI-2206] 2018-04-04 11:55:11 +02:00
Zanz2
4259fa44f9
Merge pull request #1069 from Zanz2/remotipart_workaround 
Remotipart workaround [SCI-2270]
 2018-04-04 11:27:30 +02:00
Zanz2
7f36ab3e5e deleted require and gemfile entry for remotipart 2018-04-04 11:12:39 +02:00
Zmago Devetak
685255afbc
Merge pull request #1065 from ZmagoD/zd_SCI_2222 
refactor smart annotation parser, adds repository item to smart annot…
 2018-04-04 11:07:29 +02:00
zmagod
8a156ad91e change method name 2018-04-03 13:05:25 +02:00
mlorb
11c0f5e5a1
Merge pull request #1067 from mlorb/ml-sci-2243 
Style Guide - refactor colors, typography and buttons [SCI-2243]
 2018-04-03 11:30:02 +02:00
zmagod
3d5137b56f change export model wording [fixes SCI-2239] 2018-04-03 11:22:23 +02:00
okriuchykhin
f20aebbed0
Merge pull request #1071 from okriuchykhin/ok_SCI_2265 
Fix repository rows permissions [SCI-2265]
 2018-04-03 11:03:41 +02:00
mlorb
e5e92eb215 fix the rest of the constants 2018-04-03 10:28:39 +02:00
zmagod
7dfec94ffc remove samples from smart annotations 2018-04-03 09:43:12 +02:00
Oleksii Kriuchykhin
d8d2d75631 Fix repository rows permissions [SCI-2265] 2018-04-02 20:48:44 +02:00
Oleksii Kriuchykhin
51860652c1 Refactor smart annotations modal [SCI-2223] 2018-04-02 20:38:56 +02:00
Zanz2
2fab3e4caa
Overlooked a small change #2 2018-04-02 20:05:06 +02:00
Zanz2
25619e5e01
Overlooked a small change 2018-04-02 20:02:59 +02:00
Zanz2
1606982966 found a hackish fix by doing a manual ajax call and some other things with jquery 2018-04-02 19:56:25 +02:00
Oleksii Kriuchykhin
b7c31d704f Merge branch 'zd_SCI_2222' of git://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_2222 2018-04-01 11:10:18 +02:00