Commit Graph

3709 Commits

Author SHA1 Message Date
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
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
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
Arpit Jalan ad481b3427 FIX: permalinks like read.php should work 2015-09-11 00:16:37 +05:30
Jeff Atwood 9ba5d73ddf omit needless words 2015-09-09 22:16:15 -07:00
Régis Hanol 38cb72b329 FEATURE: upload placeholder 2015-09-09 23:14:06 +02:00
Robin Ward 9f826f1ad6 UX: Change style of "New" next to unread FAQ 2015-09-09 15:18:26 -04:00
Jeff Atwood 5ae6257504 shorter copy for post placeholder text 2015-09-09 04:27:27 -07:00
Régis Hanol 9a999bfe84 FIX: ensure we never have a string when an enum is Fixnum 2015-09-09 12:59:49 +02:00
Robin Ward d3666d3468 FIX: If private messages are disabled don't show the menu link 2015-09-08 16:32:20 -04:00
Régis Hanol 0e02e0272d FIX: always-enabled plugins should be, well, enabled 2015-09-08 19:28:05 +02:00
Robin Ward 2866440968 Don't cache urls with `emoji` in them unless they are images 2015-09-08 13:12:32 -04:00
Sam 71892cc5f4 FEATURE: select all / deselect all on search page 2015-09-08 16:11:21 +10:00
Arpit Jalan 21f81979cb Update Translations 2015-09-07 19:48:43 +05:30
Sam 335be272ff FEATURE: implement capping of new/unread
We cap new and unread at 2/5th of SiteSetting.max_tracked_new_unread

This dynamic capping is applied under 2 conditions:

1. New capping is applied once every 15 minutes in the periodical job, this effectively ensures that usually even super active sites are capped at 200 new items

2. Unread capping is applied if a user hits max_tracked_new_unread,
  meaning if new + unread == 500, we defer a job that runs within 15 minutes that will cap user at 200 unread

This logic ensures that at worst case a user gets "bad" numbers for 15 minutes and then the system goes ahead and fixes itself up
2015-09-07 12:03:17 +10:00