Commit Graph

2925 Commits

Author SHA1 Message Date
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 b0465c517e (experimental) added framework for filtering all sorts of internals in discourse and consuming by plugins 2013-10-10 18:45:40 +11:00
Sam 8afff108bf css.scss makes rails 4 sad 2013-10-10 15:23:14 +11: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
Sam 2a948c52a9 this setting needs to be pushed up to 15 so we will be able to nuke new spammer accounts
it is set to max_topics_in_first_day + max_replies_in_first_day
2013-10-10 10:45:27 +11:00
Sam ad2ed5fe51 rate limits for topics and posts on first day
max_topics_in_first_day and max_replies_in_first_day
2013-10-10 10:32:03 +11:00
Rafael George 3a1e1e046b Refactor: Topic#invite_by_email
Extract Topic#email_already_existas_for? and Topic#grant_permission_to_user
Fix failing spec due to missing variable in extracted method
2013-10-09 13:55:02 -04: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
Sam 939a452293 require dependency was leading to errors in dev 2013-10-09 17:22:41 +11:00
Sam 7993845bfa add current_user_provider so people can override current_user bevior cleanly, see
http://meta.discourse.org/t/amending-current-user-logic-in-discourse/10278
2013-10-09 15:11:54 +11: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 6949bc6611 Make clickable area for progress much bigger on mobile 2013-10-07 14:41:17 -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
Sam 094b5eccca bug fixes for user_stat extraction, decrease querying 2013-10-07 15:05:00 +11:00
Sam e18b93026a defer view creation on so updates are not performed when people navigate to topics 2013-10-07 15:04:59 +11:00
Sam 5bf26ec34e large refactor, ship a few columns from the user table into user_stats 2013-10-07 15:04:59 +11:00
Robin Ward d2a1118e67 Make date on User expansion gray 2013-10-04 17:50:56 -04: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
Sam Saffron ad93fc959c security issue, anon and logged in users could see the fact that a user sent another user a pm (but could not see the pm itself or title) 2013-10-03 16:48:03 -07: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 46219bbe02 Increase size of click target on topic progress 2013-10-03 14:33:57 -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 441010ac65 optimise view count calculation query 2013-10-02 17:08:53 +10: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 af467a1675 404 page had horrible perf, it was using "take" instead of limit.
in such cases EVERY row is materialized and only after the limit is applied.

So ... imagine what happens on a forum with 2,000,000 topics
2013-10-02 13:05:03 +10:00
Sam 5f8851cb44 Avoid superfluous transaction when saving drafts 2013-10-02 12:17:27 +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 75a8dfc467 rename all css.scss to scss 2013-10-01 17:35:26 +10: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 3f0c03a20c FIX: Prevent unauthorized list of private message titles. Also remove some unused code. 2013-09-30 14:35:11 -04: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
Tiffany Green 4d9dba6d27 Adjust css for user page to work at mobile sizes
Style user page for mobile sizes

Remove guard

Bundle without guard

Remove guardfile
2013-09-30 09:18:52 -05:00
Sam 5caa7a0e4d improve performance of periodical update job, decrease frequency and shift it by a few minutes 2013-09-30 16:59:16 +10:00
Sam 6fbc5af284 notify_user is not a flag 2013-09-30 15:26:19 +10: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
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
Neil Lalonde 07d08b81c7 Show mobile view as default for nexus 7 tablet 2013-09-23 17:13:29 -07:00
Neil Lalonde 500a24ebf9 Merge branch 'master' of github.com:discourse/discourse 2013-09-23 09:51:35 -07:00
Neil Lalonde b06f928568 Fix missing provider param message when using Persona 2013-09-23 09:46:25 -07: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
Robin Ward 5bc0f7e9ee Merge pull request #1454 from awesomerobot/master
mobile: fixed quote control jump
2013-09-20 14:42:45 -07:00
Kris Aubuchon 67c2560f8c mobile: fixed quote control jump 2013-09-20 17:28:00 -04: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
Sam Saffron 085493e35d optimise regular job to avoid touching posts that have not changed 2013-09-19 23:00:42 -07: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 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
Kris Aubuchon 79b8991ed8 fixing blockquote on mobile 2013-09-18 11:05:23 -04:00
Kris Aubuchon c60912f714 mobile: blockquote title fix 2013-09-18 00:37:56 -04:00
Kris Aubuchon 05c4173723 mobile: suggested topics will now fill the viewport width 2013-09-17 23:46:12 -04:00
Kris Aubuchon 9808ae2970 mobile: reduce vertical space between posts, prevent titles from wrapping 2013-09-17 23:32:11 -04: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
Robin Ward 99b6a62fcb New composer message for people dominating a topic 2013-09-17 14:38:39 -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
Robin Ward 09d32f5600 Merge pull request #1444 from davidcelis/spoiler-padding
Better padding for spoiler text
2013-09-17 08:02:12 -07:00
Neil Lalonde b15e629f46 Strip trailing slashes from ScreeningUrl records 2013-09-17 10:26:05 -04: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
David Celis 279b1fbf48 Better padding for spoiler text
With no padding currently surrounding [spoiler] text, the white text
gets close enough to the white post background that it's a bit more
difficult to read than it reasonably could be. Pad spoiler text with 2px
to alleviate this difficulty.

Signed-off-by: David Celis <me@davidcel.is>
2013-09-16 12:49:38 -07:00
Neil Lalonde ba2c4139fe Use absolute urls in notifications for automatic spammer handling. 2013-09-16 15:07:58 -04:00
Neil Lalonde e4e8d2fc34 Allow switching between mobile and desktop view on any device. 2013-09-16 14:26:20 -04:00
Neil Lalonde c845071066 Fix an error with mobile custom header 2013-09-16 12:55:44 -04:00
Neil Lalonde 13f17b2a5c Add ability to customize css and header for mobile 2013-09-16 12:28:02 -04:00
Sam 1eb1756dcf Merge pull request #1419 from mguillemot/non_editable_username_and_email
Enable/disable the possibility of editing user's nickname or email
2013-09-15 19:24:35 -07:00
Kris Aubuchon 045b1b0d96 fixed history modal, topic progress now sticky to last post, edits heatmap is back, date/edit links now grey 2013-09-14 23:28:28 -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 10c4dee67c Merge branch 'master' of git://github.com/awesomerobot/discourse into awesomerobot-master
Conflicts:
	app/assets/stylesheets/mobile/topic-post.css.scss
	app/assets/stylesheets/mobile/topic.css.scss
2013-09-14 00:39:08 -04:00
Kris Aubuchon e1b11c62ea reintroducing the post progress indicator, fixing gutter links, reducing white space between posts 2013-09-13 23:03:29 -04:00
Neil Lalonde f86aead49e Disable custom stylesheets on mobile for now. 2013-09-13 14:54:57 -04:00
Neil Lalonde 8de91e3789 Also put a class on html element for desktop view 2013-09-13 14:54:57 -04:00
Robin Ward c365bd0070 Notify users posting sequential replies that there's a better way to do it. 2013-09-13 13:49:34 -04: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
Neil Lalonde 5071d71294 Don't show custom header on mobile view 2013-09-12 18:46:35 -04:00
Neil Lalonde 8f12212942 Remove duplicate css. Kris and I fixed the same thing. I imported variables.scss so we can use $red and $bookmarkColor 2013-09-12 18:08:12 -04:00
Neil Lalonde e3c68bc500 Merge pull request #1432 from awesomerobot/master
fixing bookmarks and blockquotes for mobile
2013-09-12 14:41:15 -07:00
vagrant 4fbd011f39 fixing bookmarks and blockquotes for mobile 2013-09-12 16:00:53 -04:00
Neil Lalonde 90aaa27b98 Fix modal button spacing on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde c260ae622d Fix closing a modal on mobile 2013-09-12 15:09:45 -04:00
Neil Lalonde f0eede077d Show bookmark colours on mobile 2013-09-12 15:09:44 -04:00
Neil Lalonde 57dc8ed9f6 Add margin to auto-close message on mobile 2013-09-12 15:09:44 -04:00
Robin Ward 3fcd331d43 Add records that indicate a user's avatar has been checked 2013-09-12 14:58:20 -04:00
Sam 00951e0578 remove "via sitename" from senders 2013-09-12 15:38:18 +10:00
Sam fc203b7c2c fix broken text when clicking share at the bottom 2013-09-12 11:47:41 +10:00
Sam aa26f9b2ad I need to figure out how to make a .try variant that does not call respond_to. 2013-09-12 11:29:44 +10:00
Neil Lalonde bded4b26fa Ask admins to fill in site_description on the dashboard, and send it to the hub 2013-09-11 16:32:49 -04:00
Neil Lalonde 4fa11f159f Add site setting site_description. If filled, it will be used in meta description tag for teh white hat SEO 2013-09-11 15:33:27 -04:00
Robin Ward 06ea8140aa New job (default off) to detect whether users have uploaded custom avatars by contacting Gravatar. 2013-09-11 15:14:18 -04:00
Robin Ward fcff4e80d1 New `user_stats` table to keep track of queried information on a user.
This is information that is not usually needed when representing a user
and is in a separate table with a has one relationship to avoid querying
it all the time.
2013-09-11 14:50:26 -04:00
Neil Lalonde fe3693cdef Merge branch 'master' of github.com:discourse/discourse 2013-09-11 10:20:27 -04:00
Sam def4f15795 Merge pull request #1427 from awesomerobot/master
Reducing margins on mobile view
2013-09-11 00:36:57 -07:00
Sam e26b3662ee drafts were saving but client was failing to parse 2013-09-11 16:18:46 +10:00
Sam efb15af209 not needed, already in private section 2013-09-11 16:18:17 +10:00
Sam 8516059025 remove global check 2013-09-11 15:58:55 +10:00
Kris Aubuchon a8bc789b81 reducing margins on mobile 2013-09-10 23:56:55 -04: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
Sam e420ce3da3 fix regression, 2 people liked this text not expanding correctly 2013-09-11 11:24:42 +10: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 2319924206 Adds a class that can detect whether a user has uploaded a custom avatar 2013-09-10 15:39:11 -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
Sam bcf0203497 fix encoding bug 2013-09-10 16:01:36 +10:00
Sam 162d94aa02 improve secure_category_id query 2013-09-10 14:29:02 +10:00
Sam df5f9d66e5 bugfix: when expanding "1 person flagged for moderation" target post is not clickable 2013-09-10 09:51:33 +10:00
Neil Lalonde 78c15d5810 Move the unique post key storage code into the Post model 2013-09-09 16:17:31 -04:00
Neil Lalonde 48ee89940e Merge pull request #1423 from einarj/nickname_registration_service
Nickname registration service object
2013-09-09 11:37:56 -07: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
Robin Ward fc4f5a36c6 Merge pull request #1418 from goshakkk/inject-current-user
Inject currentUser into controllers & routes
2013-09-09 08:54:34 -07:00
Neil Lalonde b73f4e9864 Put category description in meta description tag 2013-09-09 11:38:09 -04:00
Einar Jonsson 724b3aadcf Extracted nickname registration out of the UsersController and into its
own service.
2013-09-09 09:26:50 +00: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
Neil Lalonde eae7e75611 FIX: recover post by a non-staff user fails because the post is not unique. Uniqueness check shouldn't happen when recovering a deleted post. 2013-09-06 11:50:15 -04:00
Sam 641c51367a fix broken build
hack to allow for PMs with no users for flagging needs
2013-09-06 18:03:30 +10:00
Sam 32e3e3f382 update annotations 2013-09-06 17:38:50 +10:00
Sam 2ce4468aa5 rename system_username to site_contact_username , system_user is a special user with -1 id that is only used for certain admin tasks
for example system_user will autoclose stuff if needed, it will delete stubs and be the target for flag pms
2013-09-06 17:28:37 +10:00
Sam 41a1b6942d notify moderators now goes to the "community" user, that saves our poor mods from a flood of pms
if any staff respond to a pm they are automatically added to the list of recipients and will start
getting email notifications
2013-09-06 14:07:23 +10:00
Neil Lalonde cbe38075ac Fix asset compile problems 2013-09-05 18:04:45 -04:00
Robin Ward 63be950e5f FIX: Quotes inside a list 2013-09-05 17:04:01 -04:00
Neil Lalonde f47400fe2d Make post body have font-size 14px again 2013-09-05 16:45:38 -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
Neil Lalonde a3f3b086f3 Don't show mobile view unless mobile_view=1 param is used. Still more work to do. 2013-09-05 16:28:57 -04:00
Neil Lalonde c0b3a0ec45 Merge .deleted-user-avatar into mobile topic-post 2013-09-05 16:28:16 -04:00
Robin Ward 38fb727c00 JSHINT: missing comma 2013-09-05 16:05:04 -04:00
Neil Lalonde 17585c7152 Merge branch 'mobile' of https://github.com/awesomerobot/discourse into mobile 2013-09-05 16:03:06 -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
Kris Aubuchon b8493b024b adding missing files back in 2013-09-05 15:37:07 -04:00
Neil Lalonde c2f37d36ab Hide flag modal while flag is submitted 2013-09-05 15:14:07 -04:00
Kris Aubuchon 80c4e02335 new mobile styles, some structure changes 2013-09-05 12:09:40 -04:00
Neil Lalonde cde631cbd1 Change default of notify_mods_when_user_blocked to false 2013-09-05 11:27:24 -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
Sam c9321cae7f Our JS includes belong at the top of the file, that way we can start
downloading and parsing them earlier and not wait for the rest of the page

Our noscript stuff belongs at the bottom, we should not hold off any js work
while noscript is downloading
2013-09-05 10:41:11 +10:00
Neil Lalonde d76486a48b Topic can have null user_id when user was nuked 2013-09-04 15:42:24 -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
Robin Ward 1a6170a47c Merge pull request #1407 from einarj/extract_fake_admin_method
Extracted a fake_admin method
2013-09-04 07:59:03 -07: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 b47eedba00 Add min_trust_to_create_topic setting to require a certain trust level before users can start new topics 2013-09-03 19:12:22 -04: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
Einar Jonsson e06356ebbe Extracted a fake_admin method 2013-08-30 17:39:31 +00: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 232f5bd743 Merge pull request #1403 from einarj/use_topic_delegators
Replaced delegator methods with Forwardable def_delegator in Topic
2013-08-30 08:15:10 -07: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
Einar Jonsson 23d8f5fec7 Replaced delegator methods with Forwardable def_delegator in Topic 2013-08-30 09:29:34 +00: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
Robin Ward bbd79aafd1 Revert "Replaced delegator methods with Forwardable def_delegator in Topic"
This reverts commit 3ed037940f.
2013-08-29 11:45:27 -04:00
Robin Ward 37b4df3009 Merge pull request #1392 from einarj/use_topic_delegators
Replaced delegator methods with Forwardable def_delegator in Topic
2013-08-29 07:55:35 -07: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
Sam 39a6c25ebb Merge pull request #1393 from eparreno/cas_authentication
Allow CAS authentication
2013-08-28 14:28:59 -07:00
Neil Lalonde 4827634df9 rename application.css.erb to desktop.css.erb 2013-08-28 16:41:05 -04: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
Neil Lalonde e3aafc154b Restructure the app/assets/stylesheets directory 2013-08-28 13:58:44 -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
Emili Parreno ee96fabcba Allow CAS authentication 2013-08-28 14:34:51 +02:00
Einar Jonsson 3ed037940f Replaced delegator methods with Forwardable def_delegator in Topic 2013-08-28 11:25:57 +00: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
Sam dfa5a8a83f annotate models 2013-08-28 10:52:06 +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 9efa29e688 Detect whether to use mobile view. Session var mobile_view can override automatic detection. 2013-08-27 14:57:42 -04:00
Neil Lalonde 009dec833f Use Discourse.Resolver to load mobile templates when they exist 2013-08-27 13:41:36 -04:00
Robin Ward 73489b652e FIX: Allow intra-word underscores. 2013-08-27 12:25:05 -04:00
Neil Lalonde 89265c3a8b FIX: BAD CSRF on login. Don't check csrf in the fake login form since it doesn't actually do anything. 2013-08-27 11:31:14 -04:00
Robin Ward 07328e5e4b FIX: Navigating to a new topic after editing one was leaving edit controls open. 2013-08-27 11:29:30 -04:00
Einar Jonsson b385cdcc34 Extracted featured_users functionality out of Topic.
* Created a TopicFeatureUsers model
* Topic#featured_user_ids and Topic#feature_topic_users now delegate to
* a TopicFeatureUsers instance to keep demeter happy.
2013-08-27 09:10:50 +00:00
Sam 7787770758 leftover console.log
jshint is upset
2013-08-27 16:02:36 +10:00
Sam c4a0152dc6 recover from bad CSRF tokens without requiring a hard refresh of the browser 2013-08-27 15:56:12 +10:00
Sam 83d8bcdc27 revert non queuing of emails 2013-08-27 11:52:28 +10:00
Robin Ward 6c3cb9023c FIX: Allow backticks in code blocks 2013-08-26 16:53:10 -04:00
Neil Lalonde 3708d47c87 Check daily if there are new users who need to be approved and send a pm to moderators 2013-08-26 16:16:27 -04:00
Neil Lalonde 068a674c39 Handle overflowing values on admin logs pages 2013-08-26 16:16:27 -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
Neil Lalonde 0ad608abb2 Merge pull request #1384 from einarj/nickname_unavailable_generates_error_json
Nickname unavailable generates error json
2013-08-26 08:49:40 -07:00
Robin Ward f84630a54d FIX: New line insertion when a line begins with [] 2013-08-26 11:42:52 -04:00
Einar Jonsson 9085cec232 Move json hash from users controller to NicknameUnavailable 2013-08-26 15:00:11 +00:00
Sam ac905d4a08 defer persona init till after people launch the login dialog 2013-08-26 17:51:41 +10:00
Sam f4bda8f1ba revert change of defaults for twitter and facebook enabled 2013-08-26 17:36:08 +10:00
Sam fd6e86483f strip out css fade-in animation from share dialog, it was only causing trouble. Fixing it is more hassle than it is worth. inivisible elements take height so we constantly need to worry about re-positioning the hidden share dialog. 2013-08-26 16:28:42 +10:00
Sam 0b74c2da9c fix jittering on click caused by re-positioning of invisible share dialog. it does not use display:none to preserve an animation. 2013-08-26 16:09:30 +10:00
Sam 322b5c236c queue emails right away if a user is not online, no point waiting. 2013-08-26 14:55:35 +10:00
Sam afd1a3ac7b yeah ... we should be installing the gem :) 2013-08-26 13:52:15 +10:00
Sam 818bf1355d PluginStore for plugin specific bits of storage
Amended plugin interfaces so they work with the vk sample
2013-08-26 12:59:17 +10:00
Sam 213ce33af2 Fixed all broken specs
Moved middleware config into authenticators
2013-08-26 12:59:17 +10:00
Sam 075002a6d5 refactoring the plugin interfaces to allow for better extensible 2013-08-26 12:59:17 +10:00
Sam 2eb55b74e4 twitter and facebook are broken unless configure, so default off please 2013-08-26 12:59:17 +10:00
Sam b52aba15e0 major refactor of auth, break up the gigantic omniauth controller into sub classes for way better extensibitily 2013-08-26 12:59:17 +10:00
Sam 90dddb4395 store honeypot challenge in redis for extra security 2013-08-26 12:55:13 +10:00
Sam 011d3cf779 minor style change 2013-08-26 12:55:13 +10:00
Sam c4a2e62a95 Merge pull request #1378 from justin808/justin808_cc
Lower Complexity of UsersController
2013-08-25 17:14:39 -07:00
Sam f87ba0d88f Merge pull request #1381 from einarj/test_nickname_hub_registration_failure
Added test case for nickname registration failure
2013-08-25 17:12:52 -07:00
Sam e0c99196a8 Merge pull request #1383 from ZogStriP/add-max-image-height-site-setting
add max_image_height site setting
2013-08-25 17:11:48 -07:00
Sam 3cffdb5a65 Merge pull request #1382 from novemberkilo/master
No more rails 4 deprecation warnings
2013-08-25 17:09:49 -07:00
Régis Hanol 32f717420d add max_image_height site setting 2013-08-26 00:24:24 +02:00
Navin Keswani d87389b38e No more rails 4 deprecation warnings 2013-08-25 23:18:11 +02:00
Einar Jonsson 0d22a77c63 Added test case for nickname registration failure
* Also made a minor readability change by moving the auth.present? check
* from UsersController#create into #create_third_party_auth_records
* which is the method that relies on the check.
2013-08-25 20:18:07 +00:00
Régis Hanol fd7fd22932 FIX: changing another user's avatar changes yours 2013-08-25 17:33:43 +02:00
Robin Ward b32e87c929 Merge pull request #1377 from ZogStriP/avatar-work
Improved specs for avatar + added a warning whenever the uploaded image is not a square
2013-08-25 07:30:34 -07:00
Robin Ward b74754e673 Merge pull request #1371 from einarj/cleanup_user_registration
Extracted nickname registration into a private controller method
2013-08-25 07:30:10 -07:00
Robin Ward e1efde6707 Merge pull request #1376 from gcapizzi/lists_controller_refactoring
ListController refactoring
2013-08-25 07:29:35 -07:00
Justin Gordon 464595df5c Lower Complexity of UsersController
https://codeclimate.com/github/discourse/discourse/UsersController#method-complexity
2013-08-24 22:57:12 -10:00
Régis Hanol 4c788e75f0 add a warning whenever the uploaded image is not a square 2013-08-25 00:25:47 +02:00
Robin Ward c0b051c9f6 Show Private Messages pill as a topic list rather than individual messages. 2013-08-24 16:58:16 -04:00
Régis Hanol 3b9e62e6b9 improved specs for avatar 2013-08-24 22:45:05 +02:00
Robin Ward 20e8a8a38a FIX: Don't onebox @mentions 2013-08-24 15:01:00 -04:00
Giuseppe Capizzi 6f19cb7252 Extract ListController#list_target_user 2013-08-24 19:38:02 +02: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
Robin Ward e9663e5338 Merge pull request #1332 from locks/user_email_observer
User email observer (Code Climate improvements)
2013-08-24 08:34:11 -07:00
Robin Ward 08762f5666 Merge pull request #1369 from voisintotoro/voisintotoro-branch
PNG Files optimization
2013-08-24 08:32:15 -07:00
Ricardo Mendes 37f4022f73 Refactors UserEmailObserver to improve Code Climate score
- Extracts certain logic to private methods and remove unnecessary
comments
- Extracts email enqueueing methods into a separate class
- Fix specs involving UserEmailObserver to call #after_commit instead
of the specific methods
2013-08-24 12:21:39 +01:00
Jeff Atwood edbaafdd7b default relative dates to 30 days vs 14 2013-08-23 23:28:51 -07:00
Neil Lalonde 6e79197519 Enum site settings can have translatable names in dropdown. Add setting for how often users get digest emails by default: default_digest_email_frequency. 2013-08-23 17:36:25 -04:00
Régis Hanol 43a8bff652 add a site setting for allowing animated avatars 2013-08-23 18:55:02 +02:00
Neil Lalonde 6a3c849067 Fix [object Object] in staff logs details modal 2013-08-23 10:08:35 -04:00
Jeff Atwood f36fc8c41f remove unnecessary onebox body padding 2013-08-23 02:53:14 -07:00
Jeff Atwood 5cf0c59628 remove onebox info left padding 2013-08-23 02:48:55 -07:00
Einar Jonsson 84987cd835 Extracted nickname registration into a private controller method 2013-08-23 09:46:33 +00:00
Sam 472f0684c3 Merge pull request #1345 from salbertson/refactor-find_by_username_or_email
Improve test coverage and refactor User.find_by_username_or_email
2013-08-22 17:14:06 -07:00
Neil Lalonde 3b15e2e58e Banned users are not returned as pending review users 2013-08-22 19:23:49 -04:00
Neil Lalonde 25e0c3eac1 Log IP addresses with screened emails and urls 2013-08-22 19:04:35 -04: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
Neil Lalonde 86012ac579 Fix a case when the wrong topic is loaded because the slug starts with a number 2013-08-22 16:23:46 -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
Scott Albertson 1dbe1fb1bc Refactor User.find_by_username_or_email
* Improve test coverage
2013-08-22 09:40:07 -07:00
Robin Ward 0f27232711 FIX: Support inline code blocks with @mentions in them. 2013-08-22 12:18:36 -04:00
Neil Lalonde 24617dd776 Show empty categories with descriptions to everyone 2013-08-22 11:55:20 -04:00
voisintotoro 1983da14c3 PNG Files optimization 2013-08-22 14:00:25 +02: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
Sam d7596840e5 only staff should be able to see bookmarks and favs of other users
ensure that when they click on them they see the correct topics (topics for user they are looking at, not current user)
2013-08-22 09:18:54 +10: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
Neil Lalonde e5464a4bed Show staff action log details in a modal 2013-08-21 12:33:24 -04:00
Neil Lalonde 47add6da70 Log when a site customization is deleted 2013-08-21 12:33:24 -04:00
Neil Lalonde a95303fcd8 Log site customization changes. Use a modal to show staff action log details for site customizations. 2013-08-21 12:33:24 -04:00
Robin Ward 7f69a58439 Replace Markdown parser. 2013-08-21 10:10:57 -04:00
Robin Ward 3760cba549 Merge pull request #1366 from ZogStriP/do-not-disable-the-radio-button
do not disable the radio button in the avatar selection modal
2013-08-21 07:09:58 -07:00
Einar Jonsson 916a3f33f2 Refactored user activation business logic out of UsersController and
into a UserActivator class.
2013-08-21 09:22:34 +00:00
Sam 8a0a097dfb make message bus more robust to bad inputs, correct issue where notifications channel is not susbcribed 2013-08-21 09:07:38 +10:00
Sam 487788b65b correct missing progress bar on navigation to new topic. 2013-08-21 08:37:30 +10:00
Robin Ward 7546a29d10 FIX: After sharing links and navigating long topics sometimes you'd have a lot of blank space. 2013-08-20 18:04:40 -04:00
Régis Hanol 9204e0f420 do not disable the radio button in the avatar selection modal 2013-08-20 22:54:01 +02:00
Régis Hanol dcfe4f2061 remove useless text beneath avatar 2013-08-20 21:53:17 +02:00
Neil Lalonde 3abeb5f793 Staff action logs can be filtered to changes of one site setting 2013-08-20 13:50:51 -04:00
Sam c0c929be5a optimise query that runs every 10 minutes and takes out the user table 2013-08-20 17:40:22 +10:00
Sam f4d833da27 fix onebox exception, if oneboxes fail on save we log a warning to the log 2013-08-20 11:38:10 +10:00
Sam d43bd55e5b HACK: hold back on loading more topics for a bit while we are repositioning the page for Safari 2013-08-20 11:25:15 +10:00
Sam 341a28402d speed up scrolling on android 2013-08-20 11:25:15 +10:00
Jeff Atwood 58b7df5480 change edit to std pencil glyph on avatars 2013-08-19 15:07:48 -07:00
Sam dca0b6b9b8 Merge pull request #1358 from chrishunt/bump-favcount
Improve readability of count for complex favicons
2013-08-19 14:58:57 -07:00
Sam 60c740e16e Merge pull request #1361 from ZogStriP/fix-css-on-image-in-preview
FIX: images in the preview have rounded corners
2013-08-19 14:58:02 -07:00
Sam df2b0b47bd Merge pull request #1360 from michaelkirk/feature/oauth2
not recording Oauth2 user email
2013-08-19 14:57:05 -07:00
Régis Hanol 8107170f08 FIX: images in the preview have rounded corners 2013-08-19 23:45:55 +02:00
Neil Lalonde 1d030666d8 Log site setting changes and show in admin 2013-08-19 16:58:38 -04:00
Michael Kirk 9e8d8870f5 fixed: record Oauth2 user email 2013-08-19 11:21:27 -07:00
Neil Lalonde 3cc8354fe2 Don't trust topic title in template until it has been sanitized by the server 2013-08-19 14:19:59 -04:00
Neil Lalonde 7eaedb84e1 Add notify_mods_when_user_blocked site setting to control whether moderators get a message when someone is automatically blocked 2013-08-19 12:00:48 -04:00
Chris Hunt 53f011e89e Bump to favcount v1.1.0 2013-08-19 08:55:38 -07:00
Sam a9393e4a7a paging for flag list
corrected reload behavior on flag list
refactored post actions ... extracted flag queries
2013-08-19 21:14:26 +10:00
Viktor Palmkvist f8129c4e43 Make the composer and TopicCreator use category id instead of category name
Also fixes #1171
2013-08-19 11:57:35 +02:00
Sam 9b5da77855 correct broken logic in screen track that was causing read status not to flush properly when navigating using the suggested topics list. 2013-08-19 11:35:06 +10:00
Sam 4b0a1179e9 link to first unread as opposed to last read in topic lists 2013-08-19 11:34:08 +10:00
Sam b69d089d06 we need to decalre favcount to keep tests happy 2013-08-18 21:52:13 +10:00
Sam 3b34ab8cab Merge branch 'master' of github.com:discourse/discourse 2013-08-18 21:35:29 +10:00
Sam 82ca61f150 Merge pull request #1350 from michaelkirk/feature/oauth2
Feature/oauth2
2013-08-18 17:01:01 -07:00
Sam 1cab98bf78 Merge pull request #1336 from novemberkilo/master
First pass at fixing rails4 deprecation warnings
2013-08-18 16:59:07 -07:00
Chris Hunt 4372fc2f2e Switch out faviconNotify for favcount.js 2013-08-18 11:26:03 -07:00
Sam 3f5b5f1581 Merge branch 'master' of github.com:discourse/discourse 2013-08-18 21:30:14 +10:00
Michael Kirk 4af8a9102e Authenticate with Discourse via OAuth2
See https://github.com/michaelkirk/discourse_oauth2_example for an
example of how you might integrate your existing oauth2 provider's
authentication via a Discourse plugin.
2013-08-17 21:45:20 -07:00
Sam 3735cfdadb Merge pull request #1348 from chrishunt/dynamically-png-me
Re-write dynamic favicon javascript
2013-08-17 03:26:14 -07:00
Chris Hunt ef7231a66f Add 32px image to default favicons (for retina) 2013-08-16 18:37:33 -07:00
Chris Hunt fb9f1ae3e8 Totally re-write favicon notifier
- Black on white text
- Larger font
- Works with any size favicon (16, 32, 64)
2013-08-16 18:37:24 -07:00
Régis Hanol ea6e73076b change your avatar in a modal 2013-08-17 00:35:29 +02:00
Neil Lalonde baff59d752 Send email to contact_email when a new version of Discourse is found. Disable with the new_version_emails setting. 2013-08-16 17:28:36 -04:00
Neil Lalonde 7dd470ccc0 Oops, make highlight in topic list style-able too 2013-08-16 14:24:51 -04:00
Robin Ward 40599d20e8 FIX: Footer formatting in digest emails 2013-08-16 12:19:26 -04:00
Neil Lalonde b6285b85d2 Add reject option to pending users page 2013-08-16 11:42:43 -04:00
Robin Ward 30caa0d0b0 Merge pull request #1339 from ZogStriP/fix-custom-avatars-in-email
FIX: custom avatars in email
2013-08-16 07:18:34 -07:00
Régis Hanol 865c882a61 larger avatars in embedded posts 2013-08-16 10:14:05 +02:00
Régis Hanol 2119774fb6 FIX: custom avatars in email 2013-08-16 09:58:20 +02:00
Sam c314a1862f add todo 2013-08-16 17:04:30 +10:00
Jeff Atwood 946b02533b better copy for password change button 2013-08-15 22:25:26 -07:00
Sam b60c8080e5 Merge pull request #1337 from ZogStriP/avatar-work
Avatar work
2013-08-15 21:50:37 -07:00
Jeff Atwood 4718929d52 "change" to edit pencil glyph on user pref buttons 2013-08-15 16:11:24 -07:00
Régis Hanol c9969738bf FIX: N+1 query for avatars when searching for users 2013-08-16 00:26:49 +02:00
Jeff Atwood 8303f48004 add dimmed color to digest footer 2013-08-15 15:18:11 -07:00
Neil Lalonde 2e640baffd Fix a broken avatar when showing who deleted a post 2013-08-15 16:31:13 -04:00
Neil Lalonde 73e4d866d2 Make it possible to customize post highlight colour with css 2013-08-15 16:17:37 -04:00
Neil Lalonde 8a96c4c0f6 Fix uncategorized topics not being shown on categories page 2013-08-15 15:18:04 -04:00
Neil Lalonde 5a4b939cf7 Fix edit category modal for uncategorized when showing it the second time 2013-08-15 15:18:04 -04:00
Navin 9ab2471a92 Fix rails4 deprecation warnings
That appear when running topic_spec.rb
2013-08-15 17:52:18 +02:00
Neil Lalonde 293361dcd3 Screened URLs list in admin 2013-08-15 10:52:26 -04:00
Sam ee95d7df9c trigger observers, wow this is all very complicated and full of duct tape 2013-08-15 13:54:48 +10:00
Sam fda6cce0de minor refactor 2013-08-15 13:44:30 +10:00
Sam 79c109a819 Merge pull request #1322 from bhicks/refactor-feature-topic-users
Refactoring the feature_topic_users method
2013-08-14 20:04:54 -07:00
Sam b55c9e391d Merge pull request #1333 from fabianoleittes/fix_type_url
Fix url not to be nil
2013-08-14 20:04:00 -07:00
Ben Hicks b13796c35e Refactoring the feature_topic_users method to improve
the code climate score.
2013-08-14 20:42:16 -05:00
Fabiano Leite 4df8babb9a Fix url not to be nil 2013-08-14 21:55:25 -03:00
Sam 1965cbcad6 Merge pull request #1331 from ZogStriP/fix-avatars-on-activity-stream
FIX: performance regression on activity streams
2013-08-14 16:52:13 -07:00
Sam c2653b2915 Merge pull request #1309 from stephankaag/sidetiq
Replace Clockwork with Sidetiq
2013-08-14 16:51:04 -07:00
Régis Hanol 8af51883bf FIX: performance regression on activity streams 2013-08-15 01:32:27 +02:00
Neil Lalonde 9170166e93 Finish renaming blocked emails to screen emails 2013-08-14 16:45:30 -04:00
Robin Ward 3e7441177a Merge pull request #1330 from ZogStriP/emails-can-be-mixed-case
only the host part of an email address is case insensitive
2013-08-14 13:26:49 -07:00
Neil Lalonde 86647f0a54 Add ScreenedUrl. Rename BlockedEmail to ScreenedEmail. 2013-08-14 16:08:23 -04:00
Stephan Kaag a6b4b5dbf2 Replace Clockwork with Sidetiq 2013-08-14 21:39:40 +02:00
Régis Hanol 5ca187ba57 only the host part of an email address is case insensitive 2013-08-14 19:31:35 +02:00
Robin Ward 8fa9c51bf4 FIX: New avatar regression with mixed case email addresses. 2013-08-14 13:05:57 -04:00
Robin Ward aec929b184 Screw it, don't choose columns. 2013-08-14 12:26:31 -04:00
Robin Ward a05ffafd4c FIX: Direct link to Avatar 2013-08-14 12:22:44 -04:00
Robin Ward 479ca86713 FIX: Don't select columns if we don't have to. 2013-08-14 12:18:54 -04:00
Robin Ward 803f5d85ee Merge branch 'master' of github.com:discourse/discourse 2013-08-14 12:04:51 -04:00