Commit Graph

5694 Commits

Author SHA1 Message Date
Robin Ward
4000bcbfea FIX: Only consider image sizes from valid src values. 2013-12-23 18:03:37 -05:00
Robin Ward
62f757da2c FIX: iOS height was incorrect when zoomed for cloaking 2013-12-23 16:18:00 -05:00
Robin Ward
4c93da01c3 Googlebot seems to parse Javascript and inserts our browser update message
into their search results. If our client is googlebot, don't tell them to
update their browser.
2013-12-23 15:13:09 -05:00
Robin Ward
3415904b63 Renamed sublime-project to discourse.sublime-project as sublime expects a .sublime-project
extension.
2013-12-23 14:46:35 -05:00
Régis Hanol
0b13b8d7ea Merge pull request #1737 from chancancode/add_missing_references
Added some missing references
2013-12-23 05:51:04 -08:00
Régis Hanol
30565dcd8f Merge pull request #1745 from ok-harry/master
FIX: Title text should be correctly escaped since we are generating a raw html
2013-12-23 05:48:42 -08:00
Régis Hanol
34cbea64d1 Merge pull request #1749 from velesin/has_current_user_test_improvement
adds small HasCurrentUser mixin test improvements
2013-12-23 05:47:46 -08:00
Régis Hanol
9ee404b0e6 Merge pull request #1750 from velesin/header_controller_test_fix
fixes HeaderController test
2013-12-23 05:47:22 -08:00
Régis Hanol
2f9c81cd75 Merge pull request #1751 from velesin/text_field_tests
adds unit tests for Discourse.TextField
2013-12-23 05:46:48 -08:00
Régis Hanol
ef8625caaa Merge pull request #1753 from velesin/search_text_field_tests
adds unit tests for SearchTextField
2013-12-23 05:46:12 -08:00
Régis Hanol
fe6fc3e9b0 Merge pull request #1766 from ofgeek/patch-1
Update client.zh_CN.yml
2013-12-23 05:45:31 -08:00
ofGEEK
e452517b18 Update client.zh_CN.yml 2013-12-23 21:05:29 +08:00
Sam
efd219f67f fix build? 2013-12-23 17:53:33 +11:00
Sam
d4819c3a65 Got rid of crazy user name split
instead decorate with <wbr> to hint on best
spot to split
2013-12-23 11:11:41 +11:00
Sam
90077ae98d fix tests, clean up include logic 2013-12-23 10:41:10 +11:00
Sam
0d63197e7a update psuedo locale 2013-12-23 10:34:54 +11:00
Sam
b67a3a85dd split js with vendor/application
avoid one huge js bundle and instead break it down
to application and vendor (3rd party) our app changes
a lot, vendor changes a lot less
2013-12-23 10:32:07 +11:00
Sam
f7827456af move unhashed images into public images directory. asset precompile does not keep around unhashed urls in prd 2013-12-23 10:06:33 +11:00
Neil Lalonde
e44f51f9fa Version bump to v0.9.7.9 2013-12-22 11:28:43 -05:00
Jeff Atwood
638196b1dd Merge pull request #1762 from trident523/patch-1
INSTALL-ubuntu docs update.
2013-12-21 21:30:40 -08:00
bent
6d47d9d249 Really add that file! 2013-12-22 00:33:17 +00:00
Ben T
3a5f75c3c3 Added a quickstart file for more likely edited env settings. 2013-12-22 00:31:00 +00:00
Ben T
daff00963f Re-added bluepill instructions and fixed typo in e-mail.; 2013-12-22 00:17:39 +00:00
Jeff Atwood
21bbdf7049 Merge pull request #1759 from illspirit/master
Update failing_emails_warning
2013-12-20 19:29:21 -08:00
illspirit
e47efa6b7a Update failing_emails_warning 2013-12-20 22:08:49 -05:00
Jeff Atwood
42da514909 Merge pull request #1758 from illspirit/master
Fix smtp settings, added password setting
2013-12-20 18:26:18 -08:00
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