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
2669 commits 43 branches 185 tags 169 MiB
Commit graph

2669 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luka Murn
3e80f761b8 Add "about" modal, prepare hooks, VERSION system for addons 
Also the addon generator is fixed so it properly creates VERSION
file for new addons.
 2017-07-10 15:27:50 +02:00
zmagod
dfd488fa96 prevents cleaning data after rspec 2017-07-10 14:38:18 +02:00
Luka Murn
16e672b9d8 Add VERSION file where the sciNote Core version is stored 2017-07-10 09:26:35 +02:00
Luka Murn
bc8d945101 Damn, I spent too much time on GeneIO. Fixing again >_< 2017-07-07 13:19:39 +02:00
Luka Murn
e9ef7b61ef Fix WickedPdf bug on production 2017-07-07 13:05:18 +02:00
zmagod
6636190442 removes unneeded gems, adds validation test to models 2017-07-06 17:37:29 +02:00
mz3944
f55861b373 Merge pull request #731 from mz3944/mz-SCI-1413 
Fixed some RoR 5.1 default settings. [SCI-1413]
 2017-07-06 17:17:27 +02:00
Luka Murn
4317da343b Don't use listen gem in development mode 2017-07-06 16:49:50 +02:00
Luka Murn
9f60ece25f Merge branch 'master' into rails-5.1 
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
 2017-07-06 15:12:15 +02:00
Matej Zrimšek
9d0fd4e76f Reverted settings for WebSockets, because we might use redis subscription adapter. [SCI-1413] 2017-07-06 12:55:58 +02:00
zmagod
234ca71f0a removes unneded gems, fixes hound 2017-07-06 09:45:59 +02:00
zmagod
34478b5ce5 restore rake tasks 2017-07-06 09:32:08 +02:00
zmagod
750c82a80f setup testing tools [fixes SCI-1400] 2017-07-06 09:07:05 +02:00
Nejc Bernot
d917cf3340 Renames the WOPI_BREADCRUMBS_HOST env variable to WOPI_USER_HOST 2017-07-05 11:52:36 +02:00
Nejc Bernot
803934e07d Changes the host for the download and redirect paths 2017-07-05 10:23:10 +02:00
Luka Murn
738fc46080 Merge pull request #730 from Ducz0r/lm-sci-1427-fix 
Fixes DEPRECATION WARNING-s for Rails 5.1.2 [SCI-1427]
 2017-07-05 09:21:35 +02:00
Nejc Bernot
91fe7fe4ad Changes the completely NOT ruby code 2017-07-04 17:13:59 +02:00
Luka Murn
e3b9c1c644 Woops, almost forgot on this one 2017-07-04 15:00:14 +02:00
Luka Murn
8d68769d09 Hound is Love, Hound is Life 2017-07-04 14:47:58 +02:00
Matej Zrimšek
843116f645 Fixed some RoR 5.1 default settings. [SCI-1413] 2017-07-04 14:42:53 +02:00
Luka Murn
91cddce8a6 Fixes DEPRECATION WARNING-s for Rails 5.1.2 
This just fixes the warning messages occured during click-through
of the application. I didn't systematically search code for all
potential problems (I couldn't find the list of all deprecations
anyway).

Closes SCI-1427.
 2017-07-04 14:35:51 +02:00
Nejc Bernot
bd9904adb3 Adds support for business servers 
If the WOPI_BUSINESS_USERS environmental variable is set and true, indicates to Office online that all users are business users when trying to view/edit files
 2017-07-04 14:27:43 +02:00
Zmago Devetak
53a1dd14b7 Merge pull request #718 from ZmagoD/zd_SCI_1129_v3 
Fixes error message [fixes SCI-1129]
 2017-07-04 11:16:36 +02:00
Zmago Devetak
5f4006fe4a Merge pull request #723 from ZmagoD/zd_SCI_1408 
Fixes bugs on canvas [fixes SCI-1408]
 2017-07-04 11:16:04 +02:00
zmagod
de78a1681a fixes bug with devise_security_extension [fixes SCI-1418] 2017-07-04 11:14:25 +02:00
okriuchykhin
75c887ce7d Merge pull request #721 from okriuchykhin/ok_SCI_1412 
Fix activities [SCI-1412]
 2017-07-04 10:59:08 +02:00
Luka Murn
9a19cb711f Version bump to 1.12.1 2017-07-04 08:00:32 +02:00
okriuchykhin
2e24e6b73a Merge pull request #725 from okriuchykhin/ok_SCI_1409 
Fix datatables [SCI-1409]
 2017-07-03 15:47:19 +02:00
mlorb
1b2884c1b7 Merge pull request #722 from mlorb/ml-sci-1396 
Fix bugs on projects page [SCI-1396]
 2017-07-03 15:37:16 +02:00
Oleksii Kriuchykhin
b234c07c13 Fix datatables [SCI-1409] 2017-07-03 15:33:50 +02:00
zmagod
311270ff49 refactor 2017-07-03 15:32:02 +02:00
Zmago Devetak
76ab8d0d3c Merge pull request #728 from ZmagoD/testing-addons 
Testing addons
 2017-07-03 15:11:33 +02:00
zmagod
6dd21e87a7 fixes bug with indexes 2017-07-03 14:48:13 +02:00
okriuchykhin
4740564a40 Merge pull request #727 from okriuchykhin/ok_SCI_1445 
Fix ordering of the columns after adding the new ones [SCI-1445]
 2017-07-03 11:55:24 +02:00
Oleksii Kriuchykhin
4c6690e59b Fix ordering of the columns after adding the new ones [SCI-1445] 2017-07-03 11:53:15 +02:00
gazvoda
b10e2aa34b Merge pull request #726 from biosistemika/lg-SCI-1430 
Added data hook and form id for GA tracking [SCI-1430]
 2017-07-03 11:34:15 +02:00
lenart
74e723d5d5 Changed data hook name and form id [SCI-1430] 2017-07-03 11:28:35 +02:00
Oleksii Kriuchykhin
5c39b90b2d Fix activities button misbehaviour with turbolinks [SCI-1412] 2017-06-30 16:33:52 +02:00
zmagod
bc33883c3c first run fixing addons 2017-06-30 10:23:28 +02:00
lenart
8ec458db91 Added data hook and form id for GA tracking [SCI-1430] 2017-06-30 10:06:54 +02:00
Mojca Lorber
a3514bdaf0 fix restore action from archives pages 2017-06-29 16:14:25 +02:00
Zmago Devetak
29413f2e55 Merge pull request #724 from ZmagoD/zd_SCI_1410 
Fix Repeat Tutorial Action / Tutorial
 2017-06-29 13:56:26 +02:00
Mojca Lorber
4fb07e1e4f fix edit comments 2017-06-29 13:33:59 +02:00
Mojca Lorber
2ab74c8979 add user variable 2017-06-29 12:56:14 +02:00
zmagod
68cfac4a38 adds images into assets folder 2017-06-29 11:04:31 +02:00
zmagod
fd13921720 fixes repeat tutorial [fixes SCI-1410] 2017-06-29 11:00:50 +02:00
zmagod
bef5a085c4 Fixes bugs on canvas [fixes SCI-1408] 2017-06-29 10:29:41 +02:00
okriuchykhin
f56e972ce6 Merge pull request #720 from okriuchykhin/ok_SCI_1411 
Fix global search [SCI-1411]
 2017-06-29 09:55:56 +02:00
Mojca Lorber
21b4ba7627 fix bugs on projects page 2017-06-28 17:15:09 +02:00
Oleksii Kriuchykhin
16a68bbaee Fix hound [SCI-1412] 2017-06-28 17:02:37 +02:00