Commit Graph

10682 Commits

Author SHA1 Message Date
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
Régis Hanol e204144a58 UsernameValidator error messages weren't matching the code 2016-02-18 23:19:14 +01:00
Robin Ward e277b24671 Support for multiple emojis at once 2016-02-18 17:10:27 -05:00
Robin Ward 4d599612a2 Support for emoji poster icons 2016-02-18 17:03:18 -05:00
Robin Ward 6935925f10 Update Polls plugin to work with new Plugin API 2016-02-18 15:23:43 -05:00
Robin Ward f6aa1ac37a Migrate `onToolbarCreate` to the DiscourseAPI 2016-02-18 15:23:43 -05:00
Robin Ward 7b8e313dac Remove unncessary CP 2016-02-18 15:23:43 -05:00
Neil Lalonde 283ff4c7f8 move code for bulk adding users to a group from controller to model 2016-02-18 14:03:08 -05:00
Régis Hanol abc41c7d5b FIX: sharing a post was broken 2016-02-18 19:28:00 +01:00
Régis Hanol 8a1a9f60a2 FIX: double click counters 2016-02-18 18:42:10 +01:00
Robin Ward 46e4768971 FIX: `highlight.js` is used, but for highlighting text, not code. 2016-02-18 12:19:00 -05:00
Robin Ward 849c99f83d Remove `Discourse.Mobile` constants 2016-02-18 12:19:00 -05:00
Robin Ward ef75f87c8b Remove unused file 2016-02-18 12:19:00 -05: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
Robin Ward c0a6e34610 API for extra post menu buttons and support for solved button 2016-02-17 15:56:30 -05:00
Robin Ward 98f4b3f8a9 FIX: Bad merge 2016-02-17 12:00:08 -05:00
Régis Hanol 8893d711e0 FEATURE: new pop3 polling configuration admin dashboard check 2016-02-17 11:25:49 +01: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 e8f76c335a Merge branch 'master' into vdom 2016-02-17 18:10:12 +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
Robin Ward 63cda22623 Upgrade `withPluginApi` to support non-api callbacks 2016-02-16 16:44:27 -05:00
Robin Ward c6456f5c3e Provide an option callback to the API 2016-02-16 16:22:35 -05:00
Robin Ward 1145d204ed FIX: Editing a post wasn't refreshing properly 2016-02-16 15:22:05 -05:00
Robin Ward 5bc1c5130e FIX: Notifying users via flag wasn't refreshing the UX 2016-02-16 14:35:12 -05:00
Robin Ward ba203b3a94 FIX: Deleting selected wasn't marking them as deleted 2016-02-16 14:27:41 -05:00
Robin Ward 5d9278c098 FIX: Can force all shadow trees to rerender 2016-02-16 14:20:16 -05:00
Robin Ward 9eed95dc7b FIX: Flag button was visible to anon 2016-02-16 12:51:20 -05:00
Robin Ward cbd90339ca Add some padding to whisper icons 2016-02-16 12:47:54 -05:00
Robin Ward 9d86ffe412 UX: Rerender the like before the promise resolves. 2016-02-16 12:39:09 -05:00
Régis Hanol 63b9d1c645 FIX: sends an email notifcation when a user's post is linked 2016-02-16 18:29:23 +01:00
Robin Ward 3811b8aa4c `withPluginAPI` shim to updated plugins will not raise errors 2016-02-16 12:25:01 -05:00
Robin Ward 3a78321c63 `withPluginApi` means you don't have to check for null. 2016-02-16 12:17:22 -05:00
Robin Ward 3ea1f88cdc Merge branch 'master' into vdom 2016-02-16 11:48:42 -05:00
Régis Hanol bf96025507 link email logs to the post that generate the email notification when available 2016-02-16 16:35:57 +01:00
Régis Hanol 81c6fb318b FIX: show name in preferences when SSO is enabled and is used to override names 2016-02-16 16:09:05 +01:00
Erick Guan 0c6e5befe4 FIX: topic summary description text was conflicts with reply counter 2016-02-16 12:38:51 +01: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
Régis Hanol 4ad5660615 add slightly more logs when skipping email notifications 2016-02-15 17:53:07 +01:00
Guo Xiang Tan 2af587005b FIX: find_by_attribute method in Rails 4.5 is case insensitive.
* https://github.com/rails/rails/pull/23690
2016-02-15 23:05:16 +08:00
Régis Hanol 40b099f1a6 FIX: keep whitespaces when replacing direct link to external images with local images 2016-02-15 12:34:45 +01: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
Robin Ward f9722f8598 Add custom post icons to PluginAPI 2016-02-12 16:57:24 -05:00
Robin Ward 9b8871d7dd PluginAPI for more stable backwards compatibility going forward 2016-02-12 15:46:36 -05:00
Robin Ward 81ee8f760a FIX: On mobile some elements were overlayed on each other 2016-02-12 15:12:01 -05:00
Neil Lalonde 06c9e79984 FIX: pending flags reminder email was ignoring the 'notify about flags after' site setting. 2016-02-12 14:33:23 -05:00
Robin Ward 3abf5ebb66 FIX: Queued posts were not being removed from the stream 2016-02-12 14:21:20 -05:00
Robin Ward a3dcd06a93 FIX: Emoji in the post gutter weren't being rendered properly 2016-02-12 13:58:44 -05:00
Robin Ward c8f7e4d878 FIX: Couldn't jump to small action posts 2016-02-12 13:49:31 -05:00
Robin Ward 776020cc8a FIX: Wasn't jumping to new topic 2016-02-12 13:19:00 -05:00
Robin Ward d08007f505 FIX: Jumping to new posts was broken 2016-02-12 12:37:00 -05:00
Guo Xiang Tan 6fc2d9db3a UX: Fix a bunch of overflowing links on mobile nav. 2016-02-13 00:02:53 +08:00
Régis Hanol c740b42328 FIX: whitelist post_types used in context in email notifications 2016-02-12 12:10:30 +01: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
Robin Ward aa31f3081a FIX: Placeholders should not show up to non-admins when deleting posts 2016-02-11 16:45:28 -05:00
Robin Ward 4e209846cb FIX: Not tracking posts that dynamically load 2016-02-11 16:23:41 -05:00
Robin Ward a0d61ebf7f FIX: Clear bookmarks didn't update the UI properly 2016-02-11 15:44:04 -05:00
Robin Ward 5693795dbf FIX: Posts should have auto updating dates 2016-02-11 15:17:58 -05:00
Robin Ward 1d54ba260a FIX: Double hairline in `time-gap`s on mobile 2016-02-11 14:59:07 -05:00
Robin Ward c364d08113 FIX: Improved like animation 2016-02-11 14:36:12 -05:00
Robin Ward 5af00da2d8 FIX: Small post actions weren't applying the `deleted` class 2016-02-11 14:21:22 -05:00
Robin Ward 786f6ff8b0 FIX: Use chrome's `scrollRestoration` to fix scrolling uses with history 2016-02-11 13:14:43 -05:00
Régis Hanol 86819f08c3 FIX: use RFC-compliant previous replies separator 2016-02-11 18:48:09 +01:00
Robin Ward e3cc04f315 FIX: Odd scrolling 2016-02-11 11:00:42 -05:00
Robin Ward 867215a915 Oops, decorators are causing jumpiness 2016-02-11 11:00:42 -05:00
Robin Ward 5f65bf420c FIX: Support the plugin-api for decorators 2016-02-11 11:00:42 -05:00
Robin Ward bc1927dc1e FIX: Tab was broken with keyboard shortcuts 2016-02-11 11:00:42 -05:00
Robin Ward b5b1178f3a FIX: Suppression below was broken 2016-02-11 11:00:42 -05:00
Robin Ward 05377c62de FIX: The dom was slightly incorrect, messing up mobile rendering 2016-02-11 11:00:42 -05:00
Robin Ward 5af834b6d0 FIX: Avatars in small post actions weren't clickable 2016-02-11 11:00:42 -05:00
Robin Ward 88c104bb83 FIX: Upwards scrolling was broken in a topic 2016-02-11 11:00:41 -05:00
Robin Ward ea98a4366e FIX: Badge page was using poster-name component 2016-02-11 11:00:41 -05:00
Robin Ward 9b60551d4e Upgrade jQuery 2016-02-11 11:00:41 -05:00
Robin Ward 65d0426ff1 FIX: Janky animations when liking or expanding the post menu 2016-02-11 11:00:41 -05:00
Robin Ward 9ec44f755c FIX: If last post was deleted the gap was not displayed 2016-02-11 11:00:41 -05:00
Robin Ward 2998fe1ee5 FIX: Quoted text wasn't inserted when replying as new topic 2016-02-11 11:00:41 -05:00
Robin Ward eeafa67984 FIX: Reply as New Topic was not fading in properly 2016-02-11 11:00:41 -05:00
Robin Ward 0b84426a3a FIX: Could like your own posts if they already had likes 2016-02-11 11:00:41 -05:00
Robin Ward 68db4057dc FIX: Small actions weren't showing the avatar of who did it 2016-02-11 11:00:41 -05:00