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
17,910 Commits 1,018 Branches 579 Tags
e7cfbfeabbdb4c184a6161549521a68c38c25f3c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sam Saffron bc28c1ccb5 somehow this can be null in some cases 2016-02-23 17:34:05 +11:00
Sam Saffron 27052717a4 Merge branch 'master' into vdom 2016-02-23 17:23:05 +11:00
Sam Saffron d59c9badbe correct build 2016-02-23 17:22:41 +11:00
Sam Saffron 10aa1923a4 Merge branch 'master' into vdom 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2016-02-23 17:07:01 +11:00
Sam Saffron 32d3dd22a0 FIX: broken autocomplete on Android 
Android Chrome does not support keypress event, instead use keyup
 2016-02-23 17:06:15 +11:00
Sam Saffron d0a86f8032 Merge branch 'master' into vdom 2016-02-23 15:58:46 +11:00
Sam Saffron 6d22354ac3 FIX: cleaner error handling for multiple autocomplete matchers 2016-02-23 15:48:39 +11:00
Sam 1f81d2f178 Merge branch 'master' of github.com:discourse/discourse 2016-02-23 10:34:57 +11:00
Sam 32c681c96b annotate models 2016-02-23 10:33:53 +11:00
Sam 0af9e7b572 Merge branch 'master' into vdom 2016-02-22 12:25:07 +11:00
Sam 4c0a40f2b0 FIX: publish notification state when notifications are read 
(this clears green and blue bubbles)
 2016-02-22 12:24:51 +11:00
Sam c404da248a Merge branch 'master' into vdom 2016-02-22 12:20:59 +11:00
Sam d0337e7f5e FIX: clear notification bubble when notification is read 2016-02-22 12:20:41 +11:00
Sam 5a47199528 Merge pull request #3947 from khoa-le/update-locale-vietnamese 
Add locale for Vietnamese
 2016-02-22 11:41:37 +11:00
Sam ecca7b69bb Merge branch 'master' into vdom 2016-02-19 18:28:57 +11:00
Sam 665a87a32f UX: revert full page search focus on magnifying glass click 2016-02-19 18:28:36 +11:00
Sam 7bc1db5f27 Merge branch 'master' into vdom 2016-02-19 17:43:45 +11:00
Sam f18f6dc31f correct spec to stop checking for empty category suppression 2016-02-19 17:43:26 +11:00
Sam 8493057942 Merge branch 'master' into vdom 2016-02-19 17:09:28 +11:00
Sam 02002afd3f clean up hack 2016-02-19 17:08:08 +11:00
Sam f33cfb698c Merge branch 'master' into vdom 2016-02-19 17:03:42 +11:00
Sam c230c11707 FEATURE: stop removing empty categories users have access to from /categories page 
This is particularly important for heirarchies of categories where a parent is empty

Also, if we hide the blank category, how are we going to create the first topic?

Old behavior was hacky.
 2016-02-19 17:03:23 +11:00
Sam 29c2423daf Merge branch 'master' into vdom 
# Conflicts:
#	app/assets/javascripts/discourse/views/post.js.es6
 2016-02-19 14:09:31 +11:00
Sam ab06f86fbe FEATURE: allow users to control how many previous replies they get 
- always means we always send previous replies with every email
- never means we do not
- "unless previously sent" ... is the default, in which we only email you each reply once

The default_email_previous_replies site setting can control this toggle
 2016-02-19 13:57:07 +11:00
Sam 3de390c067 quote fields in case they are still in the db 2016-02-19 13:57:07 +11:00
Sam b9bcdb984a Merge branch 'master' into vdom 2016-02-18 16:57:40 +11:00
Sam f0e942f647 PERF: move 3 more option columns out of the user table 2016-02-18 16:57:22 +11:00
Sam b11e6ec38e Merge branch 'master' into vdom 2016-02-18 13:20:55 +11:00
Sam f9c5cded6f Correct live refresh routine for notifications 2016-02-18 13:20:22 +11:00
Sam 1e131a120c Merge branch 'master' into vdom 2016-02-17 18:39:11 +11:00
Sam 8981ca41f0 correct acceptance test 2016-02-17 18:38:57 +11:00
Sam a766f71881 Merge branch 'master' into vdom 2016-02-17 18:14:12 +11:00
Sam a5c5ac12fb correct spec 2016-02-17 18:13:57 +11:00
Sam e8f76c335a Merge branch 'master' into vdom 2016-02-17 18:10:12 +11:00
Sam 6912aa9fd9 Remove superflous columns from the users table 2016-02-17 18:08:25 +11:00
Sam bbbb09a6fb FEATURE: start tracking information about migrations that run 
This commit adds a new tracking table that lets us know

- When a migration ran
- What version Discourse was at
- How long it took
- What version Rails was at

The built in tracking in Rails is very limited, does not track this info
 2016-02-17 18:08:25 +11:00
Sam 3829c78526 PERF: shift most user options out of the user table 
As it stands we load up user records quite frequently on the topic pages,
this in turn pulls all the columns for the users being selected, just to
discard them after they are loaded

New structure keeps all options in a discrete table, this is better organised
and allows us to easily add more column without worrying about bloating the
user table
 2016-02-17 18:08:25 +11:00
Sam 18d67851c0 Merge branch 'master' into vdom 2016-02-16 11:53:14 +11:00
Sam 2b689d45ff Revert "save height on small screens" 
This reverts commit 37b5905b44.

It is causing too much confusion for little gain
 2016-02-16 11:52:33 +11:00
Sam bdcd791530 Merge branch 'master' into vdom 2016-02-15 20:47:23 +11:00
Sam d7400dd10a UX: Stop taking you to user page when compose private message is called 2016-02-15 20:27:29 +11:00
Sam 071d4aec4d Merge branch 'master' into vdom 2016-02-15 20:14:14 +11:00
Sam e083fb44f4 FIX: cope with unset notifications on the component 2016-02-15 20:13:55 +11:00
Sam 1dc168a7e6 Merge branch 'master' into vdom 2016-02-15 19:29:59 +11:00
Sam dd6ebde824 FIX: Always ensure notifications are treated as read once clicked 
UX: improve messaging so notifications list is far more stable
PERF: improve performance of notifcation lookup queries

- Add feature "SetTransientHeader" that allows shipping info to server
   in the next Ajax request
- remove local storage hack used for notifications
- amend lookupStale to return hydrated objects, move logic into store
- stop magically clearing various notifications (likes, invitee accepted, group_summary, granted badge)
 2016-02-15 19:29:47 +11:00
Sam 1f062ae2fd PERF: improve performance of consistency query 2016-02-15 19:29:47 +11:00
Sam Saffron 8e9a8472f4 FEATURE: don't move muted messages back into inbox 2016-02-15 10:56:39 +11:00
Sam b878598418 Merge branch 'master' into vdom 2016-02-13 17:49:50 +11:00
Sam b1e68390f4 FIX: false overrides should be permitted via ENV 2016-02-13 17:49:26 +11:00
Sam 560e910c6c Merge branch 'master' into vdom 2016-02-12 22:06:41 +11:00
Sam f77dfda097 FIX: bind the suggested topic/messages text 2016-02-12 22:06:14 +11:00
Sam f02e035f94 Merge branch 'master' into vdom 2016-02-12 18:21:03 +11:00
Sam 6478f5defa UX: envelope glyph for suggested PMs 2016-02-12 18:20:39 +11:00
Sam 06403df059 Merge branch 'master' into vdom 2016-02-12 17:51:44 +11:00
Sam 3e87250215 UX: initial take at collapsing mobile nav on user page 2016-02-12 17:51:26 +11:00
Sam Saffron d0dd517f27 FEATURE: blank global settings should not shadow 
Due to https://github.com/docker/docker/issues/9298 it is a huge pain
to remove ENV vars when composing images, allow us to simply treat "blank"
as a ENV var that is not being shadowed. In general we always supply a
value to ENV vars we are shadowing.
 2016-02-10 11:54:40 +11:00
Sam 3df2ee3431 UX: allow for an optional toolbar in composer in mobile 
Allows preview of text, emoji, quoting, whisper
 2016-02-09 17:10:41 +11:00
Sam Saffron b9e8732018 UX: tweak autocomplete to limit hijacking 
- Stop eating up back arrow when you hit @
- Clicking anywhere closes autocomplete
- Forward arrow no longer issues autocompletion, instead functions as right arrow
 2016-02-08 10:51:59 +11:00
Sam Saffron 38983bc977 oops 2016-02-08 09:53:47 +11:00
Sam Saffron b032c63773 FIX: properly defer authentication complete 2016-02-08 08:44:12 +11:00
Sam Saffron b0567f9c62 FEATURE: automatically sync "move to inbox" / "archive" state on messages 2016-02-07 23:39:07 +11:00
Sam Saffron e3747f654b SECURITY: hoist blocks using guids, not md5 hashes 2016-02-06 01:02:48 +11:00
Sam 0032047804 missing a bracket 2016-02-05 15:01:12 +11:00
Sam 886273f158 FIX: when CDN assets are not in root path source maps fail 2016-02-05 13:05:47 +11:00
Sam 0ef141b2c3 FIX: skip jwt encoding for auth 2016-02-05 08:48:16 +11:00
Sam Saffron 209b022385 PERF: cut down on memory usage allowed to redis 
This limits the amount of backlog message bus channels can have.
 2016-02-04 13:58:38 +11:00
Sam Saffron 3f67f91d27 need to allow for now scope 2016-02-04 00:19:08 +11:00
Sam Saffron 60ba9dcc5e PERF: fix N+1 on categories page 2016-02-03 23:59:15 +11:00
Sam Saffron e9c1f8171c more protection 2016-02-03 19:21:49 +11:00
Sam Saffron 835bedca67 add some protection so it works if currentUser is missing somehow 2016-02-03 19:04:23 +11:00
Sam Saffron bc75010b20 FEATURE: suggested messages for messages 
FEATURE: clicking envelope takes you to inbox

Suggested messages works somewhat like suggested topics.

- New show up first (in either group inbox or inbox)
- Then unread (in either group inbox or inbox)
- Finally "related" which are messages with same participants as the current pm.
 2016-02-03 18:50:05 +11:00
Sam Saffron 904e532439 SECURITY: topic titles can show up in user page unescaped when streamed in 2016-02-01 20:53:55 +11:00
Sam Saffron 4099823efe FIX: batch badge assigner was not including full info in notification 
(missing drilldown link in notification)
 2016-02-01 18:27:07 +11:00
Sam Saffron 01e0321f44 UX: match mention styling with username styling on top of post 2016-01-31 10:39:05 +11:00
Sam Saffron 6a13cc1c22 UX: tweak mention color to match username color in post header. 2016-01-31 10:02:21 +11:00
Sam Saffron 1d27b33100 FIX: DistributedCache would fail serialization in some cases 2016-01-30 09:01:15 +11:00
Sam Saffron b25e505fb7 SECURITY: user summary could show topic links you have no permissions to 2016-01-28 11:12:12 +11:00
Sam 5ed21e8767 filter out archived correctly 2016-01-28 00:14:26 +11:00
Sam b75353c26f correct specs 2016-01-27 23:40:45 +11:00
Sam 7b558f959e correct tracking logic 2016-01-27 23:20:29 +11:00
Sam 50a63a491c don't alert for inbox count of 0 2016-01-27 23:13:37 +11:00
Sam Saffron bf650de7be FEATURE: change group default tracking level to tracking (database changes) 2016-01-27 21:56:25 +11:00
Sam Saffron 8aea75edec improve copy 2016-01-27 21:51:12 +11:00
Sam Saffron a764cc3a42 FEATURE: by default users track a group (as opposed to watch) 
FEATURE: a rollup counting number of messages in the group inbox to tracking users
 2016-01-27 21:38:33 +11:00
Sam 1bb485fca5 FIX: when a user got multiple replies to a topic, emails were missing 2016-01-27 12:20:08 +11:00
Sam ee823305a1 FIX: Allow for large free disk space 
reported via @envygeeks shift multiplication of free space out of awk and into rube

awk on some systems appears to be converting stuff to floats.
 2016-01-25 13:22:36 +11:00
Sam 7138b74110 Revert "FIX: disk_space should be a BigDecimal to handle large disk (closes #3923)" 
This reverts commit 260d023b65.
 2016-01-25 13:03:43 +11:00
Sam b3855d94f4 Merge pull request #3972 from tgxworld/remove_arel_patch_merged_upstream 
Remove Arel patch that has been merged upstream.
 2016-01-25 09:27:57 +11:00
Sam 403f766546 UX: improve styling of messages and mobile view of messages 2016-01-24 18:11:49 +11:00
Sam d0ee32f3ce FIX: correct counts on user summary 2016-01-24 16:39:01 +11:00