Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,587 Commits 181 Branches 498 Tags 917 MiB
Commit Graph

23587 Commits

Author SHA1 Message Date
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
Robin Ward 54bb2a6bc2 FIX: Don't redirect to wizard when resetting password 2017-06-07 12:36:52 -04:00
Arpit Jalan d326784ecf Update translations 2017-06-07 20:13:54 +05:30
Guo Xiang Tan 5794ff53a1 FIX: Copy custom fields when moving first post of a topic. 
https://meta.discourse.org/t/transfer-poll-votes-when-moving-a-topic-into-an-existing-one/63678
 2017-06-07 19:04:48 +09:00
Guo Xiang Tan 684b05f510 FIX: Strip zero-width characters from search terms. 2017-06-07 18:19:47 +09:00
Guo Xiang Tan 860a7e1fc0 Merge pull request #4904 from tgxworld/update_gems 
Update gems
 2017-06-07 16:53:10 +09:00
Guo Xiang Tan 0f214ed43f Merge pull request #4903 from tgxworld/use_yarn_on_travis 
Switch to yarn for our travis build.
 2017-06-07 11:20:09 +09:00
Guo Xiang Tan 61a4711e83 Update i18n. 2017-06-07 11:13:21 +09:00
Guo Xiang Tan 24cf302753 Update nokogiri. 2017-06-07 11:13:07 +09:00
Guo Xiang Tan 5332f25aa9 Update gems in development group. 2017-06-07 11:12:44 +09:00
Guo Xiang Tan f83e997cf6 Switch to yarn for our travis build. 2017-06-07 10:57:48 +09:00
Guo Xiang Tan 2cad739262 FIX: Better error message when username change fails. 
https://meta.discourse.org/t/500-error-on-username-edit/64064
 2017-06-07 10:45:53 +09:00
Guo Xiang Tan d4d0aa8ca7 Minor fixes for https://github.com/discourse/discourse/pull/4845. 2017-06-07 10:03:19 +09:00
Guo Xiang Tan da736f70a4 Merge pull request #4845 from vinothkannans/download-onebox-images 
FEATURE: pull onebox images
 2017-06-07 09:55:04 +09:00
Neil Lalonde 7dfbb5a395 UX: don't hide the subcategory filters when subcategories are listed below 2017-06-06 17:38:59 -04:00
Neil Lalonde 6aa0823bf4 FIX: lounge category security settings won't be reset after an upgrade 2017-06-06 16:57:21 -04:00
Robin Ward 0de5d01d79 FIX: Onebox wasn't using correct uri 2017-06-06 16:39:15 -04:00
Robin Ward 00f06b8086 UX: Show column headers on user topic lists 2017-06-06 16:07:47 -04:00
Robin Ward 369bb78f8e FIX: Support for cookies in onebox redirects 2017-06-06 15:02:11 -04:00