IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
26,805 Commits 1,018 Branches 579 Tags
07bc52dc69588b8aed4eaf5b41e7ef887fb4f895
Commit Graph
88 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Guo Xiang Tan 7068b90c01 Merge pull request #5651 from tgxworld/live_update_group_messages 
Live update group messages
 2018-03-06 18:55:13 +08:00
Guo Xiang Tan 21c6c82473 Merge pull request #5641 from wjordan/quote-password-restore 
single quote password in restore command
 2018-03-02 08:44:38 +08:00
Guo Xiang Tan cb0c443343 Merge pull request #5615 from jjaffeux/puke 
Adds :puke: as alias to :face_vomiting:
 2018-02-27 10:20:54 +08:00
Guo Xiang Tan 616d210911 Merge pull request #5614 from nbianca/fix_period 
Try extracting time period only when the filter is 'top'.
 2018-02-26 09:38:33 +08:00
Guo Xiang Tan 9f5bc7a5ee Merge pull request #5605 from nbianca/favorites 
Added the required hooks for discourse-favorites plugin.
 2018-02-23 07:12:09 +08:00
Guo Xiang Tan dd26bbe868 Merge pull request #5610 from discourse/pm-tags 
FEATURE: Allow staffs to tag PMs
 2018-02-23 07:07:41 +08:00
Guo Xiang Tan 862e83287e Merge pull request #5575 from featheredtoast/tab-index-composer-actions 
tab index composer actions
 2018-02-22 15:16:41 +08:00
Guo Xiang Tan 8964e75ad6 Merge pull request #5612 from discourse/featheredtoast-two-factor-login 
Featheredtoast two factor login
 2018-02-21 15:00:10 +08:00
Guo Xiang Tan 80c41a0e59 Merge pull request #5510 from discourse/add-posts-count-to-web-hook-post-serializer 
Feature: add topic posts count to webhook post serializer
 2018-01-23 07:46:59 +08:00
Guo Xiang Tan e90187cbf7 Merge pull request #5469 from tgxworld/add_guard_to_prevent_primary_email_from_being_reassigned 
FIX: Add guard to prevent a primary `UserEmail` from being reassigned.
 2018-01-09 13:35:08 +08:00
Guo Xiang Tan 805d1c25d3 Merge pull request #5451 from tgxworld/treat_non_ascii_urls_as_valid 
Treat non-ascii URLs in `UrlValidator`.
 2017-12-27 14:14:20 +08:00
Guo Xiang Tan fc6cb7bbe3 Merge pull request #5444 from tgxworld/remove_phantomjs 
Switch to chrome headless mode instead of phantomjs.
 2017-12-19 19:42:40 +08:00
Guo Xiang Tan ef0f6f5b97 Merge pull request #5308 from bill2004158/master 
fix error "extension "hstore" already exists"
 2017-12-05 11:22:13 +08:00
Guo Xiang Tan 1c2d1682ae Merge pull request #5328 from tgxworld/reenable_interpolation_keys_check 
FIX: Re-enable invalid interpolation keys check and allow default key…
 2017-11-30 13:04:54 +08:00
Guo Xiang Tan 1d8b834301 Merge pull request #5369 from vinothkannans/queued 
FIX: Error if queued post not found while updating
 2017-11-28 17:51:05 +08:00
Guo Xiang Tan 71942e4f62 Merge pull request #5352 from tgxworld/method_for_replica_postgres_connection 
Expose `replica_postgresql_connection` to `ActiveRecord::Base`.
 2017-11-27 08:38:10 +08:00
Guo Xiang Tan 36ba0dfde3 Merge pull request #5292 from tgxworld/drop_email_column 
Drop unused email column from users table.
 2017-11-07 10:15:42 +08:00
Guo Xiang Tan 3c8a48f768 Merge pull request #5287 from tgxworld/fix_randomly_failing_test 
Clear all active connections after PostgreSQL failover tests.
 2017-11-03 10:03:57 +08:00
Guo Xiang Tan 88ef531202 Merge pull request #5243 from pmatsinopoulos/patch-2 
More accurate steps for preparing the database
 2017-11-03 09:33:44 +08:00
Guo Xiang Tan 88492b2b94 Merge pull request #5283 from viktorbenei/patch-1 
Fix "duplicate method" issue
 2017-11-03 09:32:45 +08:00
Guo Xiang Tan f1615c2148 Merge pull request #5263 from tgxworld/improve_pattern 
REFACTOR: Always validate email by default.
 2017-10-26 14:34:09 +08:00
Guo Xiang Tan ad9553ff86 Merge pull request #5238 from discourse/jomaxro-patch-1 
Add div to login-required text
 2017-10-24 17:04:18 +08:00
Guo Xiang Tan 22ba70fb01 Merge pull request #5226 from tgxworld/allow_user_to_disable_private_messages 
FEATURE: Allow users to disable new PMs.
 2017-10-19 16:46:18 +08:00
Guo Xiang Tan 709c234cb9 Merge pull request #5242 from pmatsinopoulos/patch-1 
Correct folder for pgsql socket
 2017-10-19 08:48:02 +08:00
Guo Xiang Tan bf22a94385 Merge pull request #5232 from tgxworld/remove_unused_file 
Remove unused file.
 2017-10-11 18:31:00 +08:00
Guo Xiang Tan 1d0fadd48c Merge pull request #5227 from majakomel/delete-tag-confirm 
UX: Improve Delete Tag Confirm Message
 2017-10-09 11:26:12 +08:00
Guo Xiang Tan 19d04dd9eb Merge pull request #5225 from pfaffman/discourse-restore-sort 
UX: discourse restore -- sort by date
 2017-10-06 15:59:09 +08:00
Guo Xiang Tan a5b7d34fe2 Merge pull request #5199 from xrav3nz/poll-feed-integration-test 
TEST ONLY: PollFeed integration test
 2017-10-03 14:33:22 +08:00
Guo Xiang Tan a966f2134c Merge pull request #5215 from gschlager/email_templates 
Add specs for EmailTemplatesController
 2017-10-03 14:30:19 +08:00
Guo Xiang Tan 9449cb174f Merge pull request #5218 from Supermathie/master 
Updated documentation after running through it
 2017-10-03 14:16:32 +08:00
Guo Xiang Tan 30fa5379ce Merge pull request #5195 from henrik/patch-1 
100.years.ago -> Time.at(0)
 2017-09-28 15:47:06 +08:00
Guo Xiang Tan 3e6bf38394 Merge pull request #5207 from tgxworld/try_travis_fix 
Fix randomly failing test.
 2017-09-28 10:56:05 +08:00
Guo Xiang Tan c37598ddbc Merge pull request #5200 from gschlager/embed 
FIX: do not escape already escaped chars in URL
 2017-09-26 09:07:57 +08:00
Guo Xiang Tan cf9607a0cb Merge pull request #5122 from tgxworld/upgrade_to_rails_5_1 
Upgrade to rails 5 1
 2017-09-25 13:49:53 +08:00
Guo Xiang Tan 3d6c79de6d Merge pull request #5108 from discourse/jomaxro-patch-1 
FIX: Only show topic timer to staff
 2017-08-29 12:53:14 +09:00
Guo Xiang Tan 4b4169c8fd Merge pull request #5053 from fantasticfears/session-controller 
Spec for local auth check
 2017-08-24 09:42:54 +09:00
Guo Xiang Tan 91d3929f52 Merge pull request #5078 from lelelelemon/master 
change count>0 to exists
 2017-08-24 09:24:42 +09:00
Guo Xiang Tan 027b999828 Merge pull request #5071 from LeoMcA/remove_duplicated_without_posts 
FIX: removed the duplicated staged users without posts
 2017-08-24 09:23:36 +09:00
Guo Xiang Tan 7c15b27a90 Merge pull request #5073 from xrav3nz/extract-github-avatar 
FEATURE: import Github profile picture
 2017-08-23 16:18:46 +09:00
Guo Xiang Tan 0600a799de Merge pull request #5075 from johnmuhl/jm-patch-1 
fix misuse of TLD
 2017-08-23 11:17:58 +09:00
Guo Xiang Tan 49ddc98b38 Merge pull request #5066 from davidtaylorhq/docker-lint-changes 
Docker lint SINGLE_PLUGIN
 2017-08-23 09:56:15 +09:00
Guo Xiang Tan f99c00a0ef Merge pull request #5059 from tgxworld/run_lint_in_another_job 
Run lint in a parallel job on Travis.
 2017-08-18 15:44:17 +09:00
Guo Xiang Tan b77aa29e71 Merge pull request #5013 from LeoMcA/alternate-emails-phase-1.5 
FIX: add additional email to tests and clean up resulting mess
 2017-08-16 16:19:28 +09:00
Guo Xiang Tan 996ce8c443 Merge pull request #5024 from fantasticfears/site-setting 
FIX: fails loud if default setting is not set
 2017-08-16 09:36:38 +09:00
Guo Xiang Tan f2539a86d0 Merge pull request #5036 from tgxworld/another_pass_at_removing_duplicated_users 
FIX: Staged users were incorrectly created multiple times with same e…
 2017-08-11 12:30:28 +09:00
Guo Xiang Tan 59423b693b Merge pull request #5035 from nbianca/remove_spork 
Remove Spork dependency.
 2017-08-11 09:52:16 +09:00
Guo Xiang Tan b404a4b97c Merge pull request #5034 from tgxworld/fix_staged_primary_email 
FIX: Staged users are still missing primary email.
 2017-08-10 10:30:51 +09:00
Guo Xiang Tan 705f75dd8c Merge pull request #5032 from xrav3nz/ux-hide-options-in-adv-search 
UX: exclude irrelevant search filters for anonymous users
 2017-08-09 18:21:44 +09:00
Guo Xiang Tan 898c6ba037 Merge pull request #5033 from tgxworld/reason_when_requesting_to_join_a_group 
FEATURE: Force user to enter reason when requesting for group members…
 2017-08-09 15:54:21 +09:00
Guo Xiang Tan 1f07050d12 Merge pull request #5031 from tgxworld/introduce_multisite_tests 
Introduce multisite tests for better coverage.
 2017-08-08 14:13:30 +09:00
Guo Xiang Tan 764957dfc4 Merge pull request #5030 from tgxworld/fix_defaults_cache_cross_talk 
FIX: SiteSettings defaults cache leaking across multisite.
 2017-08-07 17:07:31 +09:00
Guo Xiang Tan 40fc6c429a Merge pull request #5018 from discourse/wekbit-embedded-referer 
FIX: First load of embed comments would always fail on WebKit
 2017-08-04 14:12:26 +09:00
Guo Xiang Tan a47e297508 Merge pull request #5019 from tgxworld/more_resiliency_to_readonly_redis 
Fix Redis command errors when trying to start app with a readonly Redis.
 2017-08-03 06:34:36 +09:00
Guo Xiang Tan e84e310325 Merge pull request #5007 from tgxworld/split_public_settings 
FEATURE: Add group settngs to allow users to leave a group freely.
 2017-07-28 15:15:33 +09:00
Guo Xiang Tan 5012d46cbd Add rubocop to our build. (#5004) 2017-07-28 10:20:09 +09:00
Guo Xiang Tan 96267f0845 Merge pull request #4960 from discourse/category-description-error 
FIX: Explicit error when category description post is bad
 2017-07-26 08:54:22 +09:00
Guo Xiang Tan 14ce24eb9a Merge pull request #4993 from dmacjam/fix_sidekiq_documentation 
FIX: run sidekiq command documentation
 2017-07-25 22:48:47 +09:00
Guo Xiang Tan 1b0750d7ef Merge pull request #4983 from tgxworld/group_owners_can_invite_users_to_groups 
Group owners can invite users to groups
 2017-07-24 16:21:19 +09:00
Guo Xiang Tan d38b55e0c8 Merge pull request #4959 from farmdawgnation/minor-mbox-import-fix 
Add a nil check on the connection before attempting to exec it
 2017-07-21 09:45:15 +09:00
Guo Xiang Tan a56e98bfc4 Merge pull request #4977 from tgxworld/LeoMcA-alternate-emails-phase-1 
FEATURE: phase 1 of supporting multiple email addresses
 2017-07-20 11:35:09 +09:00
Guo Xiang Tan e0285bc20e Merge pull request #4971 from davidtaylorhq/travis-plugin-tests 
Load plugins for qunit travis tests
 2017-07-12 09:12:31 +09:00
Guo Xiang Tan b512ffa9eb Merge pull request #4972 from davidtaylorhq/details-integration-test 
Fix for the last broken discourse-details qunit test
 2017-07-12 09:12:09 +09:00
Guo Xiang Tan a7a8ccb100 Merge pull request #4948 from tgxworld/fix_translation_fallback_not_using_overrides 
FIX: Translation fallback was not using fallback's translation override.
 2017-07-04 09:08:22 +09:00
Guo Xiang Tan 482365b943 Merge pull request #4939 from tgxworld/memory_emoji 
Reduce allocations in `Emoji.unicode_replacements`
 2017-06-20 14:10:10 +09:00
Guo Xiang Tan baa80c9004 Merge pull request #4935 from albaguirre/fix-version-check 
FIX: version check
 2017-06-19 07:49:11 +09:00
Guo Xiang Tan e7571d1c5d Merge pull request #4933 from tgxworld/use_username_in_cert 
FIX: Use username in bot's certificate.
 2017-06-19 07:24:55 +09:00
Guo Xiang Tan 8f48c20598 Merge pull request #4931 from jjaffeux/fixes-woman-shrugging-conversion 
Fixes woman_shrugging name conversion
 2017-06-15 15:52:28 +09: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 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 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
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 da736f70a4 Merge pull request #4845 from vinothkannans/download-onebox-images 
FEATURE: pull onebox images
 2017-06-07 09:55:04 +09:00
Guo Xiang Tan 0ecb668d49 Merge pull request #4893 from tgxworld/remove_unused_columns 
Remove columns that are no longer being used.
 2017-06-06 10:07:00 +09:00
Guo Xiang Tan 18e598a3b0 Merge pull request #4897 from tgxworld/fix_invalid_group_allow_membership_requests 
FIX: Groups that do not have any owners should not allow membership re…
 2017-06-05 10:07:55 +09:00
Guo Xiang Tan 76510d695f Merge pull request #4895 from tgxworld/fix_delay_bot_welcome_post 
FIX: Delay Discobot welcome post should start counting on user's firs…
 2017-06-01 21:03:15 +09:00
Guo Xiang Tan 9fac5e28a5 Merge pull request #4879 from tgxworld/merge_bot_into_core 
Merge discourse-narrative-bot into core plugins.
 2017-05-24 15:46:22 +08:00
Guo Xiang Tan ded9575c32 Merge pull request #4878 from tgxworld/fix_topic_timestamp_changer 
Fix topic timestamp changer
 2017-05-22 16:07:54 +08:00
Guo Xiang Tan 6a3c20561a Merge pull request #4868 from rimian/patch-6 
Bump ruby version
 2017-05-16 16:46:42 +08:00
Guo Xiang Tan afbefd1e02 Merge pull request #4869 from jomaxro/patch-3 
Fix typo in existing link warning
 2017-05-15 14:13:43 +08:00
Guo Xiang Tan 84e9ecda71 Merge pull request #4853 from aputtu/patch-1 
Suggestion for string readability in client.en.yml
 2017-05-09 09:24:13 +08:00
Guo Xiang Tan 3eb920e2b0 Merge pull request #4841 from fantasticfears/webhook-ping 
add event name for ping webhooks in the header
 2017-05-04 04:54:40 +08:00
Guo Xiang Tan 7873a2efb7 Merge pull request #4843 from tgxworld/disable_post_min_length_for_pm 
FEATURE: Disable minimum post length check when in PM with non human …
 2017-04-27 16:35:19 +08:00
Guo Xiang Tan 85d9342ff0 Merge pull request #4836 from tgxworld/fix_clean_up_staged_users_job 
FIX: Clean up unused staged users job not completing.
 2017-04-27 15:41:46 +08:00
Guo Xiang Tan 5404fb31f8 Merge pull request #4810 from yjukaku/fix-minor-bench-script-bugs 
Fix bench script
 2017-04-27 10:41:57 +08:00
Guo Xiang Tan 94c7be3ca6 Merge pull request #4824 from tgxworld/fix_optimize_image_timeout 
Fix optimize image timeout
 2017-04-20 15:53:43 +08:00
Guo Xiang Tan 03762e2828 Merge pull request #4818 from OsamaSayegh/ui/groups-heading-admin-page 
The "Groups" section's heading on user admin page was visible to mods
 2017-04-18 16:12:33 +08:00