Commit Graph

2508 Commits

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