Commit Graph

3738 Commits

Author SHA1 Message Date
Sam
b2e3703ae7 Revert "UX: always show logout link in user menu, use CSS to hide"
oops was on wrong branch

This reverts commit 2cbb49baec.
2015-09-25 12:16:17 +10:00
Sam
2cbb49baec UX: always show logout link in user menu, use CSS to hide
.menu-panel .logout-link {display: none}
2015-09-25 12:14:20 +10:00
Neil Lalonde
65e159b073 Merge master 2015-09-22 15:00:32 -04:00
Kane York
e36c0966d0 FIX: :( page was never showing the URL 2015-09-21 11:38:37 -07:00
Arpit Jalan
7a9404750e Update Translations 2015-09-21 17:51:42 +05:30
Jeff Atwood
ccdd614d7f missing updated copy for category notification prefs 2015-09-18 16:14:18 -07:00
Jeff Atwood
3457ecfd04 minor copy tweaks 2015-09-18 13:26:29 -07:00
Arpit Jalan
49fc4571b0 Update Translations 2015-09-19 01:09:12 +05:30
Robin Ward
cc516d3be0 Merge pull request #3743 from sitepoint/topic-embed-info
Add embed/info endpoint for TopicEmbed queries
2015-09-18 11:00:01 -04:00
Jeff Atwood
f37f6f7673 minor embed style tweak 2015-09-18 02:44:13 -07:00
Sam
a4ace3f08e FEATURE: ui for ordering search results in full page mode 2015-09-18 17:16:53 +10:00
Régis Hanol
07e7b07b63 FIX: refreshing gravatar wasn't working 2015-09-17 19:42:44 +02:00
Jeff Atwood
33f23500f9 minor copyedit 2015-09-17 00:20:34 -07:00
Jeff Atwood
0969bd0f0d tighten up post spacing on mobile 2015-09-16 23:48:15 -07:00
Kane York
7e8f4286e3 FEATURE: Allow emoji in some translated strings 2015-09-16 18:33:17 -07:00
Jeff Atwood
fbfdb4c28a minor copyedit 2015-09-16 17:18:16 -07:00
Jeff Atwood
4714483612 copyedits on anon user call to signup action 2015-09-16 17:16:17 -07:00
Neil Lalonde
a2e51b0715 FIX: too few topics/posts notice will only show what needs to be done 2015-09-16 17:12:11 -04:00
Kane York
390af7118a Merge branch 'master' into signup-cta
Conflicts:
	app/assets/javascripts/discourse/templates/topic.hbs
2015-09-16 10:06:47 -07:00
Arpit Jalan
3ba6d54843 Update Translations 2015-09-16 19:50:29 +05:30
Régis Hanol
5277ec1ac0 FIX: ensure we have a bucket before enabling backups to S3 2015-09-16 15:55:26 +02:00
Jude Aakjaer
9cca510944 Add embed/info endpoint for TopicEmbed queries 2015-09-16 03:22:24 +00:00
Sam
922c09784b shorten so fits better in UI 2015-09-16 12:33:11 +10:00
Sam
b2ef9a02bf Less words, correct copy 2015-09-16 11:37:56 +10:00
Sam
75e8fa3ee0 document new search predicates 2015-09-16 08:51:28 +10:00
Jeff Atwood
a60a251c93 we actually support inline replies, mostly 2015-09-15 15:04:28 -07:00
Kane York
d47f1db2be Merge branch 'master' into signup-cta
Conflicts:
	app/assets/javascripts/discourse/templates/topic.hbs
2015-09-15 13:52:12 -07:00
Robin Ward
b12ace5f9d FEATURE: Add staff gear icon to composer with options 2015-09-15 16:42:04 -04:00
Kane York
2e2fa693f5 You need to translate the site settings, dummy 2015-09-15 12:42:14 -07:00
Kane York
6be78861ca Merge branch 'master' into signup-cta
Conflicts:
	app/assets/javascripts/discourse/lib/key-value-store.js.es6
2015-09-15 12:26:25 -07:00
Kane York
41721b0898 Rename variables 2015-09-15 12:25:29 -07:00
Guo Xiang Tan
d49f382dcc [CI SKIP] Typo. 2015-09-15 15:55:23 +08:00
Sam
d0199bb717 FEATURE: by default everyone gets the letter free avatar service 2015-09-15 09:54:18 +10:00
Robin Ward
3a93fafb58 FIX: Add when to split this topic text 2015-09-14 16:15:34 -04:00
Arpit Jalan
632c170caa Update Translations 2015-09-14 20:02:40 +05:30
Kane York
a5f906db69 Merge branch 'master' into category-reorder 2015-09-13 19:07:36 -07:00
Sam
25a34e56f4 Merge pull request #3759 from davidgnavas/patch-1
little typo?
2015-09-14 11:59:48 +10:00
Sam
d39faf7ddf FEATURE: allow external avatars to be shadowed by global 2015-09-14 09:43:40 +10:00
David García-Navas López de Cuéllar
6891c7f8aa little typo? 2015-09-13 22:45:26 +02:00
Robin Ward
c1d09be3cf Merge pull request #3753 from riking/patch-6
FIX: Fallbacks for missing interpolation arguments
2015-09-11 14:11:17 -04:00
Robin Ward
5af0f5f80e FEATURE: Whisper posts 2015-09-11 14:05:21 -04:00
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
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
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
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
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