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
18,410 Commits 1,018 Branches 579 Tags
bf579174c12cebe778b005d0b4a5f175a5fe130c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam d5b63730bc don't bother with register emoji if dialect is missing 2016-03-30 18:10:14 +11:00
Sam 4d71356e52 FIX: quoting a section inside expanded reply misattributed 
1. expand "in reply to"
2. select text
3. quote reply

Was incorrectly attributed to parent post
 2016-03-30 17:38:28 +11:00
Sam dbd1370ddb FIX: only hide overflow on cooked content 
otherwise topic admin menu clips
and you no longer can position stuff absolutely based off .topic-body
 2016-03-30 17:01:26 +11:00
Sam 594dc86c40 oops 2016-03-30 11:44:17 +11:00
Sam fbdd9c0034 FIX: unread and new count not removing deleted topics on the fly 
FIX: unread PMs interfering with unread count
 2016-03-30 11:18:07 +11:00
Sam aae835a42f FIX: all badges got revoked due to ensure consistency query 2016-03-29 23:54:18 +11:00
Sam f907b42f0a oops 2016-03-29 19:02:59 +11:00
Sam 95076050f4 FEATURE: warn about mailing list mode if it is checked 2016-03-29 18:50:17 +11:00
Sam ed750cac39 FIX: if badges are disabled badge pages should 404 2016-03-29 17:21:32 +11:00
Sam adbc22530c FIX: don't show badges in summary page if badges disabled 2016-03-29 17:12:15 +11:00
Sam 24630f6b54 update puma dependency 2016-03-29 17:12:15 +11:00
Sam 7ab153dac3 FIX: double XHR request when loading more badges 2016-03-29 16:56:29 +11:00
Sam 418bc4a844 FIX: when ensuring consistency also delete orphan badges 2016-03-29 16:41:03 +11:00
Sam 6bb97dcabb FIX: external hyperlinks broken in badge cards 
also, we were allowing nesting of A tags which is not really allowed
 2016-03-29 16:21:52 +11:00
Sam 7cd56e616b FIX: strip out links from badge titles 2016-03-29 16:21:52 +11:00
Sam c650c2a16f FIX: regression in badge grant admin page 2016-03-29 07:58:45 +11:00
Sam e364eb2aad correct coloring for user nav 2016-03-29 07:53:03 +11:00
Sam 68fd1d790b Merge pull request #4119 from techAPJ/badge-fix 
FIX: badge display name should be translated from server.en.yml file
 2016-03-29 05:43:15 +11:00
Sam fe51f84aa7 FEATURE: allow admins to enter badge long descriptions 
FIX: fallback to description if badge long description is missing

Also moves all badge localization into server.en, this slims the client down

serializers pass down localized names/descriptions/long descriptions
 2016-03-28 18:38:57 +11:00
Sam 236d8193bd annotate models 2016-03-28 15:21:45 +11:00
Sam 4da9a434fd Merge branch 'master' of github.com:discourse/discourse 2016-03-28 15:16:51 +11:00
Sam f82b5dbc82 FIX: rare concurrency error when updating timings 2016-03-24 16:02:23 +11:00
Sam 1b8010ed71 display long description for badges 2016-03-23 17:34:53 +11:00
Sam c095304d6d FEATURE: limit daily emails per user to 100 per day via site setting 
- controlled via max_emails_per_day_per_user, 0 to disable
- when limit is reached user is warned
 2016-03-23 15:08:48 +11:00
Sam a202ec2028 don't run mailing list if mailing list mode is disabled 2016-03-22 14:50:35 +11:00
Sam d09a20210b correct bad spec 2016-03-22 14:50:12 +11:00
Sam f9e5c49350 FIX: blue notification instead of green for replies/mentions in PMs 2016-03-22 14:28:14 +11:00
Sam 6bdd5107a6 UX: center align community title text in mobile 2016-03-22 12:44:55 +11:00
Sam 643d7f07c3 correct very odd error on connect to redis 2016-03-22 10:02:19 +11:00
Sam 77242e4680 FEATURE: in:pinned and in:unpinned search filters 2016-03-18 16:26:54 +11:00
Sam 50f7616d04 FIX: include pinned status in search results 2016-03-18 16:26:20 +11:00
Sam 88f38f34cc improve text only header 2016-03-18 15:12:55 +11:00
Sam 37ccfbdb2a Revert "FIX: vertical centering of header, using display: table" 
This reverts commit 1b4e0f3300.
 2016-03-18 14:29:39 +11:00
Sam ebcf8970b3 Merge pull request #4079 from ryantm/patch-1 
update redis dependency in documentation
 2016-03-18 12:33:58 +11:00
Sam c2fa314684 test username actually changes 2016-03-18 12:32:09 +11:00
Sam 180888c020 Merge pull request #4087 from jeremylan/bug_40489 
Fixed anonymizer when 'full name required' setting is on
 2016-03-18 12:29:51 +11:00
Sam a8dbba9a01 warn about setting 2016-03-17 17:03:12 +11:00
Sam 49fe5a93b1 tweak logo image 2016-03-17 16:56:47 +11:00
Sam 0ea20f2d77 mock was causing spec to fail 2016-03-17 15:46:16 +11:00
Sam ecbbbbc98c FIX: not showing content on topics for mobile crawler 2016-03-17 15:09:08 +11:00
Sam Saffron 14a77aa1e0 FIX: notify on bronze popular link and nice share 2016-03-17 10:33:34 +11:00
Sam Saffron 433fa74d87 FIX: ensure consistency of user options 
Edge case during upgrade can cause accounts registered after migration
prior to restart to have missing user option records
 2016-03-17 10:03:56 +11:00
Sam Saffron e947c3b9ec correct for earlier versions of ruby 2016-03-17 09:25:48 +11:00
Sam Saffron 8577b7e2cc FIX: setting owner on topic should not bump topic 2016-03-17 08:32:56 +11:00
Sam 84d234a98a Merge pull request #4076 from scossar/locale-from-header-setting 
FEATURE: add site setting for setting locale from header
 2016-03-17 07:53:20 +11:00
Sam Saffron e84d5549ef FEATURE: only allow sidekiq in master site when hosted on multisite 2016-03-17 00:26:07 +11:00
Sam Saffron b300d60086 FIX: when changing owner of last post user list on topic incorrect 2016-03-16 23:49:54 +11:00
Sam Saffron e00850a1ab FEATURE: implement before and after filters in search remove max_age and min_age 
supports

- before:monday
- after:june
- before:2001
- before:2001-01-22
 2016-03-14 23:27:02 +11:00
Sam b35186bfe2 Merge pull request #4063 from sghebuz/sghebuz-patch-1 
Fix mbox.rb for updated Email::Receiver API
 2016-03-14 11:30:30 +11:00
Sam 963d558bee update message bus 2016-03-11 14:17:06 +11:00
Sam Saffron dd65e78431 only trim leading spaces for italic and bold 2016-03-10 23:54:33 +11:00
Sam Saffron 7be90a885c FIX: bolding text when selection has a leading space 2016-03-10 22:43:48 +11:00
Sam Saffron f3efe657fa FEATURE: Automatically add http:// when adding links without them via composer 2016-03-10 18:25:02 +11:00
Sam aa001fcfc4 Merge pull request #4057 from joebuhlig/spec-for-topic-status-update-event 
Add spec for topic_status_update event
 2016-03-10 16:46:59 +11:00
Sam Saffron 0f29269de8 lang-auto not being treated correctly after update 2016-03-10 16:44:24 +11:00
Sam 7fb8fda7bf Merge pull request #4065 from phw/update-highlightjs 
Updated highlight.js
 2016-03-10 16:21:17 +11:00
Sam f590036525 zero width joiner for emojis so no space is added when converting 2016-03-10 08:58:19 +11:00
Sam fe684fdfb8 FIX: incorrect stat for topics_entered in user directory 2016-03-10 07:44:16 +11:00
Sam Saffron 6c1d5b8cd3 FIX: spinning favicon in Firefox 
Delay starting up ajax calls in MessageBus
 2016-03-08 23:28:38 +11:00
Sam ccf835e342 FEATURE: on iPhone 6 or wider show mobile toolbar by default. 
FEATURE: if user enables or disables mobile toolbar, remember state in local storage.
 2016-03-07 15:50:10 +11:00
Sam 995f13d442 missing gem 2016-03-07 14:30:13 +11:00
Sam c838291d47 Merge pull request #4041 from joebuhlig/custom-field-sorting 
Added ability to create topic sorts with custom_fields for plugins
 2016-03-07 14:15:23 +11:00
Sam 726b34ea78 Merge pull request #4058 from scossar/validate-user-locale 
FIX: validate user locale for email notifications
 2016-03-07 14:11:12 +11:00
Sam 7b4cc136ea Merge pull request #4046 from RalfJung/strings 
Profile page: Use "I" to refer to the user
 2016-03-07 14:07:58 +11:00
Sam fe6ea48123 Merge pull request #4038 from markbiegel/instagram-login 
FEATURE: Instagram OmniAuth login methods
 2016-03-07 14:05:07 +11:00
Sam 77ecaba43a Merge pull request #4049 from tgxworld/support_multisite_in_postgresql_fallback 
FEATURE: Support multisite in PostgreSQL fallback adapter.
 2016-03-07 14:01:15 +11:00
Sam Saffron 67995b3926 update rack-mini-profiler 
minor change previously expanded timings will collapse on transition.
 2016-03-06 22:56:23 +11:00
Sam Saffron ce040bfa56 FEATURE: upgrade rack-mini-profiler 
new version is collapsed so screen does not fill with timings. expands on click
 2016-03-06 22:22:45 +11:00
Sam 3e018c2588 FIX: rate limit do/undo on post actions 2016-03-06 09:51:30 +11:00
Sam 332e05b73d omit likes if notify likes is set to never 2016-03-06 09:21:38 +11:00
Sam af577a5854 FEATURE: like notification frequency of never 2016-03-06 09:12:59 +11:00
Sam Saffron a656a672a1 FIX: Don't limit the count of badges to 96 2016-03-05 10:57:32 +11:00
Sam Saffron 7598037080 Only pull in gem if it is being used, remove middleware 2016-03-04 23:17:14 +11:00
Sam Saffron 8b1772ac0f FIX: if user undos like, and relikes notify 
FEATURE: roll up likes for notify on all likes
 2016-03-04 22:56:27 +11:00
Sam 5a6c34fb8a regression, unable to edit posts 2016-03-03 16:00:14 +11:00
Sam Saffron 5f4075a6cf FEATURE: users can select how frequently they are notified on likes 
- first time
- first time and daily (default)
- always
 2016-03-02 23:16:52 +11:00
Sam Saffron c15c483931 PERF: stop rebuilding full directory item table on refresh 2016-03-02 18:23:29 +11:00
Sam 280ca372a3 FIX: logout not working 2016-03-02 11:18:32 +11:00
Sam a45dd6e491 update rails 2016-03-01 15:58:30 +11:00
Sam 5dd746d61f Upgrade message bus to latest 2016-02-29 10:54:40 +11:00
Sam Saffron 89d550dac5 UX: In Reply / Previous Replies some times purple in gmail 2016-02-27 19:07:15 +11:00
Sam Saffron 1fde5a1993 Don't return the word cloaked for cloaked post, blank works fine :) 2016-02-27 18:08:41 +11:00
Sam 0a128852de Merge pull request #4018 from httvncoder/patch-1 
Create client.vi_VN.yml
 2016-02-27 17:01:51 +11:00
Sam 1f688e966d Merge pull request #4028 from dtchau/fix/more_emoji_autocomplete_issue 
FIX: Remove existing characters when a new emoji is selected.
 2016-02-27 17:00:05 +11:00
Sam 610954ecce Merge pull request #4035 from tgxworld/dont_return_500_when_plugin_is_disabled 
Return 404 instead 500 when plugin is disabled.
 2016-02-27 16:55:50 +11:00
Sam e8d4935a2c Merge pull request #4039 from tgxworld/follow_redirects_when_downloading_favicon 
FIX: Follow redirects when downloading favicons.
 2016-02-27 16:40:00 +11:00
Sam 55753cc3f6 Merge pull request #4043 from joebuhlig/outlet-user-activity-bottom 
FEATURE: Added outlet user-activity-bottom
 2016-02-27 16:35:43 +11:00
Sam Saffron 820a435af8 FEATURE: add "email in-reply-to user option" 
We no longer include previous replies as "context", instead
we include and excerpt of the post being replied to at the bottom
of notifications, this information was previously missing.

Users may opt in to emailing previous replies if they wish
or opt out of "in-reply-to" which makes sense in some email clients that
are smarter about displaying a tree of replies.
 2016-02-26 00:05:59 +11:00
Sam 802ff3b0d9 UX: hide confusing instructions when email_always is enabled 2016-02-25 11:33:13 +11:00
Sam 4c93a411f4 Merge pull request #4037 from joebuhlig/add-topic-status-event 
Add topic status_update change event
 2016-02-25 08:32:03 +11:00
Sam Saffron 12b5821d79 add missing class 2016-02-24 19:09:18 +11:00
Sam 833af461ab FIX: stop using regex to detect mentions 2016-02-24 17:47:55 +11:00
Sam 4ce870c17f Merge pull request #4031 from rriemann/support_hyphen_in_mentions 
fix: support for hyphens in group name
 2016-02-24 17:21:56 +11:00
Sam bc61cfcad4 correct autocomplete edge case on android 
@ backspace @ was not opening an autocomplete
 2016-02-24 15:20:12 +11:00
Sam ee931e9f76 FIX: link to topic when clicking on up arrow 2016-02-24 14:50:14 +11:00
Sam d7ac056606 puma config is a production thing 2016-02-24 14:49:31 +11:00
Sam 8322bcf0c3 FIX: switch to desktop not working 2016-02-24 14:21:07 +11:00
Sam 358e027e31 FIX: don't link avatars in "in reply" section of post 2016-02-24 14:17:51 +11:00
Sam 3c072cdfc9 Merge branch 'master' of github.com:discourse/discourse 2016-02-24 13:53:43 +11:00
Sam Saffron 90e017ffef somehow this can be null in some cases 2016-02-23 12:10:25 -05:00