Matej Zrimšek
796e7da133
Fixed missing namespace in constant in migration.
2016-10-18 11:36:33 +02:00
okriuchykhin
076353b207
Merge pull request #204 from okriuchykhin/ok_SCI-463
...
Fix issue with pop-up windows and turbolinks [SCI-463]
2016-10-18 09:12:47 +02:00
Oleksii Kriuchykhin
0ec7c019b3
Fix issue with pop-up windows and turbolinks [SCI-463]
2016-10-17 14:25:54 +02:00
mz3944
7a23caff69
Merge pull request #205 from mz3944/mz_replace_hardcoded_values_with_constants_v3
...
Mz replace hardcoded values with constants v3
2016-10-17 13:55:46 +02:00
Matej Zrimšek
1b0fb255db
Replaced hardcoded big values with infinity constant in fixtures.
2016-10-17 13:52:33 +02:00
Matej Zrimšek
56293ad62d
Added missing constants namespace to constants in test models.
2016-10-17 13:21:10 +02:00
Matej Zrimšek
a31753ea39
Added additional color constants. Fix Ruby color constants RGB format so no errors occur for external Gems.
2016-10-17 11:57:47 +02:00
Matej Zrimšek
f2cd9890dd
Replaced hardcoded infinity values with constants. Added quotation marks to Ruby string constants in JS.
2016-10-17 11:57:47 +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
5966911b92
Fixed Hound alerts.
2016-10-17 11:57:46 +02:00
Matej Zrimšek
778ed8814b
Removed some unneeded code.
2016-10-17 11:57:46 +02:00
Matej Zrimšek
05acf5a725
Replaced all Ruby constants instances in JS to be called from JS.
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
Zmago Devetak
f10b25dd31
Merge pull request #208 from ZmagoD/aditional-notification-tests
...
Fix failing tests + add test to notification model
2016-10-17 08:17:29 +02:00
zmagod
613601f790
fixed checklist_item_test
2016-10-17 08:13:36 +02:00
Luka Murn
845d487fa1
Merge pull request #218 from Ducz0r/lm-mail-previews
...
Add notification mailer preview
2016-10-13 14:58:04 +02:00
okriuchykhin
9a3e531b33
Merge pull request #212 from okriuchykhin/ok_SCI_530
...
Fixes issue with comments options menu [SCI-530]
2016-10-13 13:13:41 +02:00
Oleksii Kriuchykhin
c6fb57318f
Added use of constants in JS [SCI-530]
2016-10-13 13:06:11 +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
Oleksii Kriuchykhin
37cff75013
Fixes issue with comments options menu [SCI-530]
2016-10-13 12:07:41 +02:00
Luka Murn
46aa25cb6c
Add some additional data to fake users
2016-10-13 11:14:25 +02:00
mlorb
cbc14d9d50
Merge pull request #211 from mlorb/ml_sci_491
...
change 80s glow [SCI-491]
2016-10-13 10:13:14 +02:00
Mojca Lorber
c51aedb178
change thickness of shadow
2016-10-13 10:11:32 +02:00
Luka Murn
bdaeb4db13
Add notification mailer preview
2016-10-13 08:56:04 +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
Luka Murn
8accf14d83
Merge pull request #215 from Ducz0r/lm-remove-uneccesary-email
...
Remove invitation_to_organization email
2016-10-12 14:44:48 +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
okriuchykhin
8acbcb9b73
Merge pull request #214 from okriuchykhin/ok_SCI-443
...
code notification mailer [SCI-443]
2016-10-11 16:53:26 +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
3f219e1bfe
Hound code style fixes [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
Mojca Lorber
b1b23b8f41
fixes hound
2016-10-11 10:39:00 +02:00
Mojca Lorber
63ec63047d
change 80s glow
2016-10-11 10:33:26 +02:00
Zmago Devetak
692b31325b
Merge pull request #206 from ZmagoD/zd_SCI_561
...
Fixed assinement icon [fixes SCI-561]
2016-10-11 09:32:47 +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
zmagod
a0568a7395
fix failing tests
2016-10-11 08:25:32 +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
Luka Murn
860c3f9bf1
Bump version to 1.3.1
2016-10-07 15:57:01 +02:00
