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
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
Kuba Brecka
f7e2b3be7f
remove localization duplicate - seems like a typo
2013-07-03 21:27:46 +02:00
Kuba Brecka
e58f9ef843
cs translation update
2013-07-03 21:22:41 +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
Robin Ward
b0e10673a2
FIX: Small bugs with progress indicator
2013-07-03 12:31:00 -04:00
Neil Lalonde
80928de21e
Don't double render faq and privacy policy
2013-07-03 11:57:27 -04:00
Robin Ward
ffac22a143
FIX: Support underscores in autocomplete widget
2013-07-03 11:48:59 -04:00
Robin Ward
c7ac11458b
FIX: Removed some leftover posts references outside of the stream
2013-07-03 11:29:29 -04:00
Robin Ward
f328804488
Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions
...
Conflicts:
app/models/site_setting.rb
2013-07-03 11:18:42 -04:00
Robin Ward
07791ea471
Fix update statement for Rails 4 preparation
2013-07-03 11:17:16 -04:00
Robin Ward
6364fc74ef
Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls
...
Conflicts:
app/services/spam_rules_enforcer.rb
2013-07-03 11:13:56 -04:00
Robin Ward
c12e87650d
Merge pull request #1130 from adrianlang/patch-1
...
Fix German translation of user_automatically blocked template
2013-07-03 08:06:15 -07:00
Robin Ward
3f28edbd32
Merge pull request #1132 from ThomasHarper/patch-8
...
Update client.fr.yml
2013-07-03 07:58:35 -07:00
ThomasHarper
7ef5f0ac9b
Update server.fr.yml
2013-07-03 14:47:38 +02:00
ThomasHarper
4f10ea9880
Update server.fr.yml
...
Added few POPS3 translations and few things
2013-07-03 14:22:31 +02:00
ThomasHarper
67502d0c8e
Update server.fr.yml
...
added cas_domainname
2013-07-03 14:07:26 +02:00
ThomasHarper
64a00e284e
Update client.fr.yml
...
Missing capital on homepage
2013-07-03 11:43:52 +02:00
Navin
3da37506da
Back end - temporary boosting of trust levels
2013-07-03 10:30:40 +02:00
Navin
f92d9cec47
Front end mods to use combobox for selecting user's trust level
2013-07-03 10:30:32 +02:00
Adrian Lang
5ea2bce646
Fix German translation of user_automatically blocked template
...
Right now this bug prevents blocking with German locale.
2013-07-03 09:38:21 +02:00
Sam
d3cfb56000
buggy is reply directly below
2013-07-03 16:48:55 +10:00
Sam
4d4a5735d2
logic to bypass trust level filter for high scoring posts
2013-07-03 12:37:17 +10:00
Robin Ward
ce0a7739cf
FIX: Invalid Unicode in preload store JSON
2013-07-02 20:43:52 -04:00
Neil Lalonde
bb74c8b9cf
Widen the Age column on categories page to fit the new date format
2013-07-02 17:22:35 -04:00
