IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-15 15:35:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
29,577 Commits 970 Branches 574 Tags
1d41f3c3fb8a2abe91ec9af7b7d37e2a0e80e997
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Guo Xiang Tan 747c9bb47f Merge pull request #6317 from nbianca/ignore_blacklisted_domains 
FIX: Ignore OneBox blacklisted domains.
 2018-09-03 11:10:52 +08:00
Guo Xiang Tan a6319ccf21 Merge pull request #6334 from pfaffman/patch-3 
Add shadows to enable S3 backups to Digital Ocean
 2018-08-30 08:58:54 +08:00
Guo Xiang Tan cf3b7ccae2 Merge pull request #6295 from nbianca/fix_mobile_images 
UX: Show only the expand icon in lightboxes on mobile.
 2018-08-27 13:07:55 +08:00
Guo Xiang Tan 53a6c31107 Merge pull request #6310 from nbianca/ux_ip_lookup 
UX: Improve copying from IP lookup component.
 2018-08-27 13:04:35 +08:00
Guo Xiang Tan 3584af4e51 Merge pull request #6314 from nbianca/groups_directory 
UX: Do not show the groups directory if disabled.
 2018-08-27 13:00:39 +08:00
Guo Xiang Tan 1ba24496ab Merge pull request #6261 from xrav3nz/fix/topic-embed-import-updates 
FIX: update TopicEmbed's title and user correctly
 2018-08-24 09:32:03 +08:00
Guo Xiang Tan 4a552fb967 Merge pull request #6303 from nbianca/user_serializer_spec 
Add spec for UserSerializer and UserApiKey.
 2018-08-24 08:16:11 +08:00
Guo Xiang Tan dd810b8b05 Merge pull request #6304 from tgxworld/create_functions_in_different_schema 
FIX: Create `BaseDropper` functions in a different schema.
 2018-08-23 15:01:41 +08:00
Guo Xiang Tan db05ab1868 Merge pull request #6289 from tgxworld/clean_up_post_reply_keys 
FEATURE: Clean up `PostReplyKey` records.
 2018-08-23 10:42:25 +08:00
Guo Xiang Tan 0f07494b12 Merge pull request #6259 from pfaffman/patch-2 
FIX: disable_2fa fix method selection
 2018-08-21 17:29:42 +08:00
Guo Xiang Tan 58874611a7 Merge pull request #6192 from tgxworld/drop_columns_on_email_logs 
Drop `reply_key`, `skipped` and `skipped_reason` from `email_logs`.
 2018-07-30 12:03:38 +08:00
Guo Xiang Tan 6f9a91cbd5 Merge pull request #6175 from vinothkannans/post_approval_webhook 
FEATURE: Webhook for post approval events
 2018-07-27 10:50:49 +08:00
Guo Xiang Tan 9ccdc0da76 Merge pull request #6179 from chancancode/fix-osx-docs 
Fix OSX docs
 2018-07-26 09:26:48 +08:00
Guo Xiang Tan fa19d3a53c Merge pull request #6108 from discourse/transaction-sidekiq-fix 
Fix notifications for topics moved between categories
 2018-07-24 17:44:03 +08:00
Guo Xiang Tan 663d78414b Merge pull request #6104 from tgxworld/split_up_reply_key_from_email_logs 
PERF: Move `EmailLog#reply_key` into new `post_reply_keys` table.
 2018-07-24 14:33:48 +08:00
Guo Xiang Tan 5c1bd38d84 Merge pull request #6131 from jjaffeux/lazy-load-reports 
FIX: lazy load more reports in dashboard
 2018-07-21 17:24:17 +08:00
Guo Xiang Tan 7cf6c2825e Merge pull request #6106 from OsamaSayegh/watch-when-splitting 
FIX: topic owner should watch the new topic when moving posts to a new topic
 2018-07-20 15:18:59 +08:00
Guo Xiang Tan c0c263405a PERF: Store EmailLog#bounce_key as uuid data type. (#6093) 
PERF: Store `EmailLog#bounce_key` as `uuid` data type.
 2018-07-16 20:05:54 +08:00
Guo Xiang Tan 4172e1dd52 FIX: Rename User#usernames that clashes with Group#name. (#6069) 2018-07-09 16:54:57 +08:00
Guo Xiang Tan 96aca6d7e6 Remove legacy vote post action code. (#6009) 2018-07-09 16:54:18 +08:00
Guo Xiang Tan a081771950 Merge pull request #5872 from OsamaSayegh/users-controller-specs-to-request 
REFACTOR: users contollers specs => request specs
 2018-05-28 13:32:37 +08:00
Guo Xiang Tan 569f63b8a2 Merge pull request #5825 from featheredtoast/extend-service-worker-cache 
FIX: update cache times for service workers
 2018-05-25 09:28:17 +08:00
Guo Xiang Tan 0e284e54f3 Merge pull request #5832 from featheredtoast/safari-no-serviceworkers 
Fix: Safari failing to download backups from email links
 2018-05-24 15:44:51 +08:00
Guo Xiang Tan ad9e0d6bea Merge pull request #5848 from OsamaSayegh/fix-social-login-groups 
FIX: apply automatic group rules when using social login providers
 2018-05-23 08:17:42 +08:00
Guo Xiang Tan f6becd6a4e Merge pull request #5838 from discourse/fix-for-s3-subfolders 
FIX for bucket name in GlobalSetting with folder
 2018-05-22 18:10:44 +08:00
Guo Xiang Tan 1e4abc63d0 Merge pull request #5813 from duranmla/ad/bound-avatar-typo 
Static update for htmlHelper method within bound-avatar helper
 2018-05-11 12:59:00 +08:00
Guo Xiang Tan d2a8f40fb0 Merge pull request #5711 from Supermathie/learn_cdn_url_hostname 
FIX: CDN_URL hostname should be in GlobalSetting.hostnames
 2018-04-02 16:39:24 +08:00
Guo Xiang Tan d4ebbd12a6 Merge pull request #5723 from featheredtoast/topic-list-item-unread-classnames 
Feature: Add unseen-topic and new-posts classnames to topic list items
 2018-04-02 16:35:19 +08:00
Guo Xiang Tan a70579edbd Merge pull request #5722 from mdoyle13/patch-2 
Update instructions to use correct ruby version
 2018-04-02 16:33:30 +08:00
Guo Xiang Tan 87e3779085 Merge pull request #5702 from kevinelliott/feature/20180323-fix-mass-assignment 
20180323 Fix Mass Assignment Warning
 2018-04-02 10:19:25 +08:00
Guo Xiang Tan 40dde7d259 Merge pull request #5725 from miromichalicka/master 
Fix broken queries in Drupal 6 migration.
 2018-04-02 10:14:56 +08:00
Guo Xiang Tan 8f22d6437b Merge pull request #5676 from tgxworld/extract_group_messages 
WIP: Use topic list for displaying group messages on group page.
 2018-03-16 11:57:18 +08:00
Guo Xiang Tan 937372df02 Merge pull request #5677 from jjaffeux/fix-ruby-warning-keyword 
FIX: prevents ruby warning with circular reference
 2018-03-16 09:31:54 +08:00
Guo Xiang Tan ed08bc82f1 Merge pull request #5666 from LeoMcA/pm-subject-fix 
FIX: error when group_in_subject enabled but no group in pm
 2018-03-12 09:34:37 +08:00
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