github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-24 15:49:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4,797 Commits 190 Branches 500 Tags 938 MiB
451a1620f9
Commit Graph

2655 Commits

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