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
3524 commits 70 branches 179 tags 165 MiB
Commit graph

3524 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Luka Murn d6156e2f4a
Bump VERSION to 1.13.0 2018-04-06 10:50:17 +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
Zmago Devetak 71531ebf12
refactor 2018-04-05 16:46:09 +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
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
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
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
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
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
Oleksii Kriuchykhin d8d2d75631 Fix repository rows permissions [SCI-2265] 2018-04-02 20:48:44 +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
okriuchykhin 31c68ab4bc
Merge pull request #1062 from okriuchykhin/ok_SCI_2201 
Rescale Linkedin buttons [SCI-2201]
 2018-03-28 15:23:05 +02:00
Luka Murn bccf9f1a5b
Merge pull request #1064 from Ducz0r/lm-sci-2264-fix 
Fix Office Online editing of files [SCI-2264]
 2018-03-28 13:27:52 +02:00
Luka Murn c07dc98cc8 Fix Office Online editing of files [SCI-2264] 
Office Online files could not be edited. I believe the reason
was that in Rails 5.1, `render nothing: true` was removed. So
I replaced this in `wopi_controller` with `render body: nil`.
Hopefully this will do the trick.

Closes SCI-2264.
 2018-03-28 13:22:30 +02:00
okriuchykhin 13fed0411b
Merge pull request #1063 from biosistemika/release-1.12.11 
merge release 1.12.11 branch to master
 2018-03-27 16:19:57 +02:00
Oleksii Kriuchykhin 1ed0b16d12 Rescale Linkedin buttons [SCI-2201] 2018-03-27 15:00:28 +02:00
Luka Murn 18ef385c6e
Merge pull request #1061 from okriuchykhin/ok_SCI_2251_v2 
Disable turbolinks on tasks navigation [SCI-2251]
 2018-03-27 08:34:11 +02:00
Oleksii Kriuchykhin 31aed55ffc Disable turbolinks on tasks navigation [SCI-2251] 2018-03-26 17:55:51 +02:00
okriuchykhin b5dcd3aeb4
Merge pull request #1060 from biosistemika/revert-1056-ok_SCI_2251 
Revert "Update turbolinks and fix repository table init [SCI-2251]"
 2018-03-26 17:39:39 +02:00
okriuchykhin 145f49de2d
Revert "Update turbolinks and fix repository table init [SCI-2251]" 2018-03-26 17:38:48 +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
okriuchykhin fc06f8c60b
Merge pull request #1055 from okriuchykhin/ok_SCI_2250 
Skip asset if file is missing in protocol export [SCI-2250]
 2018-03-26 14:19:49 +02:00
Oleksii Kriuchykhin 5dc01a3d42 Fix code style [SCI-2251] 2018-03-26 13:59:45 +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
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
zmagod c61efb0624 rename before_acton hook 2018-03-26 13:07:00 +02:00
mlorb 3ad7963036
Merge pull request #1053 from mlorb/ml-sci-2245 
Improve message for deleting sample/report items [SCI-2245]
 2018-03-26 09:23:16 +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
Oleksii Kriuchykhin ecd3c73772 Skip asset if file is missing in protocol export [SCI-2250] 2018-03-25 13:36:24 +02:00
mlorb 5589b27883 improve message for deleting sample/report items 2018-03-23 14:39:09 +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
okriuchykhin 06fe9dac51
Merge pull request #1015 from okriuchykhin/ok_SCI_1849_v2 
Add team export/import scripts [SCI-1849]
 2018-03-19 15:40:43 +01:00
Zmago Devetak 255ff32605
Merge pull request #1041 from ZmagoD/zd_SCI_2194 
adds permission check to archived project  SCI-2194
 2018-03-19 15:39:37 +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
okriuchykhin 95425dc64b
Merge pull request #1034 from okriuchykhin/ok_SCI_2148 
Add explicit ordering to samples_tables [SCI-2148][SCI-2149]
 2018-03-16 11:15:23 +01:00