Commit graph

6126 commits

Author SHA1 Message Date
Matej Zrimšek
a6324d61c5 Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab. 2016-09-29 14:27:26 +02:00
Mojca Lorber
5d905f0094 refactoring 2016-09-29 14:18:04 +02:00
Luka Murn
c88ae84001 Merge pull request #182 from Ducz0r/lm-fix-introductory-popup
Fix image names in introductory popup
2016-09-29 13:46:17 +02:00
Luka Murn
f1b74f1906 Fix image names in introductory popup
This will make sure browsers don't display old, cached images to clients.
2016-09-29 13:44:38 +02:00
Luka Murn
f994469cb5 Bump version to 1.3 2016-09-29 13:04:28 +02:00
Jure Grabnar
ed8df3cc62 Add favicon url to iframe 2016-09-29 12:19:29 +02:00
Zmago Devetak
d67302803a Merge pull request #180 from ZmagoD/zd_SCI_520
Changed popout content [fixes SCI-520]
2016-09-29 10:58:57 +02:00
Jure Grabnar
3bc683be8f Fix access_token_ttl calculation 2016-09-29 10:57:08 +02:00
zmagod
d95ddeaf6a changed image 2016-09-29 09:15:41 +02:00
Jure Grabnar
bc22697ebe Take/release space in putfile 2016-09-28 18:02:47 +02:00
Jure Grabnar
5e5f4c5ed4 Add text extraction on unlock 2016-09-28 17:36:53 +02:00
Jure Grabnar
02ddd64aaa Set last_modified_by on put_file 2016-09-28 17:00:19 +02:00
Mojca Lorber
f4345f3aef fixes hound 2016-09-28 16:09:39 +02:00
zmagod
cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +02:00
Mojca Lorber
efa7a1d7b5 add sample information in pop-up 2016-09-28 15:46:41 +02:00
zmagod
2a86aaf7e4 changed popout content [fixes SCI-520] 2016-09-28 15:12:30 +02:00
zmagod
485497334d generated notification related migrations and model tests 2016-09-28 14:18:52 +02:00
Jure Grabnar
1bdbc00e8c Update Gemfile.lock 2016-09-28 11:56:19 +02:00
Jure Grabnar
e96e8486ea Add check file permissions to assets controller
SCI-502 #close
2016-09-28 09:33:44 +02:00
Jure Grabnar
25c9ec67b3 Check permissions in wopi_controller 2016-09-28 09:33:44 +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
0c9292e4fc Catch GET_SHARE_URL post file action 2016-09-28 09:33:44 +02:00
Jure Grabnar
3600fbfe64 Fix UnlockUnlockedFile action
The time was nigh!
2016-09-28 09:33:44 +02:00
Jure Grabnar
674326e761 Add timestamp WOPI checking
Change status error code to 500.
2016-09-28 09:33:44 +02:00
Jure Grabnar
b51f2a3027 Add basic WOPI proof checking
Still missing validation of timestamp.
Remove web_console gem for testing.
Add relevant tests from manual for WOPI proof.
2016-09-28 09:33:44 +02:00
Jure Grabnar
0e9756ad94 Fix bad step view rebase 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
Jure Grabnar
9a8d49d513 Update Gemfile.lock 2016-09-28 09:33:44 +02:00
Nejc Bernot
b2b1d5a8f5 Initial commit of WOPI integration 2016-09-28 09:33:44 +02:00
jbargu
908f85f6c0 Merge pull request #170 from jbargu/jg_sci_485_fix_formulas
Add aliases for STDEV/VAR and ignore strings as numbers
2016-09-28 07:49:37 +02:00
zmagod
dad0d3868b fixing hound 2016-09-27 17:31:37 +02:00
zmagod
402a77526a cleaned console.log 2016-09-27 16:22:09 +02:00
zmagod
2235778110 fixed project and task comments + fixed date issue 2016-09-27 16:19:31 +02:00
Oleksii Kriuchykhin
366a49f3a1 Fixes ordering of checklist items in search results [SCI-380] 2016-09-27 13:00:51 +02:00
zmagod
0d322eba13 fixed hound 2016-09-27 11:03:10 +02:00
zmagod
4903cb970c removed comments helper 2016-09-27 10:47:18 +02:00
Oleksii Kriuchykhin
f9e5d204bb Fixes issue with scrollbar on sidebar [SCI-480] 2016-09-27 10:43:07 +02:00
zmagod
1eb9f772f4 refactor sciNote comments js and unified all comments behavior [fixes SCI-474] 2016-09-27 10:30:48 +02:00
zmagod
1cdfde827f fixes protocol and results comments 2016-09-27 09:26:25 +02:00
zmagod
980ff63104 fixed task comments 2016-09-27 09:18:46 +02:00
Oleksii Kriuchykhin
792f949a61 Fix issue with spinner in avatar upload [SCI-423] 2016-09-27 09:12:31 +02:00
zmagod
02bfa1949e fixed project comments 2016-09-27 09:00:02 +02:00
Oleksii Kriuchykhin
908ee05a23 Fix issue with words break in task description and comments [SCI-477] 2016-09-26 16:03:22 +02:00
Oleksii Kriuchykhin
8a3a9451e9 Fix issue with duplicate error messages in experiments modal [SCI-484] 2016-09-26 12:58:22 +02:00
zmagod
30a8f52216 generate new experiment img after task restored [fixes SCI-465] 2016-09-26 09:48:49 +02:00
Mojca Lorber
cc5cdf2577 Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321 2016-09-26 09:39:05 +02:00
Oleksii Kriuchykhin
db1e24202a Minor code cleanup [fixes SCI-463] 2016-09-26 09:08:38 +02:00
Mojca Lorber
c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00