Commit graph

2370 commits

Author SHA1 Message Date
Jure Grabnar
b52e596209 Update protocol timestamp on put_file
SCI-551 #close
2016-10-06 14:37:42 +02:00
Luka Murn
156d8f755e Merge pull request #199 from Ducz0r/lm-sys-notifications-rake-task
Update the system notification rake task
2016-10-06 14:23:22 +02:00
Zmago Devetak
b363799e8b Merge pull request #200 from ZmagoD/zd_SCI_553_554
fixes notification page issues and settings page design
2016-10-06 14:11:47 +02:00
zmagod
0bdf77562d add word-wrap to notrification index page [fixes SCI-556] 2016-10-06 13:49:24 +02:00
zmagod
de00a19dd9 fixes styling in settings preferences [SCI-553] 2016-10-06 13:22:44 +02:00
zmagod
5b3889c172 notification index images [fixes SCI-554] 2016-10-06 12:09:01 +02:00
Luka Murn
68396cf6b4 Update the system notification rake task 2016-10-06 11:59:19 +02:00
zmagod
b1815b85a0 start implementig tests for notification model 2016-10-06 11:40:01 +02:00
Luka Murn
fe08022b2d Merge pull request #198 from Ducz0r/lm-fix-minor-things-in-notifications
Fix various minor things concerning notifications
2016-10-06 08:59:28 +02:00
Luka Murn
5c80c8a817 Add "no notifications" to dropdown & notifications index page 2016-10-05 16:58:21 +02:00
Luka Murn
877574e853 Add link to settings from both notification lists 2016-10-05 16:26:26 +02:00
Luka Murn
56d2240de5 Optimize data query in user_notification.rb 2016-10-05 16:21:13 +02:00
Luka Murn
c37885692d Add DB index onto checked field of user_notifications 2016-10-05 16:21:13 +02:00
okriuchykhin
d18063f557 Merge pull request #197 from okriuchykhin/ok_global_notifications-SCI-442_v2
Add link to notifications index page [SCI-442]
2016-10-05 16:16:27 +02:00
Oleksii Kriuchykhin
083a09c2f7 Add link to notifications index page 2016-10-05 16:13:05 +02:00
mz3944
79f05e26ce Merge pull request #196 from mz3944/mz_code_and_style_checking
Added code semantic and style checking for JS, ERB, and SCSS files. J…
2016-10-05 16:07:02 +02:00
okriuchykhin
50f28fe883 Merge pull request #193 from okriuchykhin/ok_global_notifications-SCI-442
Global notifications screen [SCI-442]
2016-10-05 16:01:41 +02:00
Oleksii Kriuchykhin
4e2ad1d5e6 Fix the issues after code review [SCI-442] 2016-10-05 15:54:31 +02:00
Oleksii Kriuchykhin
c783e9a03d Code fix after rebase with latest master [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
d2b48e94bd CSS color fix [SCI-442] 2016-10-05 15:51:11 +02:00
Oleksii Kriuchykhin
868ffd03d6 JS code improvement [SCI-442] 2016-10-05 15:51:11 +02:00
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
Zmago Devetak
f3708bcac0 Merge pull request #191 from ZmagoD/zd_SCI_469_ver2
Comments date duplication
2016-10-05 15:47:42 +02:00
zmagod
b0f6b1f4d0 fixed comments action on project page 2016-10-05 15:39:54 +02:00
Zmago Devetak
eea310514a Merge pull request #194 from ZmagoD/zd_SCI_531_533
Notification style fixes
2016-10-05 15:27:36 +02:00
zmagod
bca3d19562 fixed comment options dropdown position 2016-10-05 15:26:11 +02:00
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