codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-01 03:17:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
5049 commits 7 branches 179 tags 87 MiB
Commit graph

1514 commits

Author SHA1 Message Date
Nathaniel Palmer
20ab14e1b8 prevent share-view being clipped at viewport bounds 2013-10-12 10:45:21 -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
Régis Hanol
7938843b50 ooops. régis can't refactor... 2013-10-11 18:49:17 +02:00
Régis Hanol
35214f0b3a Merge pull request #1522 from velesin/syntax_highlighting_context_refactoring 
removes unused context binding from Discourse.SyntaxHighlighting
 2013-10-11 09:46:47 -07:00
Régis Hanol
cf3c4fd743 no need for a computed property 2013-10-11 18:43:10 +02:00
Wojciech Zawistowski
c446cc6ce1 removes unused context binding from Discourse.SyntaxHighlighting 2013-10-11 18:37:18 +02:00
Wojciech Zawistowski
b4a6a5e841 removes unused context binding from Discourse.Lightbox 2013-10-11 17:40:30 +02:00
Robin Ward
20cba4e092 Never bind the poster expansion twice. 2013-10-10 15:18:38 -04:00
Wojciech Zawistowski
107932576e removes redundant context binding 2013-10-10 18:33:24 +02:00
Robin Ward
ea9398467b For @Sam - hide the poster expansion if you click on the avatar of the user who's expanded 2013-10-10 12:03:52 -04:00
Régis Hanol
ae72724648 add educational hint in the upload selector dialog 2013-10-10 17:54:44 +02:00
Neil Lalonde
c3fd79d61c Fix rendering of muted topic button 2013-10-10 11:26:20 -04:00
Sam
b490fd2f88 Merge pull request #1513 from velesin/computed_self_refactoring 
refactors Discourse.Computed to bind context to self
 2013-10-09 21:16:19 -07:00
Régis Hanol
3854c2d24f Merge pull request #1510 from velesin/model_refactoring 
refactors Discourse.Model
 2013-10-09 09:26:15 -07:00
Wojciech Zawistowski
708a55cb38 refactors Discourse.Computed to bind context to self 2013-10-09 18:24:33 +02:00
Wojciech Zawistowski
41a4f15d62 removes unused context binding from Discourse.Site 2013-10-09 18:06:48 +02:00
Wojciech Zawistowski
56a519c583 refactors Discourse.Model to bind context to self plus some minor clean-ups 2013-10-09 18:00:55 +02:00
Neil Lalonde
4a0b17bb16 Pressing enter in username field of login form will submit the form 2013-10-09 11:07:42 -04:00
Neil Lalonde
24598c80af Improve login modal on mobile 2013-10-09 10:16:22 -04:00
Robin Ward
8e6ae0e278 Only show filter button if the user has more than 2 posts 2013-10-08 15:44:36 -04: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
Neil Lalonde
32af23884e FIX: category validation in composer was still using categoryName instead of categoryId 2013-10-08 14:41:20 -04:00
Régis Hanol
94d68d2453 more vertical space in the upload selector dialog 2013-10-08 19:48:27 +02:00
Régis Hanol
2e5e6b8c15 better file upload dialog 2013-10-08 18:58:24 +02:00
Robin Ward
0bda906da4 Merge pull request #1494 from ScotterC/present-user-name 
Presenting name for user stream description
 2013-10-08 08:42:59 -07:00
Scott Carleton
256d82b916 Present Name for stream description 2013-10-08 11:40:16 -04:00
Robin Ward
50c74237cb Supress full name in expansion if it's the same as the username 2013-10-08 11:28:32 -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
Neil Lalonde
6713db7133 Close notifications dropdown on mobile after you click something 2013-10-07 16:11:54 -04:00
Robin Ward
cf4666d363 FIX: If the user asks for 0 similar topics, don't show an empty box 2013-10-07 15:14:01 -04:00
Robin Ward
744266374a FIX: Invalid i18n string appearing at bottom of topic 2013-10-07 15:01:51 -04:00
Robin Ward
75aaafc06e Don't show the user expansion on mobile 2013-10-07 14:32:15 -04:00
Wojciech Zawistowski
034d00b83a adds unit tests for Discourse.debouncePromise 2013-10-07 17:45:09 +02:00
Robin Ward
7da01e2389 Changes to user expansion 2013-10-04 16:55:54 -04:00
Robin Ward
7eac7303cd Better unloading of Poster expansion 2013-10-04 15:35:43 -04:00
Robin Ward
89e78f5c64 User expansion loading improvements 2013-10-04 15:33:03 -04:00
Robin Ward
d126259f03 Fixes #1496 - Ember 1.0 regression 2013-10-04 13:47:30 -04:00
Robin Ward
baa2ab8604 Small visual tweaks to user expansion 2013-10-03 16:12:17 -04:00
Robin Ward
db1f8370ee Don't show private message button when not logged in 2013-10-03 15:51:12 -04:00
Robin Ward
88476800f8 FIX: Private Message link was broken 2013-10-03 15:41:38 -04:00
Robin Ward
3cb6bb6c54 FIX: Missing username in link to user 2013-10-03 14:36:24 -04:00
Robin Ward
fc00269b7f Pop up with user information when clicking avatar on topic page 2013-10-03 13:06:30 -04:00
Robin Ward
578ef2098b Merge pull request #1488 from cfstras/removeAllowedUser 
Allow removing users from private conversations
 2013-10-03 08:02:41 -07:00
Sam
ac56b119a7 refactor actions, try keeping them short so indenting does not confuse us 2013-10-03 16:01:52 +10:00
Claus Strasburger
15a973fd45 Improved private message user removal, locale edit 
replaced array iteration with findProperty (will be renamed and aliased to findBy with Ember 1.1)
added modal dialog to verify
catched nil-error on topic.rb
 2013-10-02 19:16:43 +02:00
Robin Ward
89c25d355d FIX: Progress bar not updating properly sometimes 2013-10-02 11:24:55 -04: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
7caefded86 Merge pull request #1484 from velesin/resolver_refactoring 
refactors Discourse.Resolver
 2013-10-02 07:28:29 -07:00
Sam
ee286cc270 fix inability to save posts when navigated away, 
oh my ... what a mess, there must be a better way
 2013-10-02 16:18:16 +10:00
Sam
30bedff2c9 BUG: editing first PM was showing category selector 2013-10-02 07:43:57 +10:00
Robin Ward
9e815dbef9 FIX: Blockquote issue 2013-10-01 16:45:45 -04:00
Robin Ward
63d86eb9eb FIX: Allow Spoiler plugin (and others that use prototype.on) to work even if ListView was not initialized. 2013-10-01 13:53:26 -04:00
Robin Ward
be0ce08cc2 Ember Upgrade: 1.0 2013-10-01 11:16:27 -04:00
Claus Strasburger
b089805dc0 Added method removeAllowedUser to topic_details.js 
perform a request to /t/:id/remove-allowed-user,
then delete the user from the local list
 2013-10-01 16:44:07 +02:00
Sam
f0a122a66c move job files so they live underneath app/ and not in lib/ 
introduce new setting email_always, that will force emails to send to users regardless of presence on site
 2013-10-01 17:04:02 +10:00
Robin Ward
ca0c41fd40 Merge pull request #1477 from velesin/remove_builders_from_merge_attributes 
removes unused builders param from Discourse.Model.mergeAttributes
 2013-09-30 10:07:50 -07:00
Wojciech Zawistowski
f388226217 refactors Discourse.Resolver 2013-09-30 18:18:03 +02:00
Robin Ward
37304b7eba FIX: Too many new lines in long quotes 2013-09-27 15:08:56 -04:00
Wojciech Zawistowski
5905669270 removes unused builders param from Discourse.Model.mergeAttributes 2013-09-27 19:46:26 +02:00
Régis Hanol
cd4cda5b4c allow users to specify thumbnail size 2013-09-27 10:57:31 +02:00
Robin Ward
175e48b061 Revert "remove unnecessary (empty) view class" 
This reverts commit 58ba8a0e49.
 2013-09-22 10:38:41 -07:00
Robin Ward
a70e9cac4d Merge pull request #1452 from velesin/remove_application_view 
remove unnecessary (empty) view class
 2013-09-20 17:13:02 -07:00
Sam
13527a1df7 Merge pull request #1448 from velesin/remove_redundant_presence 
Remove duplicate mixing in of Discourse.Presence
 2013-09-20 14:22:10 -07:00
Wojciech Zawistowski
58ba8a0e49 remove unnecessary (empty) view class 
Discourse.ApplicationView does not provide any functionality above what
already automatically happens via Ember's "convention over
configuration" behavior and is therefore redundant.
 2013-09-20 17:52:38 +02:00
Robin Ward
e3a56864dd Changes to support Spoiler Alert plugin 2013-09-19 18:01:30 -07:00
Neil Lalonde
147887bc63 Remove duplicate list.js.handlebars 2013-09-19 16:52:57 -07:00
Neil Lalonde
5b455152d0 Add wrench icon to Edit Category button 2013-09-19 16:41:52 -07:00
Neil Lalonde
0a07b37ae9 Add email icon to password reset email button 2013-09-19 16:37:37 -07:00
Neil Lalonde
95257a192a Remove posts icon and make post count bold in mobile topic lists 2013-09-19 16:24:46 -07:00
Neil Lalonde
01180e78cc Use two lines per topic list item on mobile 2013-09-19 14:36:38 -07: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
Neil Lalonde
21b018192f Style categories page for mobile 2013-09-17 17:02:10 -04:00
Neil Lalonde
fdc7267ad9 Add margin to topic list footer message 2013-09-17 16:40:23 -04:00
Neil Lalonde
be71dbfd94 Topic list styling for mobile 2013-09-17 16:07:14 -04:00
Neil Lalonde
c04613f269 Fix resolver for mobile templates 2013-09-17 16:07:14 -04:00
Neil Lalonde
0fafe124db Add enable_mobile_theme site setting. Uncheck it to disable the mobile theme. 2013-09-17 11:25:37 -04:00
Robin Ward
2baf5fda8e Merge pull request #1438 from Elegios/composer_use_category_id 
Make the composer and TopicCreator use category id instead of category name
 2013-09-17 08:03:48 -07: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
Neil Lalonde
e4e8d2fc34 Allow switching between mobile and desktop view on any device. 2013-09-16 14:26:20 -04:00
Neil Lalonde
13f17b2a5c Add ability to customize css and header for mobile 2013-09-16 12:28:02 -04:00
Matthieu Guillemot
3ba1f20674 New site settings to enable/disable the possibility of editing user's nickname or email address 2013-09-14 21:34:21 +09:00
Robin Ward
5d8cfd69f7 FIX: JSHint errors 2013-09-13 12:29:57 -04:00
Robin Ward
7d9a84b496 New User Education goes through a server side ComposerMessages check. Composer message for users 
who don't have avatars.
 2013-09-13 12:23:53 -04:00
Neil Lalonde
32163bc356 Show post number in share dialog when clicking post date 2013-09-13 10:35:22 -04:00
Sam
fc203b7c2c fix broken text when clicking share at the bottom 2013-09-12 11:47:41 +10:00
Neil Lalonde
fe3693cdef Merge branch 'master' of github.com:discourse/discourse 2013-09-11 10:20:27 -04:00
Sam
8516059025 remove global check 2013-09-11 15:58:55 +10:00
Sam
681ff74cb8 Revert "inject currentUser into controllers & routes" 
This reverts commit 7ec34b205a.
 2013-09-11 13:26:46 +10:00
Neil Lalonde
e8ef55c446 Rename StaffActionLog to UserHistory 2013-09-10 22:01:20 -04:00
Robin Ward
30eed4c8b4 FIX: Showing suggested topics when composing a reply 2013-09-10 20:00:04 -04:00
Robin Ward
f2a1ef8d7d FIX: When expanding embedded replies, adjust the scroll position to not lose your place 2013-09-10 17:15:07 -04:00
Neil Lalonde
cc2acafc9a Enable mobile view. Use local storage to remember whether you chose mobile or desktop view. Mobile device detection needs to be replaced with a better solution. 2013-09-10 16:44:17 -04:00
Robin Ward
886787b157 Remove extra comma 2013-09-10 12:31:58 -04:00
Robin Ward
0de96a6059 Adds support for dynamic composer messages. 2013-09-10 12:30:56 -04:00
Robin Ward
84a8a358c3 Trivial: Rename dialect action to block quotes rather than simple quotes 2013-09-09 14:11:56 -04:00
Robin Ward
49910b860b FIX: Regression that removed the ability to quote code 2013-09-09 13:20:03 -04:00
Neil Lalonde
199584824b Don't show approval on admin user page if the site doesn't require approval of users (must_approve_users) 2013-09-09 12:24:26 -04:00
Robin Ward
360b8e32ca Merge pull request #1404 from ZogStriP/admin-can-always-upload-a-file 
staff can always upload a file
 2013-09-09 08:55:47 -07:00
Gosha Arinich
7ec34b205a inject currentUser into controllers & routes 
Through Ember's DI, instead of doing so via a mixin.
 2013-09-07 19:34:25 +03:00
Régis Hanol
eae30d7816 staff can always upload a file 2013-09-07 10:49:11 +02:00
Robin Ward
b87a78f7b2 Merge branch 'master' of github.com:discourse/discourse 2013-09-06 18:01:33 -04:00
Robin Ward
c8ad977c8a Revert "Merge pull request #1215 from Elegios/composer_use_category_id" 
This reverts commit 763859d439, reversing
changes made to b62caf80fb.
 2013-09-06 18:00:57 -04:00
Neil Lalonde
2ea6a61a17 Show post number in the share dialog 2013-09-06 17:34:31 -04: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
94917f47ed Remove brackets from username_filters[] URL 2013-09-06 15:58:54 -04:00
Neil Lalonde
eef34eea80 Fix IE9 bug in browser-update. Unable to get value of the property 'insertBefore': object is null or undefined 2013-09-06 14:57:26 -04:00
Robin Ward
763859d439 Merge pull request #1215 from Elegios/composer_use_category_id 
Make the composer and TopicCreator use category id instead of category name
 2013-09-06 11:55:27 -07:00
Robin Ward
b62caf80fb Merge pull request #1402 from LaunchAcademy/fix_index_out_of_range_error 
FIX: Index out of range error
 2013-09-06 11:53:59 -07:00
Régis Hanol
45b838009c proper content-disposition header when downloading attachments 2013-09-06 19:23:56 +02:00
Robin Ward
63be950e5f FIX: Quotes inside a list 2013-09-05 17:04:01 -04:00
Neil Lalonde
9b526364ed Merge branch 'mobile' 2013-09-05 16:29:27 -04:00
Neil Lalonde
66d1cacdbd Hide flag modal while flag is submitted 2013-09-05 16:29:13 -04:00
Robin Ward
38fb727c00 JSHINT: missing comma 2013-09-05 16:05:04 -04:00
Neil Lalonde
45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -04:00
Robin Ward
2d6759d5a0 Add cancel button to delete replies dialog 2013-09-05 15:54:16 -04:00
Neil Lalonde
c2f37d36ab Hide flag modal while flag is submitted 2013-09-05 15:14:07 -04:00
Robin Ward
71c1b8b9b9 When deleting a post as staff, ask if you want to delete direct replies too 2013-09-05 11:03:34 -04:00
Robin Ward
f157ec1f91 Select +Replies for bulk operations 2013-09-05 11:03:29 -04:00
Neil Lalonde
117fc8db58 Change the way nuked users' posts are handled. Allow null in the user_id column of posts. Show these posts in the posts stream. 2013-09-04 15:42:21 -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
Neil Lalonde
dc1efd6c78 If mobile view, don't switch to small logo in the header when scrolled down in a topic 2013-09-02 16:26:12 -04:00
Neil Lalonde
07e6956917 Restructure login form for mobile 2013-09-02 16:02:52 -04:00
Neil Lalonde
1fa6144067 Add span.btn-text around 'Reply' text in the post menu 2013-09-02 15:55:35 -04:00
Robin Ward
46efbac40e Add "Unread" filter to messages tab. Rename the other two views. 2013-08-30 12:32:05 -04:00
Robin Ward
63f2187d72 FIX: Don't do intraword italics when prefixed by a forward slash 2013-08-30 10:56:41 -04:00
Robin Ward
df5cbf76e0 Move insideGroup into the helper, not the class for grouped each 2013-08-30 10:44:34 -04:00
Eric Kelly
b70a38f485 FIX: Index out of range error 
Fixes 'index out of range error' that occurs when viewing a user's
profile page when they haven't yet posted a reply or created a topic
and is @mentioned in a topic.
 2013-08-30 00:43:54 -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
45b9f8048a Documentation update to dialect 2013-08-29 13:59:41 -04:00
Robin Ward
eb5830f3b0 FIX: Make getURL available to plugins while they are starting up in a similar load order 
to the client app.
 2013-08-29 13:11:12 -04:00
Robin Ward
425b59d381 FIX: Don't name two routes the same. It breaks in Ember RC8. 2013-08-29 12:26:05 -04:00
Robin Ward
3cec95a2c3 Better API for parsing out blocks in the parser. 2013-08-29 11:47:44 -04:00
Sam
2c61828668 saving dialog somehow vanished during refactoring 
better error handling for posts that fail to save
 2013-08-29 17:06:27 +10:00
Robin Ward
6029a77efb A nicer API for dealing with text replacements in Discourse's parser pipeline 2013-08-28 16:15:50 -04:00
Neil Lalonde
2b2c83ffb7 remove console.log 2013-08-28 15:53:42 -04:00
Neil Lalonde
c2088f5b5d Use moment.js in auto close js 2013-08-28 15:37:39 -04:00
Robin Ward
eeef24b9da Allow basic emoticons to work too. 2013-08-28 15:27:03 -04:00
Robin Ward
af18cc87fd Better documentation for new Dialect helpers. Migrated emoticon support to new helper format. 2013-08-28 13:55:08 -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
Sam
61281a3c81 invite only forums had very wonky logic, invited users were not being activated, invite_only forums were still registering users 2013-08-28 17:18:31 +10: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
Neil Lalonde
b84c7e4efb Store mobile flag in Discourse.Session instead of Discourse 2013-08-27 16:50:50 -04:00
Neil Lalonde
3cfc9a7bba Create a mobile css manifest 2013-08-27 16:40:30 -04:00
Neil Lalonde
009dec833f Use Discourse.Resolver to load mobile templates when they exist 2013-08-27 13:41:36 -04:00