Commit graph

5712 commits

Author SHA1 Message Date
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
Harry Seo
dfc95d0f6f FIX: Title text should be correctly escaped since we are generating a raw html. 2013-12-18 12:18:59 +09:00
Neil Lalonde
39a360f6e3 Improve tooltip on categories stats. 2013-12-17 17:43:04 -05:00
Neil Lalonde
47c6bb4cf2 Improve how category stats are rendered 2013-12-17 17:43:04 -05:00
Sam
d422113a0d Merge pull request #1742 from joallard/patch-1
[minor] Admin Quick Start Guide: Change email test link
2013-12-17 12:51:18 -08:00
Régis Hanol
94fda12795 use a helper instead of a view for custom HTML content 2013-12-17 18:56:59 +01:00
Neil Lalonde
3cc634d37b FIX: category_list_spec should not expect deterministic order 2013-12-17 12:53:29 -05:00
Neil Lalonde
24d81e2364 FIX: deprecation warning in create_account_controller.js. Need to move createAccount into actions. 2013-12-17 12:39:29 -05:00
Neil Lalonde
7fa07f3401 create_account_controller.js passwordRequired needs the same logic as user_authenticator. Make twitter and facebook signup work again. 2013-12-17 12:39:29 -05:00
Régis Hanol
4c6b535cc0 move arbitrary html content out of noscript and into the preloadstore 2013-12-17 18:25:27 +01:00
Régis Hanol
1b6050bdb0 only display inline HTML revision history on mobile 2013-12-17 17:45:04 +01:00
Régis Hanol
76c246664d FIX: ensureMaximumDimensionForImagesInPreview wasn't always working 2013-12-17 17:20:06 +01:00
Régis Hanol
2ef53f89f4 [0] is shorter than [0,1] :) 2013-12-17 16:30:25 +01:00
Jonathan Allard
bddca8b34f Admin Quick Start Guide: Change email test link
The feature has moved from `/admin/email/logs` to `/admin/email`.
2013-12-16 22:36:09 -05:00
Sam
ea307931a7 fix spec, categories without position are now always at the end of the list 2013-12-17 14:36:07 +11:00
Sam
29ba471db6 missing site setting, this should be auto generated 2013-12-17 12:35:09 +11:00
Sam
5bd595c9a6 FEATURE: default_code_lang for syntax highlighting is configurable 2013-12-17 12:08:29 +11:00
Régis Hanol
2ce75a8523 FIX: canonical url should not use the CDN 2013-12-17 00:35:34 +01:00
Neil Lalonde
7fb985a02e Improve spacing of registration form, and add instructions to the password field. 2013-12-16 17:31:21 -05:00
Anton Batenev
12535d645b Russian translation (actual version) 2013-12-17 01:08:37 +04:00
Robin Ward
2326d4ceb7 FIX: text node emitters should always take strings as parameters even if they
return JsonML.
2013-12-16 15:41:46 -05:00
Neil Lalonde
341adc93a4 Allow categories with null position, which means sort them based on activity. Mix absolutely positioned (position is not null) categories with null position categories. 2013-12-16 15:13:57 -05:00
Robin Ward
f1a7b63afc FIX: Large pre blocks in emails were increasing the width. 2013-12-16 14:41:59 -05:00
Robin Ward
30d1801703 Merge pull request #1739 from vikhyat/uncategorized-topics
Don't show "uncategorized" in the category dropdown if allow_uncategorized_topics is false.
2013-12-16 10:57:45 -08:00
Robin Ward
0c3a3f38e7 Merge pull request #1740 from davh/master
Updated Swedish client translations
2013-12-16 10:55:14 -08:00
Robin Ward
acf262b631 Support for "no subcategories" 2013-12-16 13:06:35 -05:00
Régis Hanol
ccd0f9c371 add onpdiff tests 2013-12-16 18:39:49 +01:00
Régis Hanol
206ef3dc08 add discourse_diff tests 2013-12-16 18:11:46 +01:00
Régis Hanol
8fff53775a revision history: no hover state on buttons when disabled 2013-12-16 16:02:25 +01:00
Régis Hanol
fd749a9c6e revision history: proper word-wrap in markdown view 2013-12-16 15:57:13 +01:00
Régis Hanol
c6fb60e0a0 FIX: S3 upload when using dots in bucket name 2013-12-16 11:44:59 +01:00
Sam
646cca3128 Good luck getting this updated everywhere, kicking myself really hard for allowing these stupid sample files
see: http://meta.discourse.org/t/enough-with-the-sample-files/10351

Our default sample setup was not minifying css or js causing js and css to be 2.5x larger than it needed

Anyone using my docker setup, please run a new bootstrap. Anyone else, apply diff manually.
2013-12-16 18:21:24 +11:00
Sam
820e29e30e don't seed welcome topic in test db 2013-12-16 12:48:45 +11:00
Sam
8ad78dcce2 added quick start guide to seeds 2013-12-16 12:46:46 +11:00
David Hedqvist
036eb3e5a5 Updated Swedish client translations 2013-12-15 22:13:05 +01:00
Régis Hanol
7124a4a694 Merge pull request #1738 from alxndr/rss-tweaks
add more info to rss feeds
2013-12-15 02:34:27 -08:00
Vikhyat Korrapati
03e152ee21 Don't show "uncategorized" if allow_uncategorized_topics is false. 2013-12-15 15:56:06 +05:30
Alexander
d93e4fc65d add more info to rss feeds 2013-12-15 01:17:39 -08:00
Sam
a1c439c21c spork rails now sourced from gem 2013-12-15 11:34:38 +11:00
Sam
1c64f34eff redis rails no longer sourced from github, was only used due to a rack cache bug which is no longer used 2013-12-15 11:07:39 +11:00
Sam
74c16ca1af Only 1 complicated git dependency left 2013-12-15 11:02:00 +11:00
Neil Lalonde
1145e4bfd9 Fix topics_year, topics_month, topics_week for uncategorized category 2013-12-13 16:17:06 -05:00
Robin Ward
3f2907a924 Merge pull request #1735 from piac/patch-2
Update client.it.yml to have category section
2013-12-13 12:52:40 -08:00
Neil Lalonde
49c3482464 Show topic and post counts by day/week/month/year on categories page 2013-12-13 15:37:45 -05:00