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
Neil Lalonde
a0f07f8914
Show the error message when send activation email fails from admin
2013-07-05 11:50:43 -04:00
Neil Lalonde
ceee8ed63b
Put back mailcatcher config in development.rb
2013-07-05 11:32:54 -04:00
Neil Lalonde
7bcf1c5aaa
Merge branch 'master' of github.com:discourse/discourse
2013-07-05 10:57:05 -04:00
Neil Lalonde
f7f9406b83
Update the omnibus_updater chef recipe
2013-07-05 10:56:57 -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
a1f1849392
getting weird exceptions after handling one, work around
2013-07-05 17:44:32 +10:00
Sam
1db9108c1b
add some error handling
2013-07-05 16:55:14 +10:00
Sam
50767be722
user where as opposed to find to compensate for deleted topics
2013-07-05 15:21:04 +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
Sam
64c89316a6
Merge pull request #1147 from ZogStriP/fix-new-users-are-allowed-to-upload-images-to-your-servers
...
FIX: new users are allowed to upload images to your servers
2013-07-04 17:21:00 -07: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
6e504e20b4
Merge pull request #1146 from ZogStriP/add-comment-in-database-yml-files
...
add a comment in database.yml template files indicating that Sidekiq mus...
2013-07-04 14:47:22 -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
Régis Hanol
c42cb6ef48
add a comment in database.yml template files indicating that Sidekiq must be restarted after changes
2013-07-04 23:31:36 +02: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
Jeff Atwood
5d26ed9820
add hardware reqs
2013-07-04 00:43:17 -07:00
Jeff Atwood
649f1ebe61
add memory and dual core recommendations
2013-07-04 00:38:24 -07:00
Navin
b90a79d40a
Move setting originalTrustLevel from a CP to setupController
2013-07-04 09:32:12 +02:00
Sam
f9120f1250
let us not fail the spec suite cause the local provider for site settings reloads.
2013-07-04 16:49:17 +10: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
b83e3a3ffd
Merge pull request #1137 from kubabrecka/cs_update47
...
cs translation update
2013-07-03 23:29:05 -07:00
Sam
33a49607d6
Merge pull request #1138 from kubabrecka/en_yml_action_type_fix
...
remove localization duplicate - seems like a typo
2013-07-03 23:15:26 -07:00
Sam
1b63cc152a
Merge pull request #1141 from abbat/master
...
i18n transliteration map from Russian Cyrillic to ASCII
2013-07-03 23:14:33 -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
7504da13e3
FIX: Whitespec in specs changed. We should really figure out a better way of ensuring correctness here.
2013-07-03 19:24:49 -04: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
Anton Batenev
89dcded3a7
i18n transliteration map from Russian Cyrillic to ASCII
...
i18n transliteration map from Russian Cyrillic to ASCII
(ISO-9:1995 / GOST 7.79-2000, table B) for pretty URLs (slug)
2013-07-04 01:17:01 +04:00
Neil Lalonde
41729aab14
Stub site setting methods instead of setting them
2013-07-03 16:54:41 -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
