318 commits

Author	SHA1	Message	Date
Robin Ward	007118b00c	Merge branch 'github-auth' of git://github.com/nverba/discourse ... Conflicts: config/locales/server.en.yml db/structure.sql spec/views/omniauth_callbacks/complete.html.erb_spec.rb	2013-02-27 12:09:22 -05:00
Jeff Atwood	7087c2b847	clarify some /admin site setting descriptions	2013-02-27 00:47:47 -08:00
Neil Lalonde	cd6c1de5b0	Add site settings for company name and domain, and use them in the Terms of Service	2013-02-26 15:50:42 -05:00
nverba	b45f872c04	Added Github authentication option, disabled by default with enable options in settings.	2013-02-26 05:00:21 +00:00
Gosha Arinich	cafc75b238	remove trailing whitespaces ❤️	2013-02-26 07:31:35 +03:00
Jeff Atwood	ea9196a8a2	minor copyedits around login / email	2013-02-25 16:23:09 -08:00
Jeff Atwood	d9d3419a51	some copyedits on admin / email	2013-02-25 15:07:40 -08:00
Jeff Atwood	8631c215ad	improved admin site setting descriptions	2013-02-22 12:34:42 -08:00
Robin Ward	1c5afc9686	Merge pull request #231 from shapkin/master ... Add english locale to page.	2013-02-22 10:58:31 -08:00
Robin Ward	532b1f5450	Can edit category descriptions, they show up in a title attribute	2013-02-22 13:43:47 -05:00
Alexander Shapkin	ee8825408b	add english locale to page	2013-02-22 15:33:35 +04:00
Neil Lalonde	560411eece	Add site_setting to disable version checks	2013-02-21 10:19:17 -05:00
Robin Ward	836c3a7379	Support for Fancy topic titles	2013-02-19 16:14:04 -05:00
Sam Saffron	d9531d94d5	basic lightbox support	2013-02-19 17:57:14 +11:00
Jesse Pollak	ad5a5b4866	This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml	2013-02-14 18:08:40 -08:00
Jeff Atwood	0244834a97	copyedit on watching/tracking	2013-02-14 15:51:41 -08:00
Jeff Atwood	91e79670c4	copyedits on new user education panel	2013-02-14 15:32:06 -08:00
Robin Ward	b9457197c0	First stab at new user education - configurable messages that pop up on a user's first ... few posts/topics.	2013-02-14 15:33:51 -05:00

Renamed from config/locales/en.yml (Browse further)