IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 20:24:05 -06:00
Code Issues Packages Projects Releases Wiki Activity
23,290 Commits 220 Branches 500 Tags 902 MiB
54e8fb0d89
Commit Graph

23290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Régis Hanol
54e8fb0d89 FEATURE: new 'allow_staff_to_upload_any_file_in_pm' site setting 2017-06-12 22:41:29 +02:00
Neil Lalonde
16475bae89 padding below suggested topics on mobile 2017-06-12 15:46:10 -04:00
Robin Ward
2ff850d446 FIX: If forcing a refresh, don't return a onebox preview 2017-06-12 14:05:59 -04:00
Neil Lalonde
0b41046238 don't force SiteSetting.title into meta title tag 2017-06-12 13:50:50 -04:00
Robin Ward
a3729b51eb FIX: Always allow the host the forum is hosted on 2017-06-12 13:22:51 -04:00
Neil Lalonde
eaeae0ac31 Version bump to v1.9.0.beta2 2017-06-12 12:48:24 -04:00
Robin Ward
bd70656b90 FIX: Oneboxing root domains could stop previewing 2017-06-12 12:13:29 -04:00
Arpit Jalan
4112c2b883 Update translations 2017-06-12 21:24:40 +05:30
Arpit Jalan
545c0ab056 Merge pull request #4918 from techAPJ/user-fields-invite 
FEATURE: add required user fields to invite accept form
 2017-06-12 21:06:22 +05:30
Arpit Jalan
b9c94aa234 FEATURE: add required user fields to invite accept form 
UX: make "accept invitation" page consistent with sign up modal
 2017-06-12 20:43:07 +05:30
Blake Erickson
9b8bf9c18c reverting add readonly to site settings 
see this commit for more details:

2ffddfb32c (commitcomment-22480952)
 2017-06-12 06:53:57 -06:00
Guo Xiang Tan
eab3562864 Merge pull request #4905 from tgxworld/strip-zero-width-chars-from-search-term 
FIX: Strip zero-width characters from search terms.
 2017-06-12 18:01:02 +09:00
Guo Xiang Tan
3acc9941dd Merge pull request #4920 from greysteil/dependabot/bundler/mail-2.6.6 
Bump mail from 2.6.6.rc1 to 2.6.6
 2017-06-12 18:00:08 +09:00
Guo Xiang Tan
5994c85ea9 FIX: Raise the right error when email params is missing. 2017-06-12 17:48:32 +09:00
Guo Xiang Tan
23420c0817 Merge pull request #4919 from tgxworld/allow_emails_to_be_skipped_for_a_notification 
UX: Don't send emails for discobot notifications.
 2017-06-12 17:11:58 +09:00
Guo Xiang Tan
e888369f51 UX: Don't send emails for discobot notifications. 2017-06-12 17:00:27 +09:00
Guo Xiang Tan
41365f681c Pin eslint to version 3.x on travis. 2017-06-12 15:20:47 +09:00
Arpit Jalan
70927d57ec FIX: wrong reset password link for zh_CN locale 2017-06-12 11:39:09 +05:30
Guo Xiang Tan
666e3e2890 Fix eslint. 2017-06-12 14:48:50 +09:00
Guo Xiang Tan
a7ed6bd9e1 Use User#username_lower instead. 2017-06-12 10:58:31 +09:00
dependabot[bot]
d43b46d09b Bump mail from 2.6.6.rc1 to 2.6.6 
Bumps [mail](https://github.com/mikel/mail) from 2.6.6.rc1 to 2.6.6.
- [Changelog](https://github.com/mikel/mail/blob/master/CHANGELOG.rdoc)
- [Commits](https://github.com/mikel/mail/commits/v2.6.6)
 2017-06-10 07:03:22 +00:00
Arpit Jalan
6e37f09b19 UX: add email to '/email/unsubscribed' page 2017-06-10 09:51:12 +05:30
Blake Erickson
2ffddfb32c add Enable read-only to Settings page 2017-06-09 16:07:02 -06:00
Robin Ward
b5bead1fe3 FIX: Don't use target=_blank for local oneboxes 2017-06-09 12:15:36 -04:00
Sam
a77c0f2265 Merge pull request #4914 from greysteil/dependabot/bundler/puma-3.9.1 
Bump puma from 3.6.0 to 3.9.1
 2017-06-09 11:50:21 -04:00
Robin Ward
d8ba1c66d5 FIX: Don't fail seed if avatar can't be downloaded 2017-06-09 11:01:48 -04:00
Jeff Atwood
5ff986129a copyedit to unsubscribe email 2017-06-09 00:27:24 -07:00
Arpit Jalan
1c0bbcd580 UX: show user email when unsubscribing 2017-06-09 09:20:24 +05:30
Robin Ward
8e2e962b1a FIX: Replace /my/ URLs before fixing the prefix 2017-06-08 16:21:54 -04:00
Jeff Atwood
33e3746d4d Merge pull request #4916 from pfaffman/patch-1 
Typo: I've been staring at this thing starting for weeks
 2017-06-08 13:17:30 -07:00
Jay Pfaffman
0da8bdca73 Update development.rb 2017-06-08 13:07:51 -07:00
Robin Ward
d92c938491 FIX: Don't raise an error cleaning up uploads if a path is nil 2017-06-08 14:31:58 -04:00
Robin Ward
602e4d0da4 FIX: Return nil when the reply_key is missing 2017-06-08 14:28:48 -04:00
dependabot[bot]
63eb298089 Bump puma from 3.6.0 to 3.9.1 
Bumps [puma](https://github.com/puma/puma) from 3.6.0 to 3.9.1.
- [Release notes](https://github.com/puma/puma/releases/tag/v3.9.1)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.6.0...v3.9.1)
 2017-06-08 14:37:02 +00:00
Régis Hanol
6997925a52 Merge pull request #4910 from jomaxro/patch-2 
Add missing URL
 2017-06-08 14:00:37 +02:00
Régis Hanol
a88a970315 Merge pull request #4911 from jomaxro/patch-1 
Fix pluralization for theme out-of-date notice
 2017-06-08 14:00:14 +02:00
Régis Hanol
9764c8ab91 Merge pull request #4912 from jomaxro/patch-3 
Fix typo in post merge confirmation
 2017-06-08 13:59:44 +02:00
Guo Xiang Tan
977bbb1f45 FIX: Bot mentioned check should be case insensitive. 2017-06-08 19:00:07 +09:00
Matt Palmer
251aa8c5f9 Merge pull request #4907 from pfaffman/tar-take-3 
FIX: allow tar to finish if files change during backup
 2017-06-08 15:47:28 +10:00
jomaxro
a813062e78 Fix typo in post merge confirmation 2017-06-08 00:19:31 -04:00
jomaxro
8c46bc140a Fix pluralization for theme out-of-date notice 2017-06-08 00:17:47 -04:00
jomaxro
dbaf7ad052 Add missing URL 2017-06-08 00:14:20 -04:00
Guo Xiang Tan
2b1c8b017b Merge pull request #4908 from tgxworld/another_round_of_gem_updadtes 
Another round of gem updades
 2017-06-08 08:48:34 +09:00
Régis Hanol
038454bde2 FIX: always confirm emails when SSO says so 2017-06-08 01:05:33 +02:00
Guo Xiang Tan
ff1154b523 Update Sidekiq to 5.0.x. 2017-06-08 07:15:13 +09:00
Guo Xiang Tan
22ecbf1249 More gem updates. 2017-06-08 07:14:22 +09:00
Régis Hanol
e8f0771dc9 FIX: the 'clean_up_uploads' jobs would delete images used in site settings 
when they were entered using absolute URLs, with the CDN or simple a different format than the one used in the database
 2017-06-07 22:53:15 +02:00
Guo Xiang Tan
677fbc783d Fix randomly failing spec. 2017-06-08 05:47:44 +09:00
Jay Pfaffman
83110a1a81 FIX: allow tar to finish if files change during backup 2017-06-07 13:31:02 -07:00
Robin Ward
17a3eddb9f FIX: Invalid path for new user of the month badge with subfolders 2017-06-07 12:54:30 -04:00