Commit graph

17252 commits

Author SHA1 Message Date
Kane York
42263ac969 use translations (doh) 2015-09-11 09:46:54 -07:00
Kane York
6119d9fdc0 FIX: Fallbacks for missing interpolation arguments
This takes effect when an interpolation is removed from a translation in
a Discourse update.

The I18n::Backend::Fallbacks loops with a catch(:exception), so calling
throw(:exception) will cause it to use the next locale, until it reaches
English which is assumed to be correct.

Also, enable fallbacks in everything except development (#3724 for more
discussion) - we should be able to test this
2015-09-11 09:39:40 -07:00
Kane York
b3913b5692 doh, computed.or 2015-09-11 09:36:03 -07:00
Kane York
fc5e157395 Sane sendAction() behavior 2015-09-11 09:34:20 -07:00
Robin Ward
7454722247 Merge pull request #3747 from scossar/reorder-menu-components-in-markup
FIX: remove 'left: auto' for slide-in menu (required for RTL layouts)
2015-09-11 12:23:16 -04:00
Robin Ward
4f5d42ca69 Merge pull request #3749 from riking/patch-1
FIX: Don't allow editing seeded category security settings
2015-09-11 12:22:58 -04:00
Neil Lalonde
3c9a818a2f fix broken js tests 2015-09-11 12:22:34 -04:00
Kane York
b706c59ab9 Use the json boolean trick 2015-09-11 09:14:45 -07:00
Robin Ward
f767a6147d Merge pull request #3752 from riking/patch-6
FIX: Give 403 for deleted topics, +lots of tests
2015-09-11 12:11:04 -04:00
Kane York
7e50af7547 Temporarily lock eslint to 1.3.1 2015-09-11 09:10:08 -07:00
Neil Lalonde
637b110e76 use setter in topic-tracking-state or else get assertion error 2015-09-11 11:38:39 -04:00
Neil Lalonde
4b43edee91 UX: mobile topic list and suggested topics: show new/unread counts OR total post count, not both. 2015-09-11 11:38:39 -04:00
Kane York
460243d7a3 FIX: Give 403 for deleted topics, +lots of tests 2015-09-11 08:29:44 -07:00
Régis Hanol
18d7c1c75d fix the build - take 2 2015-09-11 15:47:48 +02:00
Régis Hanol
29f25dbf6e fix the build 2015-09-11 15:18:17 +02:00
Régis Hanol
8128abe6b9 ES6ify user preferences controller 2015-09-11 15:10:56 +02:00
Régis Hanol
a28df55518 fix the build 2015-09-11 15:10:56 +02:00
Régis Hanol
93f9dcfcec FIX: don't overwrite custom uploaded avatar when selecting gravatar
FIX: remove unecessary serialized fields
2015-09-11 15:10:56 +02:00
Régis Hanol
569f2815d1 FIX: ensure we still works with cookies off 2015-09-11 15:10:56 +02:00
Régis Hanol
0c58f08207 FIX: profile picture selector 2015-09-11 15:10:56 +02:00
Sam
6437cd0341 FEATURE: add support for generic external avatar services
This changes it so we only ship an avatar template down to the client
it has no magic, all it knows is how to plug in size
2015-09-11 15:10:56 +02:00
Régis Hanol
22688a31ee Merge pull request #3751 from ismail-arilik/patch-1
Update some strings to meet referred options lists
2015-09-11 14:40:02 +02:00
ismail-arilik
8ca2ab1b3b Update some strings to meet referred options lists
The options which changed strings are referred, were changed to lists so these strings were supposed to be generalized.
2015-09-11 15:02:12 +03:00
Arpit Jalan
d73d4d4769 FIX: UserNameSuggester should not suggest usernames with a sequence of 2 or more special chars 2015-09-11 16:53:26 +05:30
Sam
43f8b2b41a Merge pull request #3750 from tgxworld/fix_broken_serializer
FIX: Broken BasicUserSerializer.
2015-09-11 15:45:05 +10:00
Guo Xiang Tan
98e8b16c34 FIX: Broken BasicUserSerializer. 2015-09-11 11:54:08 +08:00
Sam
90d49d1497 correct paths used for external service 2015-09-11 13:18:07 +10:00
Kane York
aca70805f1 FIX: Discourse.BaseUri should not default to / 2015-09-10 17:34:08 -07:00
Régis Hanol
f6380c66ef oooops 2015-09-11 02:15:45 +02:00
Régis Hanol
2742602254 FEATURE: support for external letter avatars service 2015-09-11 02:12:40 +02:00
Régis Hanol
e43034f08f Revert "FEATURE: SVG letter avatars (based on @eviltrout's spike)"
This reverts commit cd77465788.
2015-09-11 00:23:52 +02:00
Régis Hanol
cd77465788 FEATURE: SVG letter avatars (based on @eviltrout's spike) 2015-09-11 00:11:48 +02:00
Jeff Atwood
36abc6f9f7 Merge pull request #3746 from erlend-sh/patch-6
Repurposing CONTRIBUTING.md into a link portal, 2nd attempt
2015-09-10 15:05:43 -07:00
Kane York
f36dcb6a62 Fix build 2015-09-10 14:21:36 -07:00
Kane York
a9d10f454b Oop 2015-09-10 14:12:08 -07:00
Kane York
d86d4752cb FIX: Don't allow editing seeded category security settings 2015-09-10 14:04:21 -07:00
Kane York
c038758f8c FIX: Several fixes related to category reorder
- Move "New Category" and "Reorder Categories" into a dropdown
 - Always show "New Topic" on categories page, even for admins
 - Make category reorder modal full-height (.full-height-modal)
 - Move category reorder stylesheet out of admin stylesheet
2015-09-10 13:42:10 -07:00
Kane York
0c5fb207e9 FIX: Fix behavior of category reorder dialog 2015-09-10 13:04:25 -07:00
Régis Hanol
b68be6c5de update onebox 2015-09-10 21:56:51 +02:00
scossar
20c8bb0494 remove hardcoded left: auto 2015-09-10 11:51:47 -07:00
Erlend Sogge Heggen
28cd0361d6 Proper long form for CLA
Seems it's most commonly spelled out as "*Contributor* License Agreement", not *Contribution*.
2015-09-10 20:49:03 +02:00
Arpit Jalan
ad481b3427 FIX: permalinks like read.php should work 2015-09-11 00:16:37 +05:30
Erlend Sogge Heggen
ef787b3828 GitHub link was missing the .com
The whole point of adding github.com to the link in the first place was to leave no room for misinterpretation.
2015-09-10 20:46:36 +02:00
Erlend Sogge Heggen
c3a5ddac8c Repurposing CONTRIBUTING.md into a link portal, 2nd attempt
- Slight changes to the CLA paragraph, making it slightly easier to digest.
- Added brief synopsis of the Discourse Development Contribution Guidelines doc
- Replaced Bug Report, Feature Request and Contributing (commits) section with outgoing links

The aim of this change is to reduce the maintenance burden, since more detailed information about contribution guidelines is more naturally documented and maintained on Discourse Meta.
2015-09-10 20:43:36 +02:00
Robin Ward
9224afacaf FIX: Don't put the FAQ as "New" if there is a custom faq_url
If we do this, it's impossible to ever mark it as read.
2015-09-10 14:01:55 -04:00
Robin Ward
e29d24fefa Merge pull request #3741 from scossar/reorder-menu-components-in-markup
FIX: reorder header markup so it works in LTR and RTL layouts
2015-09-10 13:47:52 -04:00
scossar
1f8328feb5 add code that was accidentally deleted 2015-09-10 09:50:42 -07:00
scossar
d2a177f1dd change menu components position in header 2015-09-10 09:50:42 -07:00
Neil Lalonde
354a3f9638 add test for auth_token being cleared by user anonymizer, which it already does 2015-09-10 11:17:48 -04:00
Sam
c5e3be0e71 Merge pull request #3744 from tgxworld/fix_autocomplete_avatar_missing
FIX: Missing avatar in user autocomplete.
2015-09-10 17:35:55 +10:00