Jan-Willem van der Meer 352ec75b7d Merge remote-tracking branch 'origin/master' into feature-admin-emails ...

Conflicts:
	db/schema.rb

2014-08-12 17:59:24 +02:00

..

appearances

Fix 500 on appearance page

2014-06-17 11:30:51 +03:00

background_jobs

Move from ui-box to panels

2014-05-29 18:57:27 +03:00

broadcast_messages

Fix unclear text in broadcast message view.

2014-04-25 15:31:30 -05:00

dashboard

Add monthly active users to the admin dashboard.

2014-04-15 10:23:37 +02:00

emails

Test basic email flow

2014-08-11 09:54:12 +02:00

groups

Show group ldap settings on admin/group page

2014-08-12 10:33:27 +03:00

hooks

Replace ui-box title with panel-heading

2014-05-29 18:43:21 +03:00

logs

scss: rename file_content to file-content etc

2013-07-13 09:52:47 +03:00

projects

Improve admin/projects page

2014-06-03 14:19:11 +03:00

users

Add entrypoint for sending emails to users

2014-08-11 14:20:29 +02:00