github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 07:26:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6,021 Commits 190 Branches 500 Tags 938 MiB
b49e448556
Commit Graph

6021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
illspirit
1b2e3bf141 Fix smtp settings, added password 2013-12-20 20:50:17 -05:00
Jeff Atwood
e645c6badd Merge pull request #1755 from illspirit/master 
Small typo in  "check sample configuration"
 2013-12-20 16:14:28 -08:00
illspirit
eeb8579793 Small typo "check sample configuration" 2013-12-20 19:02:31 -05:00
Jeff Atwood
3189586d15 Merge pull request #1754 from trident523/patch-1 
Update INSTALL-ubuntu.md
 2013-12-20 14:04:16 -08:00
Ben T
63cddc5681 Update "check sample configuration" 
... reflects having one discourse.conf.
 2013-12-20 16:56:43 -05:00
Ben T
e33125c841 Update INSTALL-ubuntu.md 
This uses the new environment variables; by duplicating the sample config and suggesting similar changes. It's not exactly perfect as it still has the sample config problem, just to a much lesser extent. It may help to ship a "most commonly changed" configuration [db name + user/pass, hostname, smtp] that can be duplicated from and easily edited.

Follows up:
http://meta.discourse.org/t/environment-variables/11494/5
 2013-12-20 16:52:08 -05:00
Neil Lalonde
c42e9ea178 Categories page tweaks. Vertical align top the first two columns, padding fixes. 2013-12-20 16:51:39 -05:00
Wojciech Zawistowski
965fb78b06 adds unit tests for SearchTextField 2013-12-20 21:00:48 +01:00
Neil Lalonde
f91cb11666 Show why a user can't be deleted on the page instead of as a tooltip 2013-12-20 11:37:01 -05:00
Neil Lalonde
6135d1d214 Add a button to clear filters on site settings page 2013-12-20 11:37:01 -05:00
Robin Ward
0c45eba037 FIX: Users can edit posts when they've reached the newuser_max_replies_per_topic threshold. 2013-12-20 11:30:51 -05:00
Jeff Atwood
12f89aef95 invite new users to visit OTHER topics 2013-12-20 02:30:04 -08:00
Jeff Atwood
ac0bcceaf1 clarify reply limit is only for THIS topic 2013-12-20 02:27:51 -08:00
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