codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-18 11:32:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
17992 commits 7 branches 179 tags 87 MiB
Commit graph

10753 commits

Author SHA1 Message Date
Régis Hanol
97c7b894ce better logs when an error happens in SSO 2016-02-24 21:57:01 +01:00
Régis Hanol
f7432d8ec9 FEATURE: add support for multiple incoming emails for groups & categories 2016-02-24 19:47:58 +01:00
Robin Ward
5c3d14b421 Backwards compatibility for people who use Discourse.PageTracker 
Rather than importing it.
 2016-02-24 11:06:49 -05:00
Robin Ward
015eb47ea0 Don't pass topic down to the widgets 2016-02-24 10:44:27 -05:00
Joe Buhlig
770d38d025 Add topic status_update change event 2016-02-24 08:59:06 -06:00
Guo Xiang Tan
e7cfbfeabb FIX: Array#first with block will return the first element if nothing matches. 2016-02-24 22:34:40 +08:00
Jeff Atwood
f259d7a7b9 Merge pull request #4034 from techAPJ/404 
show monthly top topics on 404 page
 2016-02-24 01:10:50 -08:00
Guo Xiang Tan
a3fa80847e Return 404 instead 500 when plugin is disabled. 2016-02-24 17:09:30 +08:00
Régis Hanol
6e090c5bd1 Merge pull request #4033 from tgxworld/fix_job_exception 
FIX: Topic and Post may be `nil`.
 2016-02-24 10:08:31 +01:00
Guo Xiang Tan
f89e9024ba FIX: Topic and Post may be nil. 2016-02-24 16:27:28 +08:00
Arpit Jalan
d77511319e show monthly top topics on 404 page 2016-02-24 13:46:55 +05:30
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
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
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
Robin Ward
03068e3556 FIX: User deleted posts weren't red 2016-02-23 13:38:51 -05:00
Robin Ward
84a01599c6 Commenting was *too* good :) 2016-02-23 13:37:08 -05:00
Robin Ward
05a0308663 Finish documenting new PluginAPI 2016-02-23 12:44:52 -05:00
Robin Ward
ef079004da Ability to decorate after post cooked, and rawHtml helper 2016-02-23 12:10:25 -05:00
Arpit Jalan
9de5c340b0 FIX: invite link should not auto-accept invitation if user is already logged in 2016-02-23 12:10:25 -05: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
Robin Ward
200da89355 FIX: Broken tests 2016-02-22 22:11:35 -05:00
Robin Ward
5dd81700f1 FIX: Overflow CSS was hiding selecting posts buttons 2016-02-22 22:07:23 -05:00
Duong Tam Chau
cd84a05600 FIX: Remove existing characters when a new emoji is selected. 
When the user choose an emoji from the "More..." option, any previously typed character should be discarded.
 2016-02-22 20:24:06 -05:00
Régis Hanol
8d1da9cedd FEATURE: keep original title when sending email notifications about a PM 2016-02-23 01:34:16 +01:00
Jeff Atwood
6eb8730fce tweak banner close X button a bit 2016-02-22 15:57:31 -08:00
Sam
32c681c96b annotate models 2016-02-23 10:33:53 +11:00
Robin Ward
8bfb5b4e7b Backported double click fix 2016-02-22 16:39:43 -05:00
Robin Ward
d4091d579d Remove profiling information for vdom 2016-02-22 16:31:49 -05:00
Robin Ward
6d06979da6 FIX: Arrow in quotes was pointing the wrong way 2016-02-22 16:19:22 -05:00
Robin Ward
acc20c87b2 FIX: Jump to embedded was not working when the post was far away 2016-02-22 15:58:08 -05:00
Robin Ward
026bba1876 Merge branch 'master' into vdom 2016-02-22 15:28:07 -05:00
Robin Ward
fdf0047f56 A helper for cooked content in a decorator 2016-02-22 15:19:56 -05:00
Neil Lalonde
cab5dd09d3 FIX: broken links on admin dashboard in Top Referrers section 2016-02-22 14:31:13 -05:00
Robin Ward
65553d7b70 Allow custom classes for any widget 2016-02-22 14:09:53 -05:00
Robin Ward
54904133a0 Ability to mount ember views into vdom 
It's slow but can be used as a last resort for old plugins.
 2016-02-22 12:10:34 -05:00
Régis Hanol
780c3ad755 Merge pull request #4008 from joebuhlig/master 
Add tertiary color to email digests
 2016-02-22 14:43:21 +01:00
Joe Buhlig
6763a9923a Added tertiary color to digest 
Added hash to color in helper

Added anchor_color to topic and site name links

Styled the unsubscribe link
 2016-02-22 07:02:21 -06:00
Arpit Jalan
c2caf90de6 FIX: RSS feed must have unique GUID 2016-02-22 18:28:09 +05:30
Régis Hanol
4d981cec53 FIX: don't try to optimize large PNGs (takes too much time) 2016-02-22 12:57:24 +01:00
Jeff Atwood
c9d19c9462 tighten up mobile profile image size 2016-02-22 02:18:34 -08:00
Jeff Atwood
2ab901bec4 adjust bad styling on mobile user page 2016-02-22 02:03:50 -08:00
Jeff Atwood
66fa836d88 we don't want a clear for notification options 2016-02-22 01:53:51 -08:00
Jeff Atwood
23063ea094 mobile needs different post body overflow handling 2016-02-22 01:40:28 -08:00
Jeff Atwood
6a6e3a6a3a FIX: add global hidden overflow on all topic bodies 2016-02-22 01:17:50 -08:00
Guo Xiang Tan
3142eb76dc Revert "FIX: find_by_attribute method in Rails 4.5 is case insensitive." 
This reverts commit 2af587005b.
 2016-02-22 15:55:48 +08: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
Gerhard Schlager
eb166e78b6 Don't try to import invalid websites 2016-02-21 17:38:04 +01:00
Robin Ward
e848ea5a99 Depcreate PageTracker in favor of PluginAPI 2016-02-19 16:30:59 -05:00
Robin Ward
9b0b213ba2 FIX: Less safe API for icons 2016-02-19 16:03:26 -05:00
Neil Lalonde
e8d837269b FEATURE: pending flags reminder is sent as a group message to staff instead of sending an email to the contact email site setting. 2016-02-19 15:21:18 -05:00
Robin Ward
8b318f76a1 Expose decoration for plugins such as signatures 2016-02-19 14:46:29 -05:00
Robin Ward
f2f49a5e96 Ability to add text to a poster name icon 2016-02-19 14:22:36 -05:00
Neil Lalonde
97130463d6 FEATURE: show a new modal when suspended users try to log in 2016-02-19 12:19:20 -05:00
Guo Xiang Tan
4858187b0e UX: Don't display span if there is no count. 2016-02-19 15:55:43 +08:00
Guo Xiang Tan
5e329898f6 UX: Don't display span if there is no count. 2016-02-19 15:33:07 +08: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
Guo Xiang Tan
7a261e5e4f UX: Hide close mobile navigation on click. 2016-02-19 15:22:41 +08: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
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