Nejc Bernot
495c648f41
Added subdomain based routing constraints
...
Non-wopi routes will only work with the subdomain set by the env variable USER_SUBDOMAIN (if it is set). Likewise, wopi routes will only work with the WOPI_SUBDOMAIN if it is set, but they also require the WOPI_ENABLED to be true.
2016-11-30 16:43:33 +01:00
Jure Grabnar
1f67aec258
Prevent destroying protocols when file is edited
...
SCI-552 #close
2016-10-06 16:13:42 +02:00
Jure Grabnar
0c7cd52dba
Add WOPI icons/buttons to files
2016-10-04 12:34:43 +02:00
Jure Grabnar
03567d6208
Prevent archive of locked result asset
2016-10-03 17:07:57 +02:00
Jure Grabnar
f727289935
Add lock check for editing result
2016-10-03 13:43:35 +02:00
Jure Grabnar
d9fa882d6a
Add check for locked files on step delete
2016-10-01 14:51:55 +02:00
Jure Grabnar
ff47f29dc2
Add wopi file activity
...
SCI-393 #close
2016-09-29 16:16:42 +02:00
Jure Grabnar
5aea0fbb19
Refactor the rest of WOPI logic from Nejc
2016-09-28 09:33:44 +02:00
Jure Grabnar
c1ae4360a3
Refactor WopiController
2016-09-28 09:33:44 +02:00
Jure Grabnar
3217271efe
Remove default headers
2016-09-28 09:33:44 +02:00
Nejc Bernot
1b260785ec
First working version of office integration
...
Only works on scinote-preview
2016-09-28 09:33:44 +02:00
Nejc Bernot
b2b1d5a8f5
Initial commit of WOPI integration
2016-09-28 09:33:44 +02:00
mz3944
1c1a7c231e
Merge pull request #169 from mz3944/mz_help_button_SCI_13
...
Added help dropdown. [SCI-13]
2016-09-23 13:04:38 +02:00
Matej Zrimšek
fc86b7b1fd
Added help dropdown. [SCI-13]
2016-09-23 12:52:38 +02:00
Oleksii Kriuchykhin
e8ac754829
Fix issue with long tags in dropdown list [fixes SCI-470]
2016-09-23 11:05:17 +02:00
Matej Zrimšek
234918a76d
Word wrapping and truncating added to whole application [fixes SCI-458]. Fixed some bugs which were related to long/too long text and validations. Modified parts of application to accomodate for longer text limits.
2016-09-21 19:48:18 +02:00
Matej Zrimšek
c6a23aab98
Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408]
2016-09-21 19:37:36 +02:00
zmagod
06b1992e94
Merge branch 'zd_SCI_436' of https://github.com/ZmagoD/scinote-web into ZmagoD-zd_SCI_436
2016-09-21 19:20:55 +02:00
zmagod
9f56df02d2
removes comment tab and add comment in the info tab [fixes SCI-436]
2016-09-20 18:53:51 +02:00
Matej Zrimšek
c2f0106993
Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]
2016-09-16 15:56:44 +02:00
zmagod
b9b466cd8e
Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas
2016-09-16 09:28:19 +02:00
zmagod
e3ae22763e
removed comments tab in protocol step
2016-09-15 08:46:14 +02:00
Zmago Devetak
b26bf7b183
Merge pull request #136 from ZmagoD/zd_SCI_370
...
Enabled to delete results in task archive [fixes SCI-370]
2016-09-13 15:22:08 +02:00
zmagod
691ae94d2c
enabled to delete results in task archive [fixes SCI-370]
2016-09-13 13:26:04 +02:00
Zmago Devetak
d37c7b853b
Merge pull request #140 from ZmagoD/zd_SCI_341
...
adds label to current project in clone experiment modal [fixes SCI-341]
2016-09-13 11:59:01 +02:00
Jure Grabnar
e07d73420d
Remove spaces inside percent literal delimiters
...
I mean cmon, even dogs are now barking we shouldn't be using them,
hello?!
2016-09-13 09:54:40 +02:00
Jure Grabnar
6519e8dbb1
Add e-notation preprocessing to formulas
...
SCI-350 #close
2016-09-13 09:46:22 +02:00
Jure Grabnar
e5b2f29b42
Add libraries for HoT formulas
2016-09-13 09:44:17 +02:00
Luka Murn
ed72996523
Bump version to 1.2.3
2016-09-08 15:37:32 +02:00
Matej Zrimšek
40355dcc97
If file is recognized as office file, it's allowed to be any office file type.
2016-09-07 14:04:11 +02:00
Matej Zrimšek
f4d4977457
Removed header checking and added office file types grouping exceptions when checking file spoofing [fixes SCI-418]
2016-09-07 13:04:18 +02:00
zmagod
d482dff2e6
adds label to current project in clone experiment modal [fixes SCI-341]
2016-09-07 08:26:36 +02:00
Zmago Devetak
9440371f3f
Merge pull request #131 from ZmagoD/zd_SCI_400
...
Sets front end validation for experiment move action [fixes SCI-400]
2016-09-06 11:39:38 +02:00
mz3944
50e0c26e89
Merge pull request #125 from mz3944/mz_removed_avatar_upload_popop_sci_399
...
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
2016-09-05 11:49:04 +02:00
zmagod
667fb67052
sets front end validation for experiment move action [fixes SCI-400]
2016-09-02 16:31:17 +02:00
Luka Murn
77f00bf3a7
Bump version to 1.2.2
2016-09-01 11:34:28 +02:00
Matej Zrimšek
828eebeb16
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
2016-08-31 17:21:17 +02:00
Luka Murn
9ceea255b2
Bump version to 1.2.1
2016-08-31 14:29:27 +02:00
Luka Murn
ae9959dc3c
Bump version to 1.2.0
2016-08-31 11:22:03 +02:00
mlorb
905acfd43d
Merge pull request #109 from mlorb/ml_sci_286
...
fixes notification when adding new sample [SCI-286]
2016-08-30 17:54:45 +02:00
Zmago Devetak
6878adda46
Merge pull request #112 from ZmagoD/zd_SCI_338_vol2
...
Tutorial
2016-08-30 11:07:51 +02:00
zmagod
e02478b1f9
fixed tutorial labels
2016-08-30 09:35:57 +02:00
zmagod
5518d1cd1e
fixed 16 step of tutorial
2016-08-30 08:52:44 +02:00
Mojca Lorber
53cdbc2638
fixes notification when adding new sample
2016-08-29 13:45:54 +02:00
zmagod
2ac20d1af1
adds new image + new panel title [fixes SCI-336]
2016-08-29 09:28:29 +02:00
zmagod
d886d05ccb
Merge branch 'zd_SCI_338'
2016-08-26 16:32:49 +02:00
Matej Zrimšek
e3a7f45fdf
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
...
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
Zmago Devetak
0cfc758f43
Merge pull request #102 from ZmagoD/zd_SCI_336
...
implement first time popup logic
2016-08-26 09:19:36 +02:00
zmagod
2031c42920
fixed confirmation text
2016-08-26 09:13:45 +02:00
Matej Zrimšek
04d9163ff6
Paperclip file spoofing corrected/modified.
2016-08-25 18:57:06 +02:00
