Commit Graph

1799 Commits

Author SHA1 Message Date
Sam d79aa917f1 add option suppress_reply_directly_above to stop suppressing the reply directly above
added a bunch of debugging information to help diagnose weird positioning issues
2013-07-08 11:13:45 +10:00
Robin Ward 337f393af5 Merge pull request #1155 from ZogStriP/remove-auto-link-images-wider-than-setting
removed auto_link_images_wider_than setting
2013-07-06 17:12:11 -07:00
Robin Ward dd6530f45c Merge pull request #1151 from abbat/patch-1
Fix title for plain view
2013-07-06 17:09:44 -07:00
Robin Ward f314bd9215 Merge pull request #1153 from abbat/patch-2
Add "Next page" link to plain topic view
2013-07-06 17:09:16 -07:00
Régis Hanol 45c227c81c fix column name in admin email logs 2013-07-06 22:29:16 +02:00
Régis Hanol 6251935b1e removed auto_link_images_wider_than setting 2013-07-06 22:19:16 +02:00
Anton Batenev 3dc850e3d4 Add "Next page" link to plain topic view
"Next page" link also under noscript tag and not indexed by old crawlers.
2013-07-06 18:57:08 +04:00
Anton Batenev 8cac92dd11 Fix title for plain view
Fix title for plain view - remove <a href=> tag from title.
2013-07-06 16:58:44 +04:00
Neil Lalonde 25d2cbc33f Merge branch 'master' of github.com:discourse/discourse 2013-07-05 16:52:27 -04:00
Neil Lalonde 1c0e0da683 Add rss feed for latest and hot 2013-07-05 16:49:06 -04:00
Robin Ward 1c18490141 Revert "cheat to fix duplicate key on thumbnails"
This reverts commit 0c702522c4.
2013-07-05 16:09:43 -04:00
Robin Ward 6cd6484b5e New mode for Wordpress: Filter ONLY posts liked by moderators 2013-07-05 16:07:24 -04:00
Robin Ward 2e7eee7ebd FIX: Clear state when you abandon. 2013-07-05 13:55:33 -04:00
Robin Ward d1a0b5dd44 FIX: Editing a title would not clear it out on your next edit. 2013-07-05 13:04:54 -04:00
Robin Ward 11bb9aafc7 Extra tests for composer 2013-07-05 13:04:49 -04:00
Robin Ward 7335f5fb7f Merge pull request #1145 from abbat/yandex-workaround
Workaround solution to help Yandex crawler index discourse.
2013-07-05 10:04:40 -07:00
Neil Lalonde 84ce04dfa5 Use POST for send_activation_email action 2013-07-05 12:26:46 -04:00
Anton Batenev 694a6f4970 Fix recommendations from #1145 2013-07-05 15:59:39 +04:00
Sam 363e1010c4 never double load the stream. 2013-07-05 21:23:01 +10:00
Sam 0c702522c4 cheat to fix duplicate key on thumbnails 2013-07-05 15:01:31 +10:00
Sam 9afea0ed07 spec for change 2013-07-05 14:23:29 +10:00
Sam f3ac84d41f our referer is bust if there is no domain 2013-07-05 14:07:08 +10:00
Régis Hanol 7c82d6d4d0 FIX: new users are allowed to upload images to your servers 2013-07-05 00:44:18 +02:00
Robin Ward 07ebd20776 Merge pull request #1143 from ahx/fix-cas-email-name-and-improve-authentication-specs
Improve the omniauth controller specs. Fix the email provided by CAS. Get name from CAS attributes.
2013-07-04 14:48:52 -07:00
Robin Ward e58d09a463 FIX: If the progress docked and you jumped to the top it could dissappear. 2013-07-04 17:35:20 -04:00
Robin Ward 2d821d1ff4 Clicking the #site-logo will refresh the latest list. 2013-07-04 17:31:06 -04:00
Robin Ward 4a3bc1fb43 More Javascript Tests + Fixtures. Also a rake task to crawl them. 2013-07-04 16:20:43 -04:00
Neil Lalonde 594cb50f18 Use the correct locale in html lang attribute 2013-07-04 14:32:16 -04:00
Neil Lalonde 227294897e Remove .rss from the link element of channel in a category's rss feed 2013-07-04 14:17:01 -04:00
Anton Batenev af36d32f7f Workaround solution to help Yandex crawler index discource.
Yandex search engine doesn't index noscript tag content. See also
http://meta.discourse.org/t/noscript-tag-and-some-search-engines/8078
2013-07-04 22:08:23 +04:00
Robin Ward 28c168fc2b FIX: Unintended edits with composer 2013-07-04 13:35:15 -04:00
Neil Lalonde c157c61d0e Use the same time ago formating in embedded post as other posts 2013-07-04 10:08:44 -04:00
Robin Ward ea11286ab6 Merge pull request #1131 from novemberkilo/feature/temporary-boost-trust-levels
Feature: Admin can modify user trust levels
2013-07-04 06:57:59 -07:00
Navin c065fad546 Refactor setting originalTrustLevel to model. 2013-07-04 13:01:01 +02:00
Andreas Haller 661f2057f7 Improve the omniauth controller specs. Fix the email provided by CAS. Get name from CAS attributes.
* Make omniauth controller specs more robust by using shared examples for all authentication providers in controller spec. – Still passing. Yay!

* Return "casuser", instead of "casuser@" when no cas_domainname is configured.

* If no cas_domainname is configured, the CAS authentication would return "casuser@" for the users email field, because it tried to assume the email adress of the CAS user by it's username + cas_domainname.
  Now it just returns the username instead of adding an "@" if cas_domainname is not configured.
  This especially makes sense on CAS setups where the username equals the users email adress.
  The old behaviour, if cas_domainname is configured, was not changed.

* Fetch the email from CAS attributes if provided
  If the cas:authenticationSuccess (handled via omniauth-cas) response gives us an email use that.
  If not, behave as before (username or username@cas_domainname).

* Fetch the (full) name from CAS attributes if provided
  If the CAS response by omniauth provides a [:info][:name] field, prefer this over the uid, because we want the name to be a "Full Name", instead of just a "shortname"
2013-07-04 12:01:39 +02:00
Jeff Atwood 1589874cd2 use a color constant instead of hardcoding 2013-07-04 01:11:45 -07:00
Jeff Atwood b555a0d461 try colorizing the category description ala BBS 2013-07-04 01:09:03 -07:00
Navin b90a79d40a Move setting originalTrustLevel from a CP to setupController 2013-07-04 09:32:12 +02:00
Sam ca7c10df9a Merge pull request #1139 from stephankaag/correct_image_url_rails4
No need to include all ActionView::Helpers in Topic
2013-07-03 23:29:43 -07:00
Sam b662cb6c02 If a user read to the end of an auto closing topic, when it is closes just pretend they read the close message. 2013-07-04 11:47:12 +10:00
Robin Ward 06e5615088 OOPS! Robin self-flaggelated. 2013-07-03 19:13:13 -04:00
Sam f08e9d8822 Merge pull request #1142 from ZogStriP/fix-can-no-longer-paste-image-in-chrome-post-editor
FIX: can no longer paste image in Chrome post editor
2013-07-03 16:08:51 -07:00
Robin Ward f5d6b41f91 FIX: posts weren't being marked as last read correctly 2013-07-03 19:03:11 -04:00
Régis Hanol 5a56af03bc FIX: can no longer paste image in Chrome post editor 2013-07-04 00:39:23 +02:00
Robin Ward 4331bba549 FIX: Quotes with text against them had the wrong spacing 2013-07-03 18:26:08 -04:00
Neil Lalonde 2c8ed8414c If an auto-closing topic is manually closed, remove the auto-close countdown 2013-07-03 16:54:41 -04:00
Robin Ward 44cd5505d3 FIX: Repeatedly editing a post was popping up abandon dialog 2013-07-03 15:57:23 -04:00
Stephan Kaag 7cc7116680 No need to include all ActionView::Helpers in Topic, we only need the sanitize helper.
This also fixes a bug in Rails 4 where image_url gets accidentally overridden.
2013-07-03 21:43:29 +02:00
Neil Lalonde 115491a057 Don't overlap post date with a quote inside an embedded post. CSS could still be improved. 2013-07-03 15:11:35 -04:00
Robin Ward ba0bd934ba FIX: Links to images in posts won't go through the Discoruse router 2013-07-03 14:06:34 -04:00