Kris Aubuchon
328f9a4a39
Merge remote-tracking branch 'upstream/master'
2014-07-25 00:19:38 -04:00
Sam
95d13bf68a
PERF: move avg time calculation to daily
2014-07-25 13:21:10 +10:00
Sam
6e9f5f5584
SECURITY: fix XSS in excerpt parser
2014-07-25 12:16:00 +10:00
Sam
fbbd4999b6
FIX: remove invalid hack, correct whitelist to use value returned from callback
2014-07-25 12:16:00 +10:00
Robin Ward
f2b554be13
FIX: Use placeholder for avatar image size in expansion
2014-07-24 17:17:47 -04:00
Neil Lalonde
eda0e40094
Merge pull request #2580 from techAPJ/patch-4
...
FIX: filter whitelist domain
2014-07-24 15:24:38 -04:00
Robin Ward
f3bb8902c1
Make a mocked test that broke pending for now. The logic works, will
...
replace with a new test later.
2014-07-24 15:14:36 -04:00
Robin Ward
b88a8d2416
FIX: Clicking navigation pills a second time should refresh the list
...
you're looking at.
2014-07-24 14:59:53 -04:00
Robin Ward
f33ebc512b
FIX: Link a poster's name to their profile, makes much more sense now
...
that we're showing the popup to that.
2014-07-24 13:13:24 -04:00
Robin Ward
fa25700400
FIX: Direct links to hash URLS were broken. Regression?
2014-07-24 12:52:43 -04:00
Arpit Jalan
3b2a5f6894
FIX: filter whitelist domain name
2014-07-24 22:02:10 +05:30
Kris Aubuchon
4a1ec20585
adding border to poster expansion, changing media screen to media all, trying new notification style
2014-07-24 12:21:22 -04:00
Robin Ward
5aa411b58c
FIX: When we don't have an uploaded_avatar_id don't try to show the
...
avatar. Wait until it's loaded.
2014-07-24 11:31:08 -04:00
Robin Ward
0b368993b7
FIX: If you hit back while a replaceState was queued up it would
...
update the URL even after navigating.
2014-07-24 11:26:53 -04:00
Sam
a34037b26c
FIX: typo
2014-07-24 18:38:27 +10:00
Sam
ec03d135fa
FEATURE: allow advanced badge options in admin screen
...
clean up serializer, allow simplistic preview
2014-07-24 18:28:23 +10:00
Sam
469e74316b
FIX: don't show broken button
2014-07-24 18:28:23 +10:00
Jeff Atwood
dc96cf6d4c
Merge pull request #2578 from awesomerobot/master
...
minor alignment fix on embedded posts
2014-07-23 22:15:39 -07:00
Kris Aubuchon
b43e4b05c2
minor alignment fix
2014-07-23 23:45:30 -04:00
Sam
526da15b9e
Improve badge UI add links to badge descriptions
2014-07-24 12:21:24 +10:00
Robin Ward
c8a0bf35c5
FIX: Navigating to a user's admin page would not populate
...
`availableGroups`
2014-07-23 16:54:04 -04:00
Robin Ward
27f786e06a
FEATURE: Show user popup when clicking on an @mention in a post.
2014-07-23 16:10:29 -04:00
Robin Ward
04c6733ae7
FIX: If a deprecated view can't be found, look for a component
2014-07-23 16:10:29 -04:00
Neil Lalonde
8cb4442527
FIX: import scripts: bbcode_to_md should not be escaping html in post.raw
2014-07-23 15:16:01 -04:00
Robin Ward
06512685ab
FEATURE: If there is a category scope and show_subcategory_list is set, only
...
show the local categories in the dropdown instead of all categories.
2014-07-23 13:10:06 -04:00
Neil Lalonde
b4ad70d767
FEATURE: Continue to Discourse links are now buttons, and those pages will redirect automatically after 5 seconds
2014-07-23 12:32:12 -04:00
Robin Ward
b29b94046c
Merge pull request #2569 from lreeves/group-selector-datasource-finder
...
Move finder logic out of the group-selector component
2014-07-23 11:28:29 -04:00
Robin Ward
be15e963ea
Merge pull request #2567 from ffernand/additional_cores_for_guest_os
...
Using host Linux (Ubuntu 12.04); performance was abysmal.
2014-07-23 11:13:21 -04:00
Robin Ward
0a0d32efb4
TRIVIAL: Rename map to idMap because map means something for
...
enumerables.
2014-07-23 11:11:13 -04:00
Robin Ward
1a7eacc70a
Merge pull request #2568 from lebek/optimize-category-lookup
...
Optimize Finding a Category by Id
2014-07-23 11:06:54 -04:00
Robin Ward
016927d5b9
Merge pull request #2566 from minasmart/master
...
Enumerate deferred scripts with a sprockets helper
2014-07-23 11:00:38 -04:00
Robin Ward
c93a7020ec
Merge pull request #2565 from swalkinshaw/move-discourse-plugin
...
Move discourse_plugin to lib
2014-07-23 10:56:12 -04:00
Neil Lalonde
b0dc7db18f
Merge pull request #2548 from Elberet/smf2-import
...
Import script for Simple Machines 2 forums
2014-07-23 10:33:03 -04:00
Régis Hanol
42bd23adbe
Merge pull request #2575 from discourse/revert-2573-patch-5
...
Revert "FIX: hidden helper class is important"
2014-07-23 12:25:46 +02:00
Régis Hanol
b9bd2ddda6
Revert "FIX: hidden helper class is important"
2014-07-23 12:25:09 +02:00
Régis Hanol
4201a58a13
Merge pull request #2573 from fantasticfears/patch-5
...
FIX: hidden helper class is important
2014-07-23 10:08:20 +02:00
Sam
46c406360d
FIX: cors setting was broken
...
Some days I wonder why we bother taking a whole gem
dependency when 10 lines of code does the job right
2014-07-23 17:04:09 +10:00
Jeff Atwood
1b733ff936
missed a spot for more /!\
2014-07-22 21:34:19 -07:00
Jeff Atwood
fc1fa2d104
Caps Lock clearly needs more exclamation sign
2014-07-22 21:15:54 -07:00
Scott Walkinshaw
7e2aa5acfb
Move discourse_plugin to lib
2014-07-23 00:03:48 -04:00
Erick Guan
f2cd2f1d3c
FIX: hidden helper class is important
2014-07-23 11:50:59 +08:00
Peter Le Bek
f63e6e6dab
Optimize Category find-by-id by using a hash.
2014-07-22 23:49:49 -04:00
Jeff Atwood
66984f9eea
Merge pull request #2572 from awesomerobot/master
...
fixing wmd-editor button background
2014-07-22 19:57:01 -07:00
Kris Aubuchon
fff0f82bfb
fixing wmd-editor button background
2014-07-22 22:38:15 -04:00
Sam
0f9678fe49
FIX: faster update of all badges
...
Introduced badge triggers, introduced concept of badge that happens due to a post but has the post hidden
Delta badge grant happens once a minute, backed by redis
2014-07-23 11:46:07 +10:00
Sam
007310c4a2
Wire up triggers
2014-07-23 11:43:17 +10:00
Sam
b9a7d945c3
Improve badge grouping UI
...
Start work on triggers
2014-07-23 11:43:17 +10:00
Sam
375f0815b6
Merge pull request #2571 from awesomerobot/master
...
fixing lingering gutter width issues
2014-07-23 10:42:25 +10:00
Kris Aubuchon
ef2a5def3c
fixing lingering gutter width issues
2014-07-22 20:33:21 -04:00
lreeves
9c2f4b55ac
This moves the finder logic out of the component
2014-07-22 20:30:30 -04:00
