Commit Graph

885 Commits

Author SHA1 Message Date
Régis Hanol
9395bbbbea add test for fix in 9061c26e52 2015-03-12 16:20:14 +01:00
Robin Ward
7c9fb5d3fc Refactored SiteMap/Header to support more dynamic flag counts
Also fixes deprecation in `plugin-outlet`
2015-03-11 16:12:53 -04:00
Régis Hanol
70f00e31df FIX: pre-hoist code blocks & spans 2015-03-09 12:32:37 +01:00
Régis Hanol
9b9bd9c0a1 fix my git foo 2015-03-07 02:36:35 +01:00
Régis Hanol
f95c86ac72 FIX: hoist code blocks content before doing any kind of processing 2015-03-07 02:16:27 +01:00
Robin Ward
7c25efc095 Move identity map into the store, shouldn't have been in the adapter 2015-03-06 13:23:38 -05:00
Robin Ward
ecb553af3f Add tests for our store 2015-03-06 12:37:24 -05:00
Sam
db7a225df7 correct specs 2015-03-06 14:36:00 +11:00
Régis Hanol
809edd4da3 FIX: user-card tests 2015-03-04 13:02:36 +01:00
Robin Ward
9974a26c47 FEATURE: Can specify a list of default_avatars urls.
These new avatars will be used by new users until they upload their own
avatars. If left blank, letter avatars are used.
2015-03-03 16:19:29 -05:00
Régis Hanol
8ebab581ad temporarily disable test 2015-03-02 20:02:20 +01:00
Neil Lalonde
c04b214910 FEATURE: don't allow username and email to be the same 2015-02-27 13:47:43 -05:00
Robin Ward
be9feeb918 Replace CurrentUserMixin with an injected currentUser
This is a lot simpler and removes the need for stubbing singletons
in unit tests.
2015-02-27 10:33:39 -05:00
Neil Lalonde
cf81b3f86d FEATURE: don't allow username and password to be the same 2015-02-25 12:00:13 -05:00
Robin Ward
9264a7914f Removed a bunch of Discourse.Site globals 2015-02-23 12:36:04 -05:00
Ed Gibbs
c50205725f FIX: Default sort grantable badges by name
Currently has no default sort and was stated as a bug here:
  https://meta.discourse.org/t/badges-not-sorted-in-grant-badge-dropdown/23739
  (Post was recently deleted or made private?)
2015-02-15 17:37:11 -08:00
Robin Ward
a519fd5bcf FIX: Highlighting was not being applied after some rendering.
Also includes a bunch of ES6 stuff.
2015-02-12 15:37:02 -05:00
Robin Ward
cf3582bedb FIX: JSHint wasn't validating ES6 files, this fixes a bunch of errors. 2015-02-10 17:21:16 -05:00
Régis Hanol
b809e02c6c FIX: clicking an attachment link works only once 2015-02-09 17:49:59 +01:00
Robin Ward
a65e0a80ba Add support for more ES6 features 2015-02-06 13:26:33 -05:00
Régis Hanol
42ab39ce18 fix the build (cc @riking) 2015-02-05 12:57:33 +01:00
Régis Hanol
0a252d7785 FIX: quote whote post should insert at cursor position 2015-02-02 19:08:28 +01:00
Sam
a591c019d4 correct tests 2015-01-29 17:57:34 +11:00
Régis Hanol
b003c2b4f3 let's try category class again 2015-01-27 23:44:47 +01:00
Sam
d52b0a2458 temporarily disable category class on body while debugging issue with missing docking header 2015-01-27 13:43:40 +11:00
Régis Hanol
40da065930 fix the build (:fired:) 2015-01-26 23:49:15 +01:00
Régis Hanol
e6f849f873 FIX: make sure pasting an image in the composer is considered as an image instead of an attachment 2015-01-23 19:17:33 +01:00
Robin Ward
2ea4c1c9de FIX: Groups post page was broken.
Also added integration tests so we don't miss this breaking in the
future.
2015-01-23 11:13:27 -05:00
Robin Ward
03eb4752d1 Add categories-list css class to body for customization purposes 2015-01-21 14:34:01 -05:00
Robin Ward
649dfd8d23 Revert "Convert html.js to ES6 module format"
This reverts commit 60523d8e02.
2015-01-20 16:13:42 -05:00
Robin Ward
60523d8e02 Convert html.js to ES6 module format 2015-01-20 16:07:29 -05:00
Robin Ward
350554e198 UX: Change category badge style to use stripes 2015-01-20 14:56:06 -05:00
Robin Ward
1e6dea46dd FIX: Jump to post was not respecting gaps 2015-01-12 18:10:30 -05:00
Robin Ward
38e4defaee Support adding items to the site map via plugin outlet. 2015-01-09 16:15:16 -05:00
Jeff Atwood
6953923a03 remove |starred| from topnav default options 2015-01-06 16:03:45 -08:00
Robin Ward
7182767349 Refactor topic title/category saving to support easier changing of
attributes via plugins.
2015-01-02 14:25:41 -05:00
Robin Ward
36f53790f4 Added test for markdown bug with linking [ul] and [poll] 2014-12-31 11:45:23 -05:00
Régis Hanol
386b0a2587 fix the build 2014-12-29 22:36:25 +01:00
Robin Ward
13bf8e1e46 FIX: Markdown bug when a heading preceeded a code block. 2014-12-29 15:59:39 -05:00
Sam
ae16186100 FEATURE: post chunk size should not be configurable
If people need to configure post chunk size use a plugin
Core only supports out of the box settings, if changed can lead to
severe performance issues.
2014-12-15 10:57:34 +11:00
Robin Ward
f42a5c1ba3 Convert a lot of Globals to ES6 modules 2014-12-17 09:31:42 -05:00
Robin Ward
331bba4b6d Correct the last few test failures in the 1.9.0 branch 2014-12-17 09:31:42 -05:00
Robin Ward
1948b41875 Fix resolve errors 2014-12-17 09:31:41 -05:00
Robin Ward
7aaf2fcb65 Fix broken qunit tests in 1.9.0 2014-12-17 09:31:41 -05:00
Robin Ward
2d6b15a34d Load fewer posts when the android platform is detected 2014-12-12 11:47:39 -05:00
Robin Ward
5fd3f2547c FIX: Fix rerendering issues on some components. 2014-12-08 14:47:49 -05:00
Robin Ward
e035b07e92 Put Ember 1.8.1 + fixes back. 2014-12-04 08:51:35 -05:00
Sam
8977d5917b revert 2014-12-04 09:35:11 +11:00
Robin Ward
39fde5b9fb Upgrade to 1.8.1: So long, metamorphs! 2014-12-03 10:49:18 -05:00
Régis Hanol
a06bf0b7be fix the build 2014-11-17 15:47:07 +01:00
Marcin Rataj
9dccd975d9 UX: whitelist OpenStreetMap iframes 2014-11-17 14:30:25 +01:00
Robin Ward
564e7a988c Merge pull request #2848 from riking/whitelist-api
Improve Markdown.whiteListTag, code dialect
2014-11-07 11:33:37 -05:00
Sam
d4224a64e8 correct spec 2014-10-22 15:50:04 +11:00
Robin Ward
1cf4a0d604 Rename "User Expansion" to the much clearer "User Card" 2014-10-20 12:11:59 -04:00
Sam
a0f74daf6b correct dodgy test 2014-10-18 20:16:19 +11:00
Jeff Atwood
92b615b503 reorganize site settings a bit 2014-10-19 23:14:50 -07:00
Dean Taylor
c2614543b1 Correct minor spelling mistakes
@sam highlighted I made a spelling mistake in a commit - thought I would throw a few more in.
2014-10-19 23:55:19 +01:00
Robin Ward
0cbdf6f5bb FIX: Many bugs with admin badges interface
* Editing a badge's title would show it as changed in the side even if
  you didn't hit save

* Clicking a badge would not scroll to the top

* If there was an error saving a badge there was a missing i18n key

* URLs were using queryParams instead of paths

* User `label` tags for checkboxes for larger click targets

* Saved! text would persist when viewing another badge

* After creating a new badge it would show nothing

* Validation errors were not being properly released to the client

* Query errors were surrounded by an extra array
2014-10-17 16:14:49 -04:00
Dean Taylor
b023e81078 FIX: Censored word match fail if earlier partial match
Previously a list containing `one|two|three|four|twoagain` would fail to censor the word `twoagain` in the text `test1 twoagain test2`.
2014-10-17 03:10:30 +01:00
Robin Ward
d2ac5a9ac6 Rename /category/xyz paths to /c/xyz -- @SamSaffron did most of the
work even though I'm merging the patch!
2014-10-16 12:15:31 -04:00
Robin Ward
27e68518df FIX: BBCode was trimming leading space in [code] blocks 2014-10-10 15:11:30 -04:00
Robin Ward
3b38667274 FIX: Check for word boundaries with censored words. 2014-10-09 16:35:27 -04:00
Robin Ward
285c66b899 FIX: Say the file uploaded is too large, not "image" as you can upload
other kinds of files.
2014-10-09 16:03:04 -04:00
Robin Ward
f9a8f6d6ce FEATURE: Support for a required setting on user fields. 2014-10-08 15:10:19 -04:00
Robin Ward
11b52d1334 More deprecations to allow us to work on future versions of Ember 2014-10-07 16:04:19 -04:00
riking
ef36a619c3 Update Markdown tests 2014-10-05 17:30:29 -07:00
Robin Ward
9564ecde76 FEATURE: Site setting for words to censor in posts 2014-10-02 13:58:58 -04:00
Robin Ward
edb34c178a FEATURE: Show user fields when the user is signing up 2014-09-30 10:45:18 -04:00
Sam
8371837b21 Merge pull request #2808 from gschlager/i18n_fix07
FIX: Category creation failed when translation was missing
2014-09-29 16:20:02 +10:00
Sam
1d2c7206e6 Merge pull request #2820 from Elberet/fix-url-bbcode
FIX: reworked handling URL bbcode tags
2014-09-25 09:36:55 +10:00
Robin Ward
98d21ed21f Remove deprecated Ember.Deferred 2014-09-24 14:17:29 -04:00
Jens Maier
dcd7a149e2 FIX: reworked handling URL bbcode tags 2014-09-24 20:02:02 +02:00
Robin Ward
d1d3e5dd8c Remove broken debouncePromise and clean up some deprecations 2014-09-23 16:16:44 -04:00
Arpit Jalan
b3838c2c1c Trigger browser password manager after sigining up 2014-09-24 01:04:36 +05:30
Robin Ward
537e6b193d FIX: Allow proper escaping of bold and italics markdown, even when
nested.
2014-09-22 16:52:14 -04:00
Robin Ward
914217f78a FIX: Allow BBCode images within BBCode links 2014-09-22 14:42:24 -04:00
Jens Maier
9cca64cf69 FIX: BBCode blocks parser no longer mangles JsonML arrays 2014-09-22 03:27:39 +02:00
Gerhard Schlager
a6714e252e FIX: Category creation failed when translation was missing 2014-09-20 22:06:00 +02:00
Jeff Atwood
5646ebf4c7 fix tests expecting "name said:" to "name:" 2014-09-18 20:39:27 -07:00
Jens Maier
543bc53598 FIX: double-escaped single quotes in URLs 2014-09-18 22:07:42 +02:00
Sam Saffron
33c6a2d341 correct tests 2014-09-18 15:26:45 +10:00
Robin Ward
c16b8364ab FIX: Support ember app routing to topics with only slugs 2014-09-17 11:18:59 -04:00
Sam
306d31b92e fix test 2014-09-11 11:15:49 +10:00
Jens Maier
30dbb570e5 FIX: fix dialect block ordering 2014-09-10 13:29:40 +02:00
riking
69bc552054 FEATURE: Actually show more notifications
The "Show more notifications..." link in the notifications dropdown now
links to /my/notifications, which is a historical view of all
notifications you have recieved.

Notification history is loaded in blocks of 60 at a time.

Admins can see others' notification history. (This was requested for
'debugging purposes', though that's what impersonation is for, IMO.)
2014-09-09 16:29:08 -07:00
Robin Ward
504d61de94 FIX: Clicking on expanded user actions uses user expansion. Also added
integration test.
2014-09-09 15:18:04 -04:00
Robin Ward
2f04b53c9f FIX: Clicking outside of modal wasn't closing it 2014-09-08 16:53:05 -04:00
Robin Ward
4bec839d9d Using Discourse.XYZ in templates is deprecated. This fixes that, plus
adds some more integration tests to make sure login required is working.
2014-09-05 13:09:01 -04:00
Jeff Atwood
fad0394a40 more renaming of trust level settings 2014-09-04 13:32:00 -07:00
Jeff Atwood
fcca64c0cf rename site settings for trust levels as numbers 2014-09-04 13:16:51 -07:00
Robin Ward
dac4ed5a1e Prune dead code for search keyboard navigation in search, remove bad
tests.
2014-09-03 15:05:22 -04:00
Robin Ward
40b1558f83 Merge pull request #2747 from cpradio/remove-additional-search-code
FIX: Remove additional search code related to the up/down navigation
2014-09-03 14:46:09 -04:00
Robin Ward
a71640c15f Add the integration test for search back using a fixture. 2014-09-03 13:43:26 -04:00
cpradio
44a25271f1 FIX: Remove additional search code related to the up/down navigation
Removed additional search code that was related to the up/down navigation and their related tests.
https://meta.discourse.org/t/magic-search-code-for-keyboard-shortcuts/19563
2014-09-03 06:51:52 -04:00
Sam
921dd75dd9 FIX: anonymous had <a> items for pin/unpin
FEATURE: display category in search results
FEATURE: display topic state (locked/pinned/etc) in search results

UI cleanup for search results, clearing floats and so on.
2014-09-03 12:13:26 +10:00
Jens Maier
9be5c98c8c FIX: Markdown parser: empty links and bbcode parsed as link refs 2014-08-31 02:55:43 +02:00
Arpit Jalan
289d9e4fe1 FIX: use short date format for topic summary 2014-08-30 12:07:43 +05:30
cpradio
2e200ffbf0 Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics
Conflicts:
	config/locales/client.en.yml
2014-08-29 20:05:59 -04:00
cpradio
875b39fb5f Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics 2014-08-29 19:56:39 -04:00
cpradio
8a8552019a Fixed qunit test assertion 2014-08-29 18:03:27 -04:00
cpradio
80cb8f3a96 Fixed qunit test assertion 2014-08-29 17:54:50 -04:00
Neil Lalonde
1291e94c78 Merge pull request #2715 from cpradio/master
UX: Add focus to menu only if it comes from a keyboard shortcut and improve keyboard functionality for search
2014-08-29 17:04:52 -04:00
cpradio
096bc0c0ae Merge branch 'keyboard-binding-new-topics-banner' into dismiss-keyboard-bindings
Conflicts:
	app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
2014-08-29 09:36:34 -04:00
cpradio
723798cc30 Correct Perform Search Test 2014-08-28 23:32:56 -04:00
cpradio
185769c07b Correct Perform Search Test 2014-08-28 23:21:43 -04:00
Robin Ward
69cb5bc425 FIX: Centralize Top rendering, remove old code paths. Fix some bugs. 2014-08-28 14:34:31 -04:00
Sam
53e60030bc FIX: broken tests 2014-08-27 14:47:23 +10:00
Jens Maier
c58565d09f Fix: dialect block parser should not eat next block's whitespace 2014-08-26 14:11:23 +02:00
Jens Maier
b8f5c21df0 Workaround markdown-js links parser bug 2014-08-24 01:56:14 +02:00
Robin Ward
2ae46b4742 REMOVE: Auto quoting confused more people than it helped. 2014-08-22 14:51:31 -04:00
Robin Ward
300dbdc88b FIX: BBCode contents can span multiple lines 2014-08-22 14:32:29 -04:00
Robin Ward
104b39540a FIX: BBCode with params couldn't span lines 2014-08-22 12:14:10 -04:00
Régis Hanol
5b1785157d TRIVIAL: fix deprecations due to momentjs upgrade 2014-08-20 22:22:58 +02:00
Robin Ward
49f0eaea13 Merge pull request #2650 from Elberet/fix-parser
Fix: block parser uses regexes for stop tags, allows stricter matching
2014-08-18 11:06:08 -04:00
Robin Ward
a0d0f859ba Add login buttons to create account template. 2014-08-14 12:51:16 -04:00
Jens Maier
23002ae01c Fix: block parser now uses regexes for end tags. solves code block case, where end tag must be on a line of its own. 2014-08-14 01:58:01 +02:00
Robin Ward
0adfeb1cff ES6: Mega update of controllers 2014-08-13 10:22:47 -04:00
Robin Ward
233305e96f FIX: On devices with a weird pixel ratio, tests were failing. 2014-08-12 17:29:18 -04:00
Robin Ward
11e43bd434 FIX: Don't show Sign Up button in cases where users can't sign up 2014-08-12 16:55:23 -04:00
Robin Ward
1684ff3015 UX: Add a separate "Sign Up" button 2014-08-12 13:47:23 -04:00
Robin Ward
d1f6c31382 TESTS: Adds integration test for new about route 2014-08-12 11:15:32 -04:00
Robin Ward
37a9747f53 ES6: Convert Discourse.Resolver to ES6 2014-08-07 11:48:02 -04:00
Robin Ward
b323c86302 TESTS: Remove home logo tests, they are written in the incorrect way and
don't test much of value.
2014-08-07 11:48:02 -04:00
Robin Ward
8279752d3c REFACTOR: Don't use Discourse.Capabilities, instead use injection.
Also fix broken test. /cc @Sam
2014-08-06 18:28:02 -04:00
Robin Ward
f977843391 ES6: Convert all test files over 2014-08-06 17:51:03 -04:00
Robin Ward
417d287813 FIX: Don't link to notifications without URLs 2014-08-06 15:24:20 -04:00
Régis Hanol
3330f5907c FEATURE: restructure notification HTML layout 2014-08-05 23:36:37 +02:00
Robin Ward
d29822e4cb TWEAK: Sum new and unread in the site map category list 2014-08-05 16:01:49 -04:00
Robin Ward
3c66e48573 TESTS: Remove URL_FIXTURES constant for pretender 2014-08-01 17:27:01 -04:00
Neil Lalonde
443caaa8f7 FIX: don't let admins skip post validations, unless it's faq, tos, or privacy 2014-08-01 14:53:35 -04:00
Robin Ward
d7ad3bb2b6 TESTS: Integration tests for badge pages 2014-07-31 18:44:47 -04:00
Robin Ward
77332e8b57 TESTS: Add integration test for /top 2014-07-31 18:44:47 -04:00
Robin Ward
adea5b36a0 TESTS: Integration tests for login_required 2014-07-31 17:59:52 -04:00
Robin Ward
e63cdc50bb TESTS: Add JSON.stringify step to prepareBody where it should be. 2014-07-31 17:26:44 -04:00
Robin Ward
c30ab6d428 Return a CSRF in case it's requested 2014-07-31 17:06:16 -04:00
Robin Ward
d3cc85c784 TESTS: Use Pretender in test mode for more flexible server responses 2014-07-31 16:49:30 -04:00
Robin Ward
bf16ff275a TESTS: Sign in tests 2014-07-31 14:17:18 -04:00
Robin Ward
c5b5db48cf TESTS: Reset the preload store for testing 2014-07-31 13:25:40 -04:00
Robin Ward
c3e1dd4707 TESTS: Remove non-idiomatic tests. Too much pain to maintain or convert. 2014-07-31 13:25:40 -04:00
Robin Ward
b8bfbcb3cb ES6: Tests 2014-07-31 13:25:39 -04:00
Robin Ward
6f36d5996d Lots of work on tests 2014-07-30 20:09:45 -04:00
Robin Ward
b6684e7168 Upgrade to ember-qunit 2014-07-30 20:09:44 -04:00
Robin Ward
d29157dab9 TESTS: Refactored integration tests 2014-07-30 20:09:44 -04:00
Robin Ward
aeb0ea1f25 FIX: Broken test 2014-07-30 12:08:07 -04:00
Régis Hanol
b196de0821 TRIVIAL: use class instead of id for the 'topic-list' 2014-07-29 23:38:36 +02:00
Sam
b00b5609e6 Merge pull request #2599 from riking/disable-logster
Disable logster error reporting during tests
2014-07-29 12:29:23 +10:00
riking
f80502ea0e Disable logster error reporting during tests 2014-07-28 13:41:45 -07:00
Neil Lalonde
e1be478ef4 FIX: admins bypass some post validations. This allows them to edit legal docs even if those docs are longer than max post length, for example. 2014-07-28 16:40:14 -04:00
Robin Ward
717f57c968 Revert "FIX: You couldn't span multiple lines with bold or italics"
This reverts commit 423d37a2b6.

Conflicts:
	test/javascripts/lib/markdown_test.js
2014-07-28 13:17:39 -04:00
Robin Ward
8866141ba2 Merge pull request #2592 from Elberet/fix-parser
Fixes for quirky markdown parser behaviours
2014-07-28 13:12:22 -04:00
Sam
f7c7d38a30 FIX: broken tests 2014-07-28 12:05:27 +10:00
Jens Maier
479eb64a76 FIX: rewrite replaceBlock logic to better handle mismatched nested quotes. 2014-07-27 16:07:47 +02:00
Jens Maier
9124cf0eaf FIX: auto-quote should not trigger when the first " is preceded by bbcode-like garbage. 2014-07-27 16:05:29 +02:00
riking
5841e10b59 Extra test for spanning italics 2014-07-25 13:15:14 -07:00
Robin Ward
423d37a2b6 FIX: You couldn't span multiple lines with bold or italics 2014-07-25 16:08:00 -04:00
Robin Ward
b2f2e7b1d2 REFACTOR: Move Markdown tests to Javascript land 2014-07-25 16:08:00 -04:00
Joshua Gorner
e242368266 Convert admin section controllers to ES6 modules 2014-07-25 14:17:58 -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
Jens Maier
b19ad15086 FIX: improve list bbcodes: ignore newlines resulting in unnecessary blank lines 2014-07-24 19:39:16 +02:00
Jens Maier
79dc68512f FIX: dialects accept nested inline markup 2014-07-24 17:34:13 +02: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
Robin Ward
0a0d32efb4 TRIVIAL: Rename map to idMap because map means something for
enumerables.
2014-07-23 11:11:13 -04:00
Peter Le Bek
f63e6e6dab Optimize Category find-by-id by using a hash. 2014-07-22 23:49:49 -04:00
Robin Ward
7c0e723464 TWEAK: If show_subcategory_list is enabled, hide subcategories from
the site map.
2014-07-22 16:27:33 -04:00
Robin Ward
4c51258526 PERF: Speed up JSHint tests by using local buffers instead of AJAX
requests.
2014-07-22 14:13:37 -04:00
Neil Lalonde
386b6213a5 FEATURE: warn when caps lock is on during password input 2014-07-22 13:53:58 -04:00
Robin Ward
d9e5c2317f FIX: If a topic title edit fails, revert to previous title. 2014-07-21 13:39:23 -04:00
Régis Hanol
7ebfe86100 TEST: allows data images 2014-07-18 20:38:01 +02:00
Robin Ward
75f6b43e62 ES6: Discourse.ContainerView 2014-07-18 12:20:07 -04:00
riking
de3633235b Add JS tests for deleted post hiding (fix the build) 2014-07-17 11:13:42 -07:00
Sam
fecb9ddb43 FIX: invalid test 2014-07-17 16:11:10 +10:00
Robin Ward
d6589d4c53 FIX: Cooking issue with paragraphs in a list 2014-07-15 16:42:14 -04:00
Régis Hanol
a9342dbf92 SECURITY: fix XSS in link's href 2014-07-15 16:11:37 +02:00
Robin Ward
1886ffaff2 FIX: Work with phpBB import style links with ellipsis 2014-07-14 14:27:17 -04:00
Robin Ward
186ce78cb5 FIX: BBCode sanitization and tests 2014-07-14 11:24:25 -04:00
Neil Lalonde
e565ae2528 FEATURE: /guidelines route will always show our FAQ, ignoring the faq_url site setting 2014-07-10 12:58:41 -04:00
Régis Hanol
6b45b635f8 FIX: properly whitelist <code> classes needed for syntax highlighting 2014-07-09 16:27:47 +02:00
Robin Ward
7ab98bb0e7 FIX: Missing formatting for oneboxes in preview 2014-07-04 14:15:07 -04:00
Robin Ward
fc1ce96dbb FIX: Change the approach to sanitization. Includes a more detailed API
for allowing classes and attributes for only certain tag names.
2014-07-03 16:55:36 -04:00
Robin Ward
9c48f8f154 FIX: Don't surround <aside> with <p> as that is malformed HTML. 2014-06-30 18:11:22 -04:00
Robin Ward
a7ad7f6a45 Remove some obscure HTML tags from sanitization 2014-06-24 11:03:45 -04:00
Robin Ward
ff55a30dd7 FIX: <pre> blocks were adding too many new lines. 2014-06-23 15:21:07 -04:00
Robin Ward
42d1fcbbc2 [code] should work just like other kinda of code formatting. 2014-06-23 13:19:27 -04:00
Arpit Jalan
7e946a718e Make bookmarks menu appear all the time 2014-06-23 10:21:33 +05:30
Robin Ward
9d82111813 TRIVIAL: Remove some output from qunit test suite. 2014-06-19 16:00:01 -04:00
Sam
806ddb4ccb FEATURE: Quote reply at cursor 2014-06-18 15:17:55 +10:00
Sam
a288ff331d BUGFIX/FEATURE: call out context for search. 2014-06-17 17:53:45 +10:00
Jeff Atwood
5db621c5fe normalize to search.title for search help 2014-06-16 16:20:57 -07:00
Jeff Atwood
6ceebc3f1c Merge pull request #2435 from techAPJ/add-bookmark-menu
FEATURE: Add Bookmarks menu to user dropdown
2014-06-12 03:28:40 -07:00
Sam
8ff4536a08 BUGFIX: fragile test corrected, stubbing is not needed here. 2014-06-12 10:59:07 +10:00
Arpit Jalan
aed2483bb9 FEATURE: User Bookmarks Menu 2014-06-12 01:54:54 +05:30
Robin Ward
176120cbc1 REFACTOR: Keyboard Shortcuts should send their actions directly to
posts, not by activating clicks on buttons.
2014-06-11 14:31:03 -04:00
Robin Ward
580a1bf8b0 ES6: Migrated and deprecated a bunch of views 2014-06-10 11:54:38 -04:00
Neil Lalonde
56cd60f226 FIX: there are site settings for username min and max lengths. Neat. 2014-06-09 18:26:42 -04:00
Robin Ward
c6b92f0ef7 FIX: Support for nested bold/italics in MD 2014-06-09 17:46:36 -04:00
Neil Lalonde
78d46a81e1 FIX: js needs to use same max username length as server 2014-06-09 15:28:03 -04:00
Robin Ward
a63ac64931 FIX: Obscure emoji fail with a colon surrounded by spaces 2014-06-09 14:44:34 -04:00
Robin Ward
7adb545168 ES6: Convert {{pagedown}} to {{pagedown-editor}} with deprecations 2014-06-09 12:16:27 -04:00
Robin Ward
1df3214773 ES6: Convert header view 2014-06-09 11:34:38 -04:00
Sam
a4de1f25c1 Fix broken tests 2014-06-05 21:16:36 +10:00
Robin Ward
411985de3b FIX: Recursion with a computed property that was pointing to itself. 2014-06-04 16:33:22 -04:00
Régis Hanol
897f219d61 BUGFIX: change the image upload icon when only images are authorized (fixes #2359) 2014-06-04 19:51:26 +02:00
Neil Lalonde
72abb6e274 Disable external auths by default. Don't change settings for existing sites. 2014-06-04 11:35:18 -04:00
Neil Lalonde
5b39913766 FIX: qunit tests pass, re-enable the category notifications dropdown button 2014-06-02 15:51:03 -04:00
Sam
ddc3c992b7 Correct unit tests 2014-06-02 13:35:59 +10:00
Robin Ward
1af2ff6201 ES6: More components moved over. 2014-05-30 12:28:05 -04:00
Sam
fe594f5d1e Merge pull request #2372 from vikhyat/badge-system
Multiple grant badges
2014-05-30 10:18:00 +10:00
Ben Lubar
73946e5402 quoting fixes
- allow bbcode quotes to be nested
- don't allow the '=' to be omitted from quotes
- fix some css that made assumptions about nested quotes
2014-05-27 21:46:31 -05:00
Sam
d1f0dda636 FIX spec 2014-05-27 23:39:02 +10:00
Sam Saffron
4295644247 oops, had trouble with qunit locally 2014-05-27 15:04:22 +10:00
Sam Saffron
8e19e9b84e jshint oops 2014-05-27 14:51:04 +10:00
Sam Saffron
252e93d0f2 BUGFIX: support CDN for avatars
Correct broken spec
Implement S3 support
2014-05-27 14:40:46 +10:00
Vikhyat Korrapati
a79bf11edb Admin badge creation bug fixes. 2014-05-27 09:03:55 +05:30
Robin Ward
919ae73709 ES6: A few more controllers on a Holiday Monday 2014-05-26 14:40:06 -04:00
Sam
570c4b6300 certain keyboard shortcuts were never tested ever. 2014-05-25 14:59:05 +10:00
Sam
2a1f5876cc attempt to fix odd travis fail 2014-05-23 15:10:34 +10:00
Sam
cc681c729d FIX broken test 2014-05-23 12:23:12 +10:00
Vikhyat Korrapati
d208e4d517 Multiple grant badges. 2014-05-21 12:54:55 +05:30
Vikhyat Korrapati
6225b83f4a Show system badges in the admin interface but don't allow editing them. 2014-05-19 10:27:04 +05:30
Vikhyat Korrapati
215e42053a FIX: missing badge descriptions. 2014-05-16 13:39:40 +05:30
Sam
5914d0e132 Merge pull request #2311 from vikhyat/badge-system
Add automatically assigned trust level badges
2014-05-16 09:08:00 +10:00
Robin Ward
026cfe2dc7 ES6: Half a dozen more controllers 2014-05-15 11:32:15 -04:00
Sam
b225b1d547 query was updated 2014-05-15 20:32:34 +10:00
Vikhyat Korrapati
b144b75565 Add automatically assigned trust level badges. 2014-05-14 20:47:21 +05:30
Wojciech Zawistowski
960d64930c Wiki Post 2014-05-13 08:53:11 -04:00
Robin Ward
07007e6cbc ES6: Notification controllers, added helper to create via ES6/container 2014-05-12 14:01:21 -04:00
Arpit Jalan
93cff8deb5 Speech bubble waiting for an ajax response prior to rendering 2014-05-09 22:23:27 +05:30
Robin Ward
842dd91958 Revert "Merge pull request #2304 from techAPJ/speech-bubble-update"
This reverts commit 6590ebbcbe, reversing
changes made to 3855ead62e.
2014-05-09 12:01:36 -04:00
Arpit Jalan
d16974fd4c Speech bubble waiting for an ajax response prior to rendering 2014-05-09 08:06:56 +05:30
Robin Ward
efcf99c21d ES6: A bunch more controllers 2014-05-08 11:35:34 -04:00
Robin Ward
a0221ce5e5 ES6: More controllers converted to ES6 2014-05-08 11:35:34 -04:00
Robin Ward
4640b9d653 ES6: Half a dozen more controllers converted 2014-05-08 11:35:34 -04:00
Robin Ward
5191acfd9f ES6: Uses proper normalize method, includes support for namespaced
controllers.
2014-05-08 11:35:33 -04:00
Robin Ward
eee5f85654 ES6: AvatarSelector and HeaderController - also includes support for controllers with
camelcase via an error message.
2014-05-08 11:35:33 -04:00
Robin Ward
f51cbc8952 FIX: @mentions should not be processed within links 2014-05-06 17:48:30 -04:00
Robin Ward
aa269c92a0 Revert "ES6: AvatarSelector and HeaderController - also includes support for controllers with"
This reverts commit 44b2f82be8.
2014-05-05 13:58:57 -04:00
Robin Ward
69225a7ea9 Revert "ES6: Uses proper normalize method, includes support for namespaced"
This reverts commit b98324a937.
2014-05-05 13:58:57 -04:00
Robin Ward
389c50eb1e Revert "ES6: Half a dozen more controllers converted"
This reverts commit bc2d87e5c1.
2014-05-05 13:58:57 -04:00
Robin Ward
b17cd2f251 Revert "ES6: More controllers converted to ES6"
This reverts commit 23cc7c174a.
2014-05-05 13:58:57 -04:00
Robin Ward
23cc7c174a ES6: More controllers converted to ES6 2014-05-05 13:23:45 -04:00
Robin Ward
bc2d87e5c1 ES6: Half a dozen more controllers converted 2014-05-05 13:23:45 -04:00
Robin Ward
b98324a937 ES6: Uses proper normalize method, includes support for namespaced
controllers.
2014-05-05 13:23:45 -04:00
Robin Ward
44b2f82be8 ES6: AvatarSelector and HeaderController - also includes support for controllers with
camelcase via an error message.
2014-05-05 13:23:45 -04:00
Robin Ward
7a2dbf0d2d FIX: Changed fixture paths 2014-04-29 21:09:29 -04:00
Robin Ward
0528b408a3 Add an integration test for the new Ember 404 route 2014-04-29 15:29:13 -04:00
Robin Ward
f50039b48b Support 404 routes in the Ember App 2014-04-29 15:29:13 -04:00
Robin Ward
ba683bc611 FIX: XSS in markdown converter. 2014-04-28 14:44:15 -04:00
Robin Ward
cf6cbb955b REFACTOR: Introduce Discourse.computed.setting to create a computed
property that links to a `Discourse.SiteSetting`
2014-04-24 18:36:02 -04:00
Régis Hanol
39cc147138 BUGFIX: only redirect users top /top page once 2014-04-21 20:00:37 +02:00
Robin Ward
4dc20e6855 FIX: Sanitize custom quote attributes 2014-04-21 10:19:39 -04:00
Robin Ward
b3ed8b6a32 Use query params for sortable table headings 2014-04-17 10:52:57 -04:00
Robin Ward
fdb751296a FIX: ZALGO test suite was causing failures in the wrong place due to
missing `async` bits.
2014-04-17 10:46:33 -04:00
Robin Ward
617b4bed41 FIX: Rather than using singleton: false for avoiding caching in the
container, just unregister it afterwards.
2014-04-17 10:45:06 -04:00
Robin Ward
73cc722ed5 Update Ember.js, Handlebars and jQuery to latest 2014-04-17 10:45:06 -04:00
Vikhyat Korrapati
b62606e7f1 Remove color_hexcode column from badge_types. 2014-04-17 05:36:29 +05:30
Vikhyat Korrapati
3136217fc1 Add badge page. 2014-04-17 01:57:57 +05:30
Robin Ward
ed6e2b1d79 Remove Zalgo API from Discourse.Mention:
http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony -
Thanks @riking for finding it.
2014-04-14 16:51:18 -04:00
Robin Ward
36bb4c02b7 Only use .jshintignore for the ignore rules. 2014-04-01 12:28:17 -04:00
Wojciech Zawistowski
c0a11adbc5 Moves Markdown Editor from vendor to discourse. 2014-03-31 21:56:19 +02:00
Sam
291df4d48d Merge pull request #2193 from slainer68/delete_enable_local_account_create
Delete enable_local_account_create option as it is not used anywhere.
2014-03-28 10:19:09 +11:00
Régis Hanol
5edec22e28 fix the build 2014-03-27 16:57:46 +01:00
Régis Hanol
e663d78104 SECURITY: sanitize markdown urls (prevent XSS) 2014-03-27 15:34:35 +01:00
slainer68
6fb323fd71 Delete enable_local_account_create option as it is not used anywhere.
JS fixture
2014-03-27 00:55:06 +01:00
Neil Lalonde
86244e3a4b New sub-category badges in category chooser. Normalize category badge rendering code. 2014-03-25 17:29:59 -04:00
Vikhyat Korrapati
0f9ea25010 Interface for granting/revoking badges from admin user page. 2014-03-21 11:09:19 +05:30
Sam
2dc5e3c81e Merge pull request #2118 from vikhyat/firefox-middle-click
Fix Firefox middle-click popup blocker issue
2014-03-21 16:27:02 +11:00
Vikhyat Korrapati
4f71256542 Fix badge description i18n match. 2014-03-17 18:43:09 +05:30
Vikhyat Korrapati
9b26c8584e Initial badge system implementation. 2014-03-14 21:49:26 +05:30
Vikhyat Korrapati
e798705aec Do not call preventDefault on right and middle-click/Ctrl+click.
This should fix the middle click popup blocker issue on Firefox.
2014-03-13 11:03:19 +05:30
Régis Hanol
8b6930a5cf FIX: shortDate tests 2014-03-11 12:37:54 +01:00
Nick Schonning
62d5a10873 JSHint test helpers
Remove unreferenced globals
2014-03-11 02:40:27 -04:00
Nick Schonning
86a9e0db6a JSHint assertions.js
Mark all functions as exported
2014-03-11 02:36:10 -04:00
Nick Schonning
054eca840a JSHint parse_html.js
- Mark Tautologistics as a global
- Mark parseHTML as exported
2014-03-11 02:34:17 -04:00
Nick Schonning
3342741876 JSHint QUnit helpers
- Don’t redefine controller
- Mark all functions as exported
- Mark the QUnit asyncTest as a global function
2014-03-11 02:30:49 -04:00
Vikhyat Korrapati
b0d1d7a3e8 i18n of new/unread text next to topics. 2014-03-09 16:31:44 +05:30
Régis Hanol
8214536614 BUGFIX: don't show redirect reason if you aren't redirected
Move the redirect to top page logic server-side and make sure the reason
is not shown when top is not in the navigation menu (top_menu).
2014-03-07 18:58:53 +01:00
Régis Hanol
ca12ea42a7 FEATURE: only redirect new users to top page for a limited period
That period is defined by the `redirect_new_users_to_top_page_duration`
site setting and defaults to 7 days.
2014-03-05 22:11:01 +01:00
Robin Ward
15c9c90533 When links have thousands of clicks, display them like 3.3K 2014-03-04 13:44:53 -05:00
Robin Ward
02ea67eece BUGFIX: A MDTest was conflicting with BBCode support for upper case 2014-03-03 13:14:11 -05:00
Robin Ward
6143753fef Support uppercase bbcode too. 2014-03-03 11:59:57 -05:00
Robin Ward
d079538a6d Allow the customHTML helper to look up fragments outside of the
preloadStore, so plugins can stuff HTML in there when overriding a whole
template doesn't make sense.
2014-02-25 16:02:27 -05:00
Robin Ward
7716d940a0 BUGFIX: Allow links to images with absolute URLs as well as parens 2014-02-20 15:24:03 -05:00
Neil Lalonde
b696c96a19 Look at the age of a user's first post to determine if the user can be nuked, instead of looking at when the user registered. 2014-02-20 12:29:40 -05:00
Régis Hanol
69e0342d8f fix typo 2014-02-18 18:24:11 +01:00
Régis Hanol
aac4b55926 FEATURE: do not redirect to top page when number of topis is low 2014-02-17 14:28:12 +01:00
Robin Ward
5932e32528 Merge pull request #1937 from verg/user_dropdown
Add User Avatar Dropdown
2014-02-13 10:55:58 -05:00
verg
95f4c0f583 Add User dropdown menu to Header 2014-02-13 09:45:51 -05:00
Robin Ward
2e5413437d Fix the build 2014-02-11 18:01:06 -05:00
Robin Ward
3d62df51a6 FIX: Broken MDTest + Fix for removing leading spaces in a code block 2014-02-11 17:27:24 -05:00
Régis Hanol
4a20384b56 fix the build 2014-02-11 10:18:07 -08:00
Sam
11e962c848 BUGFIX: improve quality of unread / new counters 2014-02-11 15:28:05 +11:00
Neil Lalonde
113057bfa9 Comma needs to die 2014-02-06 11:57:45 -05:00
Robin Ward
af5254d3b4 FIX: Remove canvas tag. 2014-02-05 12:22:36 -05:00
Robin Ward
8adb08a9ca FIX: Don't allow <button> in posts either. 2014-02-04 16:29:00 -05:00
Robin Ward
abffcd9f94 FIX: Blacklist <textarea> 2014-02-04 12:48:33 -05:00
Sam
612001aa74 BUGFIX: deleted categories would mess up watching/tracking prefs 2014-02-04 15:14:31 +11:00
Wojciech Zawistowski
73253ce32e Adds JS integration tests for search 2014-01-31 01:53:08 -05:00
Robin Ward
b4fef88412 Merge pull request #1884 from velesin/search_controller_refactoring
refactors Discourse.SearchController
2014-01-30 10:44:53 -08:00
Neil Lalonde
b5d0031105 Topic list dates formatting changes: use Dec '12 and Jan 21 2014-01-29 15:45:06 -05:00
Wojciech Zawistowski
5b897bc6a4 refactors Discourse.SearchController 2014-01-29 20:53:08 +01:00
Robin Ward
2892153712 REMOVE: Get rid of the hotness control for good. 2014-01-29 11:54:34 -05:00
Régis Hanol
d0c55010aa BUGFIX: clicking on links to the same domain was broken 2014-01-29 11:31:36 +01:00
Vikhyat Korrapati
fad88c6cf3 Fix sanitization of smileys like <_< and <3. 2014-01-26 18:38:47 +05:30
Régis Hanol
e393e9765f Merge pull request #1856 from velesin/search_controller_tests
Adds unit tests for SearchController
2014-01-24 04:11:10 -08:00
Wojciech Zawistowski
5166abd75f Adds new QUnit assertion ("not") complementary to built-in "ok" 2014-01-23 20:31:33 +01:00
Wojciech Zawistowski
e27c007653 Adds unit tests for SearchController 2014-01-23 20:25:37 +01:00
Régis Hanol
ae06ea6323 BUGFIX: clicking the logo when the homepage was /categories or /top would fail 2014-01-23 17:08:52 +01:00
Robin Ward
e2c361f353 FIX: Indented code blocks followed by <blockquote> weren't working. 2014-01-21 16:18:20 -05:00
Robin Ward
3c3449aa1b Revert "New API for replacing elements in the final JsonML. Also changes spoiler"
This reverts commit 6b9b2d3d6a.

We have come up with a better solution that does not involve HTML
parsing.
2014-01-21 12:04:58 -05:00
Neil Lalonde
9be481f035 Merge pull request #1846 from velesin/admin_site_settings_controller_test_fix
fixes unit test broken (and commented out) after adding debounce behavio...
2014-01-20 14:26:24 -08:00
Robin Ward
6b9b2d3d6a New API for replacing elements in the final JsonML. Also changes spoiler
tag handling to be more robust with repsect to HTML content.
2014-01-20 15:15:50 -05:00
Wojciech Zawistowski
8812196b81 fixes unit test broken (and commented out) after adding debounce behavior to a method 2014-01-20 17:30:12 +01:00
Robin Ward
4981525047 REFACTOR: Fixes poor class hierarchy for listing topics
- Upgrades Ember to latest
- Fixes a bunch of bugs with page titles and missing "active" states
2014-01-18 19:26:24 +01:00
Régis Hanol
ad8755aa70 BUGFIX: inline spoiler for text, block spoiler for images 2014-01-15 00:53:06 +01:00
Robin Ward
71aed34e64 FIX: Allow click tracking to work with different origins 2014-01-14 15:20:46 -05:00
Régis Hanol
3a6bffa05d FEATURE: better top pages 2014-01-14 01:09:12 +01:00
Régis Hanol
70161498b6 BUGFIX: spoiler tag on lightboxed images wasn't working 2014-01-12 19:38:46 +01:00
Neil Lalonde
52580f09af Rename favorite to starred everywhere 2014-01-10 14:54:19 -05:00
Robin Ward
456a213904 FIX: Broken qunit test 2014-01-09 13:48:58 -05:00
Robin Ward
b28a8e262f FIX: Categories are ordered by topic_count. 2014-01-09 13:05:32 -05:00
Sam
e0284dfef0 update fixture 2014-01-07 11:40:28 +11:00
Régis Hanol
87217d940e Merge pull request #1457 from skisulli/keyboard-shortcuts
Global Gmail style keyboard shortcuts
2014-01-06 06:40:55 -08:00
Régis Hanol
0dc0740408 BUGFIX: clicking on the Logo generates a javascript error 2014-01-06 11:46:19 +01:00
Robin Ward
6c4417e0f0 Use the standard .jshintrc file for JSHint options. 2013-12-31 12:41:40 -05:00
Régis Hanol
7fd88a52c9 FEATURE: allow plugins to overwrite handlebars templates 2013-12-31 16:43:29 +01:00
Régis Hanol
54686388fb FEATURE: display the Top tab by default for long-time-no-see users 2013-12-30 19:42:45 +01:00
Robin Ward
a502266c42 Enable JSHINT's unused option. It caught a bunch of suspicious stuff which is fixed in this commit. 2013-12-30 13:30:22 -05:00
Régis Hanol
8685e4079f FEATURE: the top tab is the default for new users 2013-12-30 18:49:16 +01:00
Sam
d8c43f7b58 BUGFIX: fix username breakup so it works with IE
FEATURE: breakup username based on name as well
2013-12-30 16:07:35 +11:00
Régis Hanol
34cbea64d1 Merge pull request #1749 from velesin/has_current_user_test_improvement
adds small HasCurrentUser mixin test improvements
2013-12-23 05:47:46 -08:00
Régis Hanol
9ee404b0e6 Merge pull request #1750 from velesin/header_controller_test_fix
fixes HeaderController test
2013-12-23 05:47:22 -08:00
Régis Hanol
2f9c81cd75 Merge pull request #1751 from velesin/text_field_tests
adds unit tests for Discourse.TextField
2013-12-23 05:46:48 -08:00
Régis Hanol
ef8625caaa Merge pull request #1753 from velesin/search_text_field_tests
adds unit tests for SearchTextField
2013-12-23 05:46:12 -08:00
Sam
d4819c3a65 Got rid of crazy user name split
instead decorate with <wbr> to hint on best
spot to split
2013-12-23 11:11:41 +11:00
Sam
90077ae98d fix tests, clean up include logic 2013-12-23 10:41:10 +11:00
Ryan Sullivan
5100c2bbd2 Add Global Keyboard Shortcuts
Not all of these have been fully implemented yet.

**Jump To**
* `g` then `h` - Home (Latest)
* `g` then `l` - Latest
* `g` then `n` - New
* `g` then `u` - Unread
* `g` then `f` - Favorited
* `g` then `c` - Categories List

**Navigation**
* `u` - Back to topic list
* `k` / `j` - Newer/Older conversation or post
* `o` or `Enter` - Open selected conversation
* <code>`</code> - Go to next section
* `~` - Go to previous section

**Application**
* `c` - Create a new topic
* `n` - Open notifications menu
* `/` - Search
* `?` - Open keyboard shortcut help

**Actions**
* `f` - Favorite topic
* `s` - Share topic
* `<Shift>` + `s` - Share selected post
* `r` - Reply to topic
* `<Shift>` + `r` - Reply to selected post
* `l` - Like selected post
* `!` - Flag selected post
* `b` - Bookmark selected post
* `e` - Edit selected post
* `d` - Delete selected post
* `m` then `m` - Mark topic as muted
* `m` then `r` - Mark topic as regular
* `m` then `t` - Mark topic as tracking
* `m` then `w` - Mark topic as watching
2013-12-22 12:16:42 -07:00
Wojciech Zawistowski
965fb78b06 adds unit tests for SearchTextField 2013-12-20 21:00:48 +01:00
Neil Lalonde
854d9c8fc6 Minimum password length is configurable with the min_password_length site setting. FIX: reset password needs to validate password length. 2013-12-19 16:15:47 -05:00
Wojciech Zawistowski
c2e590b343 adds unit tests for Discourse.TextField 2013-12-19 19:29:15 +01:00
Wojciech Zawistowski
89bdebac3c fixes HeaderController test 2013-12-19 18:59:30 +01:00
Wojciech Zawistowski
e5269ab3e0 adds small HasCurrentUser mixin test improvements 2013-12-19 18:54:24 +01:00
Neil Lalonde
47c6bb4cf2 Improve how category stats are rendered 2013-12-17 17:43:04 -05:00
Sam
29ba471db6 missing site setting, this should be auto generated 2013-12-17 12:35:09 +11:00
Neil Lalonde
49c3482464 Show topic and post counts by day/week/month/year on categories page 2013-12-13 15:37:45 -05:00
Robin Ward
a7a7387da1 Automatically convert some quotes to blockquotes 2013-12-13 15:31:25 -05:00
Neil Lalonde
6fa2e68742 Show more than one topic per category on the wide categories page. Disable support for the 2-column categories page. The category_featured_topics site setting controls how many topics to show. 2013-12-12 15:52:30 -05:00
Neil Lalonde
ed3d3ae1e1 Upgrade font-awesome to version 4 2013-12-11 10:31:09 -05:00
Wojciech Zawistowski
9dbc2f1039 adds unit tests for the search dropdown template 2013-12-09 18:15:38 +01:00
Robin Ward
8cc6cd933a Don't allow filtering by user in summary mode and vice versa. It's just confusing. 2013-12-06 13:53:19 -05:00
Robin Ward
19987c1cbf Merge pull request #1704 from velesin/site_map_integration_tests_clean_up
cleans up site map integration tests
2013-12-06 08:31:18 -08:00