Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,130 Commits 246 Branches 502 Tags 902 MiB
Commit Graph

534 Commits

Author SHA1 Message Date
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