Matej Zrimšek
21ec05d541
Refactored searches (user and globals earch) and used constants.
2016-10-17 11:17:59 +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
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
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
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
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
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
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
Matej Zrimšek
fc86b7b1fd
Added help dropdown. [SCI-13]
2016-09-23 12:52:38 +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
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
Zmago Devetak
b26bf7b183
Merge pull request #136 from ZmagoD/zd_SCI_370
...
Enabled to delete results in task archive [fixes SCI-370]
2016-09-13 15:22:08 +02:00
zmagod
691ae94d2c
enabled to delete results in task archive [fixes SCI-370]
2016-09-13 13:26:04 +02:00
zmagod
d482dff2e6
adds label to current project in clone experiment modal [fixes SCI-341]
2016-09-07 08:26:36 +02:00
Zmago Devetak
9440371f3f
Merge pull request #131 from ZmagoD/zd_SCI_400
...
Sets front end validation for experiment move action [fixes SCI-400]
2016-09-06 11:39:38 +02:00
zmagod
667fb67052
sets front end validation for experiment move action [fixes SCI-400]
2016-09-02 16:31:17 +02:00
Matej Zrimšek
828eebeb16
Popup for preventing page leaving when uploading avatar fixed [fixes SCI-399]
2016-08-31 17:21:17 +02:00
mlorb
905acfd43d
Merge pull request #109 from mlorb/ml_sci_286
...
fixes notification when adding new sample [SCI-286]
2016-08-30 17:54:45 +02:00
Zmago Devetak
6878adda46
Merge pull request #112 from ZmagoD/zd_SCI_338_vol2
...
Tutorial
2016-08-30 11:07:51 +02:00
zmagod
e02478b1f9
fixed tutorial labels
2016-08-30 09:35:57 +02:00
zmagod
5518d1cd1e
fixed 16 step of tutorial
2016-08-30 08:52:44 +02:00
Mojca Lorber
53cdbc2638
fixes notification when adding new sample
2016-08-29 13:45:54 +02:00
zmagod
2ac20d1af1
adds new image + new panel title [fixes SCI-336]
2016-08-29 09:28:29 +02:00
zmagod
d886d05ccb
Merge branch 'zd_SCI_338'
2016-08-26 16:32:49 +02:00
Matej Zrimšek
e3a7f45fdf
Merge branch 'master' into mz_file_upload_and_client_side_upgrade
...
Conflicts:
app/assets/javascripts/application.js
app/views/results/_result_asset.html.erb
app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
Zmago Devetak
0cfc758f43
Merge pull request #102 from ZmagoD/zd_SCI_336
...
implement first time popup logic
2016-08-26 09:19:36 +02:00
zmagod
2031c42920
fixed confirmation text
2016-08-26 09:13:45 +02:00
zmagod
1738ca66d2
one-time introductory popup [fixes SCI-336]
2016-08-25 18:44:21 +02:00
Luka Murn
8018cff02e
Merge pull request #103 from Ducz0r/bb_edit_delete_comments
...
Edit&delete comments
2016-08-25 17:18:48 +02:00
zmagod
cd6780775c
removed a sentence from canvas_overview_html
2016-08-25 15:35:37 +02:00
Zmago Devetak
b090fd8d5b
Merge pull request #95 from ZmagoD/zd_SCI_374
...
adds edit workflow link if no workflow [fixes SCI-374]
2016-08-25 14:07:33 +02:00
