Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,773 Commits 180 Branches 498 Tags 916 MiB
Commit Graph

17773 Commits

Author SHA1 Message Date
Jeff Atwood 734450dcc3 retain unactivated accounts a bit longer default 2016-01-22 13:13:07 -08:00
Neil Lalonde 685ba1eb7f FEATURE: blocked users can send and reply to private messages from staff 2016-01-22 12:54:24 -05:00
Khoa, Le Ngoc 905e69a67f Merge branch 'master' of https://github.com/khoa-le/discourse into update-locale-vietnamese 
* 'master' of https://github.com/khoa-le/discourse:
  Update tranlation code

# Conflicts:
#	config/locales/client.vi.yml
#	config/locales/server.vi.yml
#	plugins/poll/config/locales/client.vi.yml
#	plugins/poll/config/locales/server.vi.yml
#	public/403.vi.html
#	public/422.vi.html
#	public/500.vi.html
#	public/503.vi.html
#	vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.vi.yml
 2016-01-22 16:20:49 +07:00
Khoa, Le Ngoc 4bce8f37b0 Add language mapping "vi_VN: vi" 2016-01-22 16:07:30 +07:00
Khoa, Le Ngoc 003399bf96 Update translation code 2016-01-22 14:54:48 +07:00
Khoa, Le Ngoc 2a9c7d0099 Update tranlation code 2016-01-22 14:43:53 +07:00
Guo Xiang Tan b8193e8e67 Remove Arel patch that has been merged upstream. 2016-01-22 12:24:36 +08:00
Sam 9569235d76 correct path 2016-01-22 07:55:07 +11:00
Guo Xiang Tan c27b9581ef Merge pull request #3971 from davidgnavas/patch-2 
little typo
 2016-01-21 22:36:13 +08:00
David García-Navas López de Cuéllar 954e3be7cf little typo 2016-01-21 15:05:03 +01:00
Guo Xiang Tan fc83525a2b FIX: Missing tag in CSS. 2016-01-21 20:39:48 +08:00
Sam 7c5a448f63 PERF: remove 10-20ms of work from every page view 
<%  s=Time.now;

main_app.categories_path
main_app.guidelines_path
main_app.tos_path
main_app.privacy_path

p (Time.now-s)*1000%>

Returns 10-20ms consistently on i7-4770k, on shared hosts the cost
could easily reach 40ms

This code simply calculates the strings

/categories
/guidelines
/tos
/privacy

It is ludicrous to spend this enormous amount of work just to calculate
4 strings.

I do not know if this is something specific about Discourse or a bug in
Rails (I tried without the main_app prefix and got similar results),
regardless we can got to avoid these _path APIs for now

Discovered this when running a flamegraph on our home page.
 2016-01-21 22:43:56 +11:00
Régis Hanol 66f9504632 FIX: remove green background for wiki (this can be re-added via a customization if needed) 2016-01-21 11:46:53 +01:00
Arpit Jalan f0b04ac730 Merge pull request #3970 from gdpelican/unsubscribe-via-email 
Hotfix for unsubscribe via email
 2016-01-21 14:59:17 +05:30
James Kiesel b92e2b33eb Hotfix for unsubscribe via email 2016-01-21 21:46:15 +13:00
Arpit Jalan 590adb5899 Merge pull request #3968 from techAPJ/top-topics 
FEATURE: make top criteria formula multipliers controlled by site setting
 2016-01-21 14:02:26 +05:30
Guo Xiang Tan 07b244741c FIX: the build. 2016-01-21 16:21:54 +08:00
Arpit Jalan 1cee914565 FEATURE: make top criteria formula multipliers controlled by site 
setting
 2016-01-21 10:30:06 +05:30
Guo Xiang Tan a2857d68bb Make eslint happy. 2016-01-21 12:31:50 +08:00
Guo Xiang Tan bd86e88b05 UX: Remove category hashtag decoration. 2016-01-21 12:27:52 +08:00
Régis Hanol 4a17cdc1e4 FIX: don't invite users with emails configured as 'incoming' (reply, group our category) 2016-01-20 23:08:27 +01:00
Régis Hanol f145310cd5 FIX: associates email replies using both 'In-Reply-To' and 'References' headers 2016-01-20 22:52:08 +01:00
Jeff Atwood f5c0972210 Merge pull request #3966 from scossar/simple-email-button 
FIX: email button padding for Outlook
 2016-01-20 12:25:01 -08:00
Régis Hanol c79a8e836e FIX: date picker on mobile 
UPDATE pickaday.js to latest version
 2016-01-20 21:06:41 +01:00
scossar 1fb709362a fix border widths 2016-01-20 11:03:13 -08:00
scossar e2b265eb98 reduce border 2016-01-20 10:19:13 -08:00
Régis Hanol 74b5d063f9 FIX: enabling suppress_from_homepage should only remove the category from the homepage 2016-01-20 17:55:58 +01:00
Régis Hanol a601d4b4ba Merge pull request #3954 from rubo77/patch-5 
save height on small screens
 2016-01-20 16:29:09 +01:00
Arpit Jalan a7605b4e25 Merge pull request #3924 from mikhailvink/master 
Updating Jive import script with images/attachments uploader
 2016-01-20 20:38:59 +05:30
Régis Hanol 260d023b65 FIX: disk_space should be a BigDecimal to handle large disk (closes #3923) 2016-01-20 15:42:24 +01:00
Régis Hanol fc3bedaaed Merge pull request #3921 from gschlager/locale-sk 
Add Slovak locale
 2016-01-20 15:38:48 +01:00
Régis Hanol c88093eecb Merge pull request #3920 from tgxworld/fix_onebox_emoji 
FIX: Emoji in Discourse onebox is wrapped in square brackets.
 2016-01-20 15:38:12 +01:00
Régis Hanol c2c01cdb5d FIX: username suggester to account for the more relaxed username rules (closes #3907) 2016-01-20 15:37:34 +01:00
Régis Hanol a44fb0cb15 Merge pull request #3799 from riking/patch-6 
FEATURE: Make it easy to override the home logo
 2016-01-20 14:47:21 +01:00
Régis Hanol 0ba4bcb2ea Merge pull request #3934 from gschlager/badges 
UX: Show translated badge names and badge groupings
 2016-01-20 14:42:30 +01:00
Régis Hanol ea02b7f54d Merge pull request #3961 from dandv/patch-5 
Include backups among items uploadable to s3
 2016-01-20 14:39:21 +01:00
Régis Hanol f61537bc16 Merge pull request #3952 from gdpelican/unsubscribe-via-email 
Unsubscribe via email
 2016-01-20 14:38:14 +01:00
Arpit Jalan 13f5151ced FIX: refresh admin report was broken 2016-01-20 17:41:21 +05:30
James Kiesel c7283751a3 Unsubscribe via email 2016-01-20 22:25:25 +13:00
Guo Xiang Tan fa794ef59d FIX: Deleting characters on category hashtag was not triggering autocomplete. 2016-01-20 17:18:04 +08:00
Guo Xiang Tan 55352eeb1b FIX: Make eslint happy. 2016-01-20 12:51:54 +08:00
Guo Xiang Tan c6697e2c14 Prefix decorate category badges with '#'. 2016-01-20 12:48:00 +08:00
Guo Xiang Tan 9652c3df4f FIX: Don't track category-badges links. 2016-01-20 12:48:00 +08:00
Sam Saffron 7303f8f309 FEATURE: first pass at user summary page 2016-01-20 15:14:25 +11:00
Neil Lalonde 9ad226aaa8 FEATURE: add email query param to login, signup, and password-reset URLs to prefill form 2016-01-19 16:53:46 -05:00
Régis Hanol 11ea16a91a FIX: localize S3 region names 2016-01-19 17:14:45 +01:00
Régis Hanol 5018a8033d FIX: add link to user profile for staged users 2016-01-19 16:41:07 +01:00
Régis Hanol 29fbc2d7bc FIX: add missing 'user_replied_pm' translation 2016-01-19 15:47:38 +01:00
Régis Hanol 735017dd9f FIX: don't invite users with the same email as 'reply_be_email_address' 2016-01-19 15:24:34 +01:00
Sam d18085c57d Merge pull request #3962 from scossar/category-dropdown-badge-wrapper-width 
FIX: category-dropdown-menu badge-wrapper width
 2016-01-19 19:54:43 +11:00