scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-14 21:24:54 +08:00
Code Issues Projects Releases Packages Wiki Activity
8647 commits 31 branches 181 tags 166 MiB
Commit graph

8647 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
zmagod
fe7b367eae fixed hound 2016-10-07 15:25:53 +02:00
zmagod
130db6a2c3 fixed assignment icon [fixes SCI-561] 2016-10-07 12:27:44 +02:00
zmagod
32f03ec94c Add Deface hooks 2016-10-06 16:47:36 +02:00
Jure Grabnar
1f67aec258 Prevent destroying protocols when file is edited 
SCI-552 #close
 2016-10-06 16:13:42 +02:00
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