Matej Zrimšek
a6a2a237aa
Removed unneeded ERB tags, which caused error. Minor refactoring.
2016-10-17 11:57:47 +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
845d487fa1
Merge pull request #218 from Ducz0r/lm-mail-previews
...
Add notification mailer preview
2016-10-13 14:58:04 +02:00
Oleksii Kriuchykhin
c6fb57318f
Added use of constants in JS [SCI-530]
2016-10-13 13:06:11 +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
42f6b679f8
Adding system notifications email function in settings
2016-10-12 11:50:26 +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
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
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
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
Luka Murn
860c3f9bf1
Bump version to 1.3.1
2016-10-07 15:57:01 +02:00
zmagod
de00a19dd9
fixes styling in settings preferences [SCI-553]
2016-10-06 13:22:44 +02:00
Luka Murn
5c80c8a817
Add "no notifications" to dropdown & notifications index page
2016-10-05 16:58:21 +02:00
Oleksii Kriuchykhin
4e2ad1d5e6
Fix the issues after code review [SCI-442]
2016-10-05 15:54:31 +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
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
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
91c7d8a952
Merge pull request #176 from ZmagoD/zd_SCI_474
...
Unify the comments
2016-10-03 15:26:17 +02:00
zmagod
ea17182372
generate notifications [fixes SCI-440]
2016-10-03 11:37:29 +02:00
Mojca Lorber
5b32be2137
adding subtitle in modal
2016-10-03 09:28:58 +02:00
Luka Murn
49c5474219
Merge pull request #178 from mz3944/mz_help_button_SCI_13_v2
...
Fixed wrong CSS formatting and added release notes link to help link.
2016-09-30 08:27:57 +02:00
zmagod
e1a1b93d44
fixed migrations
2016-09-29 14:49:58 +02:00
Matej Zrimšek
a6324d61c5
Fixed wrong CSS formatting, added release notes link to help links, and links now open in new tab.
2016-09-29 14:27:26 +02:00
Luka Murn
f994469cb5
Bump version to 1.3
2016-09-29 13:04:28 +02:00
zmagod
cab1e9b521
start implement toolbar view
2016-09-28 16:03:52 +02:00
Mojca Lorber
efa7a1d7b5
add sample information in pop-up
2016-09-28 15:46:41 +02:00
zmagod
2a86aaf7e4
changed popout content [fixes SCI-520]
2016-09-28 15:12:30 +02:00
zmagod
1eb9f772f4
refactor sciNote comments js and unified all comments behavior [fixes SCI-474]
2016-09-27 10:30:48 +02:00
zmagod
02bfa1949e
fixed project comments
2016-09-27 09:00:02 +02:00
Mojca Lorber
cc5cdf2577
Merge branch 'master' of https://github.com/biosistemika/scinote-web into ml_sci_321
2016-09-26 09:39:05 +02:00
Mojca Lorber
c2b742374f
adding popup sample info
2016-09-23 17:45:02 +02:00
mz3944
1c1a7c231e
Merge pull request #169 from mz3944/mz_help_button_SCI_13
...
Added help dropdown. [SCI-13]
2016-09-23 13:04:38 +02:00
Matej Zrimšek
fc86b7b1fd
Added help dropdown. [SCI-13]
2016-09-23 12:52:38 +02:00
Oleksii Kriuchykhin
e8ac754829
Fix issue with long tags in dropdown list [fixes SCI-470]
2016-09-23 11:05:17 +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
Matej Zrimšek
c6a23aab98
Added missing validations for text fields. Added text trimming, which removes spaces from beginning and ending of text. [fixes SCI-408]
2016-09-21 19:37:36 +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
9f56df02d2
removes comment tab and add comment in the info tab [fixes SCI-436]
2016-09-20 18:53:51 +02:00
Matej Zrimšek
c2f0106993
Replaced hardcoded values with unified constants. Minor refactoring. Also front-end error handling was updated accordingly. [fixes SCI-408]
2016-09-16 15:56:44 +02:00
zmagod
b9b466cd8e
Merge branch 'jg_sci_350_formulas' of https://github.com/jbargu/scinote-web into jbargu-jg_sci_350_formulas
2016-09-16 09:28:19 +02:00
zmagod
e3ae22763e
removed comments tab in protocol step
2016-09-15 08:46:14 +02:00
