Commit graph

5579 commits

Author SHA1 Message Date
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
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
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
Alexander
d93e4fc65d add more info to rss feeds 2013-12-15 01:17:39 -08: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
Robin Ward
a7a7387da1 Automatically convert some quotes to blockquotes 2013-12-13 15:31:25 -05:00
Giulio Piacentino
3360d9daee Update client.it.yml to have category section
As outlined in this question:
http://meta.discourse.org/t/all-categories-on-non-english-sites/11417
2013-12-13 20:26:52 +01:00
Robin Ward
1bbd1a94bb Cold/Hot classes in Topic Map 2013-12-13 13:43:20 -05:00
Robin Ward
06e9cbc6cb FIX: Look up a url without the query string if it couldn't be found with it. 2013-12-13 12:56:20 -05:00
Robin Ward
26e75c5ceb Double reading speed estimate. People skim. 2013-12-13 12:23:20 -05:00
Régis Hanol
4fe83f8385 Merge pull request #1734 from ofgeek/patch-1
Update client.zh_CN.yml
2013-12-13 06:14:16 -08:00
ofGEEK
e4b2e59daa Update client.zh_CN.yml 2013-12-13 21:36:11 +08:00
Sam
fa4a8e052f to_a not needed 2013-12-13 19:01:35 +11:00
Sam
1649f56529 work around odd scoping bug in Rails 2013-12-13 19:01:04 +11:00
Sam
05a3c8090f Merge pull request #1658 from salbertson/sa-refactor-users-controller-create
Refactor UsersController#create
2013-12-12 22:16:50 -08:00
Sam
96fdf72d5e rails master compatability 2013-12-13 17:04:45 +11:00
Sam
8ccab6d140 Got rid of buggy yepnope spaghetti, however mobile detection really should be driven from the server. 2013-12-13 15:17:05 +11:00
Régis Hanol
1884bd959f make sure extension-based oneboxes are first to run 2013-12-13 00:56:48 +01:00
Régis Hanol
6641230b7f Merge pull request #1733 from voisintotoro/newmaster2
Updated French translation and fixed the fr_FR: to fr:
2013-12-12 15:02:05 -08:00
Neil Lalonde
eadf5e9b02 Move columns around on wide categories page 2013-12-12 17:27:25 -05:00
voisintotoro
cb7de5d2de Updated French translation and fixed the fr_FR: to fr: 2013-12-12 23:17:43 +01:00
Neil Lalonde
50bd05663c Fix category ordering on categories page. I broke it. 2013-12-12 17:13:35 -05:00
Robin Ward
b41ee7256e Support for importing Disqus posts into a category 2013-12-12 16:31:24 -05:00
Neil Lalonde
ee5637d4ff FIX: font-awesome issue on site settings buttons 2013-12-12 16:09:44 -05:00
Neil Lalonde
9f9852a8dd FIX: broken font-awesome icons on user activity pages 2013-12-12 16:07:34 -05:00
Neil Lalonde
52cf27b0a6 FIX: layout problems on categories page 2013-12-12 15:52:36 -05:00
Neil Lalonde
6fa2e68742 Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show. 2013-12-12 15:52:30 -05:00
Sam
50c4e3707b Merge pull request #1731 from chancancode/no_more_scoped_in_rails_4_1
✂️ scoped for Rails 4 compat
2013-12-12 12:38:57 -08:00
Robin Ward
fcad3b8119 Experimental: Disqus XML importer 2013-12-12 15:36:19 -05:00
Régis Hanol
cf44b9e9d9 add image dimensions & size in lightbox 2013-12-12 17:39:20 +01:00
Régis Hanol
c7741c9622 FIX: absolute canonical link on topic pages 2013-12-12 17:24:00 +01:00
Régis Hanol
dd93407789 FIX: images should also be inlined in the cooked view 2013-12-12 16:57:56 +01:00
Régis Hanol
1457a3792d that fix should have been in the emoji plugin 2013-12-12 16:42:27 +01:00
Régis Hanol
be835785f8 FIX: allow new user to post emojis 2013-12-12 15:05:18 +01:00
Régis Hanol
0525cbdb11 Corrected the mention string in the user stream. (props to @sunyatasattva)
Previously the string would show *You mentioned {{Your Name}}*. Now it
correctly shows *You mentioned {{Other user name}}*
2013-12-12 11:46:36 +01:00
Régis Hanol
1d058e57e5 Merge pull request #1729 from S-YOU/master
amazon oneboxer
2013-12-12 02:42:14 -08:00
Régis Hanol
fe0188fd24 remove unused diff_engine class 2013-12-12 10:37:57 +01:00
Godfrey Chan
3c80ee0b8a ✂️ scoped for Rails 4 compat 2013-12-12 00:37:04 -08:00