Commit graph

4365 commits

Author SHA1 Message Date
Régis Hanol
a98d4d9b35 régis' git-fu at his best... 2013-10-23 11:35:27 +02:00
Régis Hanol
3cc08c3b27 fixed JSHINT 2013-10-23 11:27:50 +02:00
Régis Hanol
e39242b6ff missed a single quote 2013-10-23 11:25:16 +02:00
Régis Hanol
d05547e7f3 fix arrow direction in post incoming links 2013-10-23 11:16:03 +02:00
Régis Hanol
a12a1bcc66 bring back attachment icons 2013-10-23 09:52:15 +02:00
Sam
9ae4245955 Merge pull request #1565 from awesomerobot/master
topic page: alignment fixes for replies, minor alignment changes
2013-10-22 23:09:44 -07:00
Kris Aubuchon
ca82d07f6d simplfying the header, some more alignment adjustments on the topic page 2013-10-23 00:22:24 -04:00
Neil Lalonde
c1008f4359 Fixes for postgresql inet columns in Rails 4. They're backed by an IPAddr class now, which breaks sql parameter marker support, and automatically sets the attribute to nil when trying to assign an invalid ip address. 2013-10-22 19:19:32 -04:00
Kris Aubuchon
0ef064fd93 removed white line in quotes, cleaned up some markup 2013-10-22 18:31:40 -04:00
Robin Ward
6394d924c8 Change migration to prevent down 2013-10-22 17:51:04 -04:00
Robin Ward
348e2e3ef2 Support for per-user API keys 2013-10-22 17:34:39 -04:00
Jeff Atwood
5e2d8dcf37 even out blockquote top/bottom padding 2013-10-22 14:18:41 -07:00
Jeff Atwood
d90001e857 even out blockquote paras w/top & bottom margin 2013-10-22 14:17:19 -07:00
Kris Aubuchon
649b3d44a6 topic page: alignment fixes for replies, minor alignment changes 2013-10-22 16:36:32 -04:00
Neil Lalonde
7d582fbee3 Screened ip address can be edited, deleted, and changed to allow or block. 2013-10-22 16:30:46 -04:00
Neil Lalonde
b8d586251c Use i18n for the word Cancel in admin/.../user.js.handlebars 2013-10-22 16:30:46 -04:00
Kris Aubuchon
c2865e3e2c fixing alignment on replies, buttons - also making topic new gutter link visible on touch 2013-10-22 15:37:44 -04:00
Robin Ward
13fa473c6d Fix JSHINT 2013-10-22 11:33:45 -04:00
Robin Ward
e2845f7f16 Restrict SIZE= to numbers 2013-10-22 11:08:13 -04:00
Robin Ward
97ca7a0052 FIX: topic filter menu dissapeared 2013-10-22 10:41:41 -04:00
Régis Hanol
26218ce11f RSS feeds should contain only publicly-available posts 2013-10-22 16:30:25 +02:00
Régis Hanol
f96ea42974 fix last activity column in suggested topics 2013-10-22 10:43:00 +02:00
Jeff Atwood
d2cc9c39ac don't define bgcolor on in-reply-to 2013-10-22 01:33:51 -07:00
Jeff Atwood
5203ba41eb tighten up spacing on notification control 2013-10-21 23:56:46 -07:00
Jeff Atwood
4693019e90 remove bottom border on posts-wrapper 2013-10-21 23:39:17 -07:00
Jeff Atwood
e994ac451b fix quote reply z-order 2013-10-21 23:31:54 -07:00
Régis Hanol
9aca8e14ba fix code highlithing in list 2013-10-21 22:57:06 +02:00
Régis Hanol
6adba747b9 fix images height on IE 2013-10-21 22:56:59 +02:00
Robin Ward
0f5bd08aee Merge pull request #1558 from awesomerobot/master
differentiating visited topics better, fixing extra white space & alignment in header
2013-10-21 13:45:51 -07:00
Kris Aubuchon
2feb82b4b7 differentiating visited topics better, fixing extra white space in the title header (also realigning title header) 2013-10-21 16:23:55 -04:00
Régis Hanol
9b2f821012 Merge pull request #1512 from ScotterC/avatar-from-url
Build out a URI Adapter to allow uploading an avatar via a url
2013-10-21 13:17:37 -07:00
Robin Ward
2308784713 Merge pull request #1543 from railsaholic/small_users_controller_refactoring
refactor UsersController to reduce complexity
2013-10-21 12:21:03 -07:00
Robin Ward
51b2f512a3 Merge pull request #1557 from awesomerobot/master
fixed deleted/mod post highlight, reduced some gutter padding, re-aligne...
2013-10-21 12:19:11 -07:00
Kris Aubuchon
ecb6ec0b6d fixed deleted/mod post highlight, reduced some gutter padding, re-aligned some title elements, better spacing around .logo-small 2013-10-21 15:15:32 -04:00
Robin Ward
b51fb4d3fb Sync up with markdown-js + our changes 2013-10-21 15:06:58 -04:00
Scott Carleton
cbef844a57 Build out a URI Adapter to allow uploading an avatar via a url
Currently only really accessible via the API. The UriAdapter creates a
tempfile from a url and gives a ActionDispatch::HTTP::UploadedFile back
to the controller to process as normal.
This will help a lot in being able to transfer avatar urls from another
app without monkey patching a lot of discourse code.
2013-10-21 14:53:03 -04:00
Neil Lalonde
648b11a0eb Add screening by IP address. When deleting a user as a spammer, block all signups from the same IP address. 2013-10-21 14:50:18 -04:00
Régis Hanol
c9dd83cba4 force max-width on images/svgs in composer preview and post view
Conflicts:
	app/assets/stylesheets/desktop/topic-post.scss
2013-10-21 20:01:10 +02:00
Régis Hanol
9c820443fa do not select the marker in Chrome 2013-10-21 19:59:18 +02: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
f565766b1e Merge pull request #1555 from awesomerobot/master
fixed progress indicator a bit, line under title doesn't span full width...
2013-10-21 07:51:07 -07: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
Kris Aubuchon
2c384e0073 fix for long usernames 2013-10-21 10:13:16 -04:00
Kris Aubuchon
77540ed999 fixed progress indicator a bit, line under title doesn't span full width anymore 2013-10-21 09:38:35 -04:00
Jeff Atwood
21ee05583c no line above topic footer buttons please 2013-10-21 01:38:01 -07:00
Jeff Atwood
cec9bcfb5d make user titles smaller than usernames 2013-10-21 01:22:36 -07:00
Jeff Atwood
1a0e800afb fix line-height on topic titles 2013-10-21 00:51:11 -07:00
Jeff Atwood
2ac8f3d20b extra-info-wrapper at top of topic too narrow now 2013-10-21 00:38:24 -07:00
Sam
0f4f593c89 correct broken test 2013-10-21 17:21:35 +11:00
Sam
e7a037709f allow ordering categories in the edit category ui 2013-10-21 17:21:34 +11:00
Sam
a241ddf9d2 Merge pull request #1554 from awesomerobot/master
gutter links shouldn't fade, fixed
2013-10-20 22:20:10 -07:00
Sam
451a1620f9 Merge pull request #1545 from railsaholic/lists_controller_refactor
Remove duplication of action defintion
2013-10-20 22:19:40 -07:00
Kris Aubuchon
d4db161133 css transitions were too slow, sped up 2013-10-21 00:45:19 -04:00
Kris Aubuchon
94b5b24d88 gutter links shouldn't fade, fixed 2013-10-21 00:41:16 -04:00
Sam
29c8d2ebec oops add security 2013-10-21 15:33:42 +11:00
Sam
6067795780 categories can now be re-ordered 2013-10-21 15:25:20 +11:00
Sam
38a33a8c1b work in progress sortable categories 2013-10-21 15:25:20 +11:00
Manoj
7dfa99998f Remove duplication of action defintion, add missing spec for topics_by, extract out URL construction logic 2013-10-21 08:34:18 +05:30
Sam
243a6ae291 Merge pull request #1552 from awesomerobot/master
a few general fixes to the new flatter theme
2013-10-20 19:33:38 -07:00
Kris Aubuchon
5d88bfa8e3 a few more fixes, detailed here: http://meta.discourse.org/t/flatter-styling-now-deployed/10515 2013-10-20 22:16:02 -04:00
Kris Aubuchon
aa42a36b8a a few general fixes to the new flatter theme 2013-10-20 21:59:46 -04:00
Sam
6cfdd083d5 Merge pull request #1525 from squareleaf/logo_header_height
Change fixed width of logo in header to max-height.
2013-10-20 17:37:55 -07:00
Sam
614f45d003 correct topic and category counting query
revive old styling that was stripped
2013-10-21 10:20:16 +11:00
Tiffany Green
6681751531 Change fixed width of logo in header to max-height. Addresses issue #1045
Add max width
2013-10-20 17:35:37 -05:00
Wojciech Zawistowski
4c4a2f220e refactors Discourse.debouncePromise 2013-10-20 10:38:26 +02:00
Kris Aubuchon
88a97bcb71 minimizing the desktop topic view, also effects the background on all pages and removed bootstrap 2013-10-19 18:18:25 -04:00
Manoj
868e4ffe6d refactor UsersController to reduce complexity
Refactored: UsersController#create
2013-10-19 15:18:11 +05:30
Wojciech Zawistowski
d0f3765967 refactors Discourse.debounce 2013-10-19 09:13:00 +02:00
Robin Ward
aef4227073 Remove debug message 2013-10-18 17:49:33 -04:00
Robin Ward
db2283b9d3 FIX: JSHint 2013-10-18 17:48:19 -04: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
Régis Hanol
28fd63bd11 don't stretch images in the mobile view 2013-10-18 16:43:53 +02:00
Sam
5f74cb6bf9 category is not "positionable" 2013-10-18 18:09:30 +11:00
Sam
6f32cb52d6 minor styling changes, kill n+1 query 2013-10-18 11:23:08 +11:00
Sam
e82d975279 work in progress new category list page 2013-10-18 11:10:10 +11:00
Sam
1ee49798b2 work in progress wide category list 2013-10-18 11:10:10 +11:00
Sam
7bf96ee690 naive implementation of post_count on categories 2013-10-18 11:10:10 +11:00
Sam
9ad01a1afb more work in progress, wide category list 2013-10-18 11:10:10 +11:00
Sam
8f0e3de675 work in progress, wide categories page 2013-10-18 11:10:10 +11:00
Sam
b567bd3d37 shift site settings in front of routes 2013-10-18 11:10:10 +11:00
Jeff Atwood
e26cbe79ad add "this" to category year stats for clarity 2013-10-17 15:54:48 -07:00
Jeff Atwood
4b53c45d3d make category descriptions plain black 2013-10-17 15:32:11 -07:00
Robin Ward
3408fc395d FIX: User stream pagination 2013-10-17 16:10:11 -04:00
Robin Ward
5fa47984b4 Link large user avatar to user profile 2013-10-17 16:06:58 -04:00
Robin Ward
3df42f5c45 Disable caching of site settings temporarily 2013-10-17 15:49:33 -04:00
Neil Lalonde
0eaf32db45 Add a message to flags created because of the newuser_spam_host_threshold site setting 2013-10-17 15:08:11 -04:00
Neil Lalonde
3927913a7e FIX: composer for creating a new topic on mobile 2013-10-17 13:17:54 -04:00
Régis Hanol
82dd9009e3 4% speedup on our test suite 2013-10-17 18:47:08 +02:00
Neil Lalonde
71571b9316 Never show preview pane in composer on mobile. 2013-10-17 12:19:28 -04:00
Robin Ward
a215fc5bdc Collapse user details when not viewing index view 2013-10-17 11:27:03 -04:00
Robin Ward
f8625b5510 Merge pull request #1495 from cored/refactor-topic-invite-by-email
Refactor: Topic model
2013-10-17 07:04:12 -07:00
Robin Ward
d206e1416c Merge pull request #1533 from velesin/remove_return_from_attach_view_with_args
removes unused return statement from ContainerView.attachViewWithArgs
2013-10-17 06:57:24 -07:00
Robin Ward
0a4f5af4a8 Merge pull request #1531 from railsaholic/topics_model_refactoring
Refactored Topic#limit_topics_per_day to improve Code Climate Complexity
2013-10-17 06:56:41 -07:00
Jeff Atwood
a580078ca7 increase default max_post_size to 32k chars 2013-10-16 14:59:33 -07:00
Neil Lalonde
cabe8f0d2d Clean up ScreenUrl normalization and matching 2013-10-16 16:39:29 -04:00
Régis Hanol
a0316f2392 Merge pull request #1534 from voisintotoro/master
New update of the french translation
2013-10-16 13:38:23 -07:00
Robin Ward
7e9b119c9c Minor tweaks to user view 2013-10-16 16:22:16 -04:00
voisintotoro
b997cc2486 New update of the french translation
I hope i didn't missed some of the previous remarks.
2013-10-16 22:10:29 +02:00
Robin Ward
dd63e6d28f Two Column User View 2013-10-16 15:51:01 -04:00
Robin Ward
f81b2dc3f2 Extra comma 2013-10-16 14:16:14 -04:00
Robin Ward
c2a66a1b3b Post Expansion enhancements 2013-10-16 14:10:18 -04:00
Robin Ward
15cad17810 FIX: Nokogiri bugs in certain environments 2013-10-16 12:19:59 -04:00
Wojciech Zawistowski
3f02e0bca6 removes unused return statement from Discourse.ContainerView.attachViewWithArgs 2013-10-16 17:52:04 +02:00
Neil Lalonde
c7aaee907b When system flags users as sockpuppets, show a reason in the admin flags ui 2013-10-16 11:47:16 -04:00
Régis Hanol
debd9bfb25 add a sitesetting to enable the CleanUpUploads job 2013-10-16 17:09:36 +02: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
Manoj
7c03076c2a Refactored Topic#limit_topics_per_day to reduce code climate complexity
Extracted  1) #apply_per_day_rate_limit_for, method as generic
RateLimiter , 2) #limit_first_day_topics_per_day as a separate method,
3) Added User#added_a_day_ago?, 4) Fixed private methods indentation.
2013-10-16 14:58:18 +05:30
Sam
3d647a4b41 remove rack cache, it has been causing trouble
instead implement an aggressive anonymous cache that is stored in redis
this cache is sitting in the front of the middleware stack enabled only in production
TODO: expire it more intelligently when stuff is created
2013-10-16 16:39:18 +11:00
Neil Lalonde
42cdad9d1d FIX: edit category modal with no title, empty modals that can't be closed. Added a better way to hide a modal without really closing it. 2013-10-15 15:41:15 -04:00
Neil Lalonde
7dcd3117fe On mobile, show new user usernames in grey, and highlight system posts like the desktop site does. 2013-10-15 12:53:14 -04:00
Robin Ward
afff145bd3 FIX: Query params were going a bit haywire when going from topic to topic. 2013-10-15 12:40:12 -04:00
Robin Ward
b62913695c Merge pull request #1528 from JEG2/master
Adding post details in preparation for the API importer code.
2013-10-15 08:19:19 -07: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
James Edward Gray II
1aa9fc982d Adding post details in preparation for the API importer code. 2013-10-15 09:21:30 -05:00
Robin Ward
e0e79cae73 Merge pull request #1524 from diminutivesloop/share-view-fix
FIX: prevent share-view being clipped at viewport bounds
2013-10-15 07:08:38 -07:00
Régis Hanol
4536b5fe04 added a job to clean up orphan uploads 2013-10-15 11:15:48 +02:00
Sam
cf08d2c751 security: when login is required don't return the site node in the preload store 2013-10-15 09:50:49 +11:00
Régis Hanol
d80f4fa3f7 Merge pull request #1523 from dbarbera/avatar_formats_fix
add image authorization on upload_avatar
2013-10-14 05:33:25 -07:00
Sam
7df4e4afb9 security fix, anon should not be treated as though they can create anything 2013-10-13 09:54:48 +11:00
Sam
e5fbdde56f filter params correctly from error log 2013-10-13 08:07:45 +11:00
Nathaniel Palmer
20ab14e1b8 prevent share-view being clipped at viewport bounds 2013-10-12 10:45:21 -04:00
dbarbera
9106596a9a add image authorization on upload_avatar 2013-10-12 14:11:44 +02:00
Régis Hanol
23bf4436f5 FIX: avatar was attached to the user who uploaded it... 2013-10-12 10:55:41 +02: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
Neil Lalonde
3c2c6ab24b Add sockpuppet spammer detection. Automatically flag posts if they are from new users (registered less than 24 hours ago) at the same IP address and one of them started the topic. 2013-10-11 13:34:05 -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
c38ba8acdd add rss links to anonymous homepages 2013-10-11 18:43:29 +02: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
fee2734aaa Check for custom avatars by default now. 2013-10-11 11:09:53 -04: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
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
Robin Ward
6793cba4ae FIX: Displaying actions 2013-08-14 12:04:35 -04:00
Neil Lalonde
bc0d4f1bfc Add a confirm modal to Delete All Posts button 2013-08-14 11:48:18 -04:00
Neil Lalonde
506dd748da Add warning sign icons to all the delete user buttons 2013-08-14 11:20:00 -04:00
Régis Hanol
4866f4d8f5 FIX: N+1 query for avatars 2013-08-14 15:25:05 +02:00
Régis Hanol
3524b90d6a FIX: avatars in quotes/oneboxes
Avatars in quotes/oneboxes are still pointing to the old
`/users/:username/avatar(/:size)` route.
So, this adds back the old avatar route for the transition period.
2013-08-14 12:20:05 +02:00
Sam
11dca1fd92 make code climate a bit happier 2013-08-06 06:25:44 +10:00
Sam
6e97ddc8ef allow uploaded avatars by default 2013-08-05 14:08:08 +10:00
Sam
5f46dfedf1 Merge pull request #1320 from ZogStriP/local-avatars
Local avatars
2013-08-14 00:36:42 -07:00
Régis Hanol
9a7df140b7 updated model annotations 2013-08-13 22:09:27 +02:00
Régis Hanol
92b0cfe3d3 cleaned up non-used code 2013-08-13 22:09:10 +02:00
Régis Hanol
c867b67a0b custom avatar support 2013-08-13 22:08:29 +02:00
Régis Hanol
e5e3164ea1 added the "allow uploaded avatars" site setting 2013-08-13 22:06:22 +02:00
Régis Hanol
95a2405c9e larger avatar in the "in reply to" box
This one is for @BrentleyJones (cf.
http://meta.discourse.org/t/small-avatar-in-in-reply-to-box/8761)
2013-08-13 22:04:38 +02:00
Neil Lalonde
ed060ed5f1 Change trust level logs the previous trust level 2013-08-13 12:04:28 -04:00
Jeff Atwood
6722a1fe22 some minor user deletion tweaks 2013-08-13 00:41:23 -07:00
Neil Lalonde
b36c6d7b78 Users cannot change their own username after 3 days since registering. Site setting username_change_period allows you to change the number of days. 2013-08-12 14:55:09 -04:00
Neil Lalonde
879652f055 Add setting edit_history_visible_to_public to control whether post edits can be viewed by everyone. Uncheck it so only staff users can see edits. 2013-08-12 11:12:20 -04:00
Jeff Atwood
556cb792e9 change topic share button to match link button 2013-08-10 21:07:42 -07:00
Neil Lalonde
bb492eb8bf Add filtering to staff logs page 2013-08-09 16:59:05 -04:00
Robin Ward
652169daf6 Include a list of more new topics in the digest emails at the bottom 2013-08-09 14:43:02 -04:00
Robin Ward
730f57a751 Tiny CSS change: add background to inline code values. 2013-08-09 12:54:46 -04:00
Robin Ward
6452962f36 FIX: Notification counters were being updated incorrectly. 2013-08-09 12:12:56 -04:00
Neil Lalonde
4d8585ac10 Put staff user in the first column 2013-08-09 11:24:50 -04:00
Neil Lalonde
90a3bcf6ff Add filter by action to staff logs page 2013-08-09 10:06:59 -04:00
Neil Lalonde
33bddbff85 Use Ember.ListView for staff action logs page 2013-08-09 10:06:58 -04:00
Neil Lalonde
0d44313a4b Use Ember.ListView for blocked emails list 2013-08-09 10:06:58 -04:00
Robin Ward
7fdaefcd86 FIX: Should allow support for ember list view 2013-08-08 23:13:26 -04:00
Robin Ward
477eb81bc9 Updated docs for Discourse.Singleton 2013-08-08 13:00:48 -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
9564a6ce09 Don't include user_deleted posts in emails. 2013-08-08 10:32:51 -04:00
Jeff Atwood
7343874360 oops, meant both 2013-08-07 16:42:26 -07:00
Jeff Atwood
0ab5388839 hook nth-of-type to reply, not "row" 2013-08-07 16:38:54 -07:00
Jeff Atwood
6656410c58 reduce padding between repeat embedded posts 2013-08-07 16:31:07 -07:00
Jeff Atwood
6caf55994b tighten up user page spacing a tiny bit 2013-08-07 16:11:16 -07:00
Neil Lalonde
b097d780d0 Tweaks to staff action logs page 2013-08-07 18:29:13 -04:00
Neil Lalonde
b6b30dabd4 Send context of where a user was deleted as a spammer so it can be logged 2013-08-07 18:18:18 -04:00
Neil Lalonde
949b2068a5 Trust level change logs the target_user_id 2013-08-07 17:01:59 -04:00
Neil Lalonde
b0848db6de Oops, forgot to use i18n in some places 2013-08-07 16:46:23 -04:00
Neil Lalonde
5c8c52482a Add a way to view staff action logs in admin 2013-08-07 16:27:34 -04:00
Neil Lalonde
d2fb6ec53f Blocked Emails list in admin 2013-08-07 16:27:34 -04:00
Robin Ward
c091b44028 Merge pull request #1310 from ZogStriP/patch-1
create thumbnails by defaults
2013-08-07 13:24:30 -07:00
Robin Ward
66f9506481 FIX: IE9 regression 2013-08-07 16:20:22 -04:00
Régis Hanol
bbd05f37d2 create thumbnails by defaults
changed "create_thumbnails" default value to `true`
2013-08-07 22:18:50 +02:00
Robin Ward
fe3a69c271 Private message emails now include the history 2013-08-07 13:03:45 -04:00
Don Denton
a53a6667aa Added a missing "#" to href for TOS. 2013-08-07 00:45:55 -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
c74da0d262 Admins who haven't been approved can log in when must_approve_users is enabled 2013-08-06 16:51:29 -04:00
Neil Lalonde
57baf1f112 Logout takes you to the front page instead of leaving you on your user activity page 2013-08-06 16:04:02 -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
Jeff Atwood
890ded7b1b make topic progress more visible 2013-08-05 15:10:53 -07:00
Jeff Atwood
27f44e7e7e increase modal max-width so errors fit better 2013-08-05 14:57:56 -07:00
Robin Ward
c714b98595 Update ember-renderspeed slightly. 2013-08-05 16:20:36 -04:00
Robin Ward
de3c657ea3 FIX: Oneboxes with incorrect URL 2013-08-05 16:15:16 -04:00
Robin Ward
dbbc5248aa Update ember-renderspeed. Much less overhead. 2013-08-05 15:00:35 -04:00
Régis Hanol
e90bbc6a6c don't display debug information when running tests 2013-08-14 00:12:25 +02:00
Jeff Atwood
ab2b7fc882 get rid of text-shadow in gutter
I blame iOS for this shit
2013-08-04 01:26:41 -07:00
Robin Ward
8d08391ff5 FIX: Allow Discourse.Session.current() API to update to 0 2013-08-02 18:48:02 -04:00
Robin Ward
91efbc1830 FIX: If an error occurs loading posts, revert state correctly 2013-08-02 18:42:46 -04:00
Neil Lalonde
98b58150bb Dashboard calculations are done with an async job now 2013-08-02 18:32:33 -04:00
Neil Lalonde
1552c4b69e Remove users column from Top Traffic Sources table on dashboard. It's not useful and very expensive to calculate. 2013-08-02 18:32:33 -04:00
Robin Ward
f337aea982 FIX: Can edit 1st posts that have no categories 2013-08-02 17:41:01 -04:00
Jeff Atwood
f996a8757a add "post last edited at" to edit tooltip 2013-08-02 13:15:50 -07:00
Jeff Atwood
94c969b7d8 set min-width on post unread counts 2013-08-02 12:41:40 -07:00
Robin Ward
701843552a Fixes to {{#groupedEach}} 2013-08-02 15:14:24 -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
Neil Lalonde
8cc49d9797 Don't send more pm's after a user has been blocked from making posts. This can happen if a staff member flags posts that are already hidden. 2013-08-02 10:55:19 -04:00
Jeff Atwood
d8c2856a4c flatten the new / unread post badges 2013-08-02 03:47:06 -07:00
Sam
c4af6297b4 read restricted categories should have a glyph 2013-08-02 15:33:16 +10:00
Sam
af685e83ea oh my this convenience method sure is not convenient 2013-08-02 15:11:09 +10:00
Sam
803d023e23 Fixed GitHub auth, GitHub can provide us with a valid email - so automatically log in for those cases 2013-08-02 12:16:44 +10:00
Neil Lalonde
cf333268d5 Fix: flag modal sometimes doesn't have nuke user button when it should 2013-08-01 22:00:00 -04:00
Sam
76678f0024 broken hinting fixed 2013-08-02 11:09:54 +10:00
Sam
d343d512b9 favorite user action consistency 2013-08-02 11:07:18 +10:00
Sam
5e23a0681d work in progress, will finalize soon 2013-08-02 09:59:25 +10:00
Régis Hanol
faeb4a9ebd enhance upload selector
- Change the icon on the button to a file when attachments are enabled
- Display the list of allowed extensions in the upload selector
- FIX : regexps for validating uploads weren't escaping the dots
2013-08-02 01:30:18 +02:00
Jeff Atwood
0f067a2ad3 we need that <hr> in notification emails, I think 2013-08-01 15:15:32 -07:00
Robin Ward
952b1f6d71 Performance: Improve Ember.Object.create speed 2013-08-01 17:16:55 -04:00
Neil Lalonde
b194bafcc8 Fix rendering of email logs rows. Needed thead around the first row. 2013-08-01 17:15:28 -04:00
Jeff Atwood
236356bfe2 add foreground color to @mentions 2013-08-01 11:43:46 -07:00
Robin Ward
be3c0f2bb4 FIX: Post Menu wasn't updating the bookmark icon properly. 2013-08-01 12:20:20 -04:00
Robin Ward
4a0ea7f776 Upgrade jQuery to 2.0.3 2013-08-01 11:58:22 -04:00
Neil Lalonde
361f158b27 Change category by editing first post updates topic title 2013-08-01 10:56:15 -04:00
Robin Ward
4f0713b9da Merge pull request #1275 from ZogStriP/enable-thumbnailing-on-s3
Enable thumbnailing on s3
2013-08-01 07:35:35 -07:00
Sam
1132c10074 support server side js and arbitrary assets
proper chaining for emoji so other hooks can be called
2013-08-01 17:35:31 +10:00
Sam
160107a712 working plugin interface for custom openid auth, custom css and custom js 2013-08-01 16:02:43 +10:00
Régis Hanol
ed9417fa3b enable thumbnailing on S3
- added url to optimized image model
- refactored s3_store & local_store
2013-07-31 23:26:34 +02:00
Neil Lalonde
2af6cd616d Use allow_uncategorized_topics site setting in categoryChoose 2013-07-31 16:48:23 -04:00
Neil Lalonde
27498a912b Add indexes to help IncomingLinksReport, but not much. Refactor to limit result set size, but it doesn't help perf much either. SELECT COUNT(DISTINCT ...) is still slow. 2013-07-31 15:17:53 -04:00
Robin Ward
023c908d5a FIX: Back button broke when clicking @mentions 2013-07-31 15:08:03 -04:00
Robin Ward
51d86b7a91 Front-end Optimizations 2013-07-31 14:53:10 -04:00
Jeff Atwood
5028fdbed6 oops background-color not color 2013-07-31 11:41:29 -07:00
Robin Ward
3c03920d30 Merge pull request #1266 from bolandrm/fix_at_sign
fix mentions in code blocks
2013-07-31 07:22:18 -07:00
Zachary Lewis
5ee1df6bca Fix assets:precompile failure from missing @include 2013-07-30 21:02:11 -05:00
Jeff Atwood
c5f03986c0 prettify staff bg slightly 2013-07-30 16:25:18 -07:00
Jeff Atwood
90bcd73b31 make topic title icons properly sized 2013-07-30 16:18:29 -07:00
Jeff Atwood
b6f17a6493 we don't need a whole extra group for 1 pref 2013-07-30 15:43:38 -07:00
Jeff Atwood
81de7dc0af simplify @mention CSS, add $quote-background color 2013-07-30 15:28:18 -07:00
Ryan Boland
553a671fdb fix mentions in code blocks 2013-07-30 18:01:42 -04:00
Robin Ward
a2844ea3c6 An attempt at some Perf improvements 2013-07-30 17:27:56 -04:00
Neil Lalonde
882c1524f7 Strip trailing and leading spaces from category names 2013-07-30 16:48:45 -04:00
Neil Lalonde
277e4db2cb Use ellipsis in dashboard referred topics table. Add .overflow-ellipsis css helper. 2013-07-30 16:48:45 -04:00
Neil Lalonde
16cd3e2a53 Fix to allow admins to change the case of a someone's username 2013-07-30 16:48:45 -04:00
Neil Lalonde
06140740d0 Version checks: tolerate old version check data that can happen immediately after upgrading but forgetting to restart sidekiq/clockwork. Don't cache version check data along with other dashboard data. 2013-07-30 12:12:04 -04:00
Robin Ward
fc25da09e3 Revert "Remove RawDivView and use regular handlebars"
This reverts commit e7f349ff0f.
2013-07-30 11:20:11 -04:00
Neil Lalonde
8ef771ad8d Use warning-sign icon instead of trash for nuke user buttons 2013-07-29 18:31:47 -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
Neil Lalonde
e076158789 Add ip_address, email, and context to staff_action_logs table. Context should usually be the url from which the staff member performed the action, but could be any string that describes what the staff member was doing when the action was performed. 2013-07-29 15:29:43 -04:00
Neil Lalonde
5f3e9131ed Deleting a user from admin user page has the option to also block signups from the same email address 2013-07-29 15:29:43 -04:00
Neil Lalonde
8cee3a9fcd Add a way to add email to block list when nuking a user 2013-07-29 15:29:43 -04:00
Neil Lalonde
5f8a130277 Add BlockedEmail, to block signups based on email. Track stats of how many times each email address is blocked, and last time it was blocked. Move email validation out of User model and into EmailValidator. Signup form remembers which email addresses have failed and shows validation error on email field. 2013-07-29 15:29:43 -04:00
Neil Lalonde
e25638dab0 add a way to delete posts and topics when deleting a user with UserDestroyer 2013-07-29 15:29:43 -04:00
Neil Lalonde
a8df9778b5 Rename AdminLog to StaffActionLog 2013-07-29 15:29:43 -04:00
Robin Ward
cc4ae05be3 Left in an extra function. 2013-07-29 14:56:59 -04:00
Robin Ward
1c17f409bd Remove an {{#if}} 2013-07-29 14:50:19 -04:00
Robin Ward
08ebaf926b Move deleted at into actions history, where it should be. 2013-07-29 14:46:25 -04:00
Robin Ward
323aea78e2 Remove unused PrependPostView 2013-07-29 14:19:35 -04:00
Robin Ward
e7f349ff0f Remove RawDivView and use regular handlebars 2013-07-29 14:17:03 -04:00
Robin Ward
b11e1f8b40 Added ember-renderspeed library for profiling rendering. Removed old probes stuff that
that was just profiling the run loop.
2013-07-29 12:52:09 -04:00
Sam
22893e203a Merge pull request #1260 from sir-pinecone/reactivate-admin-refresh-btn
Fix auto-group refresh response so that ajax callback runs
2013-07-28 22:22:55 -07:00
Sam
56f7c18b09 Merge pull request #1259 from sir-pinecone/hide-admin-group-link-from-staff
hide groups nav link from non-admins
2013-07-28 22:22:09 -07:00
Sam
aa6c92922d SECURITY: correct our CSRF implementation to be much more aggressive 2013-07-29 15:13:13 +10:00
Sam
4a20d09523 distributed memoizer added to ensure absolute duplicate posts don't get through
in case of an absolute dupe just return the memoized post

This works around issues with wordpress being crazy
2013-07-29 12:25:19 +10:00
Robin Ward
a0cbbab37a FIX: Loading was broken on activity streams 2013-07-27 13:55:34 -04:00
Robin Ward
3a861c0823 FIX: Allow clicks on @names 2013-07-27 13:18:37 -04:00
Michael Campagnaro
aa7e96c0fa Fix auto-group refresh response so that ajax callback runs 2013-07-26 19:47:32 -04:00
Michael Campagnaro
16d5032143 hide groups nav link from non-admins 2013-07-26 18:58:50 -04:00
Robin Ward
01a6b45231 FIX: Can click on your own links again 2013-07-26 17:29:43 -04:00
Robin Ward
385b2fbde2 Some tests for the user stream 2013-07-26 17:09:54 -04:00
Robin Ward
5d66f6ed8e Minor fixes. Link directoy to user activity to avoid a redirect. 2013-07-26 15:56:29 -04:00
Robin Ward
e77ee1eaa8 Moved highestSeenByTopic to the Discourse.Session 2013-07-26 15:18:46 -04:00
Robin Ward
894dc2c6fd Moved Discourse.ajax into a mixin. 2013-07-26 15:12:40 -04:00
Robin Ward
20f3707fbe Moved Resolver to new File 2013-07-26 15:04:29 -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
fca83cb185 Upgrade Ember to Fix CVE-2013-4170 2013-07-26 13:10:52 -04:00
Robin Ward
c28b377494 Don't redirect to arbitrary URLs via link tracker 2013-07-26 12:14:11 -04:00
Robin Ward
29519ece23 Merge branch 'add-audio-onebox' of git://github.com/jamesaanderson/discourse into jamesaanderson-add-audio-onebox
Conflicts:
	app/assets/stylesheets/application/compose.css.scss
	app/assets/stylesheets/application/topic-post.css.scss
2013-07-26 11:30:40 -04:00
Robin Ward
d71e7cdfde Merge pull request #1254 from crob611/master
Prevent 'Quote reply' from appearing when using find in Chrome
2013-07-26 08:09:08 -07:00
Neil Lalonde
c9c68c2cb2 Show Edit buttons to staff on categories page again 2013-07-26 10:39:26 -04:00
Neil Lalonde
234474af1b Fix 'undefined' in Create Category modal title 2013-07-26 10:31:56 -04:00
Neil Lalonde
d579e4c5d5 Prevent category badges from wrapping on white space 2013-07-26 10:11:00 -04:00
Sam
d51dcd1705 improve email styling, include extra respond link 2013-07-26 17:27:46 +10:00
Sam
809594c00a correct ScreenTrack so it properly flushes everything that happened on stop and resets on start 2013-07-26 14:41:46 +10:00
Corey Robertson
d25d1f777c Prevent 'Quote reply' from appearing when using find in Chrome 2013-07-25 22:57:03 -05:00
James Anderson
d7d3be1130 Add audio onebox
http://meta.discourse.org/t/audio-html5-tag/8168
2013-07-25 19:03:23 -07:00
Robin Ward
9edd163228 Oops, left in another console.log :) 2013-07-25 16:06:58 -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
589e9916f2 fix so some half working locales boot 2013-07-25 11:25:30 +10:00
Sam
d0f50cb266 fixing up moment locales, they were not set up properly 2013-07-25 11:09:29 +10:00
Robin Ward
1b02a7c580 missing semi colon 2013-07-24 17:32:07 -04:00
Robin Ward
8408795093 Support for default User Index 2013-07-24 17:18:10 -04:00
Sam
9351a7bcb1 Merge pull request #1244 from stephankaag/rails4updates
Rails 4 updates
2013-07-24 14:16:32 -07:00
Robin Ward
9132931aa9 Use {{outlets}} for user activity views so we can swap some out. 2013-07-24 15:54:02 -04:00
Stephan Kaag
f99acebdaa Rails 4 updates 2013-07-24 21:09:18 +02:00
Sam
366cb13140 restyle all user notification emails to use a custom html template 2013-07-24 17:24:55 +10:00
Sam
cb5ce3aab9 Merge pull request #1247 from sir-pinecone/strip-spaces-from-login
Strip leading/trailing spaces from login
2013-07-24 00:16:55 -07:00
Sam
880dd53f48 Merge pull request #1249 from sir-pinecone/strip-spaces-from-group
Strip spaces from group names upon creation
2013-07-24 00:15:53 -07:00
Michael Campagnaro
867ce0310c display group validation errors in alert modal 2013-07-24 00:42:44 -04:00
Michael Campagnaro
b223cdb493 Strip spaces from group names upon creation 2013-07-24 00:00:17 -04:00
Michael Campagnaro
25f8692a79 Strip leading/trailing spaces from login 2013-07-23 23:03:38 -04:00
Régis Hanol
be9217d4c8 add server-side filesize check on uploads 2013-07-24 00:54:41 +02:00
Robin Ward
75491d2cf6 remove console.log 2013-07-23 18:03:35 -04:00
Robin Ward
82465caf97 Clean up user activity code in preparation for topic rendering 2013-07-23 17:01:43 -04:00
Robin Ward
c9c6a8fd9d User stream now uses eyeline for loading more content. 2013-07-23 16:06:26 -04:00
Neil Lalonde
44bebf255d Fix layout of category badges on categories page and in combobox 2013-07-23 15:05:37 -04:00
Robin Ward
96af490d7c FIX: Deleting posts in bulk was broken. 2013-07-23 14:59:05 -04:00
Robin Ward
6237a155e7 FIX: Linking to users on admin dashboard was broken 2013-07-23 13:35:32 -04:00
Robin Ward
d8978cb4a0 FIX: Redirect on some URLs to wrong path 2013-07-23 12:15:44 -04:00
Robin Ward
adf7c9ad06 Merge pull request #1237 from stephankaag/improve_post_analyzing
Improve post analyzing
2013-07-23 07:07:49 -07:00
Robin Ward
3ee6e42016 FIX: Server side errors with Topic.similar_to 2013-07-23 10:02:58 -04:00
Sam
7c5e15966f Merge pull request #1225 from ZogStriP/upload-selector-handles-attachments
uploads selector texts is now different when attachments are enabled
2013-07-23 00:44:17 -07:00
Sam
9ac6c6e2e9 Merge pull request #1233 from sir-pinecone/improve-group-deletion
Add confirmation modal to admin group deletion
2013-07-23 00:43:06 -07:00
Sam
7e92109ac8 Merge pull request #1240 from abbat/master
Fix locale dependend stemmer for FTS
2013-07-23 00:40:54 -07:00
Sam
73e0418b41 deleted class only for real deleted posts 2013-07-23 15:42:44 +10:00
Sam
3ad7d74c52 correct no highlighting categories when clicked 2013-07-23 13:24:39 +10:00
Sam
060c79ecc0 remove dupes before correcting topic_ids in user action consistency check job 2013-07-23 12:44:20 +10:00
Sam
9c5734b773 tone down badges for the love of all that is good 2013-07-23 12:44:20 +10:00
Doug Alcorn
35a2bb7919 Parameterize the PBKDF2 algorithm in application config
http://meta.discourse.org/t/sso-between-discourse-and-xmpp/8567/5
2013-07-22 21:36:01 -04:00
Sam
4b269de724 correct: http://meta.discourse.org/t/cant-save-adding-a-group-permission-to-a-category/8537
can not save category after adding a new custom group
2013-07-23 10:10:36 +10:00
Sam
0acc96c94e work around for http://meta.discourse.org/t/activerecord-statementinvalid-exception-raised-in-models-user-action-rb/7275/4 2013-07-23 09:48:18 +10:00
Anton Batenev
aa7d1c2fbe Fix locale dependend stemmer for FTS
Fix locale dependend stemmer for FTS to improve search relevance on non English languages.
2013-07-23 03:07:59 +04:00
Sam
ea7684fb32 Merge pull request #1226 from stephankaag/rails4_updates
Some Rails4 updates
2013-07-22 15:03:37 -07:00
Régis Hanol
6474e7df97 uploads selector texts is now different when attachments are enabled 2013-07-22 23:15:23 +02:00
Robin Ward
6221fe2d60 JSHint fix 2013-07-22 16:56:09 -04:00
Robin Ward
43ceacabab Link to edit "About Me" links directly to the field. 2013-07-22 16:53:21 -04:00
Stephan Kaag
b58da2fcf9 Add some TODO's 2013-07-22 22:39:20 +02:00
Stephan Kaag
ebd5fa76c5 Reuse post-analyzer and cooked-document when requesting multiple post stats 2013-07-22 22:24:47 +02:00
Michael Campagnaro
a0465485b4 use group.get as per PR comment 2013-07-22 16:19:08 -04:00
Stephan Kaag
ad2b667504 Remove dead code 2013-07-22 22:16:46 +02:00
Robin Ward
fd1d376975 Merge pull request #1235 from stephankaag/remove_all
Remove some calls to `all`
2013-07-22 12:26:00 -07:00
Robin Ward
0ad93e436c Merge pull request #1232 from sir-pinecone/fix-group-member-removal
Fix for autocomplete delete action removing only the last item
2013-07-22 12:22:14 -07:00
Robin Ward
4aa8f718d0 Merge pull request #1236 from jbruni/pt_BR
Brazilian Portuguese translation of "static" files (FAQ, TOS and Privacy)
2013-07-22 12:18:34 -07:00
Robin Ward
3e7b418ea8 First Try: Include Post History (context) in Notification Emails 2013-07-22 15:06:37 -04:00
J. Bruni
e257cfc56c Merge branch 'master' into pt_BR 2013-07-22 16:00:09 -03:00
J. Bruni
1c78b485d3 Brazilian Portuguese translation (FAQ) - improvements and corrections 2013-07-22 15:46:26 -03:00
J. Bruni
701eac17c7 Brazilian Portuguese translation (Terms of Service) 2013-07-22 15:45:40 -03:00
Stephan Kaag
0e3b8fbb24 Remove some calls to all. They are not required, and Rails4 raises warnings about them. 2013-07-22 20:44:11 +02:00
Stephan Kaag
b19f631b3a Some Rails4 updates 2013-07-22 19:01:22 +02:00
Robin Ward
112b9f9c2a FIX: The previous flag reason was selected when opening the modal. 2013-07-22 12:05:13 -04:00
Robin Ward
e73c809836 FIX: Reply as new Topic wasn't clearing drafts 2013-07-22 11:42:22 -04:00
Neil Lalonde
52acbec647 Load pagedown_custom.js a bit later so it can use translations 2013-07-22 11:01:15 -04:00
Robin Ward
0c4e3d5233 Merge pull request #1221 from jbruni/patch-1
Update faq.en.html.erb (only fixed a comma position)
2013-07-22 07:35:00 -07:00
Robin Ward
a71e4d5216 Merge pull request #1219 from bolandrm/fix_graphical_error_admin_dash
Fix Graphical Error on Admin Dashboard
2013-07-22 07:33:08 -07:00
Robin Ward
ed745c3fdd Merge pull request #1222 from ZogStriP/fix-s3-related-issues
Fix s3 related issues
2013-07-22 07:30:41 -07:00
Robin Ward
0f1533f41d Merge pull request #1229 from ZogStriP/close-lightbox-when-using-back-button
FIX: lightbox is not closed when using the back button
2013-07-22 07:29:53 -07:00
Robin Ward
80a0943f54 Merge pull request #1228 from ZogStriP/fix-thumbnailing-with-cdn-enabled
FIX: thumbnailing isn't working with CDN enabled
2013-07-22 07:22:59 -07: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
Robin Ward
ceb36a62c8 Merge pull request #1231 from jbruni/patch-2
Update tos.en.html.erb
2013-07-22 07:21:41 -07:00
Sam
1f3c5cb656 allow end user to recover a post they delete
automatically delete stubs after 1 day
2013-07-22 17:48:47 +10:00
Jeff Atwood
d68f30c09d flatten and simplify default category badge styles 2013-07-22 00:11:34 -07:00
Jeff Atwood
5bb2090b81 fix way too tall line-height for user titles 2013-07-21 23:54:10 -07:00
Michael Campagnaro
9616767bff Add confirmation modal to admin group deletion 2013-07-22 02:48:23 -04:00
Sam
58e7c3e1f3 push some work out of AR callbacks into PostCreator, add a couple of helpers for post and topic creation in test
fix it so the auto_track false marks topics as new
2013-07-22 15:07:20 +10:00
Sam
0ec1438b9a correct auto track param parsing for WordPress 2013-07-22 15:07:20 +10:00
Sam
acba0ea41e add auto track to permitted params 2013-07-22 15:07:20 +10:00
Sam
31bb08bcdd added an option to bypass auto tracking of topics on post creation 2013-07-22 15:07:20 +10:00
Sam
9e4b0df7ff 69 specs fail in rails 4 now ...not too bad 2013-07-22 15:07:20 +10:00
Michael Campagnaro
e471ffd07b Fix for autocomplete delete action removing only the last item 2013-07-21 22:37:01 -04:00
J Bruni
695d2abdbc Update tos.en.html.erb
Substituted literal "Wordpress" (as seen at http://en.wordpress.com/tos/) by company domain tag
2013-07-21 23:20:39 -03:00
Régis Hanol
2986798ba7 add newuser-max-attachments setting 2013-07-22 02:39:17 +02:00
Régis Hanol
418d8c7377 FIX: lightbox is not closed when using the back button 2013-07-22 01:21:43 +02:00
Régis Hanol
649ab85740 FIX: thumbnailing wasn't working with CDN enabled 2013-07-22 00:37:23 +02:00
J. Bruni
af8ea2d87d Brazilian Portuguese translation (Privacy) 2013-07-20 18:57:07 -03:00
J. Bruni
d38caed7fb Brazilian Portuguese translation (FAQ) 2013-07-20 18:56:45 -03:00
Régis Hanol
33977252c9 rollback to previous s3 syntax (ie. subdomains) 2013-07-20 11:30:36 +02:00
J Bruni
d474944043 Update fq.en.html.erb (only fixed a comma position)
you love pull requests, and I care about details
2013-07-20 04:24:00 -03:00
Sam
cacbcaeb7e blank responses led to an undefined on the user screen 2013-07-19 17:21:51 +10:00
Ryan Boland
f6963a05c4 fix graphical error 2013-07-18 23:26:04 -04:00
Régis Hanol
8406a4230c FIX: click tracking on attachments wasn't working 2013-07-19 01:27:09 +02:00
Robin Ward
7a6f1b5aff Color moderator actions on user stream 2013-07-18 17:24:51 -04:00
Robin Ward
257ddf5fc9 FIX: Private message link on messages view did not work. Removed a lot of duplication. 2013-07-18 17:07:05 -04:00
Robin Ward
7d4b089cd1 FIX: Suggested Topics were sometimes disappearing 2013-07-18 16:09:03 -04:00
Robin Ward
419cbc7701 FIX: Double load on back button 2013-07-18 15:40:06 -04:00
Robin Ward
751b757c1d FIX: Some failing specs 2013-07-18 12:26:38 -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
910c88c48e FIX: Private Message button wasn't populating username 2013-07-18 10:43:38 -04:00
Robin Ward
a97c093434 FIX: Don't transition to when viewing a user. Just render it. 2013-07-17 18:13:43 -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
Robin Ward
3238e0caa4 JSHINT 2013-07-17 10:31:27 -04:00
Robin Ward
86c884aa29 FIX: Only show undelete button when the topic is deleted 2013-07-17 10:21:47 -04:00
Robin Ward
5a5e9d0fd1 Merge pull request #1206 from BrentleyJones/fixed_modals
FIX: Modal dialogs now truly center and work at all screen sizes (mobile), now with working Bootbox
2013-07-17 06:59:48 -07:00
Robin Ward
e2ff064aa3 Merge pull request #1198 from prem-prakash/master
Adding Portuguese Brazilian translations
2013-07-17 06:59:31 -07:00
Sam
81616a46ba db consistency check for mismatching topic_ids in user_actions
fix up post mover so it remaps user actions as well
move specs for post mover into post_mover_spec
2013-07-17 16:40:56 +10: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
Sam
2573935155 improve security UI 2013-07-17 15:10:49 +10:00
Sam
625204c8bd work in progress category UI
refactor hack from earlier
2013-07-17 14:54:21 +10:00
Sam
5a7e78f0fc fix unit tests 2013-07-17 14:22:55 +10:00
Sam
63cbe8dd17 fix links to site contents, fix it so the site contents page is refreshable 2013-07-17 14:15:09 +10:00
Sam
d1dbcf52fc see: https://github.com/emberjs/ember.js/pull/2148 2013-07-17 09:55:30 +10:00
Régis Hanol
5c27dd175a make sure we handle both s3 url formats 2013-07-17 00:32:09 +02:00
Régis Hanol
7ae2fe304d renamed s3 to s3_store 2013-07-17 00:27:52 +02:00
Brentley Jones
f26b479458 FIX: History modal having custom (old) setting of min height and width.
It is functional, but it no longer resizes down. I would look at making this fluid or having a style for mobile.
2013-07-16 21:05:33 +00:00
Brentley Jones
a03e933eb6 Fix spacing 2013-07-16 19:16:22 +00:00
Brentley Jones
e060e952b5 Accidently removed some styles in the merge 2013-07-16 19:06:33 +00:00
Brentley Jones
5e08427dd3 Merge branch 'master' into fixed_modals
Conflicts:
	app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
	app/assets/stylesheets/application/modal.css.scss
2013-07-16 18:58:49 +00:00
Brentley Jones
cc28a4ddc3 FIX: Bootbox modals were not coming through properly. Temp have them use the old way of displaying. Will look into how to have them be the same as the "fixed" way. 2013-07-16 18:32:35 +00:00
Robin Ward
7c9bd8e8c9 Remove EvilTrout's stupid mistake. 2013-07-16 13:51:00 -04:00
Robin Ward
2577d76e4f Revert "Merge pull request #1201 from BrentleyJones/fixed_modals"
This reverts commit 7e889c4e24, reversing
changes made to e9d37f395f.
2013-07-16 13:38:01 -04:00
Robin Ward
4bfb546942 Removed modelReady hack now that the async router exists 2013-07-16 13:24:59 -04:00
Robin Ward
6929ee9f46 Changed HTML again on hamburger menu to make it easier to style 2013-07-16 12:24:18 -04:00
Robin Ward
82c734ec84 FIX: FAQ wasn't loading sometimes 2013-07-16 12:11:30 -04:00
Robin Ward
d466d11e71 Ember RC6 update 2013-07-16 10:35:18 -04:00
Robin Ward
75282576b9 Merge pull request #1195 from initforthe/post-analyser-backtrace-fix
Post analyser backtrace fix
2013-07-16 07:34:54 -07:00
Robin Ward
7e889c4e24 Merge pull request #1201 from BrentleyJones/fixed_modals
FIX: Modal dialogs now truely center and work at all screen sizes (mobile)
2013-07-16 07:31:17 -07:00
Sam
e9d37f395f hmm I totally missed that it was already there 2013-07-16 21:06:04 +10:00
Sam
06bd9e3234 allow login required screen to be customized 2013-07-16 20:49:04 +10:00
Sam
dc3079db37 fix mucked up styling, glyph should be inside the hyperlink so it gets color 2013-07-16 18:01:34 +10:00
Sam
ff7d9cac38 fix non localized said: in quotes 2013-07-16 17:22:54 +10:00
Sam
ef1c71ba98 missed a qunit test 2013-07-16 15:48:41 +10:00
Sam
352ac9e60c Finalize read only and post only categories, finished off UI work 2013-07-16 15:46:11 +10:00
Sam
fce2d0e3b6 reply to first post === reply to topic 2013-07-16 15:46:11 +10:00
Sam
a3155858a0 Fix share URL for first post 2013-07-16 15:46:11 +10:00
Sam
ecf17cfebb work in progress, add fidelity to category group permissions (full, create posts, readonly) 2013-07-16 15:46:11 +10:00
Sam
c7697bbae2 remove duplicate code 2013-07-16 15:44:38 +10:00
Brentley Jones
d1ab694920 FIX: Modal dialogs now truely center and work at all screen sizes (mobile) 2013-07-16 03:40:15 +00: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
premprakash
8c5e0e7550 Adding Portuguese-Brazil language 2013-07-15 14:45:16 -03:00
Robin Ward
e8f3e7c2e8 Added classes for styling to hamburger menu 2013-07-15 13:31:52 -04:00
Robin Ward
0e504aac9b FIX: You can reset your password even if logins are required. 2013-07-15 12:12:54 -04:00
Robin Ward
08723f00c6 FIX: Bugs on Admin User approval interface 2013-07-15 11:28:41 -04:00
Robin Ward
ed60f24502 Merge pull request #1194 from ZogStriP/uploads
[Upload] Great deal of renaming
2013-07-15 07:06:18 -07:00
Sam
0fee644434 Merge pull request #1191 from cfstras/patches
Fix bug: pressing enter on the "forgot password" modal does not submit the form
2013-07-15 03:18:23 -07:00
Tom Russell
96065a1499 Prevent backtrace in PostAnalyser 2013-07-15 11:15:04 +01:00
Jeff Atwood
52fa9a5453 widen @name autocomplete dialog 20% 2013-07-15 00:42:02 -07:00
Régis Hanol
36e6345eee change the icon in the composer toolbar with a more generic upload icon
also changed all references to "images uploads" to a "uploads"
2013-07-14 23:44:50 +02:00
Régis Hanol
3397c2235f display the size of the attachment in the preview
instead of adding it during post processing
2013-07-14 12:28:24 +02:00
Régis Hanol
6f2ce93ab2 FIX: create an upload when FastImage throws an exception
FastImage might throw an exception when it isn't able to recognize a
file as being an image (ie. happens when users changes the extension
manually)

Also improved upload specs a lot
2013-07-13 23:42:19 +02:00
Claus Strasburger
b5593daae1 Fix bug: pressing enter on the "forgot password" modal does not submit the form 2013-07-13 22:24:09 +02:00
Robin Ward
2aa487d2c8 Show who deleted a topic 2013-07-12 16:38:21 -04:00
Robin Ward
0c7ead339b Don't recalculate trustLevels combobox 2013-07-12 16:24:15 -04:00
Robin Ward
62d161fd70 Show number before trust level. Also use less memory for trust levels. 2013-07-12 16:18:32 -04:00
Robin Ward
35128c212b FIX: User page broke when the user had no stats 2013-07-12 15:59:35 -04:00
Robin Ward
15a41a41f2 Use fancy formatting in the suggested topics list 2013-07-12 12:47:26 -04:00
Robin Ward
6122d31711 FIX: Jshint in computed.js - not in qunit? 2013-07-12 12:14:32 -04:00
Robin Ward
6ca5df0a09 Can recover deleted topics. Deleted topics show the first post as deleted in the UI. 2013-07-12 12:09:17 -04:00
Robin Ward
5eaae063f0 Discourse Macro Helpers + Minor Fix to Admin User View 2013-07-11 19:35:52 -04:00
Robin Ward
bb5a9aa34b Remove reliance on views for logic, move to controller 2013-07-11 16:55:07 -04:00
Robin Ward
19c169540c Staff can enter and view deleted topics 2013-07-11 16:39:35 -04:00
Robin Ward
eba662b988 FIX: Topic Status Icons had weird margins after font awesome update 2013-07-11 12:04:39 -04:00
Robin Ward
4540a51a8f FIX: deleted_by wasn't showing up on refresh 2013-07-11 11:18:25 -04:00
Robin Ward
7fd8bb75d9 Merge pull request #1177 from ZogStriP/attachments
Attachments
2013-07-11 06:49:20 -07:00
Sam
1aef6de4b0 automatically approve invited users on forum where moderators must approve (keep in mind only moderators can invite)
speed up specs a touch
allow invite controller to accept an email in absence of user (cleans up API)
2013-07-11 11:22:00 +10:00
Neil Lalonde
7792b7da48 Use the solid envelope icon. Font-awesome swapped icon-envelope and icon-envelope-alt. 2013-07-10 17:06:07 -04:00
Régis Hanol
ac41e94619 refactor optimized_image a bit 2013-07-10 22:59:54 +02:00
Régis Hanol
ffb9a1250a don't track via AJAX when clicking on local attachments 2013-07-10 22:59:53 +02:00
Régis Hanol
1f8eaa6ca3 display correct template when attachment or image 2013-07-10 22:59:53 +02:00
Régis Hanol
27ab5f471c support arbitrary attachments 2013-07-10 22:59:53 +02:00
Régis Hanol
e8c1a81e87 do not create global variables 2013-07-10 22:59:53 +02:00
Robin Ward
6de1fed87a Glyph stuff: Put them on the left of the user menu, fix padding on link arrows in gutter. 2013-07-10 16:58:58 -04:00
Jeff Atwood
f1a5f4ce66 left align post quotes and blockquotes 2013-07-10 13:57:52 -07:00
Neil Lalonde
8814f9ed05 Fix a case when a staff user views a topic with a deleted post by a nuked user; might be a temporary solution until we decide what to do with nuked records 2013-07-10 16:52:47 -04:00
Robin Ward
91dc0b9ef1 JSHint issue with file that didn't show up in Qunit locally. Weird! 2013-07-10 16:29:53 -04:00
Robin Ward
f58dec1ac0 Also include deleted_at 2013-07-10 16:27:02 -04:00
Robin Ward
8ffe9e28d6 Shows who deleted a post 2013-07-10 16:22:49 -04:00
Robin Ward
8888ae4b40 Added some macros to simplify code 2013-07-10 16:21:18 -04:00
Robin Ward
1fef617818 Qunit tests for deleting posts on the front end. Support for deleted_by
property.
2013-07-10 16:21:13 -04:00
Neil Lalonde
cdf0754626 Show/update post edits count and icon after editing a post 2013-07-10 15:15:13 -04:00
Neil Lalonde
0e3e5bf533 Add relative_date_duration site setting 2013-07-10 12:38:43 -04:00
Robin Ward
cc47616cdb Merge pull request #1157 from abbat/email-custom-headers
Add custom headers for email messages
2013-07-10 07:12:51 -07:00
Adrian Lang
d4ef582f94 Correct caption of 'Make Visible' button
The variable 'visible' is also used for toggling the admin menu visibility,
so it is always true when the visibility toggle is shown. Hence, it's caption
is always 'Make Invisible', even when the topic already is invisible.
2013-07-10 10:16:39 +02:00
Sam
8367326e76 glyphs on the user stream, rename responses to replies 2013-07-10 16:35:06 +10:00
Sam
7cee5efab8 The flattening part 2, cleaned up styling so it is more consistent with the removal of border yesterday
quote style now matches block quote style
2013-07-10 12:17:43 +10:00
Robin Ward
b7327942af Add deleted_by to Trashable tables 2013-07-09 15:46:36 -04:00
Neil Lalonde
ba7a4e9845 Merge pull request #1165 from novemberkilo/feature/log-trust-level-boosts
Log all changes of user trust level by an admin
2013-07-09 12:16:08 -07:00
Neil Lalonde
3c38062802 Check for updates: edge cases when the message on the dashboard doesn't make sense. 2013-07-09 14:01:08 -04:00
Robin Ward
72632670db FIX: Font Awesome upgrade changed padding on (+) Reply as New Topic 2013-07-09 13:34:00 -04:00
Robin Ward
82b578249c Subtle changes to border colors 2013-07-09 13:11:13 -04:00
Robin Ward
efd631296e FIX: Don't allow a user to stage a post while another is being staged. 2013-07-09 12:34:28 -04:00
Anton Batenev
b0dbb0ea13 And add tests for empty string & null 2013-07-09 20:19:10 +04:00
Robin Ward
d98f288aa4 FIX: Recovering a deleted post was not updating a topic's statistics 2013-07-09 12:15:55 -04:00
Robin Ward
1be08dbcb5 Merge pull request #1170 from abbat/russian-translation
Russian translation (actual version)
2013-07-09 08:26:35 -07:00
Robin Ward
7ad471f019 FIX: If you split one topic already, the second topic was showing "Saving..." 2013-07-09 11:18:09 -04:00
Robin Ward
e05a3569a1 FIX: Deep linking into a category was losing the badge 2013-07-09 10:57:52 -04:00
Anton Batenev
ed1fb847ed Russian translation (actual version) 2013-07-09 18:26:59 +04:00
Robin Ward
5cda0e556c Merge pull request #1111 from jamesaanderson/flash-video-onebox
Add flash video onebox support
2013-07-09 06:55:56 -07:00
Robin Ward
f9d1fcb169 Merge pull request #1140 from stephankaag/code_refactoring
Refactor code that raises deprecating warnings in Rails 4
2013-07-09 06:48:48 -07:00
Robin Ward
437175b102 Merge pull request #1166 from jamesaanderson/mobile-and-tablet-video-rendering-fix
Mobile and tablet video rendering fix
2013-07-09 06:44:49 -07:00
Robin Ward
f4c3416f1b Merge pull request #1167 from ZogStriP/i18n-helper
I18n helper
2013-07-09 06:43:48 -07:00
Jeff Atwood
a6b63b2871 de-box the topic posts a bit
I CANT TAKE IT ANY MORE AHHHHHHH
2013-07-09 03:38:01 -07:00
Sam
0f46df4670 workaround for bust up button on topics 2013-07-09 18:16:18 +10:00
Sam
8f892da890 move bookmark to end 2013-07-09 18:16:17 +10:00
James Anderson
171e703e11 Mobile and tablet video rendering fix
http://meta.discourse.org/t/chrome-for-ipad-iphone-breaks-with-this-video-embed/7983
2013-07-08 17:22:25 -07:00
Régis Hanol
1f263c57fd fool jshint 2013-07-09 02:14:35 +02:00
Régis Hanol
c1acce17cc removed unnecessary console.log 2013-07-09 02:10:55 +02:00
Régis Hanol
924c5d65cb wrapped I18n.lookup to inject the "js" namespace 2013-07-09 02:10:55 +02:00
Sam
e993d6b29b upgrade font awesome to version 3.2.1, use scss instead of css for the include. 2013-07-09 10:06:57 +10:00
Neil Lalonde
806bd98f99 Update category's topic_count immediately when trashing or recovering a topic; this ensures that a category can be deleted without waiting for the category_stats job to run. 2013-07-08 15:23:20 -04:00
Neil Lalonde
d3fe8f65a2 Add tooltip to avatars of people who liked a post 2013-07-08 14:00:47 -04:00
Neil Lalonde
ad096ac2b7 More nav links on admin users list page 2013-07-08 12:44:14 -04:00
Neil Lalonde
9b0f63627b Add blocked users count to dashboard 2013-07-08 12:44:13 -04:00
Stephan Kaag
2abfd38aee Refactor code that raises deprecating warnings in Rails 4 2013-07-08 18:35:11 +02:00
Robin Ward
cfc4dda9ff FIX: OpenGraph should feature the desired post, if found in the set. 2013-07-08 12:21:39 -04:00
James A. Anderson & Jalil Mohammed
d51a3cf50f Add flash video onebox as disabled setting by default 2013-07-08 06:37:44 -07:00
Navin
d77ce23de2 Log all changes of user trust level by an admin 2013-07-08 11:53:22 +02:00
Sam
4b437ccd2f Merge pull request #1148 from nterray/fix_html_entities_after_editing_topic_title
Add :title as attribute for basic_topic
2013-07-07 23:45:25 -07:00
Sam
f42fc3be37 Merge pull request #1150 from mcwumbly/topic-likes
little tweaks to like counts in topic list view
2013-07-07 23:39:38 -07:00
Sam
807b9d438a Merge pull request #1159 from jd-erreape/user_refactors
Refactors in user model
2013-07-07 23:38:16 -07:00
Sam
180d887481 title for category pages 2013-07-08 16:01:40 +10:00
Sam
2f096083d0 custom title for user page 2013-07-08 15:56:13 +10:00
Sam
085e094497 404 if a category does not exist .... 2013-07-08 15:56:13 +10:00
Sam
f1a31cd9e6 Merge pull request #1163 from ZogStriP/refactor-cooked-post-processor
refactored CookedPostProcessor
2013-07-07 22:01:48 -07:00
Sam
5d6ce6d17f Merge pull request #1164 from ZogStriP/add-label-for-boolean-settings
add label for boolean setting
2013-07-07 22:00:09 -07:00
Sam
91238af6f1 correct failing specs 2013-07-08 12:25:38 +10:00
Sam
3dbb4ff9bc Reorder filters on user page and name them better (All, Topics, Posts, Responses) 2013-07-08 12:12:06 +10:00
Sam
ae6ad734eb remove bad console.log 2013-07-08 12:11:20 +10:00
Sam
d79aa917f1 add option suppress_reply_directly_above to stop suppressing the reply directly above
added a bunch of debugging information to help diagnose weird positioning issues
2013-07-08 11:13:45 +10:00
Régis Hanol
f9b2738ae1 add label for boolean setting 2013-07-08 01:43:30 +02:00
Régis Hanol
ac7253a938 refactor CookedPostProcessor & specs 2013-07-08 01:39:08 +02:00
Juan de Dios Herrero
27b038cd40 Refactored username validations to avoid repeated code 2013-07-07 13:05:18 +02:00
Juan de Dios Herrero
e4fc6e02ed Added discourse hub nickname operations simplify and avoid repeated code 2013-07-07 12:40:35 +02:00
Anton Batenev
4e04c4dddd Add custom headers for email messages
See http://meta.discourse.org/t/custom-headers-in-emails-site-settings/7480
2013-07-07 04:37:44 +04:00
Robin Ward
337f393af5 Merge pull request #1155 from ZogStriP/remove-auto-link-images-wider-than-setting
removed auto_link_images_wider_than setting
2013-07-06 17:12:11 -07:00
Robin Ward
dd6530f45c Merge pull request #1151 from abbat/patch-1
Fix title for plain view
2013-07-06 17:09:44 -07:00
Robin Ward
f314bd9215 Merge pull request #1153 from abbat/patch-2
Add "Next page" link to plain topic view
2013-07-06 17:09:16 -07:00
Régis Hanol
45c227c81c fix column name in admin email logs 2013-07-06 22:29:16 +02:00
Régis Hanol
6251935b1e removed auto_link_images_wider_than setting 2013-07-06 22:19:16 +02:00
Anton Batenev
3dc850e3d4 Add "Next page" link to plain topic view
"Next page" link also under noscript tag and not indexed by old crawlers.
2013-07-06 18:57:08 +04:00
Anton Batenev
8cac92dd11 Fix title for plain view
Fix title for plain view - remove <a href=> tag from title.
2013-07-06 16:58:44 +04:00
David McClure
a3eb175683 - like counts use number formatting (so 1100 is 1.1K like other counts)
- made 'likes' column wide enough to hold 3 digit and > 999 likes
2013-07-06 00:07:10 -07:00
Nicolas Terray
d5285e2d93 Add :title as attribute for basic_topic
When we update the <title> after editing a topic, we should use the raw
`topic.title` as `topic.fancy_title` may contains some htmlentities and
will be displayed as is in the browser tab.

This fix the following issue:

> Incorrect HTML title after editing title/category of topic
> http://meta.discourse.org/t/incorrect-html-title-after-editing-title-category-of-topic/8136
2013-07-05 23:22:52 +02:00
Neil Lalonde
25d2cbc33f Merge branch 'master' of github.com:discourse/discourse 2013-07-05 16:52:27 -04:00
Neil Lalonde
1c0e0da683 Add rss feed for latest and hot 2013-07-05 16:49:06 -04:00
Robin Ward
1c18490141 Revert "cheat to fix duplicate key on thumbnails"
This reverts commit 0c702522c4.
2013-07-05 16:09:43 -04:00
Robin Ward
6cd6484b5e New mode for Wordpress: Filter ONLY posts liked by moderators 2013-07-05 16:07:24 -04:00
Robin Ward
2e7eee7ebd FIX: Clear state when you abandon. 2013-07-05 13:55:33 -04:00
Robin Ward
d1a0b5dd44 FIX: Editing a title would not clear it out on your next edit. 2013-07-05 13:04:54 -04:00
Robin Ward
11bb9aafc7 Extra tests for composer 2013-07-05 13:04:49 -04:00
Robin Ward
7335f5fb7f Merge pull request #1145 from abbat/yandex-workaround
Workaround solution to help Yandex crawler index discourse.
2013-07-05 10:04:40 -07:00
Neil Lalonde
84ce04dfa5 Use POST for send_activation_email action 2013-07-05 12:26:46 -04:00
Anton Batenev
694a6f4970 Fix recommendations from #1145 2013-07-05 15:59:39 +04:00
Sam
363e1010c4 never double load the stream. 2013-07-05 21:23:01 +10:00
Sam
0c702522c4 cheat to fix duplicate key on thumbnails 2013-07-05 15:01:31 +10:00
Sam
9afea0ed07 spec for change 2013-07-05 14:23:29 +10:00
Sam
f3ac84d41f our referer is bust if there is no domain 2013-07-05 14:07:08 +10:00
Régis Hanol
7c82d6d4d0 FIX: new users are allowed to upload images to your servers 2013-07-05 00:44:18 +02:00
Robin Ward
07ebd20776 Merge pull request #1143 from ahx/fix-cas-email-name-and-improve-authentication-specs
Improve the omniauth controller specs. Fix the email provided by CAS. Get name from CAS attributes.
2013-07-04 14:48:52 -07:00
Robin Ward
e58d09a463 FIX: If the progress docked and you jumped to the top it could dissappear. 2013-07-04 17:35:20 -04:00
Robin Ward
2d821d1ff4 Clicking the #site-logo will refresh the latest list. 2013-07-04 17:31:06 -04:00
Robin Ward
4a3bc1fb43 More Javascript Tests + Fixtures. Also a rake task to crawl them. 2013-07-04 16:20:43 -04:00
Neil Lalonde
594cb50f18 Use the correct locale in html lang attribute 2013-07-04 14:32:16 -04:00
Neil Lalonde
227294897e Remove .rss from the link element of channel in a category's rss feed 2013-07-04 14:17:01 -04:00
Anton Batenev
af36d32f7f Workaround solution to help Yandex crawler index discource.
Yandex search engine doesn't index noscript tag content. See also
http://meta.discourse.org/t/noscript-tag-and-some-search-engines/8078
2013-07-04 22:08:23 +04:00
Robin Ward
28c168fc2b FIX: Unintended edits with composer 2013-07-04 13:35:15 -04:00
Neil Lalonde
c157c61d0e Use the same time ago formating in embedded post as other posts 2013-07-04 10:08:44 -04:00
Robin Ward
ea11286ab6 Merge pull request #1131 from novemberkilo/feature/temporary-boost-trust-levels
Feature: Admin can modify user trust levels
2013-07-04 06:57:59 -07:00
Navin
c065fad546 Refactor setting originalTrustLevel to model. 2013-07-04 13:01:01 +02:00
Andreas Haller
661f2057f7 Improve the omniauth controller specs. Fix the email provided by CAS. Get name from CAS attributes.
* Make omniauth controller specs more robust by using shared examples for all authentication providers in controller spec. – Still passing. Yay!

* Return "casuser", instead of "casuser@" when no cas_domainname is configured.

* If no cas_domainname is configured, the CAS authentication would return "casuser@" for the users email field, because it tried to assume the email adress of the CAS user by it's username + cas_domainname.
  Now it just returns the username instead of adding an "@" if cas_domainname is not configured.
  This especially makes sense on CAS setups where the username equals the users email adress.
  The old behaviour, if cas_domainname is configured, was not changed.

* Fetch the email from CAS attributes if provided
  If the cas:authenticationSuccess (handled via omniauth-cas) response gives us an email use that.
  If not, behave as before (username or username@cas_domainname).

* Fetch the (full) name from CAS attributes if provided
  If the CAS response by omniauth provides a [:info][:name] field, prefer this over the uid, because we want the name to be a "Full Name", instead of just a "shortname"
2013-07-04 12:01:39 +02:00
Jeff Atwood
1589874cd2 use a color constant instead of hardcoding 2013-07-04 01:11:45 -07:00
Jeff Atwood
b555a0d461 try colorizing the category description ala BBS 2013-07-04 01:09:03 -07:00
Navin
b90a79d40a Move setting originalTrustLevel from a CP to setupController 2013-07-04 09:32:12 +02:00
Sam
ca7c10df9a Merge pull request #1139 from stephankaag/correct_image_url_rails4
No need to include all ActionView::Helpers in Topic
2013-07-03 23:29:43 -07:00
Sam
b662cb6c02 If a user read to the end of an auto closing topic, when it is closes just pretend they read the close message. 2013-07-04 11:47:12 +10:00
Robin Ward
06e5615088 OOPS! Robin self-flaggelated. 2013-07-03 19:13:13 -04:00
Sam
f08e9d8822 Merge pull request #1142 from ZogStriP/fix-can-no-longer-paste-image-in-chrome-post-editor
FIX: can no longer paste image in Chrome post editor
2013-07-03 16:08:51 -07:00
Robin Ward
f5d6b41f91 FIX: posts weren't being marked as last read correctly 2013-07-03 19:03:11 -04:00
Régis Hanol
5a56af03bc FIX: can no longer paste image in Chrome post editor 2013-07-04 00:39:23 +02:00
Robin Ward
4331bba549 FIX: Quotes with text against them had the wrong spacing 2013-07-03 18:26:08 -04:00
Neil Lalonde
2c8ed8414c If an auto-closing topic is manually closed, remove the auto-close countdown 2013-07-03 16:54:41 -04:00
Robin Ward
44cd5505d3 FIX: Repeatedly editing a post was popping up abandon dialog 2013-07-03 15:57:23 -04:00
Stephan Kaag
7cc7116680 No need to include all ActionView::Helpers in Topic, we only need the sanitize helper.
This also fixes a bug in Rails 4 where image_url gets accidentally overridden.
2013-07-03 21:43:29 +02:00
Neil Lalonde
115491a057 Don't overlap post date with a quote inside an embedded post. CSS could still be improved. 2013-07-03 15:11:35 -04:00
Robin Ward
ba0bd934ba FIX: Links to images in posts won't go through the Discoruse router 2013-07-03 14:06:34 -04:00
Robin Ward
b0e10673a2 FIX: Small bugs with progress indicator 2013-07-03 12:31:00 -04:00
Neil Lalonde
80928de21e Don't double render faq and privacy policy 2013-07-03 11:57:27 -04:00
Robin Ward
ffac22a143 FIX: Support underscores in autocomplete widget 2013-07-03 11:48:59 -04:00
Robin Ward
c7ac11458b FIX: Removed some leftover posts references outside of the stream 2013-07-03 11:29:29 -04:00
Robin Ward
f328804488 Merge branch 'add-list-of-authorized-extensions' of git://github.com/ZogStriP/discourse into ZogStriP-add-list-of-authorized-extensions
Conflicts:
	app/models/site_setting.rb
2013-07-03 11:18:42 -04:00
Robin Ward
07791ea471 Fix update statement for Rails 4 preparation 2013-07-03 11:17:16 -04:00
Robin Ward
6364fc74ef Merge branch 'rewrite_update_alls' of git://github.com/stephankaag/discourse-1 into stephankaag-rewrite_update_alls
Conflicts:
	app/services/spam_rules_enforcer.rb
2013-07-03 11:13:56 -04:00
Navin
3da37506da Back end - temporary boosting of trust levels 2013-07-03 10:30:40 +02:00
Navin
f92d9cec47 Front end mods to use combobox for selecting user's trust level 2013-07-03 10:30:32 +02:00
Sam
d3cfb56000 buggy is reply directly below 2013-07-03 16:48:55 +10:00
Sam
4d4a5735d2 logic to bypass trust level filter for high scoring posts 2013-07-03 12:37:17 +10:00
Robin Ward
ce0a7739cf FIX: Invalid Unicode in preload store JSON 2013-07-02 20:43:52 -04:00
Neil Lalonde
bb74c8b9cf Widen the Age column on categories page to fit the new date format 2013-07-02 17:22:35 -04:00
Neil Lalonde
0270ee0d98 Add classes to td's in suggested topics 2013-07-02 17:03:23 -04:00
Robin Ward
05fe33111e FIX: Moving a post should also update its TopicLink records 2013-07-02 16:42:25 -04:00
Robin Ward
22e6b3f466 FIX: When moving topics to an existing topic, say it's an existing topic in the moderator message. 2013-07-02 15:47:15 -04:00
Robin Ward
9c552c39a2 FIX: CSS for post selection was off in lower resolutions 2013-07-02 15:29:05 -04:00
Neil Lalonde
0fde2a2d54 Move post timestamp in embedded post to the top right 2013-07-02 15:10:58 -04:00
Neil Lalonde
075ed1ab53 Refactor user blocking code; hide the Block button in admin 2013-07-02 14:42:53 -04:00
Robin Ward
1308dbbef7 FIX: Quote popup broke in refactor 2013-07-02 13:36:38 -04:00
Robin Ward
a04924deea FIX: Progress wasn't docking properly 2013-07-02 13:10:38 -04:00
Robin Ward
064efa1671 FIX: Progress bar updates faster 2013-07-02 12:46:49 -04:00
Stephan Kaag
89b621d31a Refactor update_all statements in order to prevent deprecation warnings in Rails 4 2013-07-02 18:36:47 +02:00
Robin Ward
5770879472 Refactor: Move Topic Details into better objects, identity map, tests, query string filters 2013-07-02 10:36:46 -04:00
Sam
12f866a727 Merge pull request #1120 from abbat/master
Russian translation (actual version)
2013-07-01 22:44:30 -07:00
Sam
c3f64f99b3 fix up messed up routes 2013-07-02 15:21:26 +10:00
Sam
f6b850e7a4 allow skipping the validations on creation if its an api call AND skip_validations is specified
this allows wordpress plugin to post very very short titles or titles that would otherwise be disallowed
2013-07-02 12:23:19 +10:00
Jeff Atwood
68d98ec94e user titles are massively overstyled
LETS FIX IT
2013-07-01 17:19:15 -07:00
Sam
46c6949b6e Merge pull request #1123 from stephankaag/rails4-new
Refactor routes in order to be compatible with Rails 4
2013-07-01 16:07:22 -07:00
Stephan Kaag
e39cc464b1 Refactor routes in order to be compatible with Rails 4 2013-07-01 20:00:06 +02:00
Sam
b92e912ac9 add min replies, min score and min trust level params for wordpress 2013-07-01 21:29:45 +10:00
Anton Batenev
5281ba5af3 Russian translation (actual version) 2013-07-01 11:14:19 +04:00
Sam
5d4760f91d ruby 1.9.3 compat ... to_h does not exist there 2013-07-01 12:44:46 +10:00
Sam
54fed60ecb firefox / concurrency fix, would not navigate correctly to a post.
posts can be in the DOM in a non-ready state between willInsertElement and didInsertElement

didInsertElement takes care of the scrolling, ignore analysing anything about that post until its properly inserted
2013-07-01 12:27:46 +10:00
Sam
8c053b8e83 Performance fix, avoid expensive animations, they slow down scrolling 2013-07-01 12:27:46 +10:00
Sam
8e1469c7cc Merge pull request #1114 from ZogStriP/patch-2
bumped default max upload size to 2048Kb
2013-06-30 19:27:12 -07:00
Sam
158488a820 Merge pull request #1115 from mfeckie/stop-faqs-looking-hideous
Make the FAQ fonts match rest of site
2013-06-30 19:26:44 -07:00
Régis Hanol
6723ba6014 Add a list of for file uploads 2013-07-01 02:19:03 +02:00
Neil Lalonde
c1a39b5a30 Show date with year in message to banned users who try to log in 2013-06-30 12:49:34 -04:00
Martin Feckie
e410edddaf Make the FAQ fonts match rest of site 2013-06-30 19:57:35 +08:00
Régis Hanol
4de88814d2 bumped default max upload size to 2048Kb 2013-06-30 11:35:33 +02:00
Sam
7681ba0c32 don't fail this query cause avg_time is 0 2013-06-30 01:30:47 +10:00
Régis Hanol
31bf1c4b2e FIX: can't drag selected text 2013-06-28 23:10:39 +02:00
Neil Lalonde
a352b70bfc Permit changing my own username's case without an error saying it is already taken 2013-06-28 16:21:46 -04:00
Robin Ward
2deaf8ef98 Custom Wordpress Serializer and Path, with Specs 2013-06-28 13:56:13 -04:00
Neil Lalonde
2d6118297d Changes to tiny date format to remove mon and show short format dates instead 2013-06-28 13:10:04 -04:00
Sam
87f7bd921b minor tweak for name splitter (split on number) 2013-06-28 16:15:13 +10:00
Sam
6b82f1047a that date there is on purpose for date boundries 2013-06-28 16:08:48 +10:00
Sam
1ec12fc808 this spec is just refusing to work on jenkins 2013-06-28 16:07:36 +10:00
Sam
3c67cf8acd remove timecop, specs were failing and we can avoid it here anyway 2013-06-28 15:14:44 +10:00
Sam
e63bfd2f4c improve the breakUp user name algorithm, add some tests 2013-06-28 13:56:38 +10:00
Sam
966513a66d my spec suite has been playing up attempting to clean some stuff by avoiding type checks 2013-06-28 12:18:04 +10:00
Sam
4512956c68 don't run the wrong sentinel on message, message is validated in the post, in effect some flags were being rejected incorrectly 2013-06-28 12:14:40 +10:00
Jeff Atwood
40c9014634 make flag reply reply-ier 2013-06-27 16:01:48 -07:00
Neil Lalonde
8e50b49cf1 Try to fix specs that are failing in jenkins 2013-06-27 17:23:06 -04:00
Neil Lalonde
1355c1e3b0 Fix links to uncategorized when SiteSetting.uncategorized_name is set 2013-06-27 16:16:06 -04:00
Neil Lalonde
5d6ad8f39c Show a useful message when a banned user tries to log in 2013-06-27 15:14:42 -04:00
Neil Lalonde
948fc62b4a Handle configurable routes for statics in static_controller.js. Make it better when we can use ember's new async routing. 2013-06-27 13:01:12 -04:00
Robin Ward
bf96c8ad01 Support for Custom FAQ content 2013-06-27 12:50:24 -04:00
Neil Lalonde
94b8286819 Configurable FAQ url 2013-06-27 12:10:43 -04:00
Sam
1dd6699bf2 fix jshint 2013-06-27 17:19:11 +10:00
Sam
9fd00cac65 work in progress, add custom faq link, ember router needs to know about this or the redirect trick will not work 2013-06-27 17:15:59 +10:00
Sam
6145e99baa navigate to message fixed, changed to button
added spec to catch this regression in future
2013-06-27 16:59:07 +10:00
Sam
87e9e9d437 fix broken link for admin user in flags 2013-06-27 16:59:07 +10:00
Sam
274d8cbc0b if the title is the same as the value for a number, do not display it 2013-06-27 16:59:07 +10:00
Régis Hanol
689b296204 FIX: urls in BBCode tags weren't working 2013-06-27 00:42:11 +02:00
Neil Lalonde
6b58713fa6 Fix title attributes on post info 2013-06-26 16:27:18 -04:00
Jeff Atwood
a0031f2a0d minor style tweaks to flags layout 2013-06-26 12:10:07 -07:00
Neil Lalonde
b1d0f30379 Fix AdminUser bulkApprove; add a way to approve a user without sending them the welcome email for cases when must_approve_users is enabled and there are existing users 2013-06-26 13:24:30 -04:00
Robin Ward
89f182899f Support for custom Privacy Policies 2013-06-26 10:59:36 -04:00
Neil Lalonde
196a8f4ba5 Add dashboard warnings for system_username and notification_email site settings 2013-06-26 10:57:04 -04:00
Sam
039b4758ac fix 1.9.3 regression, [] does not work on OpenStruct there. 2013-06-26 21:49:29 +10:00
Sam
5a4279f2ab if for some reason user was nuked don't kill the old flag page 2013-06-26 18:05:15 +10:00
Sam
827830d7ea move each flag to its own row inside a nested table. 2013-06-26 17:01:58 +10:00
Sam
48d7a33157 Flag UI now displays deleted status for post/topic correctly on old flags
Commented out a spec that was failing in order random, with a TODO
2013-06-26 16:18:50 +10:00
Sam
148d2f2cd4 bug fixes 2013-06-26 16:00:17 +10:00
Sam
65dc04c00e simplify flag reporting and correct it so it properly displays old flags 2013-06-26 15:57:55 +10:00
Régis Hanol
d3eae56e71 soften the lightbox overlay 2013-06-26 02:44:20 +02:00
Sam
92562c2090 Merge pull request #1057 from house9/list-controller-1
refactor list_controller
2013-06-25 17:36:56 -07:00
Sam
4b56aa8183 Merge pull request #1089 from budnik/minor_refactorings
Some refactorings
2013-06-25 17:29:51 -07:00
Sam
3af12ba7d3 Merge pull request #1088 from ComputerDruid/fix-ipv6
Fix ipv6 addresses in the database
2013-06-25 17:25:48 -07:00
Dan Johnson
9f6b7889a8 views: convert 'ip' (bigint) -> 'ip_address' (inet)
This fixes all known issues when connecting to discourse over IPv6.

This table has no primary key, so the migration is done with update_all,
for each ip address in the views table. Since this table can potentially
grow quite large, this process might take a long time. I don't know any
way around this, though.

This migration uses a SQL command to populate the new field from the old
one, so as not to rely on the View model class, which should keep the
migration from failing if that class is modified in the future.
2013-06-25 19:47:25 -04:00
Dan Johnson
2e478d8537 TopicLinkClick: convert 'ip' (bigint) -> 'ip_address' (inet)
When accessed over IPv6, the ip address of the user is a 128-bit number,
too big for PostgreSQL's bigint data type. Since PostgresSQL has the
built-in inet type, which handles both IPv4 and IPv6 addresses, we
should use that instead. Where this is done elsewhere in the codebase,
the column is called ip_address, so we should follow that convention as
well.

This migration uses a SQL command to populate the new field from the old
one, so as not to rely on the TopicLinkClick model class, which should
keep the migration from failing if that class is modified in the future.
2013-06-25 19:41:19 -04:00
Neil Lalonde
b2d300fe0b Add ability to give users a title. Show them under usernames beside posts. Needs love from a designer. 2013-06-25 18:39:20 -04:00
Neil Lalonde
a86b35c873 Remove the access_password site setting 2013-06-25 15:05:25 -04:00
Robin Ward
3067c2ed3b Private messages have instructions for reply by email. We also strip X-Discourse headers
before sending the message as they are no longer needed.
2013-06-25 11:35:26 -04:00
Jesse House
2e12eb2b62 refactor list_controller
- minor refactoring of actions 'category' and 'category_feed'
- fix defect in 'category' where check was for literal
  string 'uncategorized' instead of SiteSetting.uncategorized_name
- major refactoring on defined topic actions
2013-06-25 08:29:00 -07:00
Robin Ward
3fc69337d3 Enable reply by email for all users, display a message in the footer indicating so. 2013-06-25 11:27:17 -04:00
Dmitriy Budnik
2722029d38 stylistic refactorings
w/ less syntactic sugar
2013-06-25 18:23:23 +03:00
Robin Ward
62daeedf08 Merge pull request #1092 from ZogStriP/rolling-back-markdown-conversion-pipeline-order-changes
reverting changes to the markdown conversion pipeline order
2013-06-25 08:20:10 -07:00
Régis Hanol
573c4b41f0 reverting changes to the markdown conversion pipeline order 2013-06-25 17:13:41 +02:00
Neil Lalonde
8ee00b4d5e Make the reply-on-which-topic modal bigger 2013-06-25 10:50:36 -04:00
Sam
7d1e8239e0 Merge pull request #1070 from house9/top-menu
adds TopMenuItem model which encapsulates top_menu parsing logic
2013-06-25 02:51:57 -07:00
Sam
4c51f36db2 was dropping off the last key when inviting a user by email. 2013-06-25 17:53:12 +10:00
Sam
1106eb9902 correct the category chooser to properly convert any html in category descriptions to text 2013-06-25 17:22:56 +10:00
Jeff Atwood
1ac7c28680 add method='post' to JS injected login form 2013-06-24 21:42:08 -07:00
Neil Lalonde
008f3b4785 Use tiny date format on posts 2013-06-24 18:46:58 -04:00
Jeff Atwood
d9a8419d68 Merge pull request #1087 from ZogStriP/fix-posts-rebake
Fix posts rebake
2013-06-24 15:32:14 -07:00
Régis Hanol
3d2ef18bb7 move BBCode formating before the markdown conversion 2013-06-24 22:25:08 +02:00
Neil Lalonde
e12dff2c31 New bootbox renders all the buttons backwards. :< 2013-06-24 15:29:58 -04:00
Neil Lalonde
c79ab3fc2e Change modal that asks which topic you want to reply in; upgrade bootbox.js 2013-06-24 15:01:07 -04:00
Jesse House
06be760257 adds TopMenuItem model which encapsulates top_menu parsing logic 2013-06-24 10:04:18 -07:00
Dmitriy Budnik
d12288de49 adding a missing User association 2013-06-24 17:08:49 +03:00
Robin Ward
adce747d1b Merge pull request #1084 from abbat/master
Russian translation (actual version)
2013-06-24 06:27:11 -07:00
Robin Ward
1b8c9d2efd Merge pull request #1077 from jamesaanderson/jump-to-last-post-in-best-of-mode-fix
Jump to last post in "Best of" mode fix
2013-06-24 06:26:44 -07:00
Anton Batenev
fe51fd87cc Russian translation (actual version) 2013-06-24 15:55:44 +04:00
Jeff Atwood
ab74bbfc8e we use wrench for admin not cog
NO WIRE COAT HANGERS!! NO WIIIIREEE COOAATT HANNGGERSS
2013-06-24 01:22:40 -07:00
James Anderson
c6113f6701 Jump to last post in "Best of" mode fix
http://meta.discourse.org/t/jump-to-last-post-does-not-work-in-best-of-mode/7626/
2013-06-23 12:12:37 -07:00
Sam
47fd1c5228 more left over code removed 2013-06-23 15:33:35 +10:00
Sam
25bb8cf382 remove dead uncalled code 2013-06-23 15:28:38 +10:00
Sam
4f2e72b6f7 Merge pull request #1071 from jamesaanderson/master
Correctly resize big images in preview
2013-06-23 22:31:07 -07:00
Sam
ea932b74e7 values is a much more consistent name than all_values ... we use {}.values not {}.all_values
also fixes random ordering of tests failure in site settings
2013-06-23 15:07:49 +10:00
Sam
22d6f6784c Merge pull request #1075 from ZogStriP/fix-lightboxing-when-using-s3
FIX: lightbox wasn't working when using s3 upload
2013-06-23 22:11:45 -07:00
Sam
287d0dbd75 bad locale files could lead to broken automatic groups 2013-06-23 14:44:16 +10:00
Sam
298949a343 missing dependency 2013-06-23 14:32:46 +10:00
Sam
fc6983d238 basic requires that 20 topics are entered thanks @novemberkilo 2013-06-23 14:32:37 +10:00
Régis Hanol
08aa23f0ca FIX: lightbox wasn't working when using s3 upload 2013-06-22 13:38:42 +02:00
James A. Anderson
9c617d051e Correctly resize big images in preview
http://meta.discourse.org/t/correctly-resize-big-images-in-preview/4426/4
2013-06-21 18:13:52 -04:00
Jeff Atwood
028af5fec6 move top H1 sizing CSS rule down for precedence 2013-06-21 11:31:00 -07:00
Robin Ward
82c21868f3 Moved JSHint into Qunit suite. It's much harder to forget about now! 2013-06-21 14:07:11 -04:00
Régis Hanol
787555431c add lightbox overlay 2013-06-21 18:30:57 +02:00
Robin Ward
bb908d5913 Email parsing uses Traditional Markdown Linebreaks by default. Added JS tests for line breaks. 2013-06-21 11:37:26 -04:00
Neil Lalonde
bfdbf373f3 Don't show invisible topics in uncategorized on categories page 2013-06-21 11:36:00 -04:00
Robin Ward
455742d3ee Merge pull request #1062 from ComputerDruid/fix-which-s
Use "command -v" to test for convert instead of "which -s"
2013-06-21 07:12:42 -07:00
Robin Ward
8dceb655db Merge pull request #1058 from ZogStriP/delete-optimized-images-when-cleaning-up-orphans
make sure we also delete optimized images
2013-06-21 07:10:28 -07:00
Robin Ward
601c35fc58 Merge pull request #1067 from adkron/feature/supress_to_suppress
Correct spelling of suppress
2013-06-21 07:08:12 -07:00
Jeff Atwood
bcf54be780 incorrect nesting of #each on /admin/flags 2013-06-21 00:40:20 -07:00
Régis Hanol
8a751e6e44 make sure we also delete optimized images 2013-06-21 09:34:02 +02:00
Jeff Atwood
a9c251e71a restructure /admin/flags rows a bit 2013-06-21 00:29:54 -07:00
Jeff Atwood
6de1e16595 add icons to the flag action buttons 2013-06-21 00:12:17 -07:00
Amos L King
777e8c2012 Correct spelling of suppress
supress => suppress

Amos King @adkron <amos.l.king@gmail.com>
2013-06-20 23:44:27 -05:00
Dan Johnson
8009b3f036 Use "command -v" to test for convert instead of "which -s" 2013-06-20 21:42:18 -04:00
Sam
9778bfb749 Merge pull request #1059 from vipulnsward/fix_method_typo
`fake_success_reponse` => `fake_success_response`
2013-06-20 18:23:46 -07:00
Régis Hanol
da6f627c2f add background color on suggested topics list header 2013-06-20 23:22:46 +02:00
Neil Lalonde
f39f44ddbf Categories page should not show invisible topics 2013-06-20 16:07:53 -04:00
Vipul A M
1884dc8d3f fake_success_reponse => fake_success_response 2013-06-21 01:17:35 +05:30
Neil Lalonde
42564c9ce7 Mods can edit categories 2013-06-20 15:09:31 -04:00
Robin Ward
3257bef387 Category List and Topic View Integration Test 2013-06-20 15:02:26 -04:00
Jeff Atwood
6a9a294b09 add back dynamic h1 sizing, but ONLY top title 2013-06-20 11:39:58 -07:00
Robin Ward
d78898443d Oops: Forgot debugging information in scrolling handlers 2013-06-20 14:32:22 -04:00
Robin Ward
a8b5716421 FIX: Coudln't scroll while on Qunit page due to browser bindings 2013-06-20 14:29:59 -04:00
Robin Ward
cc90939aa8 Merge pull request #1056 from cezarcp/text_logo
Allow to use a text logo when logo_url setting is set to an empty value
2013-06-20 10:00:47 -07:00
Robin Ward
6c37a8f8fb Merge pull request #1055 from vipulnsward/dedeuplicate_app_controller
Remove code duplication in ApplicationController
2013-06-20 09:55:09 -07:00
Robin Ward
4aa20cf23c Merge pull request #1053 from vipulnsward/remove_var
Remove unused var.
2013-06-20 09:54:34 -07:00
Neil Lalonde
88a9e13510 Don't create globals in i18n.js 2013-06-20 12:47:50 -04:00
Neil Lalonde
94853f0295 Fix length check of pm body; refactor composer length and title length validation 2013-06-20 12:33:34 -04:00
Vipul A M
4ddc0825f5 Remove code duplication in ApplicationController 2013-06-20 21:17:33 +05:30
Cezar
132b0498ed added a conditional that checks if the logo_url setting is empty. In that case, the logoHTML function returns a header tag with the site_title as its content 2013-06-20 12:28:52 -03:00
Vipul A M
5e5ef9cafd Remove unused var. 2013-06-20 20:58:05 +05:30
Robin Ward
9f3d5b9f1e Merge pull request #1044 from ZogStriP/clean-orphan-uploaded-files
added a rake task to clean orphan uploaded files
2013-06-20 07:53:50 -07:00
Robin Ward
8e6a903f9b Merge pull request #1046 from house9/admin-user-index-2
extract Admin::UsersController#index to its own query class
2013-06-20 07:52:22 -07:00
Robin Ward
2e7c5a674c Merge pull request #1049 from ZogStriP/admin-alerts
Admin alerts
2013-06-20 07:51:40 -07:00
Jeff Atwood
a546472775 remove extra box around TH on topic lists
this is mostly to make /categories less visually noisy
2013-06-20 01:39:32 -07:00
Sam
70683c1f09 Merge pull request #1034 from chrishunt/rebake-oneboxes
Optionally rebake oneboxes with posts:rebake task
2013-06-20 01:18:57 -07:00
Sam
14db3869ba Merge pull request #1050 from abbat/master
Russian translation (actual version)
2013-06-20 01:17:53 -07:00
Sam
cb1b956ac2 we need overflow auto on code blocks 2013-06-20 17:46:18 +10:00
Sam
08df4c41cc Merge branch 'master' of github.com:discourse/discourse 2013-06-20 17:42:29 +10:00
Sam
4a8a663a67 flagging workflow changes per http://meta.discourse.org/t/we-need-an-archive-flag-notification-button/7450 2013-06-20 17:42:15 +10:00
Anton Batenev
f1a1b8ca11 Russian translation (actual version) 2013-06-20 03:44:07 +04:00
Jeff Atwood
6424a3d3e1 remove max-width on h1, seems unnecessary? 2013-06-19 16:31:18 -07:00
Jeff Atwood
da582fc202 switch bookmark from yellow to blue 2013-06-19 16:01:39 -07:00
Jesse House
e0ff74ead0 extract Admin::UsersController#index to its own query class
- move query to its own class
- use postgres ILIKE case insensitive
- removed duplicated list of trust levels
2013-06-19 13:48:45 -07:00
Neil Lalonde
e263bb3c0a Anons should be able to see post history 2013-06-19 16:43:16 -04:00
Régis Hanol
8a26b86739 added image magick alert 2013-06-19 22:36:56 +02:00
Régis Hanol
9036738ba2 added s3 file uploads alert 2013-06-19 22:11:11 +02:00
Régis Hanol
4a17d6dca6 added a rake task to clean orphan uploaded files 2013-06-19 21:51:41 +02:00
Neil Lalonde
8b9b87f42e Remove extra padding at top of posts 2013-06-19 14:30:05 -04:00
Neil Lalonde
3e0f47705a Remove some extra padding on the right of post info 2013-06-19 13:35:44 -04:00
Robin Ward
5ef6714d48 New site setting: minimum_topics_similar, allows you to specify a minimum amount
of topics that need to be in the database before it will suggest similar topics as
a user creates a post.
2013-06-19 13:14:24 -04:00
Sam
6491bda4ab fix the positioning for replies
fix stubs
2013-06-19 18:23:01 +10:00
Chris Hunt
ef76e18215 Optionally invalidate onebox in PostAnalyzer#cook 2013-06-19 00:19:42 -07:00
Sam
6a9484155d oops forgot to reorder this 2013-06-19 17:04:34 +10:00
Sam
31bcabd5e1 minor UI fixes for site customisations 2013-06-19 15:18:22 +10:00
Sam
e7d6b25998 shuffle around the topic metadata so we don't need absolute positioning 2013-06-19 14:44:36 +10:00
Sam
799b402778 fix horribly broken invite code, could lead to inviting the wrong person to a conversation 2013-06-19 10:31:19 +10:00
Neil Lalonde
66c18a0bec I missed one td that needs the activity class 2013-06-18 18:53:34 -04:00
Neil Lalonde
21efbc7d92 Edits link is same colour as date when at lowest heatmap level 2013-06-18 18:45:26 -04:00
Neil Lalonde
b7efd0be50 Move post date and edits link to top right of content area 2013-06-18 17:35:37 -04:00
Neil Lalonde
c9556b4bb8 Remove bookmark from top right of post; move its functionality to the post menu button 2013-06-18 17:35:37 -04:00
Robin Ward
87024c8676 Allow reply by email for admins in PMs 2013-06-18 17:26:33 -04:00
Robin Ward
8af9952b25 Change all headers to X-Discourse-* instead of Discourse-* 2013-06-18 15:54:02 -04:00
Robin Ward
60fce196c7 More Qunit tests including a CLI runner 2013-06-18 13:44:20 -04:00
Robin Ward
8e96299653 FIX: Discourse.Presence was broken on arrays. The flag button was showing for anonymous users. 2013-06-18 11:36:48 -04:00
Neil Lalonde
7544e231c5 Make edit category modal a little taller so scroll bar is not rendered 2013-06-18 11:00:20 -04:00
Neil Lalonde
eea00afb80 tos and privacy urls redirect based on site settings 2013-06-18 10:52:04 -04:00
Robin Ward
b9a2469774 Merge pull request #1041 from vipulnsward/refactor_topics_controller
Refactor `TopicsController` and remove code duplication
2013-06-18 06:35:32 -07:00
Sam
6989851cd4 Merge pull request #1038 from ZogStriP/keep-uploads-reverse-index-up-to-date
Keep uploads reverse index up to date
2013-06-18 00:43:31 -07:00
Sam
14e7bb4a08 improve style a tiny bit 2013-06-18 17:22:37 +10:00
Sam
80c42753e1 fix up find as you type for the invite into PM function
allow mods to remove users from a PM
2013-06-18 17:17:01 +10:00
Vipul A M
531587c5ca Refactor TopicsController and remove code duplication 2013-06-18 11:22:09 +05:30
Sam
7abb20928b Merge pull request #1033 from chrishunt/move-dynamic-favicon-to-user
Move 'dynamic favicon' setting to User preference
2013-06-17 17:31:02 -07:00
Robin Ward
8acdc18bc8 First stab at polling support for POP3S / reply by email 2013-06-17 16:49:02 -04:00
Régis Hanol
ae3543872c renamed the sha column to the proper sha1 2013-06-17 22:16:14 +02:00
Neil Lalonde
281a08a99f Allow people to capitalize a word when ninja-editing a post 2013-06-17 15:57:13 -04:00
Neil Lalonde
014db4c2e9 Discourse.Site.instance now returns a singleton object; add js test for NavItem 2013-06-17 13:05:08 -04:00
Robin Ward
3c7eb3a4e8 FIX: null dates crashed the client app. last_posted_at was not updating properly on split topic. 2013-06-17 13:02:50 -04:00
Robin Ward
c2d9d95237 FIX: Dates in the history window shouldn't wrap in spans 2013-06-17 11:56:50 -04:00
Robin Ward
797b99db7c Moved a bunch of tests to QUnit. Added basic Discourse.Site support to test suite. 2013-06-17 11:38:30 -04:00
Sam
2174c0d661 improve code highlight formatting, pre is still messed up though, it should wrap 2013-06-17 17:49:02 +10:00
Sam
a15ab2a0a6 flag type summary 2013-06-17 17:15:56 +10:00
Sam
4714d31c01 fix scrolling while clicking up and down on search results 2013-06-17 16:23:03 +10:00
Sam
7ca5ab3da3 allow api for restricted by global password sites 2013-06-17 16:09:59 +10:00
Sam
30df1b1815 fix positioning regression 2013-06-17 16:05:41 +10:00
Sam
80c03b7b1e case sensitive where it should not be 2013-06-17 15:47:18 +10:00
Sam
8c7519df86 missing pluralization 2013-06-17 15:37:46 +10:00
Sam
dd5cd1df4f Merge pull request #1037 from ZogStriP/imagineering
Imagineering
2013-06-16 22:01:10 -07:00
Sam
f13f6adc0b cursor pointer should always be the case for <a> ... not being pointer is an exception 2013-06-17 13:43:30 +10:00
Sam
0052e78bfe render error when people attempt to save an invalid group name
hide controls when we showing an automatic group
2013-06-17 13:43:06 +10:00
Sam
b97d186cb5 automatic groups should not allow you to muck with the listed users in the group 2013-06-17 12:54:25 +10:00
Sam
7c73140674 offsets for find as you type names for PMS and Groups were crazy, change it so it renders the autocomplete below. 2013-06-17 12:14:59 +10:00
Sam
dbfd40da84 order group member by username, bump up max count to 200 for now 2013-06-17 12:02:48 +10:00
Régis Hanol
af45b5a11e proper column naming
silly schemaless database habits are hard to kill
2013-06-17 04:02:17 +02:00
Sam
fe979b7299 correct suggested list trigger to perform all work AFTER it is debounced, avoids incorrect new/unread items 2013-06-17 12:00:06 +10:00
Régis Hanol
454636abf1 annotate models 2013-06-17 02:49:34 +02:00
Régis Hanol
510bac4b27 refactored a bit & tested thumbnails creation 2013-06-17 02:49:34 +02:00
Régis Hanol
cc9e0ec80a create thumbnails when needed 2013-06-17 02:49:34 +02:00
Régis Hanol
d4c3fe4e6a added create_thumbnails? site setting
defaults to `false`
2013-06-17 02:49:34 +02:00
Régis Hanol
5de03814fb created optimized_image model 2013-06-17 02:49:34 +02:00
Régis Hanol
2c3f757951 moved has_been_uploaded and uploaded_regex to the Upload model 2013-06-17 02:49:34 +02:00
Régis Hanol
8a98310cf9 make sure we only do the work once 2013-06-17 02:49:34 +02:00
Régis Hanol
6c4554b941 identifies all uploads with the SHA1 hash of the file content 2013-06-17 02:49:33 +02:00
Régis Hanol
6ea91b4416 remove useless upload topic direct association 2013-06-17 02:49:33 +02:00
Sam
b545a49d32 Merge pull request #1025 from ZogStriP/reverse-index-take-2
Reverse index take 2
2013-06-16 16:49:57 -07:00
Robin Ward
4b250dfd33 Merge pull request #1028 from vipulnsward/mute_variable_suppression
`toggle_mute` doesn't require a param
2013-06-16 12:50:53 -07:00
Chris Hunt
d6069092b2 DRY up preference loading in Discourse.User#save 2013-06-15 00:05:55 -07:00
Chris Hunt
09d3800701 Move 'dynamic favicon' from Server to User pref 2013-06-14 23:58:24 -07:00
Sam
ce82d18df5 fix unescaped string
improve tab "active" detection for categories
2013-06-15 15:45:22 +10:00
Neil Lalonde
06b7085287 Add classes to the th elements for everything in topic list too 2013-06-14 18:26:49 -04:00
Neil Lalonde
247ef08799 Add distinct classes to posts, likes, and views td elements in topic lists 2013-06-14 17:45:05 -04:00
Neil Lalonde
07e4cba281 Move the render replies button into the post-controls div with the other buttons 2013-06-14 17:38:43 -04:00
Neil Lalonde
a650593f89 Add classes to all post menu buttons 2013-06-14 17:15:21 -04:00
Neil Lalonde
002d4b4e23 Fix for using non-ascii category name as a link in top_menu 2013-06-14 15:49:48 -04:00
Neil Lalonde
f198c814a8 Add explanations for deactivate user and block user buttons in admin 2013-06-14 11:34:03 -04:00
Neil Lalonde
f62c421c91 Render category descriptions differently on the categories page 2013-06-14 11:18:44 -04:00
Vipul A M
8298a07fd9 toggle_mute doesn't require a param 2013-06-14 11:08:59 +05:30
Régis Hanol
037f62928b add proper post_uploads reverse index 2013-06-13 23:44:24 +02:00
Robin Ward
5193ddc72f Super basic test support for listing topics 2013-06-13 15:08:42 -04:00
Robin Ward
cb6774a895 FIX: Impersonate was hidden when navigating to user details page in admin from list. 2013-06-13 13:47:31 -04:00
Neil Lalonde
4db8204a15 Remove topic links when a post is deleted 2013-06-13 13:41:54 -04:00
Robin Ward
49c09898e2 The EmailBuilder now creates the Reply by Email Key if necessary. 2013-06-13 12:40:06 -04:00
Robin Ward
cf9b6beb13 Add specs for all user notifications, including whether they support
reply by email.
2013-06-13 12:40:01 -04:00
Robin Ward
e29f4a3496 Work in Progress: Reply By Email:
- Add support classes and settings to enable reply by email
- Split out Email builder to be more OO, add many specs
2013-06-13 12:39:56 -04:00
Neil Lalonde
7f7ef29e42 Fix for message saying 'There are no more 29-category topics.' 2013-06-13 12:18:11 -04:00
Neil Lalonde
ef18a3ad5c Locales should be sorted in dropdown 2013-06-13 12:18:11 -04:00
Robin Ward
3f03ce3c8c Merge pull request #1018 from abbat/patch-1
pluralizationRules for Russian translation
2013-06-13 07:21:35 -07:00
Robin Ward
cb40ceb9e8 Merge pull request #1019 from ZogStriP/reverse-index-of-user-uploads
added a reverse index of user uploads + rake task
2013-06-13 07:20:55 -07:00
Sam
f7de9f17d5 refactor validators
add a new setting for min pm body length
use that setting for flags
scale entropy check down for pms
2013-06-13 18:18:43 +10:00
Sam
875ee62d45 we don't need these move events, they always get in the way of me profiling cause they flood the uis with event 2013-06-13 13:17:26 +10:00
Sam
28853177fd fix autoclose to work with jquery 1.9 and moment js 2013-06-13 12:03:44 +10:00
Sam
e6e81efe85 correct information leak in page not found 2013-06-13 10:27:17 +10:00
Régis Hanol
770c1faeb1 added a reverse index of user uploads + rake task 2013-06-13 01:43:50 +02:00
Neil Lalonde
246148d4ff Make topics invisible when first post is automatically hidden because of spam flags 2013-06-12 16:02:11 -04:00
Robin Ward
77b218a142 FIX: Do not suggest similar topics from secure categories you can't see. 2013-06-12 13:45:11 -04:00
Neil Lalonde
2c68dd1c12 Put h3 footer messages inside the footer tag for easier styling 2013-06-12 13:02:48 -04:00
Anton Batenev
848bd01ecd pluralizationRules for Russian translation 2013-06-12 20:04:40 +04:00
Neil Lalonde
28ac110a3c Add eu-west-1 to s3 regions 2013-06-12 12:02:47 -04:00
Robin Ward
a104c37d63 Experiment: QUnit for integration Ember integration tests 2013-06-12 11:56:59 -04:00
Neil Lalonde
8c888f424b Fix change username 2013-06-12 11:24:32 -04:00
Neil Lalonde
1a1115321d Remove a console.log 2013-06-12 10:45:07 -04:00
Neil Lalonde
5d7f22ed63 Include the latest class on the a tag in posters list 2013-06-12 10:45:07 -04:00
Robin Ward
1ecdd73a71 Merge pull request #1016 from abbat/master
Russian translation (draft)
2013-06-12 07:44:51 -07:00
Sam
ae1f5b3de0 goodbye NaNy 2013-06-12 16:38:02 +10:00
Sam
2a43d70869 refactor 2013-06-12 16:00:43 +10:00
Sam
165751e71b compact is better 2013-06-12 15:47:58 +10:00
Sam
d5b07464ea partial fix for suggested js error 2013-06-12 15:24:45 +10:00
Sam
201891f51f refactor and fix bug I introduced 2013-06-12 14:56:31 +10:00
Sam
eca2931a63 double notification is not really something we need. 2013-06-12 14:14:15 +10:00
Anton Batenev
f6060d5ff6 Russian translation (draft) 2013-06-12 06:58:16 +04:00
Sam
74041be23b bring back some instrumentation 2013-06-12 11:47:03 +10:00
Sam
c1f6169b48 hidden and deleted state in user stream 2013-06-12 11:14:08 +10:00
Sam
6bf2f15610 use lodash cause we like lodash (faster and we can remove templating easily) 2013-06-12 10:23:47 +10:00
Sam
eb91a0c9df Merge pull request #1012 from ZogStriP/extract-imgur-support-to-a-gem
Extract imgur support to a gem
2013-06-11 16:59:53 -07:00
Sam
334194ef82 Merge pull request #1013 from ZogStriP/replaced-lightbox-with-magnific-popup
replaced colorbox with magnific popup lightbox
2013-06-11 16:58:59 -07:00
Chris Hunt
48ee32f23e Get value for each property in i18n helper 2013-06-11 16:42:12 -07:00
Chris Hunt
a362d62b42 Do not return mail password in EmailController 2013-06-11 16:00:13 -07:00
Régis Hanol
ba3d07ddcb replaced colorbox with magnific popup lightbox 2013-06-12 00:32:48 +02:00
Robin Ward
bddc9dd4b8 FIX: Replace modal with an empty view when closed. Fixes the bug where you'd edit a category, close
and then click edit again.
2013-06-11 16:41:09 -04:00
Régis Hanol
8a2d635e62 removed imgur support 2013-06-11 21:51:41 +02:00
Neil Lalonde
a53f958c78 Fix error when trying to edit a category with empty slug 2013-06-11 15:43:07 -04:00
Neil Lalonde
82b5f57e40 Make it possible to set a site setting to empty string 2013-06-11 14:31:38 -04:00
Neil Lalonde
811a0df68b Make s3 region site setting a drop down 2013-06-11 14:24:04 -04:00
Robin Ward
ffde23f09f FIX: Header was sometimes being shown twice in a topic 2013-06-11 13:31:07 -04:00
Robin Ward
0cbf7c2417 FIX: Error viewing user page when not logged in. 2013-06-11 12:58:12 -04:00
Robin Ward
82116d5db5 FIX: Change username view was not loading. Also you can always edit yourself. 2013-06-11 12:35:46 -04:00
Robin Ward
8b4e3402c2 Small improvements to digest emails and preview mechanism. 2013-06-11 12:27:11 -04:00
Robin Ward
45cff9c674 Merge pull request #1011 from chrishunt/add-parens
Add missing parentheses to moment()
2013-06-11 09:01:04 -07:00
Chris Hunt
d5c7e6b5f4 Add missing parentheses to moment() 2013-06-11 08:46:14 -07:00
Neil Lalonde
5ff7e570ac Add support for enum site settings that render as a dropdown; use a dropdown for default_locale 2013-06-11 11:40:14 -04:00
Sam
c27d5dc2bd regression, empty suggested list after posting a topic 2013-06-11 18:10:28 +10:00
Sam
c2cfbce9ce automatically updating times for posts on topic
moved moment.js into localization file (we need to localize it)
added helpers for date formatting use, moment().shortDate() moment().longDate() moment().shortDateNoYear()
2013-06-11 17:25:50 +10:00
Sam
6d85dc1724 bring in unread items to "latest" as well as new items. 2013-06-11 15:51:43 +10:00
Sam
4d7a520a8c don't render 0 ... also this file needs some love 2013-06-11 15:27:26 +10:00
Sam
4e01b84695 fix digest 2013-06-11 15:27:26 +10:00
Sam
fa8a84f20c removed sugar.js, port functionality to moment and underscore.js
bring in latest ace from local so we don't mess up with https
2013-06-11 15:27:26 +10:00
Sam
eed5875505 fix bug with wrapping 2013-06-11 15:27:26 +10:00
Sam
a92bb46966 edit date to use formatter, compensate for invalid local time (at least don't blow up) 2013-06-11 15:27:26 +10:00
Robin Ward
850123dce8 FIX: User Pill errors 2013-06-10 18:51:25 -04:00
Robin Ward
ab5507ac06 Merge pull request #1002 from chrishunt/add-stack-exchange-onebox
Add Stack Exchange onebox
2013-06-10 12:38:03 -07:00
Robin Ward
93bbe190c0 Moved Email components into a module 2013-06-10 15:34:10 -04:00
Neil Lalonde
78000fe870 Fix category delete 2013-06-10 14:20:06 -04:00
Neil Lalonde
9b1d0baf45 Send a message to moderators when a newuser_spam_host_threshold is exceeded. Send it no more than once per day per user. 2013-06-10 13:17:32 -04:00
Robin Ward
0d83f373b8 Add some logic to jumpTop/jumpBottom when best of is enabled 2013-06-10 13:07:54 -04:00
Chris Hunt
1fb0b424ed Add Stack Exchange onebox 2013-06-10 09:27:13 -07:00
Robin Ward
3b7d3aa487 FIX: Search wasn't using the lowercase username for finding the context. 2013-06-10 10:42:06 -04:00
Robin Ward
ad6705cca7 Update Ember to latest master (RC5) 2013-06-10 10:14:42 -04:00
Jeff Atwood
b4a4774165 extend consumer email warning to yahoo & outlook 2013-06-10 00:08:06 -07:00
Vipul A M
4f606ffd8e Some minor cleanups
1. Change map to keys
2. Remove overshadow
3. Remove var
2013-06-10 10:38:10 +05:30
Sam
6a6496eedf Merge pull request #995 from novemberkilo/master
Refactoring Post model
2013-06-09 16:19:06 -07:00
Sam
2d14b54096 Merge pull request #988 from chrishunt/add-dynamic-favicon
Add 'dynamic favicon' setting
2013-06-09 16:13:54 -07:00
Navin
3fdba0019b Extract callbacks and validations for Post
Move Post create callbacks to PostCreate
Extract Post validations
Move stripped_length_validator to lib/validators
2013-06-09 20:47:04 +02:00
Sam
26f378e022 Merge pull request #989 from chrishunt/redirect-when-cant-edit
Fix RestrictedUserRoute
2013-06-08 07:16:22 -07:00
Sam
1756f713d6 SECURITY HOLE, upgrade right away if you are using Secure Groups. 2013-06-08 23:52:06 +10:00
Chris Hunt
3bdfdd7c04 Redirect when can_edit === false or undefined 2013-06-07 22:09:51 -07:00
Chris Hunt
af1c14939e Add 'dynamic favicon' setting 2013-06-07 17:15:49 -07:00
Robin Ward
eab38b5c34 JSHint fix :(
)
2013-06-07 18:08:08 -04:00
Robin Ward
b46b533e70 Create the composer view with the defaultContainer. This is in prep for redeploying
on RC5. Ideally we'll change how the composer is instantiated altogether but that will
have to wait for a future release.
2013-06-07 18:04:51 -04:00
Sam
a6f67d85eb also should have caught this earlier 2013-06-08 07:47:48 +10:00
Sam
1e725629cd no idea how this was even working 2013-06-08 07:45:45 +10:00
Robin Ward
fa4cfa1269 ScreenTrack refactor - removes logic from TopicView didInsertElement 2013-06-07 17:20:10 -04:00
Neil Lalonde
34e1f376f6 Add [PM] to subject of email notifications for private messages 2013-06-07 15:50:11 -04:00
Robin Ward
463be6fadf Merge pull request #982 from jd-erreape/add_scopes_to_roleable
Added role scopes to roleable
2013-06-07 12:08:26 -07:00
Robin Ward
cdc3a57a91 Merge pull request #983 from ZogStriP/fix-combobox-not-working-properly
FIX: combobox were not working properly
2013-06-07 12:08:04 -07:00
Régis Hanol
3f5c12ca1b FIX: combobox were not working properly 2013-06-07 20:45:31 +02:00
Neil Lalonde
169125e96d Fix a case where a random topic with null slug will be rendered instead of 404 2013-06-07 14:30:26 -04:00
Robin Ward
668a4a3042 Move MessageBus subscribing/unsubscribing out of view 2013-06-07 14:28:33 -04:00
Robin Ward
5217602ec3 FIX: RSS paths render a 404 for missing topics. 2013-06-07 12:52:12 -04:00
Juan de Dios Herrero
36fe8fbc6d Added role scopes to roleable 2013-06-07 18:26:06 +02:00
Robin Ward
3ae72259a6 Merge pull request #979 from iancmyers/strong-parameters
All parameters for #create in PostsController pass through strong_parameters
2013-06-07 09:17:29 -07:00
Robin Ward
7c715e76e8 Refactor: Light pass of didInsertElement calls of views 2013-06-07 12:13:46 -04:00
Juan de Dios Herrero
1b92d9d7f8 Added roleable module for User model 2013-06-07 12:33:48 +02:00
Ian Christian Myers
b61e10f9ad All parameters for #create in PostsController pass through strong_parameters.
We are now explicitly whitelisting all parameters for Post creation. A nice side-effect is that it cleans up the #create action in PostsController. We can now trust that all parameters entering PostCreator are of a safe scalar type.
2013-06-07 01:29:25 -07:00
Sam
d1784f1f87 more moment goodness 2013-06-07 18:27:42 +10:00
Sam
000847b8d2 date helper uses the formatter now 2013-06-07 18:27:42 +10:00
Sam
5fa20ce357 more progress towards full migration to moment.js 2013-06-07 18:27:42 +10:00
Chris Hunt
2f59c5c513 Set line height on entire row, not two columns 2013-06-06 18:37:25 -07:00
Chris Hunt
d50a598e62 Notify admin of successful user approval 2013-06-06 18:37:25 -07:00
Chris Hunt
f6ce985121 Send activation email after user approved 2013-06-06 18:37:25 -07:00
Chris Hunt
41b0692543 Show 'waiting approval' and don't send email
When 'must approve users' in enabled, we don't want to send an
activation email to users after they sign up. Instead, we will show them
'waiting approval' and not take an action until their account is
approved by an admin.
2013-06-06 18:36:16 -07:00
Sam
1eed1e240b Merge pull request #977 from chrishunt/add-apple-touch-icon
Add 'apple touch icon url' site setting
2013-06-06 17:40:12 -07:00
Sam
7ff42377ac $.browser is gone from jQuery 1.9 ... and this is a check for ie7 and 6 ... don't care 2013-06-07 10:38:39 +10:00
Sam
6ed79e66bc jquery 1.9.1 upgrade ... remove jquery rails 2013-06-07 09:12:46 +10:00
Neil Lalonde
564d242832 Notify moderators when someone is automatically blocked because of spam flags 2013-06-06 18:49:19 -04:00
Sam
11afa0c11b work in progress migrate to moment 2013-06-07 08:49:22 +10:00
Chris Hunt
268a5debbf Add 'apple touch icon url' site setting 2013-06-06 14:43:05 -07:00
Neil Lalonde
a151bfc7ec Store when a topic was first set to auto-close and report that amount of time when it closes. And do some refactoring. 2013-06-06 17:04:21 -04:00
Robin Ward
b758427572 Fix annoying jshint :) 2013-06-06 16:48:15 -04:00
Robin Ward
ba5f2d23a1 Fixed ContainerView code to build views correctly 2013-06-06 16:45:25 -04:00
Robin Ward
8f32aed944 Only use HTML templates for the digest email. 2013-06-06 15:08:56 -04:00
Robin Ward
7bc80c2dcf Changed HTML Digest template. Removed margins, shrunk logo. 2013-06-06 14:45:32 -04:00
Neil Lalonde
62041da7e0 Handle /t/only-the-slug urls by trying to find the topic by slug (second try) 2013-06-06 14:41:37 -04:00
Robin Ward
f268b882fd The posts rebake task should regenerate links too. 2013-06-06 13:52:30 -04:00
Robin Ward
526f2af69a FIX: Touch events conflicted on mobile safari with {{action}}s, preventing admin menu
option from working. Mobile Safari works with click so this seems to fix it.
2013-06-06 13:16:36 -04:00
Robin Ward
06e83c9e6a FIX: Hitting enter while the invite dialog is up should submit the form, not refresh the
entire page :)
2013-06-06 12:06:43 -04:00
Robin Ward
bac03a3369 Merge pull request #975 from jd-erreape/username_refactor
[WIP] Refactored user_name suggestion methods into a module
2013-06-06 08:12:29 -07:00
Juan de Dios Herrero
96d23ddd8d Refactored user_name suggestion methods into a module to reduce the complexity of User model 2013-06-06 16:40:10 +02:00
Ian Christian Myers
0d01c33482 Enabled strong_parameters across all models/controllers.
All models are now using ActiveModel::ForbiddenAttributesProtection, which shifts the responsibility for parameter whitelisting for mass-assignments from the model to the controller. attr_accessible has been disabled and removed as this functionality replaces that.

The require_parameters method in the ApplicationController has been removed in favor of strong_parameters' #require method.

It is important to note that there is still some refactoring required to get all parameters to pass through #require and #permit so that we can guarantee that parameter values are scalar. Currently strong_parameters, in most cases, is only being utilized to require parameters and to whitelist the few places that do mass-assignments.
2013-06-06 00:30:59 -07:00
Robin Ward
a3d62fdf69 Temporarily roll back ember rc5. We identified some things we need to fix. 2013-06-06 01:25:43 -04:00
Sam
255a614142 keep /srv/status exposed 2013-06-06 14:40:10 +10:00
Robin Ward
7b70330e85 FIX: Javascript errors when navigating to some topics 2013-06-05 20:53:48 -04:00
Sam
2ca734c118 Merge pull request #964 from chrishunt/exclusive-club
Add 'invite only' site setting
2013-06-05 16:38:47 -07:00
Robin Ward
6384518599 Allow images in the daily digest for top scoring posts 2013-06-05 18:55:27 -04:00
Robin Ward
4d1e8356b8 FIX: Again, try to get a flexible absolute logo_url 2013-06-05 18:23:43 -04:00
Robin Ward
8328aa97fd FIX: HTML email should use image_tag to get the correct path to the image 2013-06-05 18:01:40 -04:00
Robin Ward
0b97ea6345 Better HTML emails, smarter email digests, new email section in admin with digest preview 2013-06-05 17:47:25 -04:00
Neil Lalonde
f030d9b420 Make default_logo_check more smarter 2013-06-05 16:59:19 -04:00
Neil Lalonde
4e8ff74b99 Show dashboard warning when favicon and/or logo urls contain the same filename as the shipped defaults 2013-06-05 16:43:39 -04:00
Neil Lalonde
b55182b983 Use PostDestroyer when deleting all of a user's posts; deleting a post removes its flags and resets its flag counts 2013-06-05 16:05:13 -04:00
Robin Ward
dfba2b6e0a FIX: Strip links from google indexed bios when the users are new. 2013-06-05 15:28:10 -04:00
Robin Ward
eb673c7e5d Merge pull request #963 from chrishunt/chrishunt/refresh-user-list-after-approval
Refresh admin user list after approval
2013-06-05 12:07:49 -07:00
Robin Ward
112d57e899 Merge pull request #960 from iancmyers/strong-parameters
Began implementing strong_parameters
2013-06-05 12:03:17 -07:00
Stephan Kaag
469bf044c3 Remove superfluous } 2013-06-05 21:54:07 +03:00
Chris Hunt
a523fa56ac Don't require authentication for invites 2013-06-05 11:12:37 -07:00
Chris Hunt
acf147ef88 Disable OmniAuth account creation if 'invite only' 2013-06-05 11:11:02 -07:00
Chris Hunt
d432798ff8 Silently fail if user tries to sneak in
When 'invite only' is enabled, there's no way for a user to create an
account unless they try and sneak in by POSTing to /users/. We will
silently fail if this happens.
2013-06-05 11:08:21 -07:00
Chris Hunt
8f14e46964 Hide registration on login modal if 'invite only' 2013-06-05 11:06:54 -07:00
Chris Hunt
24da1ab07e Add 'invite only' site setting 2013-06-05 11:06:05 -07:00
Robin Ward
7d089fdfb5 FIX: Compile templates properly with the latest handlebars 2013-06-05 14:00:02 -04:00
Robin Ward
07cd87f941 FIX: Couldn't navigate to Categories list via link 2013-06-05 12:40:06 -04:00
Robin Ward
a0bd51862e Upgrade Ember to RC5. Disabled a deprecation warning that I believe is in error. 2013-06-05 12:07:18 -04:00
Chris Hunt
f05c30ab8d Refresh admin user list after approval 2013-06-05 08:57:25 -07:00
Neil Lalonde
f0d4a38433 Admin flags UI shows when it's loading and when there are no results 2013-06-05 10:24:50 -04:00
Ian Christian Myers
41528f5d11 Implemented strong_parameters for Upload/UploadsController.
The topic_id param is now required using strong_parameters' #require method. If the parameter is missing ActionController::ParameterMissing will be raised instead of Discourse::InvalidParameters.
2013-06-05 00:55:55 -07:00
Ian Christian Myers
f50b648844 Implemented strong_parameters for PostAction/PostActionsController.
PostActionsController now uses strong_parameters' #require to require certain parameters. ActionController::ParameterMissing is now thrown when a reqired parameter is missing, rather than Discourse::InvalidParameters.
2013-06-05 00:23:51 -07:00
Ian Christian Myers
3b245031a4 Implemented strong_parameters for Invite/InvitesController.
The email parameter is now required using strong parameters and will throw ActionController::ParameterMissing if it is missing. If the email address is incorrect or invalid, Discourse::InvalidParameters will still be thrown.
2013-06-05 00:04:03 -07:00
Ian Christian Myers
130d837952 Implemented strong_parameters for Category/CategoriesController.
Category now requires parameters to be permitted by strong_parameters using #require or #permit for mass-assignment. Missing required parameters now throw a ActionController::ParameterMissing execption instead of the Discourse::InvalidParameters execption.
2013-06-04 23:45:25 -07:00
Sam
870e59883b secure the links on the topic pages, eliminated deleted topics as well. 2013-06-05 16:10:26 +10:00
Sam
913a607528 need to punch through account creation stuff 2013-06-05 14:01:24 +10:00
Sam
2dfba8d6de we need to be able to do username checks for registration to work 2013-06-05 12:50:42 +10:00
Sam
2509d0f4fa Merge pull request #959 from chrishunt/chrishunt/login-required-fixes
'login required' site setting improvements
2013-06-04 19:09:40 -07:00
Sam
93be638d93 message format is awesome, remove 0 unread and 0 new links. 2013-06-05 12:04:54 +10:00
Chris Hunt
3074300f76 Allow customization of 'login required' message 2013-06-04 18:53:36 -07:00
Chris Hunt
3774808a6e Redirect to '/' if OmniAuth login from '/login' 2013-06-04 18:35:20 -07:00
Sam
e52e46a609 fix blank created_at .. date is unbound, we should rename it to unboundDate 2013-06-05 11:32:53 +10:00
Sam
9a57aaaaa9 fix encoding for category excerpt
fix missing secure category topics in categories page
2013-06-05 11:22:47 +10:00
Chris Hunt
28aeb1d36c Remove static navigation from login page 2013-06-04 18:20:03 -07:00
Sam
5e305eaf0a missing skip filter for omniauth 2013-06-05 10:30:51 +10:00
Sam
21b3359ea4 Merge pull request #957 from chrishunt/chrishunt/lock-down-the-base
Add 'login required' site setting
2013-06-04 17:22:08 -07:00
Sam
56ee7cdc1f Merge pull request #956 from ZogStriP/fix-image-upload-to-s3
fix image uploads on s3/imgur
2013-06-04 16:34:42 -07:00
Sam
5f85aaee1d correct message bus regression
implement automatically updating dates in list
2013-06-05 09:32:44 +10:00
Chris Hunt
122f9188c9 Redirect Ember routes to login if login required 2013-06-04 16:10:10 -07:00
Chris Hunt
789289a290 Show login modal on header buttons if required 2013-06-04 16:10:10 -07:00
Chris Hunt
978785720a Redirect to root after login if no path provided
If we do not do this, then people that login from /login will just be
redirected back to the login page. We'd rather have them see the root
path.
2013-06-04 16:10:10 -07:00
Chris Hunt
92a4828f72 Redirect all controllers to login if required
We want to skip the filter for sessions controller so that we can login
and we want to skip the filter for static pages because those should be
visible to visitors.
2013-06-04 16:10:10 -07:00
Chris Hunt
85ceb5efa7 Add 'login required' site setting 2013-06-04 16:10:10 -07:00
Régis Hanol
e3e55d4dad fix image uploads on s3/imgur 2013-06-05 00:35:42 +02:00
Neil Lalonde
2465c9c724 Add min_private_message_title_length site setting so private messages can have short titles 2013-06-04 17:59:23 -04:00
Chris Hunt
f58dd7a6fb Set properties of AdminApi after ajax response 2013-06-04 11:05:44 -07:00
Robin Ward
11e703f6a0 Merge pull request #953 from chrishunt/chrishunt/fix-featured-topic
Add missing handlebar in featured_topics template
2013-06-04 10:31:44 -07:00
Robin Ward
02b1f78410 FIX: Include preloaded data even if the request type isn't explicitly text/html 2013-06-04 12:56:12 -04:00
Robin Ward
4392a17b54 Strip out links when displaying a new user's bio 2013-06-04 12:06:25 -04:00
Neil Lalonde
2259e97d42 Add a count of blocked users on the dashboard 2013-06-04 11:53:19 -04:00
Chris Hunt
5ef4bcdecc Add missing handlebar in featured_topics template 2013-06-04 08:33:47 -07:00
Neil Lalonde
c4904aacc0 Automatically flag someone as a spammer if their posts get at least X spam flags from N users while their trust level is 'new user'. Staff can clear and set this status from the user record in admin. 2013-06-03 16:37:40 -04:00
Sam
24131bcc0e correct regressions, not loading topics on click 2013-06-03 19:03:57 +10:00
Sam
978bc0ca4e auto refresh suggested list 2013-06-03 14:54:51 +10:00
Sam
3ef16f292d remove dead code
update title properly when count in list changes
remove broken (*) title notification from topic cause its just weird
2013-06-03 10:38:57 +10:00
Robin Ward
1833c124d9 FIX? : Sometimes preloaded data is missing 2013-06-02 14:05:38 -04:00
Robin Ward
33d0a6a876 FIX: Safety checks for categories index 2013-06-02 11:20:08 -04:00
Navin
cab3502c15 Replace PostAnalyser module with a class
Encapsulate Post#cooked_document as well
Include specs for PostAnalyzer class
2013-06-01 14:59:27 +02:00
Jeff Atwood
0606725b29 fix some /tos and /privacy issues 2013-05-31 16:43:29 -07:00
Robin Ward
545dbfc07e New Feature: Staff can choose to "Take Action" when flagging to immediately reach hiding
thresholds.
2013-05-31 17:39:32 -04:00
Jeff Atwood
476ffcc627 make delete user button a Danger Button 2013-05-31 12:50:11 -07:00
Robin Ward
d23ef1d090 FIX: You could update a topic to have a title that's too short if the TextCleaner
removed extra characters. Additionally, updating the title will not return an error
message to the client app if the operation fails (rather than failing silently.)
2013-05-31 15:24:13 -04:00
Jeff Atwood
2982c23265 add quotes around favicon URL 2013-05-31 12:18:41 -07:00
Robin Ward
a4d88fbaa7 New categories weren't getting correct default colors 2013-05-31 13:42:46 -04:00
Robin Ward
fea3f326a9 FIX: Persona login was not using promises 2013-05-31 13:16:14 -04:00
Robin Ward
0af0a214b2 Refactor: Back all modals by controllers 2013-05-31 12:29:38 -04:00
Robin Ward
830b7805e9 Merge pull request #927 from bplexico/extract_invite_redeemer
Extract InviteRedeemer from Invite
2013-05-31 08:30:42 -07:00
Sam
b35b3da077 allow eviction of computer help for @geek 2013-05-31 15:09:19 +10:00
Sam
b228a7c185 Merge pull request #923 from eriko/cas_support
remove hardcoded value and replace with SiteSetting.cas_domainname
2013-05-30 21:39:29 -07:00
Sam
d2c1eb090e Merge pull request #921 from nirnanaaa/postgres-truefalse
removed t's and f's from models
2013-05-30 21:38:26 -07:00
Sam
41187a5de1 Merge pull request #931 from ZogStriP/more-file-upload-test-coverage
added more file uploads test for better coverage
2013-05-30 21:36:33 -07:00
Sam
e5f8297670 Merge pull request #928 from jd-erreape/master
Refactored some class methods to scopes in order to achieve a better 'Rails way'
2013-05-30 21:31:53 -07:00
Régis Hanol
6cc0f8f2d4 added more file uploads test for better coverage 2013-05-31 03:13:37 +02:00
Neil Lalonde
42714b424f For 403 errors, show the same html page as 404 2013-05-30 16:39:39 -04:00
Chris Hunt
afa519b3ae Only pass searchContext type, id in search request 2013-05-30 12:54:34 -07:00
Juan de Dios Herrero
807f763fb0 Merge remote-tracking branch 'upstream/master' 2013-05-30 21:42:26 +02:00
DI2uNk
24e32092e7 Refactored two class methods into scopes (to achieve a better 'rails way')
Also added some tests to the methods
2013-05-30 21:21:31 +02:00
Neil Lalonde
b82a5dfd56 Move logic to reject slugs that are just numbers into the slug module 2013-05-30 11:54:02 -04:00
Brian Plexico
0591d5be11 Extract InviteRedeemer from Invite 2013-05-30 11:49:11 -04:00
Neil Lalonde
7d5c313456 Don't allow category slugs that are numbers 2013-05-30 11:09:09 -04:00
Neil Lalonde
5d444be72b Support incomplete topic urls like /t/just-a-slug; fix error when using route /t/:topic_id/:post_number 2013-05-30 10:39:15 -04:00
Sam
3898d90142 fix bugs with sync being wonky 2013-05-30 20:44:53 +10:00
Sam
d20056ad0e correct watcher, live updates for unread 2013-05-30 16:49:58 +10:00
Sam
6ad86aa305 read state is now published 2013-05-30 16:49:58 +10:00
Sam
8874c9ea75 Add message format support that can be used on complex localization strings
Add message about new and unread topics at the bottom of topics
move localization helper into lib
2013-05-30 16:49:57 +10:00
Sam
e93b7a3b20 more progress towards live unread and new counts, unread message implemented, still to implement delete messages 2013-05-30 16:49:57 +10:00
Sam
f2da06a78f gmefile lock 2013-05-30 16:49:57 +10:00
Sam
90167e427b highlight logic changed 2013-05-30 16:49:57 +10:00
Sam
73834370a5 work in progress, live unread and new counts 2013-05-30 16:49:57 +10:00
Sam
33683715a9 work in progress live unread / new counts 2013-05-30 16:49:57 +10:00
Sam
33ff87bf44 work in progress, live unread / new counters 2013-05-30 16:49:57 +10:00
Sam
4e2c6f43d1 correct broken pm draft 2013-05-30 08:55:23 +10:00
Erik Ordway
364a59d344 remove hardcoded value and replace with SiteSetting.cas_domainname 2013-05-29 15:47:49 -07:00
Robin Ward
830b93a16b Reduced complexity of admin flags controller, split up into methods, moved reports into model. 2013-05-29 16:49:34 -04:00
nirnanaaa
364113a4d5 removed t and f 's from group model
removed t and f 's from user model as mentioned in #919

removed t's and f's from category model
2013-05-29 22:10:43 +02:00
Robin Ward
5ae7707000 Refactor: Convert repeated {{view Discourse.xyz}} to registered view helpers 2013-05-29 15:14:31 -04:00
Robin Ward
57d5355ce8 wat 2013-05-29 15:00:35 -04:00
Robin Ward
4d5c145198 Refactor: Adds Discourse.Utilities.registerViewHelper to register view helpers 2013-05-29 14:32:39 -04:00
Robin Ward
3d0587d8ce Refactor: move category slug helper to Category model 2013-05-29 14:18:02 -04:00
Robin Ward
fe3ac50aae Use {{aceEditor}} helper to display the ace editor 2013-05-29 14:09:21 -04:00
Robin Ward
0601bb6d74 Trivial JS clean up 2013-05-29 14:09:17 -04:00
Neil Lalonde
6abd9ddd2d Add warning on admin dashboard if production env is configured to send email through gmail 2013-05-29 14:00:35 -04:00
Robin Ward
acb2623b4b JSHINT: extra comma 2013-05-29 13:30:03 -04:00
Robin Ward
9717a344c3 Refactor: Less reliance on views for logic for topic list 2013-05-29 13:28:07 -04:00
Robin Ward
4cf1d9c266 Display details about the search context in the placeholder 2013-05-29 12:19:31 -04:00
Neil Lalonde
b1bdebd611 url for uncategorized category topic list is always /category/uncategorized 2013-05-29 12:06:33 -04:00
Robin Ward
f151b30044 Show excerpts on Categories page 2013-05-29 11:46:01 -04:00
Robin Ward
2e26fca36b FIX: Hitting ESC while autocomplete is open shouldn't close the composer. 2013-05-29 11:28:41 -04:00
Robin Ward
5cb1cc6fcb FIX: Categories pill wasn't always being highlighted properly. 2013-05-29 11:02:37 -04:00
Robin Ward
27c1f1044c FIX: Regression, messages were hidden 2013-05-28 21:24:45 -04:00
Robin Ward
92dc59fba9 Properly assign draft keys to Categories List view. 2013-05-28 21:16:24 -04:00
Sam
46389754d6 Merge pull request #892 from eriko/cas_support
Cas support
2013-05-28 16:13:29 -07:00
Robin Ward
d75b160385 Enable subscribing to notifications on start, instead of currentUser
change which was hokey.
2013-05-28 17:12:37 -04:00
Robin Ward
fc7fefb581 Merge pull request #913 from chrishunt/chrishunt/style-api-button
Add styling to 'Generate API Key' button
2013-05-28 13:26:30 -07:00
Robin Ward
c73455bfa2 FIX: Missing () made notifications invisible 2013-05-28 16:17:32 -04:00
Robin Ward
ee319ea7f7 FIX: Issues that didn't show up originally 2013-05-28 15:57:11 -04:00
Neil Lalonde
264dd65410 Fix replying in a topic that is uncategorized after allow_uncategorized_topics is set to false 2013-05-28 15:53:01 -04:00
Robin Ward
560fb15d8a Include pinned topics in category list.
- removes an (n+1) query for user data
- supports the preload store for the data to avoid a second request
- fix a bug where uncategorizes was reporting (0, 0, 0) for topics by week, month, year
2013-05-28 15:36:16 -04:00
Chris Hunt
e75f881d58 Add styling to 'Generate API Key' button 2013-05-28 12:10:18 -07:00
Neil Lalonde
dda831fd41 Fix a regression that broke pre-fill of username when sending private message 2013-05-28 14:17:35 -04:00
Robin Ward
320b35bf90 Merge pull request #910 from novemberkilo/master
WIP - Reduce complexity of Post#raw_links
2013-05-28 10:07:41 -07:00
Robin Ward
8d47f92c27 Merge pull request #908 from chrishunt/chrishunt/extract-topic-status-update
Extract topic status update
2013-05-28 10:00:49 -07:00
Neil Lalonde
f190a96b30 Allow stuff in gutter to be selected 2013-05-28 12:57:33 -04:00
Neil Lalonde
a4b90ac54f Prevent avatars from wrapping on topic list 2013-05-28 12:57:32 -04:00
Chris Hunt
21a54567ff Extract TopicStatusUpdate from Topic 2013-05-28 09:01:04 -07:00
Robin Ward
dd54736d06 Refactor: Removed the last of the references to Discourse.currentUser. 2013-05-28 11:52:31 -04:00
Robin Ward
57f97880e6 Refactor: Instead of getting currentUser from the Discourse namespace, use
`Discourse.User.current()`
2013-05-28 11:25:56 -04:00
Erik Ordway
9a409d9440 fix comment and remove url setting as it is not used. 2013-05-28 08:06:18 -07:00
Navin
1d5952a92f Extract analysis type methods to a module and refactor Post#raw_links 2013-05-28 16:41:18 +02:00
Robin Ward
55526e24d6 FIX: The title attribute was missed when refactoring UserAction streams 2013-05-28 10:20:56 -04:00
Chris Hunt
54a798eb12 Add Topic#age_in_days for determining age of topic 2013-05-27 18:02:15 -07:00
Sam
d2f2a8e218 refactoring 2013-05-28 09:13:53 +10:00
Robin Ward
b73bb49076 FIX: More search results was broken. 2013-05-27 17:49:49 -04:00
Régis Hanol
f184090444 FIX: You can't change a subject whilst Flagging
Meta: [You can't change a subject whilst Flagging](http://meta.discourse.org/t/you-can-t-change-a-subject-whilst-flagging/6887)

This revert a change made by @eviltrout in b794830a25 in the `flag_view.js`.
The `Em.run.schedule('afterRender', function() {...})` is apparently not enough. Had to schedule the event on the next run loop.

Hopefully, the PR emberjs/ember.js#1235 will soon be merged in and we'll have a proper radio button control in Ember.js.
2013-05-27 22:29:24 +02:00
Robin Ward
62a20f5655 FIX: Couldn't access "Uncategorized" category from category list. 2013-05-27 14:15:52 -04:00
Neil Lalonde
b1ef2ea1e1 Fix TopicPostersSummary when a suggested topic includes a user who has been deleted 2013-05-27 14:12:15 -04:00
Robin Ward
197909246c Weigh staff likes higher when calculating scores. New site setting: staff_like_weight
can set the factor (default is 3)
2013-05-27 12:46:08 -04:00
Neil Lalonde
8b0b77c161 Bounce the popup tips again when you click submit button again 2013-05-27 11:51:27 -04:00
Robin Ward
1879176e80 FIX: Invited by link was broken on user activity. 2013-05-27 11:05:41 -04:00
Robin Ward
e1781240a6 Merge branch 'refactoring' of git://github.com/mattvanhorn/discourse
Conflicts:
	lib/text_sentinel.rb
2013-05-27 10:42:20 -04:00
Robin Ward
a15910ad1e Merge pull request #899 from chrishunt/chrishunt/extract-topic-posters-summary
Extract topic posters summary
2013-05-27 06:30:58 -07:00
Sam
bf16b4f381 Merge pull request #903 from chrishunt/chrishunt/extract-post-move
Extract post move
2013-05-26 19:10:50 -07:00
Chris Hunt
6024529f81 Extract PostMover from Topic into its own class 2013-05-26 18:42:04 -07:00
Sam
661ddbb158 introduce strong_parameters 2013-05-27 11:06:09 +10:00
Sam
d84ae80074 Simplify user action make it more idiomatic 2013-05-27 10:22:37 +10:00
Janis Miezitis
f58bcf7fe3 Refactored duplication in user action 2013-05-26 16:07:20 +03:00
Chris Hunt
b8fbac582e Add Topic#url for determining url for a Topic 2013-05-25 17:44:32 -07:00
Chris Hunt
f2b5e20840 Add Topic#max_post_number to find max post number 2013-05-25 17:44:32 -07:00
Chris Hunt
c4cce68613 Add Post#is_first_post?
We should be able to ask a post if it's the first in a topic
2013-05-25 17:44:32 -07:00
Robin Ward
74b661317c FIX: User stream was loading the same page over and over once you scrolled past 60
items.
2013-05-25 14:08:09 -04:00
Chris Hunt
63c63c2939 Remove unused parameters from posters_summary 2013-05-24 15:33:50 -07:00
Chris Hunt
c1841a6c89 Extract Topic#posters_summary 2013-05-24 15:33:45 -07:00
Neil Lalonde
ada79260b3 Change composer error message when title is too long or too short, and make sure the submit button is 'disabled' when title is too long 2013-05-24 17:10:07 -04:00
Robin Ward
e2774cc2df Merge pull request #896 from xtream/master
Removed unnecesary method
2013-05-24 14:09:44 -07:00
Neil Lalonde
d26b87bd3c Add Site Setting allow_uncategorized_topics. Uncheck it to force people to choose a category for all new topics. 2013-05-24 16:56:43 -04:00
Matt Van Horn
e5e904aa4e minor refactorings 2013-05-24 13:36:33 -07:00
Matt Van Horn
d7817cf314 extract TopicNotifier class from topic 2013-05-24 13:36:33 -07:00
Robin Ward
3037e9adf6 FIX: Clearing flags wasn't making topics visible again. 2013-05-24 16:03:20 -04:00
Robin Ward
d1fdc66ca4 FIX: For spam detection, don't count total occurances of links of the same host, but
post count including that host.
2013-05-24 15:20:58 -04:00
Robin Ward
bd779834e5 Use search context for filtering search results by current category or user 2013-05-24 14:04:26 -04:00
Neil Lalonde
48d39d2f8c Oops jshint fail again 2013-05-24 12:45:58 -04:00
Neil Lalonde
e600b45155 Composer uses bouncing popup messages beside fields with invalid values when you click the submit button 2013-05-24 12:26:17 -04:00
Robin Ward
962f0dd5f9 Search correctly passes context data to server 2013-05-24 12:21:53 -04:00
Victor Cruz Dueñas
bca006feca removed unnecesary method 2013-05-24 18:03:02 +02:00
Robin Ward
69bb70fbd3 Removed bindings to Discourse.site 2013-05-24 11:56:40 -04:00
Robin Ward
56764f817b Fix JsHint 2013-05-24 11:02:17 -04:00
Robin Ward
1dae46021e Category controller should use the correct category object 2013-05-24 10:57:26 -04:00
Robin Ward
c0c97487d8 Merge pull request #888 from novemberkilo/master
Refactor to reduce complexity of Post#save_reply_relationships
2013-05-24 07:04:28 -07:00
Sam
a1520f0dee implement save :) 2013-05-24 21:04:26 +10:00
Sam
a8ae81df4b sorry this is meant to be staff styling :) 2013-05-24 13:32:57 +10:00
Sam
ca2dee52db moved comments to the bottom, they are way less intrusive there 2013-05-24 12:48:32 +10:00
Sam
2cd95bc649 lets try out annotations 2013-05-24 12:35:14 +10:00
Sam
fc3c93d237 almost fixed the regression of not allowing top level filters 2013-05-24 09:54:39 +10:00
Robin Ward
84fd366322 Navigating should set a searchContext (unused right now). 2013-05-23 18:51:40 -04:00
Robin Ward
eb0c102931 Migration logic from SearchView to a controller, where it should be. 2013-05-23 17:42:57 -04:00
Erik Ordway
0bdee973a0 allow disabling of local logins. In the instance where an .edu is using cas they may not want a user to be able to log in once the users credentials have been revoked in the system that feeds the CAS authentication server. This is very optional 2013-05-23 13:44:14 -07:00
Erik Ordway
1575ce7b10 add cas support with a few tests 2013-05-23 13:40:50 -07:00
Navin
9aacde2f2d Refactor Post#save_reply_relationships 2013-05-23 18:09:06 +02:00
Navin
ba4eaa0297 Helper to create reply relationship with post 2013-05-23 18:08:24 +02:00
Navin
d7219a6fbc Helper to add a number to quoted_post_numbers 2013-05-23 18:07:45 +02:00
Neil Lalonde
4492d06a9f Don't send notifications for moderator action posts 2013-05-23 11:42:52 -04:00
Robin Ward
0bd61df34c Merge pull request #884 from mattvanhorn/refactor_topic
Refactor topic
2013-05-23 07:26:22 -07:00
Matt Van Horn
c4b5821ef8 Revert annotation and non-English I18n changes 2013-05-23 06:44:47 -07:00
Sam
3dfc034e8d Merge pull request #881 from novemberkilo/master
Improve flog metric for Post#extract_quoted_post_numbers
2013-05-23 00:21:27 -07:00
Matt Van Horn
7271b90655 annotate topic model 2013-05-22 22:36:01 -07:00
Matt Van Horn
806255b3c4 refactor Topic validation
introduce a couple of custom validators
fix minor discrepancies in tests
copy I18n error message keys to default location
clean up validation invocation
move some responsibilities out of validator into class
2013-05-22 22:31:52 -07:00
Sam
fcc7192fd2 User tracking state implementation progress for live unread / new counts 2013-05-23 15:22:06 +10:00
Robin Ward
7a31630837 Search Refactor: Remove some manual SQL, make search data tables more idomatic Rails/AR 2013-05-22 16:31:13 -04:00
Navin
4754216369 Simplify branching 2013-05-22 21:45:31 +02:00
Navin
ef93512de8 Extract quote parsing into a method 2013-05-22 21:38:45 +02:00
Robin Ward
b9a310f4b1 Search Refactor: Let's use a class to keep track of our state rather
than passing params everywhere. Also make the private API private.
2013-05-22 15:22:06 -04:00
Robin Ward
0f296cd42b Refactor + Fix: Wasn't correctly loading activity streams. Code is a lot more Ember-y now. 2013-05-22 12:06:37 -04:00
Matt Van Horn
872995db57 refactor guardian class for clarity & correctness
introduce NullUser to avoid type-checking
DRY up code
reduce number of multiple returns
remove some redundant/impossible logic branches
add pending test for possible bug
add test & fix for ability to flag archived posts
add #secure_category? method to topic class
Fix bug that prevented flagging of archived topics
Rename NullUser to AnonymousUser
DRY up can_<action>? methods
Fix some ownership logic, and a test, for Guardian
2013-05-22 01:09:34 -07:00
Sam
96f8d79e83 Merge pull request #876 from chrishunt/chrishunt/observe-changes-for-topic-users
Trigger UserActionObserver when updating TopicUser
2013-05-21 23:02:27 -07:00
Sam
c4d8085fc5 remove moderator status posts from best feed 2013-05-22 15:04:53 +10:00
Chris Hunt
d0bc8c95d3 Trigger UserActionObserver when tracking visit 2013-05-21 20:45:03 -07:00
Chris Hunt
685f4960f1 Trigger UserActionObserver when updating TopicUser 2013-05-21 20:43:43 -07:00
Robin Ward
45361934b9 User the BasicUserSerializer for the invited user 2013-05-21 12:03:51 -04:00
Robin Ward
046e6e5d86 Simplified grouping on user views, fixed issue with messages not loading on initial load. Really
simplified the restricted user route.
2013-05-21 11:50:01 -04:00
Robin Ward
27828c5ec2 Merge pull request #871 from avdi/refactoring-with-josh-and-avdi
Various refactorings towards Ruby/Rails idiom from Josh Susser and Avdi Grimm
2013-05-21 07:18:50 -07:00
Sam
b5eff93a9d update message bus to support per client filtering
start work on user_tracking_state
fix can_ban? in guardian
expose protected scopes on topic_query we need
move guardian spec to use build as opposed to creating topics / posts / users
start work on user tracking spec
2013-05-21 16:39:51 +10:00
Jeff Atwood
7e3e6ab78d icon tweak on merge/split 2013-05-20 12:34:15 -07:00
Robin Ward
dee45d8dba Changed elementId to be id 2013-05-20 15:31:05 -04:00
Robin Ward
42248a7164 Removed many unnecessary paths that included content.x when just x would do. 2013-05-20 15:27:58 -04:00
Robin Ward
9544cfd7dc target="controller" is unnecessary. By default it will target the controller. 2013-05-20 14:37:05 -04:00
Robin Ward
a79d53c628 Removed many unnecessary controller. uses in templates. 2013-05-20 13:45:14 -04:00
Robin Ward
c7aebbf4d6 Replace Ember.Text* insertions with helpers. 2013-05-20 12:56:36 -04:00
Robin Ward
1097d51b33 Replaced {{view Discourse.TextField}} with {{textfield}} helper. 2013-05-20 12:47:59 -04:00
Robin Ward
b794830a25 Replaced Em.run.next with the more proper Em.run.schedule('afterRender')
when we are waiting for rendering to finish.
2013-05-20 12:20:10 -04:00
Sam
a3dce9afd7 don't error out on not posts if its a json request 2013-05-20 17:32:53 +10:00
Sam
fc57578c85 proper 404 for json request 404 2013-05-20 17:28:32 +10:00
Sam
e91ed83586 the private message stream is different to normal streams, improving the ui a bit and collapsing conversations 2013-05-20 16:44:06 +10:00
Sam
80fb20816c get rid of nonsense 404.html
correct 404 handling for invalid pages
2013-05-20 10:29:49 +10:00
Sam
18b00d01d0 Merge pull request #859 from lengarvey/user_refactoring
Light refactoring of the User model
2013-05-19 16:41:20 -07:00
Neil Lalonde
5f7f87437c Fix for topic excerpt being from the wrong post 2013-05-18 13:35:21 -04:00
Leonard Garvey
b16705be0d Clean up update_visit_record!
update_visit_record! appears to add user_visit record if one
doesn't exist and days_visited is simply a counter for the number
of visit records.
2013-05-18 16:02:06 +10:00
Leonard Garvey
32f4dfd2fb DRY up the user model slightly
regular? is just the inverse of staff?
2013-05-18 16:00:35 +10:00
Sam
25105082d5 Merge pull request #850 from bplexico/refactor_post_rb
Refactored post model to reduce duplication in validator methods
2013-05-17 15:56:53 -07:00
Neil Lalonde
546a2b654a Improve style of security tab of category modal 2013-05-17 16:09:52 -04:00
Josh Susser and Avdi Grimm
2acc80d192 Various idiomatic User refactorings. 2013-05-17 15:44:35 -04:00
Josh Susser and Avdi Grimm
5659b66729 Refactor select().map() to use pluck.
Remove a method already provided by ActiveRecord.
2013-05-17 15:11:37 -04:00
Neil Lalonde
191d454589 Show Inbox before Sent Items 2013-05-17 14:11:33 -04:00
Josh Susser and Avdi Grimm
d30330441a Refactored conditional to an || to be more idiomatic. 2013-05-17 14:06:58 -04:00
Brian Plexico
a86646312b Refactored post model to reduce duplication in validator methods 2013-05-17 12:15:21 -04:00
Neil Lalonde
2265c046ba Some tweaks to category modal 2013-05-17 11:19:58 -04:00
Neil Lalonde
f3282e33a3 Add tabs to category create/edit modal. Categories can have a default auto-close setting that applies to all new topics created in the category. Add rspec-given and write some integration tests. Tests for topic auto-close with category default 2013-05-17 11:05:35 -04:00
Sam
8f46653345 refactor 2013-05-17 09:03:52 +10:00
Robin Ward
a80ec535a3 Support for "Select All / Deselect All" while selecting posts to merge / delete. 2013-05-16 16:50:38 -04:00
Robin Ward
7daca77443 Remove modal state to choose move type. Instead use two buttons on the multi select popup, one
for split and one for merge.
2013-05-16 14:22:41 -04:00
Robin Ward
1e9497d9ef FIX: Add unseen "*" icon on category list for new topics. 2013-05-16 13:36:58 -04:00
Robin Ward
d554a59102 Support for a new site setting: newuser_spam_host_threshold. If a new user posts a link
to the same host enough tiles, they will not be able to post the same link again.

Additionally, the site will flag all their previous posts with links as spam and they will
be instantly hidden via the auto hide workflow.
2013-05-16 12:19:50 -04:00
Sam
04b8cd5c95 consistency check, need to also ensure delete cleans stuff up, maybe make notifications trashable 2013-05-16 17:50:14 +10:00
Sam
88417725b5 we need some, albeit hacky way of clearing these old pms, make at least some way of finding them 2013-05-16 17:30:30 +10:00
Sam
7e1c5ae5b7 glyph in secure categories to the right, like pms 2013-05-16 16:55:07 +10:00
Sam
eb71e9de24 opening move, don't get rid of green notification till the pm is read
TODO a way to list all unread PMs
2013-05-16 16:37:47 +10:00
Sam
e9ebadb414 Nuke message_bus_observer move to service class and classes
Secure all messages triggered by post creation and all user actions so they don't leak
(meaning, if you have a browser open and secure topics are created you will only get them if you are allowed to see them)
2013-05-16 15:03:16 +10:00
Régis Hanol
27dfb7a948 FIX: @username mentions when there are multiple code blocks in a post.
Meta: [All of my internal users show as coming from 127.0.0.1!](http://meta.discourse.org/t/all-of-my-internal-users-show-as-coming-from-127-0-0-1/6607)

This fixes the regular expression used to identify @ inside <code> or <pre> blocks in the `postConversion` hook.
2013-05-16 01:59:07 +02:00
Lee Machin
dadb7eaa23 fix crash caused by incorrect query in scope
setting all categories to be secured led to a blank screen on all pages

use stabby lambda for consistency in class

make the test a little more concise

- move the local assignments into let blocks for
reusability

- remove calls to `to_a`, which aren't needed

- use 'be_empty' instead of '[]' to be consistent
with the other matchers in the test

add a test for the `secured` scope with multiple
secured categories
2013-05-15 22:26:52 +01:00
Robin Ward
b1bfda0e11 Don't show new user education when editing a reply. 2013-05-15 15:16:42 -04:00
Neil Lalonde
ae78954fc0 Fix the 'no more topics' message for categories with non-ascii names 2013-05-15 11:44:45 -04:00
Neil Lalonde
18634ad00d Don't cache the problems list with the rest of the dashboard data 2013-05-15 11:09:12 -04:00
Neil Lalonde
d4b8e727fc Remove templateName from topic_closing_view because it doesn't use a template 2013-05-15 10:08:08 -04:00
Robin Ward
05ed2af08f Add post count to similar posts popup. Fix alignment. 2013-05-14 16:53:17 -04:00
Neil Lalonde
21b4b8d5d5 Expire dashboard data when you upgrade to a new discourse version. Version check data was being cached and causing confusion to people who upgraded. 2013-05-14 16:17:25 -04:00
Robin Ward
008b308939 Fix: comma 2013-05-14 12:49:53 -04:00
Neil Lalonde
101ba5d8fe Add Create Topic button to /categories page 2013-05-14 12:47:28 -04:00
Robin Ward
df2a718446 FIX: Load more user admin details, even when passed from a list 2013-05-14 12:03:46 -04:00
Neil Lalonde
957d95c1cc Fix rerender of topic close message when you navigate away from a closing topic 2013-05-13 16:25:17 -04:00
Neil Lalonde
6d47d4854e Don't reload the page when auto close time is changed 2013-05-13 16:25:17 -04:00
Neil Lalonde
b7cdee4d5c Add title tag to the admin options button in the composer 2013-05-13 16:25:17 -04:00
Robin Ward
bdca804796 Add a touchend event to the admin menu. Hopefully helps IE11 Touch. 2013-05-13 15:29:16 -04:00
Robin Ward
be234ce9b9 You can now 'move' the first post of a topic to another topic as a merge. In that
case, the first post is cloned instead of being deleted from the original topic.
2013-05-13 14:07:31 -04:00
Neil Lalonde
9828c87525 Topic Auto-Close: admins and mods can set a topic to automatically close after a number of days 2013-05-13 12:53:52 -04:00
Sam
670b66ade3 better add some tests here tomorrow 2013-05-13 18:47:32 +10:00
Sam
b6bf95e741 speed up startup (avoid loading some gems on startup)
correct group permission leaks
add Discourse.cache for richer caching support
2013-05-13 18:04:03 +10:00
Sam
9b33e826f2 clear flags on reply to notify moderators 2013-05-13 11:48:01 +10:00
Sam
a27046bacd fix cache hole 2013-05-13 11:09:03 +10:00
Sam
d68e3f7369 optimisations (cut down on category queries, cut down on expensive current_user query) 2013-05-13 11:07:22 +10:00
Sam
98d9f174ae fix spec 2013-05-13 11:07:22 +10:00
Robin Ward
8900ba4779 Fixes staticController bug with requiring an HTML response. 2013-05-10 18:52:10 -04:00
Robin Ward
2f3dc63dd3 FIX: Oneboxes weren't being rendered 2013-05-10 18:50:05 -04:00
Robin Ward
cf01c98d81 Experimental: Interface to Move Posts to an Existing Topic 2013-05-10 14:55:51 -04:00
Régis Hanol
8ebed7a4b1 FIX: user education displays [object Object] 2013-05-10 15:15:21 +02:00
Sam
942f168ab6 UI still a tad rough, but we have a first pass of secure categories 2013-05-10 16:47:47 +10:00
Sam
5280b3a01b more group progress, UI getting there, controller mostly done
changed it so notify moderators goes to the moderators group
allow admins to grant self moderation and revoke self moderation
2013-05-09 17:37:34 +10:00
Sam
4f328e3e45 +x on files makes no sense unless they really are executable
rails in the script dir makes no sense, use binstubs or bundler instead
2013-05-09 17:35:15 +10:00
Sam
0f0fd281a8 group progress, never email banned users 2013-05-09 11:34:58 +10:00
Robin Ward
c1185d92eb Trivial: Remove extra comma 2013-05-08 12:13:23 -04:00
Robin Ward
0d8c962fdf Fix: Multi-Select should close when an operation succeeds. A little refactoring, too. 2013-05-08 12:04:10 -04:00
Robin Ward
4e16badeae Merge pull request #833 from kubabrecka/admin_api_l10n
Localize admin API section
2013-05-08 07:39:02 -07:00
Neil Lalonde
f35a44aeae Add ability for admins and mods to send another activation email to a user, to activate an account, and deactivate an account 2013-05-08 10:10:47 -04:00
Kuba Brecka
05bc63b102 Localize admin API section 2013-05-08 09:13:10 +02:00
Sam
6b536dcde5 work in progress ... groups 2013-05-08 15:20:38 +10:00
Sam
7571152d1d fix issue adding users to groups 2013-05-08 10:32:29 +10:00
Robin Ward
6843ba7ed6 Fix regression: default to JSON type on GET requests. 2013-05-07 17:17:21 -04:00
Neil Lalonde
52ee1928cc Oops, I made a spec fail by refactoring after I made the test pass and didn't check the tests 2013-05-07 15:40:18 -04:00
Neil Lalonde
8e24a608b0 Show empty categories on categories page to people people who can edit and delete categories 2013-05-07 15:31:56 -04:00
Robin Ward
bd99d5a40c Calls to Discourse.ajax no longer need getURL -- will be done automatically. 2013-05-07 15:16:27 -04:00
Robin Ward
0b4fc5d81c Deprecate success and error in Discourse.ajax 2013-05-07 11:25:21 -04:00
Robin Ward
6cbcd6e4a6 The last of the callback style AJAX have been converted to promises. 2013-05-07 10:58:41 -04:00
Robin Ward
dfd423a188 Thanks JSHINT! 2013-05-07 10:33:04 -04:00
Robin Ward
be191a95da More promises instead of callbacks. 2013-05-07 10:27:12 -04:00
Robin Ward
4200f4107b Merge branch 'master' of github.com:discourse/discourse 2013-05-07 10:27:09 -04:00
Régis Hanol
4606cb4f3b FIX: hide/show preview in composer preference is saved in local storage 2013-05-07 12:34:47 +02:00
Sam
20493106cd fix post trashing 2013-05-07 17:56:56 +10:00
Sam
a232e77fa8 whitspace 2013-05-07 17:33:04 +10:00
Jeff Atwood
3bfd3c9723 Merge pull request #825 from ZogStriP/do-not-show-clic-count-in-category-tag
do not show the clic count in category tag
2013-05-06 21:56:04 -07:00
Sam
e9fc272db7 remove acts_as_paranoid, use .trash! , .recover! and .with_deleted as needed
makes upgrading to rails 4 possible
2013-05-07 14:39:01 +10:00
Robin Ward
397553e29c More promises instead of callbacks. 2013-05-06 14:44:19 -04:00
Robin Ward
a71a15913c Site Customization saving should use a promise instead of success callback. 2013-05-06 14:20:20 -04:00
Régis Hanol
53a430be9d do not show the clic count in category tag 2013-05-06 19:40:39 +02:00
Neil Lalonde
e70526d851 Fix links to user pages on dashboard 2013-05-06 12:15:25 -04:00
Neil Lalonde
69be7d0ad1 Change the title Visits to Clicks in referral tables on admin dashboard 2013-05-06 11:56:35 -04:00
Neil Lalonde
b944157d88 Fix edit uncategorized when on the /category/uncategorized page 2013-05-06 11:22:58 -04:00
Sam
be1ab8b275 automatic group infrustructure 2013-05-06 14:49:56 +10:00
Sam
9b1263bb3e Merge pull request #817 from ZogStriP/prevent-duplicates-actions-on-a-post
prevent duplicate actions on a post
2013-05-05 17:50:53 -07:00
Régis Hanol
4470c05457 prepend the username in the participant alt-text in the topic list 2013-05-06 01:00:44 +02:00
Régis Hanol
392b9696f4 prevent duplicate actions on a post 2013-05-04 02:52:45 +02:00
Neil Lalonde
5b33992604 Fix a case when editing uncategorized all the hidden form controls become visible 2013-05-03 18:58:07 -04:00
Neil Lalonde
52942d2de6 Merge pull request #813 from slainer68/ga_domain_name
Google Analytics Domain name site setting
2013-05-03 14:57:01 -07:00
Neil Lalonde
c6370a3479 Add ability to edit the uncategorized category name, color, and text_color in a modal 2013-05-03 17:55:04 -04:00
slainer68
ac66f25043 Google Analytics Domain name site setting 2013-05-03 21:58:10 +02:00
Neil Lalonde
16bc215c68 Make enter key work to submit the signup form 2013-05-03 12:33:08 -04:00
Neil Lalonde
3c322e6d3d Reply button at bottom of topic doesn't ask you to abandon your post when you click it more than once 2013-05-03 12:13:34 -04:00
Sam
42494b5bb1 we can't trust CSRF for anon the way it is designed.
The page they have loaded may be cached we need a different way of delivering the CSRF potentially
2013-05-03 16:43:11 +10:00
Régis Hanol
63b221970d Add a clear pin link in the list topics view 2013-05-02 23:31:43 +02:00
Neil Lalonde
7b44c83b50 Trying to improve dashboard layout with the referral stats on the right 2013-05-02 11:52:37 -04:00
Sam
40f631b5c1 fix style 2013-05-02 22:29:45 +10:00
Sam
99283e757f staff rename forgotten 2013-05-02 20:08:32 +10:00
Sam
cb9a89940a display admin/mod status on user page 2013-05-02 17:40:44 +10:00
Sam
5ec52bd2e9 :s/moderator?/staff/g ... our naming was kind of crazy, renamed moderator? to staff 2013-05-02 17:22:27 +10:00
Sam
65cd00cf25 moderators now have teeth, more at http://meta.discourse.org/t/moderator-permission-set/6307/5
allow pms to be targetted at groups
2013-05-02 15:15:53 +10:00
Sam
e59ab32210 Merge pull request #800 from goodbrews/imgur-api-v3
Update to Imgur API v3
2013-05-01 21:52:00 -07:00
David Celis
6be26f5316 Update to Imgur API v3
Version 2 of Imgur's API is deprecated. Their documentation for v2 is no
longer online, and applications can only be registered under version 3.
Version 3 of their API has a slightly different endpoint but, more
importantly, uses a Client ID/Secret pair instead of an API Key.

This PR updates Discourse to use the new version of Imgur's API.

Signed-off-by: David Celis <me@davidcel.is>
2013-05-01 21:39:10 -07:00
Régis Hanol
f71f7d166c FIX: when topic is closed, you can still invite someone to reply 2013-05-02 02:22:54 +02:00
Sam
72aee82a07 Merge pull request #803 from ZogStriP/remove-rounded-corners-on-images-in-posts
removes rounded corners on images in posts
2013-05-01 16:27:13 -07:00
Régis Hanol
f67f62ccb2 removes rounded corners on images in posts 2013-05-02 01:20:12 +02:00
Neil Lalonde
3c7afeb233 Fix incoming links dashboard data when topic record can't be found 2013-05-01 19:10:31 -04:00
Neil Lalonde
38ed86d0c5 Add reports for IncomingLinks on admin dashboard 2013-05-01 18:12:02 -04:00
Neil Lalonde
5f4dbd6ddc Use tos_url site setting in flag modal if it's set 2013-05-01 11:49:18 -04:00
Sam
e4a76812a6 this is a slightly round about way of making our self oneboxes sane
shrunk avatar to 60px, added global whitelisting
2013-05-01 16:38:13 +10:00
Sam
e5c5c0bbb3 no_js to use site customisations 2013-05-01 11:04:47 +10:00
Sam
08ce46e7ed :s/POST/REPLY/g 2013-05-01 10:52:31 +10:00
Sam
7276542231 firefox used to display "loading..." on back sometimes 2013-05-01 09:49:28 +10:00
Sam
58dbfa1b91 Merge pull request #796 from ZogStriP/fix-shift-clicks-on-links
FIX: shift+click on links
2013-04-30 16:02:24 -07:00
Jeff Atwood
180c021940 normalize on "private message" vs "conversation" 2013-04-30 13:54:14 -07:00
Jeff Atwood
51f16333be increase default max_likes to 50
WE LIKE LIKES MAN
2013-04-30 12:45:27 -07:00
Neil Lalonde
20d73a4151 Fix bookmarks admin dashboard counts to include bookmarks that were deleted 2013-04-30 12:52:12 -04:00
Neil Lalonde
6f0d68fe5f Align star to the top of the line in topic list for topics showing excerpts 2013-04-30 12:35:41 -04:00
Régis Hanol
ff309cf024 FIX: shift+click on links
Default browser's behavior when shift+clicking was messed up.

This adds the shift key modifier to the list of click modifiers in both
`click_track` and `discourse`.

Also updated & refactored a bit the `click_track_spec`.
2013-04-30 15:48:58 +02:00
Fayimora Femi-Balogun
0cdeb88f29 Fix misspelling 2013-04-30 11:09:30 +02:00
Sam
cef9a74053 route for markdown /md/topic_id/post_number 2013-04-30 16:30:41 +10:00
Sam
8a04cc05aa render :json appears to have changed ... this is odd ... better add some tests 2013-04-30 14:01:34 +10:00
Sam
855ba562ac api was not showing api key cause model in ember is just partial advice that is sometimes followed up 2013-04-30 13:49:01 +10:00
Sam
b25a5a20bb option to strip links from excerpts 2013-04-30 13:25:55 +10:00
Sam
fc56e51cc6 Merge pull request #792 from ZogStriP/fix-shift-click-to-select-text-does-not-work-in-topics
FIX: Shift+Click to select text does not work in topics
2013-04-29 19:35:13 -07:00
Régis Hanol
52bad538a1 FIX: Shift+Click to select text does not work in topics 2013-04-30 03:16:38 +02:00
Régis Hanol
017ee7c2da FIX: [security bug] XHR check bypass 2013-04-30 02:34:19 +02:00
Neil Lalonde
f517fa6099 Oops, jshint fail. I never remember the triple equals 2013-04-29 16:46:49 -04:00
Neil Lalonde
442be64d5e Show an excerpt of a pinned topic's body in the topic list 2013-04-29 16:37:19 -04:00
Jeff Atwood
3673744e6d Merge pull request #786 from GriffinHeart/fix-history-combo
Fixed combo boxes display in edit history
2013-04-29 13:09:34 -07:00
Neil Lalonde
dc07563c0d Add unstarred_at column to topic_users so we can permanently track when topics are starred 2013-04-29 11:39:05 -04:00
Sam
5cfcdc7ef0 backend for secure categories mostly done (todo pm groups) 2013-04-29 16:33:43 +10:00
Sam
a99efecb39 Merge pull request #783 from bolandrm/rotten_tomatoes_onebox
added rottentomatoes.com onebox
2013-04-28 20:46:50 -07:00
Hugo Almeida
4f77c61654 Fixed combo boxes display in edit history 2013-04-29 04:02:11 +01:00
Sam
c850dd9f88 Merge pull request #784 from ZogStriP/fix-right-click-on-selection-deselects
FIX: right click on selection deselects
2013-04-28 19:01:55 -07:00
Régis Hanol
ede9d2a0a8 show diff in post history view 2013-04-29 03:20:51 +02:00
Régis Hanol
a651270c09 FIX: right click on selection deselects 2013-04-29 01:38:14 +02:00
Ryan Boland
9bc8faeaf2 added rottentomatoes.com onebox 2013-04-28 16:24:03 -04:00
Jonathan Roes
057b4768e6 strip whitespace when changing e-mail addresses
Fixes #778.
2013-04-27 23:03:06 -04:00
Régis Hanol
0b222550f7 flash draft status when requirements are not met for new users 2013-04-28 02:37:53 +02:00
Régis Hanol
dca2fbcefc add meaningful error message on upload [fixes #773] 2013-04-27 20:26:17 +02:00
Jeff Atwood
eae2e74152 Merge pull request #774 from ZogStriP/patch-1
force the browse dialog to only accept images...
2013-04-26 17:15:09 -07:00
Neil Lalonde
bbf982984d Add TOS and Privacy Policy site settings that can link to external sites. 2013-04-26 18:46:36 -04:00
Jeff Atwood
514df5441a these parens! 2013-04-26 15:32:26 -07:00
Jeff Atwood
2e2160f964 oops my bad 2013-04-26 15:26:59 -07:00
Jeff Atwood
01e0226086 ignore username matches inside <pre> or <code>
also remember, lazy ? faster than greedy, less backtracking
2013-04-26 15:11:26 -07:00
Jeff Atwood
dd9ea50456 fix username lookup regex for mentions 2013-04-26 14:34:12 -07:00
Neil Lalonde
1375954fbc Add title tags to dashboard stats to show percent change from previous period 2013-04-26 17:14:03 -04:00
Neil Lalonde
c589b4b187 Add a js spec for admin/report model, and find a bug too 2013-04-26 17:14:02 -04:00
Neil Lalonde
6063f81946 Show something on categories page when js is disabled 2013-04-26 13:10:41 -04:00
Régis Hanol
07b9c47efe force the browse dialog to only accept images
on image upload
2013-04-26 13:56:05 +03:00
Sam
b82e408351 add list unsubscribe 2013-04-26 16:56:28 +10:00
Sam
f9e33ec6b8 store ip address and current user with incoming links
make links long an readable in share dialog
2013-04-26 16:18:55 +10:00
Merp
71d2903879 Bugfix for change password button in user preferences, fixed bad function parameter name passed to forgot_password. 2013-04-25 20:06:31 -04:00
Sam
f0d3500ada Merge pull request #735 from kubabrecka/i18n_user_actions4
move i18n of UserActions to JS-side and make sentences translatable (take 3)
2013-04-25 15:53:17 -07:00
Neil Lalonde
159c9b10d5 Add a nag to admin dashboard if you haven't changed the title site setting from the default 'Discourse' 2013-04-25 17:53:31 -04:00
Régis Hanol
03d3c738c3 improve & refactor quote reply 2013-04-25 03:22:35 +02:00
Neil Lalonde
23a069c907 Show heatmap for views in suggested topics 2013-04-24 11:51:33 -04:00
Neil Lalonde
db2de1eff0 Add contact_email to site settings 2013-04-24 11:15:47 -04:00
Sam
37867af1bb track incoming links, amend share link to include user
fix pm styling
2013-04-24 18:05:35 +10:00
Sam
4d9dc82be0 bug fix 2013-04-24 14:39:31 +10:00
Sam
81673dcde8 slug memoization in the table 2013-04-24 12:46:43 +10:00