codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-04 12:51:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
18290 commits 7 branches 179 tags 87 MiB
Commit graph

18290 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arpit Jalan
5b8817cc70 Merge pull request #3807 from riking/patch-8 
Add styling & assets for google docs placeholder oneboxes
 2016-01-26 14:37:57 +05:30
Khoa, Le Ngoc
06e637fc4a Merge remote-tracking branch 'upstream/master' into update-locale-vietnamese 
* upstream/master: (185 commits)
  SECURITY: Upgrade rails.
  FIX: new user summary page was broken
  Version bump to v1.5.0.beta9
  Remove addressable from Discourse.
  UX: change glyph when inviting existing user to a topic
  FIX: Allow for large free disk space
  Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923)"
  UX: improve styling of messages and mobile view of messages
  FIX: correct counts on user summary
  FIX: link to filtered down list of badges from summary FEATURE: pick featured badges in summary page
  FIX: do not allow new email to be duplicate FIX: return proper error message when email already exists
  retain unactivated accounts a bit longer default
  FEATURE: blocked users can send and reply to private messages from staff
  Remove Arel patch that has been merged upstream.
  correct path
  little typo
  FIX: Missing tag in CSS.
  PERF: remove 10-20ms of work from every page view
  FIX: remove green background for wiki (this can be re-added via a customization if needed)
  Hotfix for unsubscribe via email
  ...

# Conflicts:
#	.tx/config
 2016-01-26 12:44:29 +07:00
Guo Xiang Tan
2a24403ef8 Merge pull request #3976 from tgxworld/upgrade_rails 
SECURITY: Upgrade rails.
 2016-01-26 12:23:23 +08:00
Guo Xiang Tan
33a7651ad6 SECURITY: Upgrade rails. 2016-01-26 12:01:57 +08:00
Arpit Jalan
3ed703b856 FIX: new user summary page was broken 2016-01-26 03:02:16 +05:30
Arpit Jalan
d0719aed24 FIX: changing topic from one watched category to another watched category makes topic 'new' again 2016-01-26 01:28:01 +05:30
Neil Lalonde
0a95fee68f Version bump to v1.5.0.beta9 2016-01-25 13:40:56 -05:00
Guo Xiang Tan
b91522c450 Merge pull request #3974 from tgxworld/remove_addressable_from_discourse 
Remove addressable from Discourse.
 2016-01-25 20:15:21 +08:00
Guo Xiang Tan
0e73660c8d Remove addressable from Discourse. 2016-01-25 18:34:58 +08:00
Arpit Jalan
23c1c5ef19 UX: change glyph when inviting existing user to a topic 2016-01-25 13:10:51 +05:30
Sam
ee823305a1 FIX: Allow for large free disk space 
reported via @envygeeks shift multiplication of free space out of awk and into rube

awk on some systems appears to be converting stuff to floats.
 2016-01-25 13:22:36 +11:00
Sam
7138b74110 Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923)" 
This reverts commit 260d023b65.
 2016-01-25 13:03:43 +11:00
Sam
b3855d94f4 Merge pull request #3972 from tgxworld/remove_arel_patch_merged_upstream 
Remove Arel patch that has been merged upstream.
 2016-01-25 09:27:57 +11:00
Sam
403f766546 UX: improve styling of messages and mobile view of messages 2016-01-24 18:11:49 +11:00
Sam
d0ee32f3ce FIX: correct counts on user summary 2016-01-24 16:39:01 +11:00
Sam
4b8e12d138 FIX: link to filtered down list of badges from summary 
FEATURE: pick featured badges in summary page
 2016-01-24 15:51:30 +11:00
Arpit Jalan
0064927077 FIX: do not allow new email to be duplicate 
FIX: return proper error message when email already exists
 2016-01-23 13:42:53 +05:30
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