github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 06:53:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6,859 Commits 214 Branches 500 Tags 960 MiB
dd4a01896b
Commit Graph

305 Commits

Author SHA1 Message Date
Régis Hanol
345960e194 Merge pull request #1634 from velesin/click_track_tests_fixture_helper 
refactors click track tests to use fixture helper
 2013-11-09 01:31:41 -08:00
Wojciech Zawistowski
67a1da7af4 refactors header notifications (renders them via separate controller / template) 2013-11-08 21:06:27 +01:00
Wojciech Zawistowski
e31559b05f refactors click track tests to use fixture helper 2013-11-08 20:30:20 +01:00
Wojciech Zawistowski
db002e9294 refactors logo component unit tests to use fixture helper 2013-11-08 20:23:29 +01:00
Robin Ward
cabde46fe4 Merge pull request #1631 from velesin/fixture_jshint_fix 
FIX: adds fixture test helper to JSHint config
 2013-11-08 09:53:36 -08:00
Wojciech Zawistowski
bdbddddbdd cleans up setup of header integration test 2013-11-08 17:38:35 +01:00
Wojciech Zawistowski
e3e2d66ae4 FIX: adds fixture test helper to JSHint config 2013-11-08 17:28:57 +01:00
Robin Ward
ac9a763ab3 FIX: Extra space before tags in blockquotes 2013-11-07 16:06:50 -05:00
Robin Ward
35d4229847 Merge pull request #1624 from velesin/qunit_fixture_helpers 
adds QUnit test helper simplifying usage of #qunit-fixture
 2013-11-07 12:34:42 -08:00
Robin Ward
43c577adf5 Merge pull request #1623 from velesin/remove_qunit_scratch 
removes redundant #qunit-scratch (use standard #qunit-fixture instead)
 2013-11-07 12:33:58 -08:00
Robin Ward
0a692d00da Merge pull request #1615 from velesin/header_notifications_tests 
adds integration tests for notifications dropdown in header
 2013-11-07 12:33:38 -08:00
Wojciech Zawistowski
89d33c5f3f adds QUnit test helper simplifying usage of #qunit-fixture 2013-11-07 19:46:38 +01:00
Wojciech Zawistowski
74cbb18f67 removes redundant #qunit-scratch (replaces it with standard #qunit-fixture) 2013-11-07 18:18:07 +01:00
Wojciech Zawistowski
52208b4eb7 adds integration tests for notifications dropdown in header 2013-11-05 17:56:13 +01:00
Wojciech Zawistowski
1dcd2d903b enhances integration test helper with the ability to invoke additional setup / teardown code 2013-11-05 17:42:37 +01:00
Robin Ward
b8e63719f8 FIX: Don't autolink within a markdown link. 2013-11-04 14:24:40 -05:00
Neil Lalonde
ede59a4386 FIX: issue 1538. After upgrading and before a new version check request has been made, dashboard might still say that an update is available. 2013-11-04 12:51:09 -05:00
Wojciech Zawistowski
2bd3cc4e16 cleans up logo integration tests 2013-10-31 17:27:28 +01:00
Wojciech Zawistowski
489dab333a extracts logo component from header 2013-10-30 21:56:48 +01:00
Robin Ward
49abdbaaf7 Merge pull request #1587 from velesin/logo_tests 
integration tests for the logo part of header
 2013-10-29 12:39:02 -07:00
Robin Ward
5689e314c5 Upgrade Ember to 1.1.2 2013-10-29 13:01:57 -04:00
Wojciech Zawistowski
97b907e309 integration tests for the logo part of header 2013-10-29 17:33:53 +01:00
Robin Ward
84d531cff7 Merge pull request #1583 from velesin/header_test_fix 
fixes wrong placement of expect in header integration test
 2013-10-29 08:04:19 -07:00
Wojciech Zawistowski
37e56249be fixes wrong placement of expect in View Topic integration test 2013-10-28 19:15:40 +01:00
Wojciech Zawistowski
76602f6353 fixes wrong placement of expect in header integration test 2013-10-28 19:01:36 +01:00
Robin Ward
e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Sam
8ad103abb0 correct fixture 2013-10-25 14:59:57 +11:00
Sam
e57967c6c3 better exception when discourse.ajax is called, still need to figure out how to fix it though :) 2013-10-25 14:30:45 +11:00
Robin Ward
9adcd1579d Renamed components to lib in the JS project, as Ember has components and they mean something different. 2013-10-24 12:36:46 -04:00
Robin Ward
541620c115 Routes and support for sub-categories 2013-10-23 15:22:49 -04:00
Robin Ward
49a11e51df Ember support for parent categories 2013-10-23 15:22:49 -04:00
Régis Hanol
a12a1bcc66 bring back attachment icons 2013-10-23 09:52:15 +02:00
Robin Ward
e94a8cf62e Remove some autogenerated stuff we don't use. 2013-10-22 17:38:32 -04:00
Robin Ward
348e2e3ef2 Support for per-user API keys 2013-10-22 17:34:39 -04:00
Robin Ward
e2845f7f16 Restrict SIZE= to numbers 2013-10-22 11:08:13 -04:00
Robin Ward
e527cbf884 FIX: Link reference-style text without a url 2013-10-21 14:16:49 -04:00
Robin Ward
d9a16079a5 FIX: Do not allow users to create tables 2013-10-21 13:32:15 -04:00
Robin Ward
7a5c3bfcd8 whitelist acceptable syntax highlighting classes 2013-10-21 13:11:10 -04:00
Robin Ward
d10f9f756f FIX: [code] blocks with # headers within 2013-10-21 12:12:58 -04:00
Robin Ward
1783089d64 FIX: [quote] without params was failing. 2013-10-21 11:12:47 -04:00
Robin Ward
4d9ca99929 Merge pull request #1542 from velesin/debounce_refactoring 
refactors Discourse.debounce
 2013-10-21 07:50:26 -07:00
Robin Ward
c5f14cdd0e Merge pull request #1549 from velesin/debounce_promise_refactoring 
refactors Discourse.debouncePromise
 2013-10-21 07:49:47 -07:00
Régis Hanol
533006a5ec Merge pull request #1536 from velesin/computed_tests_refactoring 
Discourse.Computed tests refactoring
 2013-10-20 07:01:26 -07:00
Wojciech Zawistowski
4c4a2f220e refactors Discourse.debouncePromise 2013-10-20 10:38:26 +02:00
Wojciech Zawistowski
d0f3765967 refactors Discourse.debounce 2013-10-19 09:13:00 +02:00
Robin Ward
1113b8d7a8 FIX: Don't double sanitize values, allow blockquotes with leading text 2013-10-18 17:34:54 -04:00
Robin Ward
d7182d0b14 FIX: Only wrap inline html tags in <p> 2013-10-18 15:21:05 -04:00
Wojciech Zawistowski
42c12206c3 Discourse.Computed tests refactoring 2013-10-17 18:52:24 +02:00
Neil Lalonde
71571b9316 Never show preview pane in composer on mobile. 2013-10-17 12:19:28 -04:00
Robin Ward
665a07f004 Merge pull request #1532 from velesin/container_view_tests 
unit tests for Discourse.ContainerView
 2013-10-17 06:55:23 -07:00
Robin Ward
5126ed757e Merge pull request #1530 from velesin/view_tests 
adds unit tests for Discourse.View
 2013-10-17 06:55:00 -07:00
Robin Ward
dd63e6d28f Two Column User View 2013-10-16 15:51:01 -04:00
Wojciech Zawistowski
07ec58a89d unit tests for Discourse.ContainerView 2013-10-16 17:47:51 +02:00
Robin Ward
8d016092cd FIX: Heading with style 2013-10-16 10:39:06 -04:00
Robin Ward
67771d6bdf FIX: New line after blockquote 2013-10-16 10:28:48 -04:00
Robin Ward
f27413219e Support for MDTest 2013-10-16 10:28:42 -04:00
Wojciech Zawistowski
349588630f adds unit tests for Discourse.View 2013-10-15 18:00:10 +02:00
Robin Ward
5281b7f80c Upgraded and refactored Sanitizing. Much less crap should get through now! 
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
 2013-10-15 10:53:11 -04:00
Robin Ward
af931f0444 Reverting the Sanitizer commit in case we have to do something urgent 
before we deploy it early next week. It's in the branch `sanitizer` for
now.

This reverts commit 9e93d8ed52.
 2013-10-11 16:44:26 -04:00
Robin Ward
9e93d8ed52 Upgraded and refactored Sanitizing. Much less crap should get through now! 
Conflicts:
	app/assets/javascripts/discourse/components/syntax_highlighting.js
 2013-10-11 16:25:40 -04:00
Wojciech Zawistowski
708a55cb38 refactors Discourse.Computed to bind context to self 2013-10-09 18:24:33 +02:00
Neil Lalonde
bccb37b6f3 When creating a topic, don't select a category by default when allow_uncategorized_topics is false. Also, added category validation on the server to enforce allow_uncategorized_topics. 2013-10-08 14:41:20 -04:00
Robin Ward
e7935d4263 Merge pull request #1501 from velesin/debounce_promise_tests 
adds unit tests for Discourse.debouncePromise
 2013-10-08 07:56:07 -07:00
Wojciech Zawistowski
034d00b83a adds unit tests for Discourse.debouncePromise 2013-10-07 17:45:09 +02:00
Wojciech Zawistowski
7106b27860 refactors asyncTestDiscourse to bind context as self 2013-10-07 17:36:20 +02:00
Robin Ward
fc00269b7f Pop up with user information when clicking avatar on topic page 2013-10-03 13:06:30 -04:00
Wojciech Zawistowski
4fc4831efc adds unit tests for Discourse.debounce 2013-10-02 20:03:04 +02:00
Régis Hanol
af96ef2994 FIX: deleting a flagged post issue 
cf. http://meta.discourse.org/t/deleting-a-flagged-post-issue/10061

The bug was only happening when you were about the delete the first post, which means deleting the entire topic.
 2013-10-02 16:59:57 +02:00
Robin Ward
0b5df524c7 Merge pull request #1487 from velesin/has_current_user_tests 
adds unit tests for Discourse.HasCurrentUser
 2013-10-02 07:27:06 -07:00
Robin Ward
be0ce08cc2 Ember Upgrade: 1.0 2013-10-01 11:16:27 -04:00
Wojciech Zawistowski
363a8d6e4f adds unit tests for Discourse.HasCurrentUser 2013-09-30 21:46:42 +02:00
Wojciech Zawistowski
2f9a467453 adds unit tests for Discourse.Controller 2013-09-30 18:12:12 +02:00
Robin Ward
37304b7eba FIX: Too many new lines in long quotes 2013-09-27 15:08:56 -04:00
Robin Ward
19d94f3576 Merge pull request #1467 from velesin/resolver_tests 
adds unit tests for Discourse.Resolver
 2013-09-27 09:19:11 -07:00
Sam
191dc77482 Merge pull request #1451 from velesin/remove_return_from_router_map 
remove unnecessary return statement inside Discourse.Router.map
 2013-09-26 14:39:47 -07:00
Wojciech Zawistowski
95d8014931 adds unit tests for Discourse.Model 2013-09-26 19:03:43 +02:00
Wojciech Zawistowski
9b7b70920a adds unit tests for Discourse.Resolver 2013-09-25 18:30:22 +02:00
Wojciech Zawistowski
cd3a2143d2 remove unnecessary return statement inside Discourse.Router.map 
Ember's Router.map(callback) method doesn't expect any value to be
returned by callback function. Therefore, return statements present
inside Discourse.Router.map are unnecessary (and are silently ignored by
Ember).
 2013-09-19 17:26:43 +02:00
Wojciech Zawistowski
7da10c0149 Remove duplicate mixing in of Discourse.Presence 
AdminEmailIndexController and AdminEmailPreviewDigestController explicitely mix in Discourse.Presence, but they extend base classes Discourse.Controller and Discourse.ObjectController that already mix in Discourse.Presence, so this explicit inclusion is redundant.
 2013-09-18 18:40:57 +02:00
Viktor Palmkvist
37673e3412 Make the composer and TopicCreator use category id instead of category name 
Also fixes #1171
Includes backwards compatibility for topic creation
 2013-09-17 12:13:19 +02:00
Régis Hanol
eae30d7816 staff can always upload a file 2013-09-07 10:49:11 +02:00
Robin Ward
a9f3489237 FIX: Don't onebox links with labels unless the labels are the same as the URL 2013-09-06 16:47:26 -04:00
Robin Ward
63be950e5f FIX: Quotes inside a list 2013-09-05 17:04:01 -04:00
Neil Lalonde
45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -04:00
Robin Ward
f157ec1f91 Select +Replies for bulk operations 2013-09-05 11:03:29 -04:00
Sam
61d3e43744 better split logic for names starting with capitols eg: ABBob should split to AB Bob 2013-09-04 15:02:04 +10:00
Robin Ward
63f2187d72 FIX: Don't do intraword italics when prefixed by a forward slash 2013-08-30 10:56:41 -04:00
Neil Lalonde
82bc6b677f Add link in hamburger menu to switch between mobile and desktop views 2013-08-29 15:19:28 -04:00
Robin Ward
380a6c9e9d FIX: Blockquotes prefixed by spaces 2013-08-29 15:18:27 -04:00
Robin Ward
c99cf64d70 FIX: Quoting within code blocks. 2013-08-29 14:42:31 -04:00
Robin Ward
1204eb62c3 FIX: Escape contents when using the quote tool. 2013-08-29 14:15:05 -04:00
Robin Ward
3cec95a2c3 Better API for parsing out blocks in the parser. 2013-08-29 11:47:44 -04:00
Robin Ward
550ef104c6 FIX: Markdown references within a list were not working properly. 2013-08-28 13:06:41 -04:00
Robin Ward
f7ad80ff7b A couple of important markdown fixes. 2013-08-28 11:14:31 -04:00
Robin Ward
8f94760cd4 Better API for adding on to our Dialect 2013-08-27 18:17:34 -04:00
Régis Hanol
96772af35b FIX: avatar thumbnail won't save after upload 2013-08-27 23:01:35 +02:00
Robin Ward
73489b652e FIX: Allow intra-word underscores. 2013-08-27 12:25:05 -04:00
Robin Ward
6c3cb9023c FIX: Allow backticks in code blocks 2013-08-26 16:53:10 -04:00
Robin Ward
2d45c56ba5 Replace Markdown Linebreak Regexp with node parser. 2013-08-26 15:21:23 -04:00
Robin Ward
373b525ec1 Revert "FIX: New line insertion when a line begins with []" 
This reverts commit f84630a54d.
 2013-08-26 12:46:15 -04:00
Robin Ward
f84630a54d FIX: New line insertion when a line begins with [] 2013-08-26 11:42:52 -04:00
Robin Ward
20e8a8a38a FIX: Don't onebox @mentions 2013-08-24 15:01:00 -04:00
Robin Ward
5e286443a8 FIX: Code blocks were trimming leading spaces sometimes when they should have only 
trimmed trailing spaces.
 2013-08-24 13:24:27 -04:00
Robin Ward
093ead7855 Support for ***bold and italics*** 2013-08-24 13:06:07 -04:00
Régis Hanol
43a8bff652 add a site setting for allowing animated avatars 2013-08-23 18:55:02 +02:00
Robin Ward
612c0ccccb FIX: Autolinking within a list 2013-08-22 18:03:01 -04:00
Robin Ward
513f941f50 Fixes @mentions inside of lists 2013-08-22 17:50:36 -04:00
Robin Ward
f2c4b3e37f FIX: Following a mention with a coded mention. 2013-08-22 16:13:02 -04:00
Robin Ward
6fe0d29a01 FIX: @mentions within backticks followed by proper @mentions. 2013-08-22 15:55:29 -04:00
Robin Ward
5e50c4624f FIX: New lines in code blocks were somewhat unpredictable 2013-08-22 13:46:51 -04:00
Robin Ward
0f27232711 FIX: Support inline code blocks with @mentions in them. 2013-08-22 12:18:36 -04:00
Robin Ward
ae93fcebde FIX: Autolines were duplicating some text 2013-08-21 22:49:55 -04:00
Robin Ward
a3757016d9 FIX: Quotes with new lines were broken 2013-08-21 22:36:02 -04:00
Neil Lalonde
adbb6a19bb Fix 'You must choose a category' when a category is already chosen 2013-08-21 16:14:22 -04:00
Robin Ward
30cfa33629 FIX: @mentions within simple quotes 2013-08-21 16:10:16 -04:00
Robin Ward
7f69a58439 Replace Markdown parser. 2013-08-21 10:10:57 -04:00
Régis Hanol
c867b67a0b custom avatar support 2013-08-13 22:08:29 +02:00
Robin Ward
ffcf3f7e7d Have BBCode tests go through the cooked code path, as in the future 
both parsers will be present in the same module.
 2013-08-12 14:05:58 -04:00
Neil Lalonde
ce05b43c1d Fix delete user button on admin/user page so it's enabled at the right times, and update its title attribute to be more helpful 2013-08-08 12:54:38 -04:00
Robin Ward
86246a64eb Convert Discourse.Site and Discourse.ScreenTrack to use Discourse.Singleton 2013-08-08 12:49:58 -04:00
Robin Ward
51f5cf77fb Convert Discourse.User to use Discourse.Singleton 2013-08-08 12:42:08 -04:00
Robin Ward
8e1fae0459 Add Discourse.Singleton class mixin for creating singletons. 2013-08-08 12:00:58 -04:00
Robin Ward
1c3804934e Show the entire history of replies above a post when you expend "in reply to" 2013-08-06 17:43:10 -04:00
Neil Lalonde
879aa06601 Change tiny date formatting for dates in past years. Example: 10 Dec '12 2013-08-06 13:47:24 -04:00
Robin Ward
8d08391ff5 FIX: Allow Discourse.Session.current() API to update to 0 2013-08-02 18:48:02 -04:00
Neil Lalonde
9db0ac16a9 Add site setting delete_removed_posts_after to configure after how many hour posts that were deleted by their authors will be deleted 2013-08-02 13:35:52 -04:00
Robin Ward
ef82b66e95 Easier to group bindings. Perf improvements. 2013-08-02 13:18:09 -04:00
Robin Ward
4a0ea7f776 Upgrade jQuery to 2.0.3 2013-08-01 11:58:22 -04:00
Neil Lalonde
4fd5087f91 Add button to delete a spammer in the flag modal 
Add SiteSettings: delete_user_max_age, delete_all_posts_max. Add delete spammer button to admin flags UI
Moderators can delete users too
 2013-07-29 15:29:44 -04:00
Robin Ward
385b2fbde2 Some tests for the user stream 2013-07-26 17:09:54 -04:00
Robin Ward
e77ee1eaa8 Moved highestSeenByTopic to the Discourse.Session 2013-07-26 15:18:46 -04:00
Robin Ward
773823c41f Remove Discourse.transient. Use a singleton for session data, it's a lot cleaner. 2013-07-26 14:59:28 -04:00
Robin Ward
0317cf9608 Show topics as a list of topics on the User Stream. 2013-07-25 15:56:20 -04:00
Sam
3f5ea1ef79 oops ... I keep forgetting to run qunit, really need to get it into autospec 2013-07-25 12:06:02 +10:00
Régis Hanol
be9217d4c8 add server-side filesize check on uploads 2013-07-24 00:54:41 +02:00
Robin Ward
96af490d7c FIX: Deleting posts in bulk was broken. 2013-07-23 14:59:05 -04:00
Robin Ward
b9a5a0460d Have JSHint depend on the files it includes. Doesn't work for adding files but it helps 
a lot in development mode.
 2013-07-23 13:17:42 -04:00
Robin Ward
8b181e0803 Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting 
add newuser-max-attachments setting
 2013-07-22 07:22:23 -07:00
Sam
239d8b6795 fix spec 2013-07-22 18:04:20 +10:00
Régis Hanol
2986798ba7 add newuser-max-attachments setting 2013-07-22 02:39:17 +02:00
Régis Hanol
8406a4230c FIX: click tracking on attachments wasn't working 2013-07-19 01:27:09 +02:00
Robin Ward
7d4b089cd1 FIX: Suggested Topics were sometimes disappearing 2013-07-18 16:09:03 -04:00
Robin Ward
e3bbb2c8bb Never render an avatar img if we know the username is invalid. 2013-07-18 12:03:09 -04:00
Robin Ward
3761ccb018 FIX: Sometimes the total post count could be incorrect 2013-07-17 16:50:20 -04:00
Robin Ward
19f3a8d640 Each user activity filter has its own URL now. 2013-07-17 15:42:31 -04:00
Sam
c2be81a76e Merge pull request #1199 from ZogStriP/uploads 
adds the `max_attachment_size_kb` setting
 2013-07-16 23:03:42 -07:00
Robin Ward
1927263d1d FIX: Compile templates with the correct ember 2013-07-16 11:47:26 -04:00
Robin Ward
d466d11e71 Ember RC6 update 2013-07-16 10:35:18 -04:00
Sam
6a2ffa9415 fix qunit tests 2013-07-16 17:52:25 +10:00
Régis Hanol
5ce05ff5cb adds the max_attachment_size_kb setting 
so that we can specify a different max upload size for attachments and images.
 2013-07-16 02:01:36 +02:00