Commit graph

14492 commits

Author SHA1 Message Date
Zmago Devetak
71ad5bf034 Merge pull request #190 from ZmagoD/zd_SCI_529
Prepare settings screen for notifications
2016-10-05 14:54:47 +02:00
Zmago Devetak
c547d8a07a Merge pull request #195 from ZmagoD/zd_SCI_532
add word wrapping to notifications dropdown [fixes SCI-532]
2016-10-05 14:54:10 +02:00
zmagod
dfcbebbf4f cleaned up bootstrap extension 2016-10-05 14:49:23 +02:00
okriuchykhin
bfa7e57bd8 Merge pull request #168 from okriuchykhin/ok_SCI-463
Fixes issue with unexpected notification windows [fixes SCI-463]
2016-10-05 14:45:23 +02:00
Zmago Devetak
2dd6638c8c Merge pull request #192 from ZmagoD/zd_SCI_437
Added links to notification project name and task
2016-10-05 14:36:41 +02:00
zmagod
9c7a690944 fixed type, fixed settings controller, fixes setting view on mobile devices 2016-10-05 14:33:22 +02:00
Matej Zrimšek
5d5681bffe Added code semantic and style checking for JS, ERB, and SCSS files. JS, ERB and RUBY checkers were also bound to Hound. 2016-10-05 14:28:34 +02:00
zmagod
cba4318185 add word wrapping to notifications dropdown [fixes SCI-532] 2016-10-05 13:22:33 +02:00
zmagod
5bf278298b fixed navbar on sceens smaller than 1000px 2016-10-05 12:22:27 +02:00
zmagod
f9d956bbca fix notifications number on [fixes SCI-531] 2016-10-05 11:50:57 +02:00
zmagod
c4f28c3649 made notification images bigger [fixes SCI-533] 2016-10-05 10:16:51 +02:00
zmagod
848beb5d4b minor fix 2016-10-05 09:46:18 +02:00
zmagod
d7a4f85ba1 added links to notification project name and task 2016-10-05 09:40:44 +02:00
zmagod
d90f17d1eb clean comments date duplication [fixes SCI-469] 2016-10-05 08:42:32 +02:00
Jure Grabnar
62356c36a1 Add file extension to global search 2016-10-04 19:04:08 +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
6229e6a3a1 styled notification settings button [fixes SCI-529] 2016-10-04 16:12:56 +02:00
zmagod
a68e7abc57 first run notification settings 2016-10-04 15:52:48 +02:00
Jure Grabnar
0c7cd52dba Add WOPI icons/buttons to files 2016-10-04 12:34:43 +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
mlorb
00b0f6ab07 Merge pull request #184 from mlorb/ml_sci_472
Protocol steps/results - change title for comment section, remove info tab [SCI-472]
2016-10-03 17:20:45 +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
Mojca Lorber
3b0185a45b change title of modal 2016-10-03 16:33:58 +02:00
Zmago Devetak
1aa09a2ce2 Merge pull request #187 from ZmagoD/zd_SCI_440
add notifications generators
2016-10-03 16:15:20 +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
zmagod
36fb2713b3 start fixing comments dates 2016-10-03 16:10:20 +02:00
Zmago Devetak
84313a28a0 Merge pull request #186 from ZmagoD/zd_SCI_441_vol2
code notifications in toolbar
2016-10-03 16:09:04 +02:00
Luka Murn
71458a890b Merge pull request #185 from okriuchykhin/global-notifications-SCI-444
Initial code for system notifications [SCI-444]
2016-10-03 16:05:25 +02:00
Zmago Devetak
91c7d8a952 Merge pull request #176 from ZmagoD/zd_SCI_474
Unify the comments
2016-10-03 15:26:17 +02:00
Oleksii Kriuchykhin
a39c948c5f System notifications code rework 2016-10-03 15:21:26 +02:00
Jure Grabnar
f727289935 Add lock check for editing result 2016-10-03 13:43:35 +02:00
zmagod
77df0bc82c cleans more comment link 2016-10-03 12:34:16 +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
Mojca Lorber
093fbd6b8e fixes hound again 2016-10-03 10:40:32 +02:00
Mojca Lorber
2041f2a09d fixes hound 2016-10-03 10:15:46 +02:00
Mojca Lorber
053cd8ed84 removes handler 2016-10-03 10:12:13 +02:00
Mojca Lorber
5b32be2137 adding subtitle in modal 2016-10-03 09:28:58 +02:00
zmagod
b9bc2f17c8 fixing hound 2016-10-03 08:27:13 +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
5c9e995e56 Don't delete asset on locked 2016-10-01 13:23:04 +02:00
Jure Grabnar
a2d6d9a29a Add WOPI controlls to result 2016-10-01 11:23:32 +02:00