Commit graph

5808 commits

Author SHA1 Message Date
Sam
bac2d21382 strip out nil settings from config 2013-12-20 19:12:08 +11:00
Sam
95c4bf4cfa ignore custom conf files 2013-12-20 18:14:39 +11:00
Sam
8b33b45c2d should be commented out 2013-12-20 18:01:41 +11:00
Sam
2cf2ee9d2d I need to add better testing here 2013-12-20 17:41:12 +11:00
Sam
cc9326c29d existence in file always overrides 2013-12-20 17:09:51 +11:00
Sam
61a50f1cf6 allow nuking of vars via env 2013-12-20 17:07:08 +11:00
Sam
13e1016d73 oops forgot to commit this 2013-12-20 16:38:51 +11:00
Sam
4b04ac4c2b correct defaults 2013-12-20 16:23:01 +11:00
Sam
f5f09933df Merge branch 'master' of github.com:discourse/discourse 2013-12-20 16:17:52 +11:00
Sam
7b8d2547d0 globals now implemented and documented 2013-12-20 16:17:21 +11:00
Sam
b312b4d563 clean up config to use global settings 2013-12-20 15:12:23 +11:00
Jeff Atwood
2ac9ad6d51 edit copy on new user topic reply limit 2013-12-19 16:06:06 -08:00
Régis Hanol
e6e04ca0e9 FIX: new user username color 2013-12-20 00:58:48 +01:00
Régis Hanol
452232096f smaller images in oneboxes 2013-12-20 00:32:39 +01:00
Neil Lalonde
66616c9574 Categories page is even better on Nexus 7 (and probably iPad mini) 2013-12-19 16:51:18 -05:00
Neil Lalonde
854d9c8fc6 Minimum password length is configurable with the min_password_length site setting. FIX: reset password needs to validate password length. 2013-12-19 16:15:47 -05:00
Neil Lalonde
33c6997ded Move password validation into PasswordValidator 2013-12-19 16:15:47 -05:00
Robin Ward
4f7d440fa4 Remove unused hook. 2013-12-19 14:43:36 -05:00
Robin Ward
1cac9fa257 New users can only post newuser_max_replies_per_topic times per topic. 2013-12-19 13:45:55 -05:00
Wojciech Zawistowski
c2e590b343 adds unit tests for Discourse.TextField 2013-12-19 19:29:15 +01:00
Wojciech Zawistowski
89bdebac3c fixes HeaderController test 2013-12-19 18:59:30 +01:00
Wojciech Zawistowski
e5269ab3e0 adds small HasCurrentUser mixin test improvements 2013-12-19 18:54:24 +01:00
Neil Lalonde
39e711783d FIX: alignment of avatars and category badge on mobile 2013-12-19 11:55:54 -05:00
Robin Ward
3dffa763c5 Merge pull request #1741 from abbat/master
Russian translation (actual version)
2013-12-19 08:33:56 -08:00
Robin Ward
40327c25e8 Merge pull request #1747 from alxndr/rss-tweak
tweak RSS elements for W3C compatibility
2013-12-19 08:26:04 -08:00
Neil Lalonde
c35af5d755 FIX: When re-opening a topic that auto-closed, make sure it won't auto-close again 2013-12-19 11:25:05 -05:00
Robin Ward
c2f0bdcf49 Merge pull request #1746 from ofgeek/patch-1
Update client.zh_CN.yml
2013-12-19 08:24:35 -08:00
Robin Ward
3be026b1da Merge pull request #1748 from alxndr/profile-bio-newlines
respect newlines in About Me on profile page
2013-12-19 08:24:18 -08:00
Régis Hanol
8dad928557 Add setupTopicController event 2013-12-19 17:01:22 +01:00
Alexander
7b2835b73f respect newlines in About Me on profile page 2013-12-19 10:54:37 -05:00
Sam
66afabcf4c stop messing with asset pipeline defaults
stripping postfixes is wasteful and uneeded. It messes up our build
2013-12-19 12:33:17 +11:00
Godfrey Chan
e41eecb91b Added some missing references, see https://github.com/rails/rails/issues/12982 2013-12-18 15:06:19 -08:00
Sam
9cecabd023 don't warn unless in production 2013-12-19 09:59:44 +11:00
Régis Hanol
380f60d17c shorter text is better text 2013-12-18 22:10:45 +01:00
Neil Lalonde
beef3008b6 Shorter instructions for the name field in the signup form. 2013-12-18 15:37:59 -05:00
Neil Lalonde
1f0a59584b Revert "Re-apply with fixes: Stop using user agent to detect mobile devices. Use a media query and yepnope to load the appropriate css and customizations." 2013-12-18 14:47:22 -05:00
Neil Lalonde
58e5d532c5 Revert "Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server." 2013-12-18 14:47:12 -05:00
Neil Lalonde
c0e1ef75f6 Don't auto-close a topic too soon in PeriodicalUpdates 2013-12-18 14:09:49 -05:00
Neil Lalonde
eeed9abcf0 Style categories page for mobile 2013-12-18 11:50:51 -05:00
Neil Lalonde
8057373584 Category featured users: show most recent posters instead of most frequent posters 2013-12-18 11:10:03 -05:00
Alexander
8294dced6c tweak RSS elements for W3C compatibility
installation needs to have contact_email set in the admin settings in
order for that installation to have truly valid feeds
2013-12-18 11:06:36 -05:00
ofGEEK
51f92fd87b Update client.zh_CN.yml 2013-12-18 20:55:09 +08:00
Sam
14d21ec865 improve config so you can use it with a socket optionally 2013-12-18 19:23:58 +11:00
Sam
786f488186 attempt to make travis less upset 2013-12-18 19:15:22 +11:00
Sam
8f9f6580d2 fix travis 2013-12-18 17:55:30 +11:00
Sam
a85333790f attempt to bypass setting port if socket is provided 2013-12-18 17:48:54 +11:00
Sam
a7421f8612 correct parsing 2013-12-18 17:21:01 +11:00
Sam
573e3bd348 fix error message 2013-12-18 17:17:12 +11:00
Sam
5232f0efd1 default to a db called postgres 2013-12-18 16:54:47 +11:00
Sam
ffffee3ae1 IMPORTANT - removed all sample files
This is very likely to cause merge conflict, it is for the greater good
Discuss at: http://meta.discourse.org/t/enough-with-the-sample-files/10351

From now on we use ENV to customise if needed
2013-12-18 16:46:37 +11:00