Commit graph

3638 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
246dae4f46 Code style improvements according to hound [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8907e54b49 Global notifications index page added [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
8b5b0723d1 Initial code commit 2016-10-05 15:51:11 +02:00
zmagod
9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
Jure Grabnar
85d2370d28 Change some values to string in CheckFileInfo 2016-10-04 18:19:36 +02:00
Jure Grabnar
3e74c96085 Add wd* params to iframe action url 2016-10-04 18:00:08 +02:00
zmagod
a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Luka Murn
61cb9651c7 Merge pull request #188 from biosistemika/global-notifications
Global notifications
2016-10-04 08:30:50 +02:00
zmagod
c9bbab1004 added html_safe to outputed message, hide notifications number when dropdown is toggled, clear all unseen notification form count when the dropdown is toggled, generate notification only to other users 2016-10-03 20:31:00 +02:00
Jure Grabnar
72c5824e67 Remove navbar for viewing WOPI files 2016-10-03 20:02:13 +02:00
Jure Grabnar
ec82f64df2 Add WOPI breadcrumbs 2016-10-03 19:45:39 +02:00
Jure Grabnar
1949b1fe88 Add CloseUrl to WOPI 2016-10-03 18:25:01 +02:00
Jure Grabnar
03567d6208 Prevent archive of locked result asset 2016-10-03 17:07:57 +02:00
mlorb
153b692c0c Merge pull request #181 from mlorb/ml_sci_321
Displaying more information for individual samples in Sample table [SCI-321]
2016-10-03 16:37:35 +02:00
zmagod
0d23f05698 Merge branch 'global-notifications' of https://github.com/biosistemika/scinote-web into zd_SCI_440 2016-10-03 16:14:22 +02:00
Jure Grabnar
f727289935 Add lock check for editing result 2016-10-03 13:43:35 +02:00
zmagod
947096862d fixed hound 2016-10-03 11:40:59 +02:00
zmagod
ea17182372 generate notifications [fixes SCI-440] 2016-10-03 11:37:29 +02:00
zmagod
2ee02ec472 mark all seen notifications 2016-10-03 08:20:23 +02:00
Jure Grabnar
1e14955ade Prevent deleting asset on step update 2016-10-01 18:47:05 +02:00
Jure Grabnar
d9fa882d6a Add check for locked files on step delete 2016-10-01 14:51:55 +02:00
Jure Grabnar
a2d6d9a29a Add WOPI controlls to result 2016-10-01 11:23:32 +02:00
Jure Grabnar
ff47f29dc2 Add wopi file activity
SCI-393 #close
2016-09-29 16:16:42 +02:00
zmagod
e1a1b93d44 fixed migrations 2016-09-29 14:49:58 +02:00
Jure Grabnar
ed8df3cc62 Add favicon url to iframe 2016-09-29 12:19:29 +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
zmagod
cab1e9b521 start implement toolbar view 2016-09-28 16:03:52 +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
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
zmagod
dad0d3868b fixing hound 2016-09-27 17:31:37 +02:00
zmagod
2235778110 fixed project and task comments + fixed date issue 2016-09-27 16:19:31 +02:00
Mojca Lorber
c2b742374f adding popup sample info 2016-09-23 17:45:02 +02:00
Matej Zrimšek
13e886f7a9 Removed unneeded upper case for errors which had them, along with their refactoring. [fixes SCI-408] 2016-09-22 17:35:23 +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
Zmago Devetak
5fedcb4be2 Merge pull request #160 from ZmagoD/zd_SCI_464
Fixes restore experiment error [fixes SCI-464]
2016-09-21 19:24:33 +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
8a8bf10f08 clean up flash label 2016-09-21 19:09:57 +02:00
zmagod
bf8e2a208f fixes restore experiment error [fixes SCI-464] 2016-09-21 08:34:32 +02:00
zmagod
42bbc47f5f first working version 2016-09-20 17:06:07 +02:00
zmagod
da86208441 styled step comments 2016-09-20 14:13:40 +02:00