Karina Kwiatek 391f4a28ed Merge branch 'master' into feature/announcements ... # Conflicts: # db/schema.rb		2020-04-19 21:52:58 +01:00
..
ajax	Merge pull request #18 from skiprope/temp-bans	2015-05-05 16:54:23 +02:00
announcement	Show announcement validation errors on the frontend	2020-04-19 21:26:55 +01:00
answer	Made titles functional, because functional programming is the future	2015-05-14 03:32:19 +05:30
devise	Fix emails	2015-07-23 12:12:36 +05:30
discover	fixes Retrospring/bugs#82	2015-06-17 12:07:51 +02:00
group	fix Retrospring/bugs#95	2015-08-28 16:29:02 +02:00
inbox	Upgrade to Rails 5	2020-04-19 00:59:22 +02:00
layouts	Merge branch 'master' into feature/announcements	2020-04-19 21:52:58 +01:00
moderation	fix Retrospring/bugs#95	2015-08-28 16:29:02 +02:00
notifications	make the notification center smaller and shorten content	2015-09-16 23:59:47 +02:00
public	fix Retrospring/bugs#95	2015-08-28 16:29:02 +02:00
question	localize placeholders	2015-06-08 20:48:23 +02:00
services	fix Retrospring/bugs#95	2015-08-28 16:29:02 +02:00
shared	Add announcements to the top of the application template	2020-04-19 21:38:21 +01:00
static	Merge remote-tracking branch 'github/master'	2018-05-20 14:18:02 +02:00
user	Use Rolify for admin and moderator roles	2020-04-19 22:35:58 +02:00