Commit graph

7596 commits

Author SHA1 Message Date
Sam
de9aa49b52 BUGFIX: default should register CSS for both mobile and desktop
If you want desktop only use :desktop option
2014-04-10 16:30:22 +10:00
Sam
97269fc918 FEATURE: education panel on pinning at bottom of topics 2014-04-10 15:53:58 +10:00
Jeff Atwood
cfc1444177 Merge pull request #2246 from awesomerobot/master
de-bluing some non-links
2014-04-09 21:06:10 -07:00
Kris Aubuchon
ec96ca4c60 modifying some styles for the new pin/unpin feature 2014-04-09 23:27:05 -04:00
Kris Aubuchon
1725f6e5bc Merge remote-tracking branch 'upstream/master' 2014-04-09 21:26:00 -04:00
Kris Aubuchon
8067381782 de-bluing some non-links 2014-04-09 21:19:04 -04:00
Sam
b9d4edd91a FEATURE: display unpinned state, allow unpinning by clicking on pin 2014-04-10 10:59:02 +10:00
Jeff Atwood
3f6764ce22 don't need the external link glyph in summary now 2014-04-09 17:10:07 -07:00
Jeff Atwood
1926a4c236 Safari 5.1 apparently, so fine 2014-04-09 16:21:08 -07:00
Sam
ac097e2d0f Merge pull request #2244 from vikhyat/css-import
Site Customization @import fixes
2014-04-10 07:01:34 +10:00
Robin Ward
b0405d7cfa Adds a Site Setting to whitelist onebox domains 2014-04-09 16:57:45 -04:00
Robin Ward
f8964bf453 Remove unused SiteSetting 2014-04-09 16:18:31 -04:00
Robin Ward
868fa2187d Upgrade Onebox gem to get many new fixes 2014-04-09 16:03:21 -04:00
Neil Lalonde
7d760a5145 Add subcategory badge to digest emails 2014-04-09 13:59:39 -04:00
Robin Ward
034287033e Add back onebox support for flash video 2014-04-09 13:41:25 -04:00
Régis Hanol
c3a1c867dd REFACTOR: poll mailbox specs 2014-04-09 19:26:19 +02:00
Robin Ward
ce40a27274 FIX: If there is an invalid URI in the import, don't throw an error 2014-04-09 11:04:45 -04:00
Robin Ward
4da76aab96 FIX: Markdown javascript error with certain formatting. 2014-04-09 10:46:24 -04:00
Vikhyat Korrapati
33307a50b3 Get rid of plugins.css, inject it using DiscourseSassImporter. 2014-04-09 19:42:43 +05:30
Régis Hanol
3e72de7dc1 BUGFIX: share pop-up wasn't properly positioned when activated using keyboard 2014-04-09 16:01:09 +02:00
Vikhyat Korrapati
8c129e480a Always use DiscourseSassImporter, add optional sprockets deps tracking. 2014-04-09 19:17:19 +05:30
Jeff Atwood
863a099783 add launcher command info 2014-04-08 23:45:48 -07:00
Jeff Atwood
66f517d51e add official 1 GB support with UNICORN_WORKERS 2014-04-08 23:38:48 -07:00
Sam
324077bb6c Merge pull request #2241 from bmamlin/closed-poll-readme
Update README.md for poll plugin
2014-04-09 13:35:39 +10:00
Burke Mamlin
b694b19299 Update README.md for poll plugin 2014-04-08 23:19:19 -04:00
Sam
93d79080bb BUGFIX: broken specs after pulling in closed poll stuff 2014-04-09 12:38:21 +10:00
Sam
90a26ddbb5 Merge pull request #2240 from bmamlin/closed-poll
allow polls to be closed independently of topic
2014-04-09 12:10:46 +10:00
Sam
4c82386f80 BUGFIX: bust for anon 2014-04-09 11:24:33 +10:00
Burke Mamlin
765cf700e3 allow polls to be closed independently of topic 2014-04-08 21:16:29 -04:00
Sam
8cdf25532c Merge pull request #2207 from riking/list-setting
UI for list site settings
2014-04-09 09:34:50 +10:00
Sam
b0dc9279ff Merge pull request #2203 from riking/change-owner
Change post owner functionality
2014-04-09 09:31:46 +10:00
riking
6779bec58c Add UI for list site settings 2014-04-08 14:17:55 -07:00
riking
9c4dd1cb35 Change comma-delim site settings to pipe-delim 2014-04-08 14:17:55 -07:00
Neil Lalonde
948c509148 Version bump to v0.9.9.1 2014-04-08 17:16:09 -04:00
Robin Ward
aa63868d5e FIX: Problem crawling amazon titles 2014-04-08 16:39:47 -04:00
Robin Ward
c3bc49d5d4 Ditch params when showing link domains 2014-04-08 15:15:22 -04:00
Régis Hanol
79ad879170 BUGFIX: uses markdown instead of HTML when inserting hyperlinked images 2014-04-08 19:33:14 +02:00
Régis Hanol
b328fd0031 BUGFIX: N+1 query when listing users in admin section 2014-04-08 19:12:53 +02:00
Régis Hanol
79c6bb718a BUGFIX: make sure site settings are refreshed after a restore 2014-04-08 18:06:53 +02:00
Régis Hanol
6373de550f update annotations 2014-04-08 17:35:44 +02:00
Régis Hanol
11dcd2f6c5 BUGFIX: add default value to top_topics' scores 2014-04-08 17:35:28 +02:00
Vikhyat Korrapati
ce4f87e461 Pass sprockets context and environment to Sass::Engine. 2014-04-08 20:09:11 +05:30
Sam
77133fd896 Merge pull request #2239 from riking/setting-strip-b
Strip whitespace from site settings
2014-04-08 19:29:49 +10:00
riking
eb90315dfd Strip whitespace from site settings 2014-04-08 01:59:48 -07:00
riking
1540a3d5e5 Allow changing ownwership of posts by admins 2014-04-08 01:47:42 -07:00
riking
7a843d2ac2 FIX: Only unhide flagged post if editor is the author
Also, rename @user to @editor in PostRevisor
2014-04-08 01:47:36 -07:00
riking
4814659b7b FIX: Edit ratelimits should be on the actor, not post owner 2014-04-08 01:47:36 -07:00
Jeff Atwood
150081bf27 die, colon! DIEEEEEEeeeEEeee 2014-04-08 00:12:00 -07:00
Sam
792393442f Merge pull request #2159 from riking/widen-gap
Widen 'post omitted' bars
2014-04-08 17:05:04 +10:00
Sam
d71f62a9f9 Merge pull request #2180 from tomciopp/master
More idiomatic approach to finding drafts
2014-04-08 16:46:24 +10:00