Oleksii Kriuchykhin
0ec7c019b3
Fix issue with pop-up windows and turbolinks [SCI-463]
2016-10-17 14:25:54 +02:00
Matej Zrimšek
a6a2a237aa
Removed unneeded ERB tags, which caused error. Minor refactoring.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
ece89da391
Removed ruby constants duplicates in JS, because of caching problems.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
778ed8814b
Removed some unneeded code.
2016-10-17 11:57:46 +02:00
Matej Zrimšek
0780bd2416
Ruby constants are now automatically available in JS. Refactoring was needed.
2016-10-17 11:57:37 +02:00
Matej Zrimšek
a3dfb59558
Added remaining constants.
2016-10-17 11:30:05 +02:00
Matej Zrimšek
21ec05d541
Refactored searches (user and globals earch) and used constants.
2016-10-17 11:17:59 +02:00
Luka Murn
02d3e03f75
Bugfix for notification emails
...
The URLs in notification emails didn't get server URL prepended,
so users could not click on them.
2016-10-13 12:12:28 +02:00
mlorb
78f7879c04
Merge pull request #216 from mlorb/ml_sci_555
...
Adding update notifications in settings [SCI-555]
2016-10-13 08:53:55 +02:00
Mojca Lorber
8f783f87f7
fixes hound
2016-10-12 15:32:40 +02:00
Mojca Lorber
42f6b679f8
Adding system notifications email function in settings
2016-10-12 11:50:26 +02:00
Mojca Lorber
6bea0a9e1a
fixes merge conflicts
2016-10-12 10:55:40 +02:00
Luka Murn
cccabcdd7b
Remove invitation_to_organization email
...
This email is no longer needed, because if user enables
assignment notifications, he/she will already receive an
email whenever he/she is added to a new organization/team (via
notifications email).
2016-10-12 10:54:36 +02:00
Mojca Lorber
4f1cbad7da
adding update notifications in settings
2016-10-12 10:42:07 +02:00
Zmago Devetak
f25767fdc3
Merge pull request #209 from ZmagoD/zd_SCI_534_remove_popup
...
Removed introductory popup [fixes SCI-534]
2016-10-12 08:13:46 +02:00
Zmago Devetak
b225dc1e29
Merge pull request #210 from ZmagoD/zd_SCI_548_protocol_steps_not_visible
...
Fixes protocol steps [fixes SCI-548]
2016-10-12 08:13:28 +02:00
Oleksii Kriuchykhin
4c6a60c249
Added html_safe to notification email template
2016-10-11 16:46:20 +02:00
Oleksii Kriuchykhin
90c853743c
Additional fixes to email markup and logic [SCI-443]
2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
5399033fce
Added user settings for email notifications [SCI-443]
2016-10-11 16:43:17 +02:00
Oleksii Kriuchykhin
8dc956010c
Initial code commit [SCI-443]
2016-10-11 16:43:17 +02:00
zmagod
ea305b356a
fixes protocol steps [fixes SCI-548]
2016-10-11 09:10:12 +02:00
zmagod
42a30576e3
removed introductory popup [fixes SCI-534]
2016-10-11 08:33:50 +02:00
Luka Murn
448daab7c8
Merge pull request #207 from biosistemika/add-deface-hotfix
...
Merge hotfix 1.3.1 into master
2016-10-07 18:26:13 +02:00
zmagod
32f03ec94c
Add Deface hooks
2016-10-06 16:47:36 +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
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
Oleksii Kriuchykhin
083a09c2f7
Add link to notifications index page
2016-10-05 16:13:05 +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
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
Zmago Devetak
eea310514a
Merge pull request #194 from ZmagoD/zd_SCI_531_533
...
Notification style fixes
2016-10-05 15:27:36 +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
zmagod
9c7a690944
fixed type, fixed settings controller, fixes setting view on mobile devices
2016-10-05 14:33:22 +02:00
zmagod
5bf278298b
fixed navbar on sceens smaller than 1000px
2016-10-05 12:22:27 +02:00
zmagod
d7a4f85ba1
added links to notification project name and task
2016-10-05 09:40:44 +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
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
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
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
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
91c7d8a952
Merge pull request #176 from ZmagoD/zd_SCI_474
...
Unify the comments
2016-10-03 15:26:17 +02:00
