github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 06:53:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4,299 Commits 214 Branches 500 Tags 960 MiB
9977f3098c
Commit Graph

2358 Commits

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