Commit graph

9061 commits

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

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

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

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

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

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

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

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

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

use stabby lambda for consistency in class

make the test a little more concise

- move the local assignments into let blocks for
reusability

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

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

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

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

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

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

Also updated & refactored a bit the `click_track_spec`.
2013-04-30 15:48:58 +02:00
Fayimora Femi-Balogun
0cdeb88f29 Fix misspelling 2013-04-30 11:09:30 +02:00
Sam
cef9a74053 route for markdown /md/topic_id/post_number 2013-04-30 16:30:41 +10:00
Sam
8a04cc05aa render :json appears to have changed ... this is odd ... better add some tests 2013-04-30 14:01:34 +10:00
Sam
855ba562ac api was not showing api key cause model in ember is just partial advice that is sometimes followed up 2013-04-30 13:49:01 +10:00
Sam
b25a5a20bb option to strip links from excerpts 2013-04-30 13:25:55 +10:00
Sam
fc56e51cc6 Merge pull request #792 from ZogStriP/fix-shift-click-to-select-text-does-not-work-in-topics
FIX: Shift+Click to select text does not work in topics
2013-04-29 19:35:13 -07:00
Régis Hanol
52bad538a1 FIX: Shift+Click to select text does not work in topics 2013-04-30 03:16:38 +02:00
Régis Hanol
017ee7c2da FIX: [security bug] XHR check bypass 2013-04-30 02:34:19 +02:00
Neil Lalonde
f517fa6099 Oops, jshint fail. I never remember the triple equals 2013-04-29 16:46:49 -04:00
Neil Lalonde
442be64d5e Show an excerpt of a pinned topic's body in the topic list 2013-04-29 16:37:19 -04:00
Jeff Atwood
3673744e6d Merge pull request #786 from GriffinHeart/fix-history-combo
Fixed combo boxes display in edit history
2013-04-29 13:09:34 -07:00
Neil Lalonde
dc07563c0d Add unstarred_at column to topic_users so we can permanently track when topics are starred 2013-04-29 11:39:05 -04:00
Sam
5cfcdc7ef0 backend for secure categories mostly done (todo pm groups) 2013-04-29 16:33:43 +10:00
Sam
a99efecb39 Merge pull request #783 from bolandrm/rotten_tomatoes_onebox
added rottentomatoes.com onebox
2013-04-28 20:46:50 -07:00
Hugo Almeida
4f77c61654 Fixed combo boxes display in edit history 2013-04-29 04:02:11 +01:00
Sam
c850dd9f88 Merge pull request #784 from ZogStriP/fix-right-click-on-selection-deselects
FIX: right click on selection deselects
2013-04-28 19:01:55 -07:00
Régis Hanol
ede9d2a0a8 show diff in post history view 2013-04-29 03:20:51 +02:00
Régis Hanol
a651270c09 FIX: right click on selection deselects 2013-04-29 01:38:14 +02:00
Ryan Boland
9bc8faeaf2 added rottentomatoes.com onebox 2013-04-28 16:24:03 -04:00
Jonathan Roes
057b4768e6 strip whitespace when changing e-mail addresses
Fixes #778.
2013-04-27 23:03:06 -04:00
Régis Hanol
0b222550f7 flash draft status when requirements are not met for new users 2013-04-28 02:37:53 +02:00
Régis Hanol
dca2fbcefc add meaningful error message on upload [fixes #773] 2013-04-27 20:26:17 +02:00
Jeff Atwood
eae2e74152 Merge pull request #774 from ZogStriP/patch-1
force the browse dialog to only accept images...
2013-04-26 17:15:09 -07:00
Neil Lalonde
bbf982984d Add TOS and Privacy Policy site settings that can link to external sites. 2013-04-26 18:46:36 -04:00
Jeff Atwood
514df5441a these parens! 2013-04-26 15:32:26 -07:00
Jeff Atwood
2e2160f964 oops my bad 2013-04-26 15:26:59 -07:00
Jeff Atwood
01e0226086 ignore username matches inside <pre> or <code>
also remember, lazy ? faster than greedy, less backtracking
2013-04-26 15:11:26 -07:00
Jeff Atwood
dd9ea50456 fix username lookup regex for mentions 2013-04-26 14:34:12 -07:00
Neil Lalonde
1375954fbc Add title tags to dashboard stats to show percent change from previous period 2013-04-26 17:14:03 -04:00
Neil Lalonde
c589b4b187 Add a js spec for admin/report model, and find a bug too 2013-04-26 17:14:02 -04:00
Neil Lalonde
6063f81946 Show something on categories page when js is disabled 2013-04-26 13:10:41 -04:00
Régis Hanol
07b9c47efe force the browse dialog to only accept images
on image upload
2013-04-26 13:56:05 +03:00
Sam
b82e408351 add list unsubscribe 2013-04-26 16:56:28 +10:00
Sam
f9e33ec6b8 store ip address and current user with incoming links
make links long an readable in share dialog
2013-04-26 16:18:55 +10:00
Merp
71d2903879 Bugfix for change password button in user preferences, fixed bad function parameter name passed to forgot_password. 2013-04-25 20:06:31 -04:00
Sam
f0d3500ada Merge pull request #735 from kubabrecka/i18n_user_actions4
move i18n of UserActions to JS-side and make sentences translatable (take 3)
2013-04-25 15:53:17 -07:00
Neil Lalonde
159c9b10d5 Add a nag to admin dashboard if you haven't changed the title site setting from the default 'Discourse' 2013-04-25 17:53:31 -04:00
Régis Hanol
03d3c738c3 improve & refactor quote reply 2013-04-25 03:22:35 +02:00
Neil Lalonde
23a069c907 Show heatmap for views in suggested topics 2013-04-24 11:51:33 -04:00
Neil Lalonde
db2de1eff0 Add contact_email to site settings 2013-04-24 11:15:47 -04:00
Sam
37867af1bb track incoming links, amend share link to include user
fix pm styling
2013-04-24 18:05:35 +10:00
Sam
4d9dc82be0 bug fix 2013-04-24 14:39:31 +10:00
Sam
81673dcde8 slug memoization in the table 2013-04-24 12:46:43 +10:00
Jeff Atwood
d8299914ce align flag text boxes 2013-04-23 14:15:09 -07:00
Neil Lalonde
72508d459b Use heat map on views column in topic lists 2013-04-23 15:06:13 -04:00
Neil Lalonde
06e5083950 Dashboard links to list of admins and moderators; Move a bunch of ember routes into one file: admin_users_list_routes.js 2013-04-23 12:07:58 -04:00
Neil Lalonde
fe7de44275 Put admins and moderators counts on the same line 2013-04-23 11:48:26 -04:00
Neil Lalonde
fe1b979c65 Admin Dashboard: click numbers in Users per Trust Level table to see a list of the users 2013-04-23 10:41:40 -04:00
Neil Lalonde
e8172e66d2 Add bg colour to table headings on dashboard 2013-04-23 10:30:09 -04:00
Sam
3d98659708 Merge pull request #758 from ZogStriP/do-not-display-clicks-count-in-oneboxes
do not display clicks count in oneboxes
2013-04-22 22:59:04 -07:00
Neil Lalonde
7257d65082 Add warning to dashboard if using default logo or favicon 2013-04-22 15:38:48 -04:00
Régis Hanol
451a818162 do not display clicks count in oneboxes 2013-04-22 20:21:29 +02:00
Neil Lalonde
439877bdb9 Show a warning if there are email jobs in the retry queue 2013-04-22 13:37:16 -04:00
Neil Lalonde
ae487e740c Add a dashboard warning when sidekiq queue has more than 100 jobs 2013-04-22 13:02:24 -04:00
Sam
f980b4d16e fix regression 2013-04-22 18:06:59 +10:00
Sam
cfc62dadff speed up tests
add the ability to find the first notify private message
2013-04-22 17:45:03 +10:00
Sam
8827dd3e42 speed up tests 2013-04-22 13:48:41 +10:00
Jeff Atwood
316f744ad7 Merge pull request #752 from ZogStriP/add-autocomplete-support-for-plus-and-minus
Add '+' and '-' support to the autocomplete plugin
2013-04-21 20:44:21 -07:00
Sam
fd035cf777 thinking about it .. WE ALWAYS track external links. WE DON'T display external link counts inside oneboxes.
Reverting to old behavior so we can fix properly
2013-04-22 10:42:12 +10:00
Sam
4f5ed10b83 click tracking broken for AGES 2013-04-22 10:00:38 +10:00
Sam
8cf5722301 ember rc3 upgrade 2013-04-22 10:00:38 +10:00
Régis Hanol
ea23f637e1 Add '+' and '-' support to the autocomplete plugin 2013-04-22 01:43:41 +02:00
Régis Hanol
8355ed1992 removed a missing console.log 2013-04-20 22:48:06 +02:00
Jeff Atwood
79fa01a8c4 Merge pull request #742 from ZogStriP/fix-notify-users-that-their-actions-has-been-throttled
FIX: Where is a user notified that one of their actions has been throttled for the day?
2013-04-20 03:03:42 -07:00
Jeff Atwood
024791a80e simplify admin user view a tad 2013-04-19 22:34:11 -07:00
Shane Liesegang
42fdbe2fb6 Fixing Amazon uploads to not be hardcoded to https
Amazon S3 uploads are currently hardcoded to use https, where they should probably use whatever protocol the rest of the site is using. Removing the protocol and just using "//" links should accomplish that.
2013-04-19 22:05:51 -03:00
Régis Hanol
71df94369b FIX: Where is a user notified that one of their actions has been throttled for the day? 2013-04-20 01:43:32 +02:00
Jeff Atwood
b644509c28 reduce auto track default from 5m to 4m 2013-04-19 15:11:38 -07:00
Jeff Atwood
8c8784abb6 simplify user profile layout, bold labels 2013-04-19 15:06:35 -07:00
Jeff Atwood
6948d2cbf3 increase email notify delay to 10 mins 2013-04-19 14:59:11 -07:00
Neil Lalonde
2c516400de Fix links to topics with empty slug because they use non-ascii titles 2013-04-19 16:47:34 -04:00
Neil Lalonde
62a746fb68 A pathetic attempt to get html markup to work in category descriptions. Link will still mangle it, but simple bold, italics, etc. will work. 2013-04-19 12:41:34 -04:00
Sam
de9ca54aed * event machine fix is critical (long polling has been broken)
* thin upgrade
* work in progress - groups
* fix live-refresh in dev
2013-04-19 13:06:00 +10:00
Sam
d0a8cfa6c0 more persona supression 2013-04-19 11:07:15 +10:00
Sam
6ae212235c move persona a bit, still should be yanked out further 2013-04-19 10:34:39 +10:00
Sam
4cea92c4e9 work in progress add support for groups 2013-04-19 10:34:39 +10:00
Sam
a6170db443 change text to notify when you are notifying in the flag dialog 2013-04-19 10:34:06 +10:00
Neil Lalonde
372442bd1c Make it possible to edit a category with an empty slug 2013-04-18 17:07:06 -04:00
Neil Lalonde
cbe0168922 Fix a problem where you might see missing {{sentTo}} value after a failed login 2013-04-18 16:44:56 -04:00
Neil Lalonde
f76d6c0f3f Fix for loading uncategorized topics when slug for uncategorized_name is blank 2013-04-18 16:28:47 -04:00
Neil Lalonde
5cd6c85e8b Add bookmarks and favorites to dashboard stats 2013-04-18 14:27:22 -04:00
Neil Lalonde
75cfcbfa4f Need to require email in user.rb because specs can start failing when running guard 2013-04-18 14:27:04 -04:00
Neil Lalonde
c07942763a Merge pull request #734 from kubabrecka/extract_title1
extracting one more hardcoded title
2013-04-18 09:29:30 -07:00
Neil Lalonde
4cec82f416 Merge pull request #731 from kubabrecka/extract_titles
extracting some hardcoded title="..." strings
2013-04-18 09:29:03 -07:00
Neil Lalonde
eca35b9079 Don't show sad face when version checks have not been done yet 2013-04-18 11:45:10 -04:00
Kuba Brecka
d355e42d73 move i18n of UserActions to JS-side and make sentences translatable (take 3) 2013-04-18 12:08:13 +02:00
Kuba Brecka
38ea6cff62 extracting one more hardcoded title 2013-04-18 11:24:47 +02:00
Kuba Brecka
2901b5bbef extracting some hardcoded title="..." strings 2013-04-18 10:42:29 +02:00
Sam
4bd4e4e1c7 missing bits from user page rediscovered 2013-04-18 17:23:52 +10:00
Jeff Atwood
474080a414 localize composer toggler help text 2013-04-17 23:14:58 -07:00
Sam
6974ad487c fix not found error when spiders were hitting with .php 2013-04-18 09:55:47 +10:00
Jeff Atwood
b64a4100fa change "visitor" trust level to "new user"
I blame me for this mistake.. visitor means other stuff in practice. New
User is correct meaning.
2013-04-17 16:11:24 -07:00
Régis Hanol
e76f629df8 Text Cleaner now removes all periods from the end of the title 2013-04-18 00:19:42 +02:00
Neil Lalonde
f6db90dae7 Add topic-creator class to post info on the left of a post if the poster started the topic 2013-04-17 11:41:22 -04:00
Neil Lalonde
dd456df0cc Dashboard stats arrows lost their colours 2013-04-17 10:46:27 -04:00
Neil Lalonde
d67682ff6c Make commits-widget contents fill its container, and improve layout on dashboard 2013-04-17 10:25:28 -04:00
Sam
437142424c speed up tests, fix notification of mentioned users in pms 2013-04-17 17:39:18 +10:00
Jeff Atwood
05bcd499d5 move post metadata up 2px 2013-04-16 23:32:23 -07:00
Jeff Atwood
e671cf906c make one text for latest changes widget + taller 2013-04-16 16:35:28 -07:00
Neil Lalonde
9a7019e44f Add some icons to admin dashboard 2013-04-16 18:38:14 -04:00
Jeff Atwood
dfdf65e870 Merge pull request #719 from paulyoung/access-code-password
Fixes #718: Changed password field type on Access Code entry page.
2013-04-16 15:05:36 -07:00
Paul Young
aad9fc1032 Fixes #718: Changed password field type on Access Code entry page. 2013-04-16 18:03:21 -04:00
Jeff Atwood
72be25c30a improve invite users action button 2013-04-16 14:53:06 -07:00
Neil Lalonde
3b6aeb14c7 Add subtype to topics to classify private messages 2013-04-16 16:56:18 -04:00
Neil Lalonde
2b5a2b5fce Add a refresh button to problems on dashboard, so you can check for problems again 2013-04-16 12:09:37 -04:00
Wojciech Kocjan
8a63b46adc Fix for notifications not being shown when running with prefix 2013-04-16 11:46:16 +02:00
Sam
3bc4aefe87 fix double include 2013-04-16 18:43:07 +10:00
Régis Hanol
f64de0c41e FIX: generate API key not working 2013-04-16 00:04:12 +02:00
Régis Hanol
b24c1a1ad9 better consistency around email case sensitivity 2013-04-15 02:20:33 +02:00
Neil Lalonde
f30a74c4f6 Fix version check when your version is later than the one fetched by the last version check job 2013-04-15 11:00:29 -04:00
Sam
f314e7a89c make source git pull freindly, no need to copy files around when updating 2013-04-15 15:07:40 +10:00
Sam
ea3c6d2e6f fix jshint 2013-04-15 13:18:26 +10:00
Sam
2bdb53261b don't treat notify user as a flag 2013-04-15 13:09:52 +10:00
Sam
5b4fa68e8c Merge pull request #705 from wpp/refactor_users_controller
Refactor user controller, create action, mostly.
2013-04-14 18:40:19 -07:00
Jeff Atwood
00d0072d2d make ToS clear that USA stuff applies to USA only 2013-04-14 12:12:04 -07:00
Jeff Atwood
c9c736068d fix ToS so paid upgrades are shown as optional 2013-04-14 12:06:05 -07:00
Sam
5bca572321 Merge pull request #701 from lsdafjklsd/patch-1
Fixed typo
2013-04-12 16:06:50 -07:00
Philipp Weissensteiner
3dcb1905e3 Refactor user controller, create action, mostly.
The gist of the commit are a few improvements in the
create action, where:

* long boolean statemenst have been wrapped in smaller more readable
  methods.
* the 3rd party user info creation has been extracted (still in controller)
* a small helper method for creating a new user from params (to reduce
  visual clutter)
* specs have been added where I came across untested methods/branches

Other changes are more trivial like formatting and whitespace fixes.
Hope this helps. Regards.
2013-04-13 00:53:59 +02:00
Neil Lalonde
7bc80ea525 Oops i broke jshint again 2013-04-12 18:13:58 -04:00
Neil Lalonde
48d5cb02c2 Add email as a sharing option 2013-04-12 18:06:36 -04:00
Neil Lalonde
651cfba93f Add ability to destroy a user with 0 posts 2013-04-12 16:53:00 -04:00
Sam
86b317ea73 oops 2013-04-12 18:14:36 +10:00
Sam
0054416786 keep jshint happy :) need to reconfigure my vim jshint ... 2013-04-12 18:04:35 +10:00
Sam
e969eb14e8 added 2 new flag types: notify user and notify moderators
fixed up messed up user navigation
refactored
2013-04-12 17:55:45 +10:00
Sam
0f362c5474 this has been bugging me for ages, broken "fill your profile link" fixed AND bio updates when you save 2013-04-12 10:07:58 +10:00
Ryan Haywood
57e16613cb Fixed typo 2013-04-11 17:42:52 -03:00
Neil Lalonde
04ca4077a7 Merge pull request #697 from kubabrecka/quote_post_fix
fix title of "quote post" button
2013-04-11 10:59:42 -07:00
Neil Lalonde
36dc5874e5 Post image_count doesn't count favicons and thumbnails in oneboxes, so visitors can post links that get oneboxed 2013-04-11 12:36:45 -04:00
Neil Lalonde
e2ff5a1898 Use a button for the 'visit category topic' link 2013-04-11 11:43:08 -04:00
Neil Lalonde
7b76447e5e Change edit category modal submit button text to Save Category 2013-04-11 10:50:25 -04:00
Sam
3860a9302b fix quote reply regression 2013-04-11 16:32:56 +10:00
Sam
850b042cab introduce rack:cache as a default, so users don't need to configure apache or nginx
under rack cache we are able to serve 620reqs a second per thin (on my machine) before it 12 (on my machine)

reorganised so mini profilers can be cleanly disabled from config file

added caching for categories index

move production.rb to production.sample.rb
2013-04-11 16:24:21 +10:00
Sam
5f30ea7463 Merge pull request #684 from ZogStriP/auto-replace-rules-in-titles
auto replace rules in titles
2013-04-10 21:12:20 -07:00
Neil Lalonde
c0f3c47196 Use message bus to broadcast addition and removal of categories 2013-04-10 15:53:36 -04:00
Kuba Brecka
11886e3e33 fix title of "quote post" button 2013-04-10 20:32:28 +02:00
Neil Lalonde
229395729d Make title field bigger when editing a topic title 2013-04-10 14:19:34 -04:00
Neil Lalonde
28ed4defe3 Merge pull request #692 from ZogStriP/fix-text-not-updated-when-changing-notifications
FIX: Text not updated when changing notifications after reading a topic
2013-04-10 10:54:44 -07:00
Neil Lalonde
b2f017e87b Merge pull request #691 from ZogStriP/fix-setting-min-topic-title-length-is-ignored
FIX: setting min_topic_title_length is ignored
2013-04-10 10:04:42 -07:00
Neil Lalonde
03047b0ab0 Category is fetched from server when loading edit category modal, because topic_count needs to be up-to-date for the delete button to show/hide in a sane way 2013-04-10 12:08:24 -04:00
Neil Lalonde
5d46478e38 Add UI to delete an empty category 2013-04-10 12:08:23 -04:00
Régis Hanol
ebbd5af8bc FIX: Text not updated when changing notifications after reading a topic 2013-04-10 15:41:06 +02:00
Régis Hanol
d120a5d139 FIX: setting min_topic_title_length is ignored 2013-04-10 14:54:10 +02:00
Régis Hanol
c5cf8be864 auto replace rules in titles 2013-04-10 11:00:50 +02:00
Sam
33e3ad1603 clean up onebox application so it uses a single code path
use fragments for oneboxes
strip parent <p> if <div> is in it
clean some tests
2013-04-10 17:52:38 +10:00
Sam
ab9c55689e don't error out if no range is selected 2013-04-10 17:49:25 +10:00
Sam
c29390386f less crazy customize screen, more consistent with other screen 2013-04-10 15:55:33 +10:00
Sam
9b487953c4 collapse some db tests
ensure deleted topics do not show up in user stream
2013-04-10 12:50:00 +10:00
Sam
e8a6626e6a whitespace 2013-04-10 11:55:10 +10:00
Robin Ward
00f9e628e0 Don't apply markdown to content of [quote] -- it messes up spacing. 2013-04-09 17:32:50 -04:00
Neil Lalonde
6746415ef3 Fix colour picker size on iPad 2013-04-09 13:12:29 -04:00
Neil Lalonde
78d9b44106 Show custom colours in colour picker too 2013-04-09 12:52:22 -04:00
Robin Ward
1ce7a40084 Revert "Merge pull request #677 from kubabrecka/localization_user_actions2"
This reverts commit c3a426930b, reversing
changes made to 9f9072bd9d.
2013-04-09 12:33:32 -04:00
Robin Ward
5ba9e484f8 Merge pull request #650 from wojciechka/double_prefix_fix
Detect and remove prefix being added twice when going to pages already in history
2013-04-09 09:30:01 -07:00
Robin Ward
c3a426930b Merge pull request #677 from kubabrecka/localization_user_actions2
move i18n of UserActions to JS-side and make sentences translatable
2013-04-09 09:25:28 -07:00
Robin Ward
ab8196faea Merge pull request #679 from mark-rushakoff/remove_param_to_sym
Don't call to_sym on param
2013-04-09 09:21:52 -07:00
Neil Lalonde
d0887b61c1 Use checkmark instead of X on category colour picker 2013-04-09 12:02:02 -04:00
Robin Ward
161b8f43b6 Fix content editor in smaller widths 2013-04-09 11:28:28 -04:00
Robin Ward
fa27476267 Merge pull request #676 from kubabrecka/update_localized_tos
update localized TOS
2013-04-09 06:30:28 -07:00
Wojciech Kocjan
3cf240ada8 Detect and remove prefix being added twice when going to pages already in history. 2013-04-09 12:12:27 +02:00
Mark Rushakoff
56acb5fcce Don't call to_sym on param 2013-04-08 22:55:39 -07:00
Neil Lalonde
64eeb7f21e jshint made me break my code. Change logic to fix usedBackgroundColors and make jshint happy 2013-04-08 19:18:24 -04:00
Neil Lalonde
93f36cdf93 Show which category colors have already been used when creating/editing a category 2013-04-08 18:33:51 -04:00
Régis Hanol
2424a656e8 improve quote reply selection 2013-04-08 23:44:12 +02:00
Kuba Brecka
8d927418e8 move i18n of UserActions to JS-side and make sentences translatable 2013-04-08 22:54:08 +02:00
Robin Ward
75aeb9550f Convert a bunch of callbacks to promises 2013-04-08 16:51:03 -04:00
Kuba Brecka
57b9fe4602 update localized TOS 2013-04-08 22:35:48 +02:00
Robin Ward
02bab415bd Convert Autocomplete to use promises 2013-04-08 14:59:00 -04:00
Robin Ward
6c983218b3 Clean up JS 2013-04-08 14:58:17 -04:00
Neil Lalonde
0f767ca227 Trim category description at 200 chars in category combobox 2013-04-08 12:18:19 -04:00
Robin Ward
4ad006ea97 FIX: non-logged in users couldn't see who liked something 2013-04-08 11:57:23 -04:00
Neil Lalonde
467d59ec5a Merge some work: topic counts in category select; fix All count on dashboard 2013-04-08 10:23:29 -04:00
Jeff Atwood
cd5b778305 fix caret alignment on drop-down notification btn 2013-04-07 23:46:45 -07:00
Sam
73c508115a better consistency check 2013-04-08 13:02:20 +10:00
Sam
9ad320768e Merge pull request #667 from ZogStriP/dont-track-links-in-oneboxes
don't track links in oneboxes
2013-04-07 18:30:24 -07:00
Sam
11ff0ccd03 correct logic for tracking the highest seen post number so its always consistent 2013-04-08 11:12:52 +10:00
Sam
fd31f946ee correct count 0 on user filters 2013-04-08 10:42:18 +10:00
Régis Hanol
d080ae4d2d don't track links in oneboxes 2013-04-08 02:24:12 +02:00
Sam
3ba0bf6d5d Merge pull request #651 from ZogStriP/change-title-background-when-composer-requirements-are-not-met
Change Title background to red when requirements are not met
2013-04-07 15:11:10 -07:00
Sam
9a1619727d Merge pull request #670 from ZogStriP/add-some-tests-for-uploads
added some tests for uploads
2013-04-07 15:05:35 -07:00
Régis Hanol
41b7f741d0 extract hard-coded strings 2013-04-07 18:14:50 +02:00
Régis Hanol
1692350336 added some tests for uploads 2013-04-07 17:52:46 +02:00
Régis Hanol
f211b9601a change title background to red when requirements are not met 2013-04-07 15:32:06 +02:00
Régis Hanol
aecf03c4f5 FIX: quote reply button was wrong when there is a custom header 2013-04-06 23:05:50 +02:00
Jeff Atwood
78cb85eb53 oneboxes don't need a border-radius 2013-04-06 02:12:21 -07:00
Jeff Atwood
5842233d4f remove caret style, only used one place 2013-04-06 01:43:59 -07:00
Jeff Atwood
705f94668f one more unused bootstrap style
I CAN SEARCH WITH REGEX MANNN
2013-04-06 00:42:36 -07:00
Jeff Atwood
a8e5d15a25 fix star alignment on topic titles 2013-04-06 00:06:45 -07:00
Jeff Atwood
836050457e remove more unused bootstrap default styles
confirmed unused with searches
2013-04-05 17:19:51 -07:00
Jeff Atwood
b78362bb85 add back in font-awesome <li> rule 2013-04-05 15:40:36 -07:00
Jeff Atwood
3588bb828a removing unneeded css vendor prefixes caniuse.com 2013-04-05 14:52:21 -07:00
Jeff Atwood
b89086a0ab add text-align: center to header icons 2013-04-05 14:27:58 -07:00
Jeff Atwood
66d4b5fa08 remove vendor prefixes from chosen CSS
we're modern baby
2013-04-05 14:23:12 -07:00
Jeff Atwood
2179675254 remove a bunch of unneeded font-awesome css 2013-04-05 13:55:35 -07:00
Robin Ward
a14f62766e Replace MultisiteI18n hack with SiteContent and admin editing. 2013-04-05 16:48:15 -04:00
Jeff Atwood
52f79e8096 1st child in post body blockquotes, no top margin 2013-04-05 13:43:40 -07:00
Robin Ward
c6bd6371f2 Exclude recently made invisible topics from the categories list. Also remove a couple n+1 queries. 2013-04-05 16:09:27 -04:00
Neil Lalonde
ee43ce693f Add topic counts to category selector 2013-04-05 15:43:56 -04:00
Robin Ward
fe8d2377e8 admins/moderators should not receive "body is too similar" when editing
a regular user's post.
2013-04-05 15:38:03 -04:00
Robin Ward
72b4f41254 Can change TOS content via site content editor 2013-04-05 15:21:55 -04:00
Neil Lalonde
91b9479986 Hide search icon in category selector when there are few categories 2013-04-05 14:39:03 -04:00
Neil Lalonde
eb212aec9b Fix dashboard totals for topics, posts, and private messages 2013-04-05 14:09:16 -04:00
Robin Ward
af9b27358c If an admin or moderator edits a visitor's post, the restrictions should be based
on the *editors* access rights, not the original poster.
2013-04-05 13:59:00 -04:00
Wojciech Kocjan
0481fbae8c Fix for reply to user avatar and picture uploading not working when editing post with discourse running in a prefix 2013-04-05 12:46:14 +02:00
Sam
5273657537 a method called "adding_user_record" is annoying me. 5 lines of code replaced with 2 2013-04-05 17:53:39 +11:00
Sam
ea8d69fbd6 fix my broken test 2013-04-05 17:47:54 +11:00
Sam
a2cca2540e some minimal site settings diags
fix issue where days_visited was totally out of sync
2013-04-05 17:47:54 +11:00
Sam
a7f92ec0c1 topic reply count resync for each new post 2013-04-05 17:47:54 +11:00
Sam
bf8e756175 Merge pull request #637 from wojciechka/master
Putting rootURL in JavaScript using Discourse::base_uri and erb
2013-04-04 21:42:54 -07:00
Sam
27776287f4 Merge pull request #654 from ZogStriP/consistent-behavior-regarding-file-uploads
consistent behavior regarding file uploads
2013-04-04 21:36:17 -07:00
Sam
4fbf017272 get regular trust level going, self heal inconsistent topic timings 2013-04-05 15:30:28 +11:00
Régis Hanol
82bd92dd46 consistent behavior regarding file uploads 2013-04-05 01:07:31 +02:00
Jeff Atwood
6aaa0ffe5e add max-width to all img in onebox-result-body 2013-04-04 15:20:11 -07:00
Robin Ward
fa1ba6791b Work in Progress: Content Editing in Admin Section 2013-04-04 17:26:22 -04:00
Neil Lalonde
bd0e98aec2 Fix for when category description has html. Could be better. 2013-04-04 17:16:30 -04:00
Neil Lalonde
d974aea536 Underline links in the detected problems messages on admin dashboard 2013-04-04 16:16:58 -04:00
Neil Lalonde
66bc48a0e3 Give magic wands to all moderators 2013-04-04 16:14:55 -04:00
Neil Lalonde
4096c6bdc2 Use a font-awesome icon in category search field instead of the default hideous one 2013-04-04 12:46:38 -04:00
Neil Lalonde
a4a09dc242 Fix styling of category select when editing a topic title 2013-04-04 11:34:07 -04:00
Neil Lalonde
3e0ef018ab Use temp variable for .chosen().next() 2013-04-04 10:44:11 -04:00
Wojciech Kocjan
a875b1c44a Store base URI in Discourse.BaseUri and use it in all places where rootURL was previously used 2013-04-04 11:16:38 +02:00
Jeff Atwood
02c6f0f631 make ban the actual icon-circle-ban, and danger 2013-04-04 02:09:27 -07:00
Jeff Atwood
9eec973fc4 screwed up the magicks a bit. 2013-04-04 01:56:35 -07:00
Jeff Atwood
90d979d88d add moderator MAGGICCCKKSSSSSsssSSss 2013-04-04 01:52:47 -07:00
Sam
e61a28f3e1 utc vs non utc is a subtle issue, tests were failing for a few hours every day cause of this 2013-04-04 13:29:54 +11:00
Sam
86cf7b1524 trust level 0 is highlighted in light gray as opposed to having special semantics around account age. 2013-04-04 12:24:23 +11:00
Sam
4871454705 Merge pull request #639 from ZogStriP/cleaner-login-modal-when-there-is-no-login-button
cleaner login modal when there is no login button [fixes #638]
2013-04-03 16:40:39 -07:00
Neil Lalonde
68e9a727b8 Merge branch 'categories' 2013-04-03 17:50:42 -04:00
Neil Lalonde
5871b01323 Show descriptions in category combobox 2013-04-03 17:46:51 -04:00
Régis Hanol
aca7fa01bb cleaner login modal when there is no login button [fixes #638] 2013-04-03 23:28:42 +02:00
Robin Ward
5beaf61ac0 Removes extra comma 2013-04-03 16:33:25 -04:00
Robin Ward
5ec41d454c Converted a bunch of ajax calls to use promises 2013-04-03 16:24:42 -04:00
Robin Ward
33f349a1e6 Show all Hot rankings at once with a toggle button 2013-04-03 15:25:18 -04:00
Neil Lalonde
bb18b6cb9b Dashboard: split out private messages from topic and post counts; re-enable report_spec because I think I fixed it... 2013-04-03 13:26:09 -04:00
Robin Ward
738789f336 Admins can't lock themselves out of a site by setting approval. 2013-04-03 12:23:28 -04:00
Robin Ward
459c7e3d59 Include pinned on Categories page 2013-04-03 11:45:53 -04:00
Robin Ward
ac0bc1bb30 Including your avatar if you've posted is confusing. Let's remove it for now. 2013-04-03 11:29:50 -04:00
Robin Ward
59e4e77190 Merge pull request #634 from wojciechka/master
Allow handling of back/forward buttons in browser when running with prefix (i.e. as /discourse)
2013-04-03 08:11:53 -07:00
Robin Ward
2b9514a311 Merge pull request #627 from kubabrecka/translatable_flags_and_likes
make post actions (likes, flags) translatable as whole sentences
2013-04-03 08:09:13 -07:00
Robin Ward
368011d03b Merge pull request #628 from ZogStriP/add-uploads-controller-specs
add UploadsController specs
2013-04-03 08:06:49 -07:00
Robin Ward
0e09c8b9b9 Merge pull request #622 from ZogStriP/prevent-users-from-uploading-files-other-than-images
prevent users from uploading files other than images
2013-04-03 07:39:55 -07:00
Wojciech Kocjan
a0ef917736 Reworked rootURL in ember.js and allow handling of back/forward buttons in browser 2013-04-03 14:41:26 +02:00
Sam
814be151c1 fixed regression 2013-04-03 16:47:33 +11:00
Régis Hanol
2b120ef886 add UploadsController specs 2013-04-03 01:17:17 +02:00
Robin Ward
ee76f1926d Debugging Tool for Hot Topics 2013-04-02 18:00:53 -04:00
Sam
161fdcb364 fix weird selection bugs during quote reply. 2013-04-03 08:10:29 +11:00
Sam
f99d40b419 push login form to the bottom so its not hovering on the top in lynx or google summary 2013-04-03 07:44:35 +11:00
Kuba Brecka
f957b0aee5 make post actions (likes, flags) translatable as whole sentences 2013-04-02 21:15:55 +02:00
Neil Lalonde
202addb693 User Visits count for 30 days ago was always 0 2013-04-02 15:03:23 -04:00
Neil Lalonde
b6a6581b3c Refactor some report javascript to get rid of some helpers 2013-04-02 14:41:13 -04:00
Robin Ward
75703cfc6a Minor JS cleanup 2013-04-02 12:44:03 -04:00
Neil Lalonde
3fda486020 Use envelope icon for Private Message button 2013-04-02 12:28:41 -04:00
Robin Ward
e8d66beea5 Fix @notification text for non visitors 2013-04-02 11:58:12 -04:00
Robin Ward
422dbbd25a Exclude older topics from the first x rows in "Hot" 2013-04-02 11:15:04 -04:00
Régis Hanol
3524a93cfb prevent users from uploading files other than images 2013-04-02 11:38:15 +02:00
Régis Hanol
dd4f24919f Fix some 'quote reply' button quirks 2013-04-02 10:35:22 +02:00
Jeff Atwood
effb440de0 remove close function from browser update nag 2013-04-02 00:42:59 -07:00
Sam
9c9087b99c less bloated browser update
no need for respond.js (ie8 compat stuff)
preload store should not be naming stuff get, its reserved
bad js generates for preload store
use browse happy, cause its better
2013-04-02 17:44:48 +11:00
Jeff Atwood
b9be14101b remove margins from h3,h4 in onebox body 2013-04-01 21:23:47 -07:00
Sam
133ea0b8a0 no idea where this loading message came from but we don't seem to need it 2013-04-02 15:20:59 +11:00
Sam
08af09cd7d don't pass notification email into to the default cause it freezes in a potentially incorrect value 2013-04-02 13:29:34 +11:00
Robin Ward
2a6889c087 Removes repetitive view.category from the template 2013-04-01 20:56:04 -04:00
Sam
f2f82ea83b Merge pull request #614 from ZogStriP/implemented-cancel-image-upload
users can now cancel image upload
2013-04-01 17:39:17 -07:00
Sam
190f7b4812 classes for logo big and small 2013-04-02 11:37:41 +11:00
Sam
3376ea5615 Merge pull request #619 from ZogStriP/fix-cannot-paste-text-in-composer
FIX: cannot paste text in composer
2013-04-01 17:19:49 -07:00
Sam
028d3bd19f remove problem chars from browser update 2013-04-02 11:07:41 +11:00
Régis Hanol
0cb8ea1426 FIX: cannot paste text in composer 2013-04-02 02:05:20 +02:00
Robin Ward
61b5c0340e Convert all Ajax calls to use Discourse.ajax() 2013-04-01 18:09:23 -04:00
Neil Lalonde
5344ab2893 Remove weird characters from browser-update.js 2013-04-01 17:33:11 -04:00
Jeff Atwood
533936f3a2 increase max_mentions to 10 2013-04-01 14:31:07 -07:00
Neil Lalonde
acb2a18e8a Show a Please Upgrade message to people on unsupported browsers 2013-04-01 16:19:57 -04:00
Robin Ward
1e6f8dc93a Include uncategorized pinned topics on 'Hot' 2013-04-01 13:49:35 -04:00
Régis Hanol
cf9b5d1a3d users can now cancel image upload 2013-04-01 19:01:29 +02:00
Robin Ward
79c986dd92 Fix issue with duplicate slugs 2013-04-01 12:26:51 -04:00
Robin Ward
e4d190d856 XSS fix for category descriptions 2013-04-01 12:01:27 -04:00
Robin Ward
4c5ab8d688 Update Discourse to Ember 1.0 RC2 2013-04-01 11:26:24 -04:00
Robin Ward
f429e95d4e Merge pull request #601 from kubabrecka/split_multiple_pluralization
split i18n strings where there are 2 pluralizable variables
2013-04-01 07:49:05 -07:00
Robin Ward
0fc86a9869 Merge pull request #605 from kubabrecka/i18n_pluralization
implement pluralization for server-side and js
2013-04-01 07:48:10 -07:00
Neil Lalonde
68710be564 Merge pull request #610 from PragTob/ReportsRemoveDuplication
Battling code duplication in the Report class
2013-04-01 07:39:44 -07:00
Robin Ward
f9ea1a448d Merge pull request #600 from kubabrecka/consistent_topic_count
make sure Category.topic_count is consistent with week/year stats
2013-04-01 07:37:07 -07:00
Robin Ward
f8931d371c Merge pull request #609 from katiefenn/docked_topic_progress_bug
Topic progress does change its X coordinate when switching between static and float views
2013-04-01 07:31:00 -07:00
Robin Ward
8f518a2496 Merge pull request #604 from wpp/refactor_suggest_username
Improve suggest_username method in user class
2013-04-01 07:25:27 -07:00
Robin Ward
b61907fbf3 Merge pull request #593 from ZogStriP/get-quote-reply-button-working-on-ios
Get the "quote reply" button working on iOS
2013-04-01 07:20:49 -07:00
Robin Ward
75d5049c0a Merge pull request #606 from ZogStriP/better-client-side-upload
improved images upload on the client side
2013-04-01 07:11:26 -07:00
Robin Ward
865cf011a2 Merge pull request #561 from ZogStriP/fix-quote-reply-gets-in-the-way
FIX: "Quote Reply" button gets in the way
2013-04-01 07:04:46 -07:00
Tobias Pfeiffer
3324f0f2d2 Battling code duplication in the Report class
* the reports mainly followed the same structure but with
  different classes, so I took the code and a class as its
  parameter
* the method on which reports.data is generated may change
  but mostly is count_per_day so made that optional
* grouped the refactored methods to the top, some unrefactored
  methods remain but those are a bit harder to refactor, and not
  as reusable so I'd like to get this through first
* Overall I believe this patch enhances maintainability :-)
2013-04-01 15:26:58 +02:00
katiefenn
2a18c9c600 Topic progress does change its X coordinate when switching between static and float views 2013-04-01 11:50:01 +01:00
Sam
dce2847b4f Merge pull request #597 from ZogStriP/fix-s3-image-upload
FIX: S3 image upload
2013-04-01 03:12:58 -07:00
Sam
128bba302f Merge pull request #588 from mark-rushakoff/admin-title-tooltip
Add admin title to trophy tooltip in admin users list
2013-04-01 03:11:37 -07:00
Sam
7043ab906f Merge pull request #602 from knoxmic/master
FIX: Autocomplete, missing charcode for correct term
2013-03-31 23:52:02 -07:00
Régis Hanol
72989dca7c improved images upload on the client side 2013-04-01 03:19:21 +02:00
Kuba Brecka
af0a772629 implement pluralization for server-side and js 2013-03-31 19:55:02 +02:00
Philipp Weissensteiner
c34f476b31 Improve suggest_username method in user.rb
The suggest_username method showed up on codeclimate
so I thought I'd give it some love and make it more readable.
In the process removed trailing whitespaces and had to fix a
terrible spelling error :)
2013-03-31 19:01:11 +02:00
knoxmic
182f794466 fix autocomplete charcode '0' and 'z' 2013-03-31 16:00:21 +02:00
Kuba Brecka
1c50c99e9a split i18n strings where there are 2 pluralizable variables 2013-03-31 14:20:02 +02:00
Kuba Brecka
d50b5e1fd8 make sure Category.topic_count is consistent with week/year stats 2013-03-31 13:22:05 +02:00
Kuba Brecka
db56d2bc97 let <title> contain site name instead of just "Discourse" 2013-03-30 23:16:59 +01:00
Neil Lalonde
92aa0f45d2 Show trends on some dashboard numbers 2013-03-30 14:07:35 -04:00
Régis Hanol
0aff5042e5 FIX: S3 image upload 2013-03-30 17:56:25 +01:00
Régis Hanol
b7a7d8b006 Get the "quote reply" button working on iOS 2013-03-30 02:52:52 +01:00
Neil Lalonde
d0f810dee5 Don't request list of problems from server as often if there weren't any problems 2013-03-29 16:05:29 -04:00
Neil Lalonde
25073e873f Fetch the list of problems more frequently on the admin dashboard 2013-03-29 15:48:26 -04:00
Régis Hanol
5ea35ff393 FIX: "Quote Reply" button gets in the way 2013-03-29 19:34:45 +01:00
Robin Ward
df85201298 Adjust hot to include more recent topics 2013-03-29 13:33:31 -04:00
Neil Lalonde
436515ec6c Dashboard checks for facebook, twitter, and github configs 2013-03-29 13:32:40 -04:00
Robin Ward
92eaa69df9 Merge pull request #589 from goshakkk/user-admin-scope
Create the User.admins and User.moderators scopes
2013-03-29 10:06:28 -07:00
Robin Ward
de8f525701 Merge pull request #582 from kubabrecka/add_es_js
adding "es" translation js file
2013-03-29 10:04:24 -07:00
Gosha Arinich
bdfa9b0508 create the User.admins and User.moderators scopes 2013-03-29 09:52:09 +03:00
Mark Rushakoff
f633d1232f Add admin title to trophy tooltip in admin users list 2013-03-28 22:53:54 -07:00
Mark Rushakoff
3e3712a517 Don't call to_sym on param 2013-03-28 20:50:07 -07:00
Jeff Atwood
cb6b9ccc6d make h1 margins specific to .cooked, and preview 2013-03-28 17:07:57 -07:00
Neil Lalonde
f2d61496af Fix automatic selection of share link 2013-03-28 16:58:41 -04:00
Robin Ward
a819a26f34 BUGFIX: New status posts weren't using PostCreator 2013-03-28 16:40:54 -04:00
Robin Ward
473a64d39d Add score, percent_rank to topics. Adds HotTopic model and consolidated job to calculate
hotness. Note: People on Heroku will have to update their jobs to the new structure
in Heroku.md
2013-03-28 15:39:54 -04:00
Kuba Brecka
30babccc64 adding "es" translation js file 2013-03-28 19:30:37 +01:00
Régis Hanol
1668b5eab2 FIX: allows the selection of the default landing tab 2013-03-28 14:01:13 +01:00
Sam
0bcd142a81 Merge pull request #193 from tms/timing-is-everything
Make topic lists show last activity more intuitively
2013-03-27 22:57:44 -07:00
Sam
2295290383 added best=N option to get N best comment on a post 2013-03-27 22:53:11 -07:00
Neil Lalonde
e263cb81ca Make sure share dialog goes away when clicking outside of it, including links to other routes 2013-03-27 19:43:47 -04:00
Robin Ward
e0fc7afc41 Fixes bug where progress looked weird when creating a new post. 2013-03-27 17:41:02 -04:00
Neil Lalonde
55884e4b77 Escape key closes share dialog 2013-03-27 16:29:02 -04:00
Robin Ward
36269cfbaa Rename 'popular' to 'latest'. First stab at 'Hot' tab. 2013-03-27 16:21:23 -04:00
Neil Lalonde
d1945057fd Include topic title in share links with third parties 2013-03-27 16:01:46 -04:00
Neil Lalonde
35f3cd9325 Make login buttons even smaller 2013-03-27 14:36:26 -04:00
Robin Ward
b9fee3bf00 Robin sucks at jshint 2013-03-27 12:31:17 -04:00
Neil Lalonde
4711cb4716 Cleanup layout of login buttons 2013-03-27 12:23:11 -04:00
Robin Ward
d9539225f8 Merge pull request #574 from wojciechka/master
Fix URL for composer /education paths when using prefix for Discourse
2013-03-27 08:58:27 -07:00
Robin Ward
a9019288c5 Let's use a horizontal control for selecting the hotness rather than a dial. 2013-03-27 11:57:22 -04:00
Wojciech Kocjan
c88c7538b6 Fixed URL for composer /education paths 2013-03-27 16:10:47 +01:00
Robin Ward
4cb4843323 Includes post count in filter message by user 2013-03-27 10:53:43 -04:00
Robin Ward
ba8e526950 Fix z-index of "in reply to" tabs versus filter message. 2013-03-27 10:48:12 -04:00
Kuba Brecka
41c9c4f253 update Sugar.js localized date formats 2013-03-27 09:29:25 +01:00
Sam
fc94d3e551 match the create api with the update api ... so api is more consistent 2013-03-26 23:49:35 -07:00
Robin Ward
994ab94107 Remove extra comma 2013-03-26 18:37:07 -04:00
Robin Ward
af7f6fea28 Can set the hotness of a category. For the soon to be implemented "hotness" tab. 2013-03-26 18:08:58 -04:00
Neil Lalonde
5961ffc0e4 Add site setting to choose which share links to show and in what order 2013-03-26 17:17:37 -04:00
Neil Lalonde
1b779e5e71 Increase the size of the share links 2013-03-26 17:17:37 -04:00
Neil Lalonde
7bfd66aa80 Add title attrs to share links 2013-03-26 17:17:37 -04:00
Robin Ward
a30c019275 Show totals in best of yellow thigny. 2013-03-26 15:40:30 -04:00
Robin Ward
f1e2923a91 Display correct post counts, even with a filter active 2013-03-26 15:06:23 -04:00
Robin Ward
5dc47c2d82 Rename posts_count in topic view to post_counts_by_user which makes much more sense 2013-03-26 14:06:24 -04:00
tms
172173eccc Make topic lists show last activity more intuitively 2013-03-25 22:13:23 -04:00
Sam
c57ec611e1 basic api support 2013-03-25 18:04:46 -07:00
Sam
a177264114 refactoring of topic view tracking 2013-03-25 18:04:46 -07:00
Sam
c2db546877 getAjax helper ... saves a lot of typing, we can extend later 2013-03-25 18:04:46 -07:00
Jeff Atwood
8ce9eefdce bit more spacing for quote reply glyph 2013-03-25 17:31:08 -07:00
Neil Lalonde
1ed6406a7d Add twitter, facebook, and google plus links to share dialog 2013-03-25 18:54:11 -04:00
Sam
7f9f619f82 Merge pull request #566 from mikl/danish-translation-enabling-stub
Stub for actually enabling the Danish translation.
2013-03-25 15:12:40 -07:00
Mikkel Hoegh
8ca898760c Oops, missed a spot. 2013-03-25 23:07:02 +01:00
Mikkel Hoegh
4fefe349d0 Stub for actually enabling the Danish translation. 2013-03-25 23:02:08 +01:00
Jeff Atwood
bce127d6db add icon-quote glyph to quote reply pop-up button 2013-03-25 11:16:06 -07:00
Marco Sampellegrini
ce98ce4b93 Italian Translation! 2013-03-25 18:35:38 +01:00
Robin Ward
c372e36cb6 Don't count @mentions as links in a post 2013-03-25 13:12:15 -04:00
Robin Ward
6568b4aaa9 Better error messages when hitting max mentions/images/links 2013-03-25 12:27:09 -04:00
Neil Lalonde
4fb3b58592 Remove the extra column from per_day_counts_report 2013-03-25 11:35:48 -04:00
Sam
6804c994f5 fix missing info error 2013-03-24 18:30:19 -07:00
Sam
3f0251dc63 get rid of metamorph 2013-03-24 18:13:03 -07:00
Sam
4cc1b88d91 Merge branch 'scroll_work' 2013-03-24 17:31:10 -07:00
Sam
deb603f41c Merge pull request #547 from kid0m4n/convert-ruby-1-9-syntax
Convert a lot of :a => b to a: b and bring peace to the world
2013-03-24 16:43:17 -07:00
Karan Misra
5dfb04e4b3 Convert a lot of :a => b to a: b and bring peace to the world 2013-03-25 05:07:36 +05:30
Sam
36a069488e Merge pull request #492 from sbauch/email-whitelist
added email whitelist SiteSetting feature to replicate email blacklist S...
2013-03-24 16:35:24 -07:00
Sam
b1d1ab7d2b Merge pull request #559 from ZogStriP/fix-exception-when-wrong-resource-type-in-url
[fixes #391] exception when wrong resource type in URL
2013-03-24 16:16:34 -07:00
Régis Hanol
0da8f35659 [fixes #391] exception when wrong resource type in URL 2013-03-24 22:25:24 +01:00
Robin Ward
5b9ff91e88 Merge pull request #553 from buddhamagnet/issue-352-missing-template
Add render nothing to refresh_browsers method
2013-03-24 08:27:18 -07:00
Jeff Atwood
6689f72dfd first-child removes whitespace from top of posts
MUST REMOVE SCRIPT METAMORPH FROM COOKED FOR THIS TO WORK!
2013-03-24 03:03:46 -07:00
Jeff Atwood
a001232ff3 move h1-h6 margins into topic-body 2013-03-24 02:26:54 -07:00
Jeff Atwood
a7dfcc54e8 fix h4 style issue on topic map 2013-03-24 02:07:37 -07:00
Jeff Atwood
85c0a8e396 margin tweak no longer necessary 2013-03-24 02:01:07 -07:00
Jeff Atwood
e0a119ba36 remove a TON of unused bootstrap classes 2013-03-24 01:44:42 -07:00
Jeff Atwood
0c8a803144 fix the CSS problem with paras under headings 2013-03-24 00:49:42 -07:00
Jeff Atwood
f14cf4c97e reduce read time required for basic user to 15m 2013-03-23 23:52:34 -07:00
buddhamagnet
baef69d08c add render nothing to refresh_browsers method 2013-03-23 21:37:37 +00:00
Kuba Brecka
274d665f35 extract hardcoded strings from admin reports 2013-03-23 18:06:28 +01:00
Robin Ward
030ecfaa71 Fix bug where new posts wouldn't load after hitting the bottom if you'd filtered 2013-03-23 11:18:38 -04:00
Robin Ward
842760e50e Bump up best of to top 20% 2013-03-23 11:14:07 -04:00
Robin Ward
38d00767e6 Merge pull request #541 from kubabrecka/extract_string
extract hardcoded string into locales
2013-03-23 07:35:24 -07:00
Karan Misra
3f27ffca9f topic_poster.rb: Fix formatting of the attributes return value 2013-03-23 19:09:01 +05:30
Sam
7b6f54a3db Merge pull request #540 from kubabrecka/remove_gitkeep
remove unnecessary .gitkeep files
2013-03-23 03:26:17 -07:00
Kuba Brecka
5de0d85595 extract hardcoded string into locales 2013-03-23 11:24:04 +01:00
Jeff Atwood
38285b6219 for PMs, switch to envelope glyph instead of lock 2013-03-23 02:46:50 -07:00
Kuba Brecka
4424328bff remove unnecessary .gitkeep files 2013-03-23 10:45:40 +01:00
Sam
ae2cfa325c so subtle ... 2013-03-22 20:28:39 -07:00
Sam
35a9051f56 cleanup 2013-03-22 20:18:10 -07:00
Jeff Atwood
f0b57d5e4a reduce basic user time required from 25m to 20m 2013-03-22 15:33:40 -07:00
Neil Lalonde
158cda7628 Add moderator and admin count to dashboard 2013-03-22 17:50:34 -04:00
Robin Ward
8761b5ac4f Merge pull request #533 from moneypenny/master
Use consistent new-style hashes in render calls
2013-03-22 12:48:47 -07:00
Neil Lalonde
aa6e87c5c1 Dashboard memory warning 2013-03-22 15:47:35 -04:00
Robin Ward
9c38c13ac5 The "Best Of" mode uses a percentage ranking of posts. 2013-03-22 15:44:39 -04:00
Sam Bauch
77e3434d81 added email whitelist SiteSetting feature to replicate email blacklist. email_validator method now also uses the regex method for both the whitelist and blacklist. 2013-03-22 14:49:42 -04:00
Neil Lalonde
ab412dd8b4 Update admin dashboard views now that ember lets us render the same view multiple times with different models 2013-03-22 14:31:40 -04:00
Sarah Vessels
54c7b1ab63 Use consistent new-style hashes in render calls *twitch* 2013-03-22 14:08:11 -04:00
Robin Ward
1d7c38bedf Merge pull request #531 from kubabrecka/unused_code
removing some unused code
2013-03-22 09:20:18 -07:00
Robin Ward
7b3149a65a Merge pull request #528 from kubabrecka/missing_js_langs
adding JS support for id and pt languages
2013-03-22 09:19:37 -07:00
Robin Ward
7527d65d60 Merge pull request #529 from kubabrecka/i18n_date_formats
update JS date formats for new languages
2013-03-22 09:18:45 -07:00
Kuba Brecka
b392143991 removing some unused code 2013-03-22 17:14:29 +01:00
Robin Ward
154471126f Update to master Ember.js 2013-03-22 12:13:52 -04:00
Robin Ward
bfa14b419c Animate in the bottom filter bar 2013-03-22 12:05:17 -04:00
Robin Ward
5ec8af0019 Cleaned up a bunch of JS 2013-03-22 12:05:13 -04:00
Neil Lalonde
6f8d13d47e Dashboard warning when sidekiq is not running 2013-03-22 11:35:51 -04:00
Kuba Brecka
d14198ce0c update JS date formats for new languages 2013-03-22 16:32:03 +01:00
Kuba Brecka
4f74d4e8fc adding JS support for id and pt languages 2013-03-22 16:18:06 +01:00
Dan Berman
9ad5720090 someone's been playing too much 2013-03-22 06:18:48 -04:00
Sam
e99f137316 refactor analysis of read posts and centralize logic 2013-03-22 00:40:08 -07:00
Robin Ward
ee5213be5f Fixes regression with video embeds 2013-03-21 20:53:12 -04:00
Neil Lalonde
8cc7f3c20b Dashboard warning when clockwork doesn't seem to be running 2013-03-21 16:51:50 -04:00
Neil Lalonde
40962c84ca Add 'all' column to admin dashboard counts 2013-03-21 16:51:50 -04:00
Neil Lalonde
38415f28da Remove old caching code from report model 2013-03-21 16:51:49 -04:00
Robin Ward
35ec6c6806 Show loading when filtering by user / best of 2013-03-21 16:46:22 -04:00
Robin Ward
ce3fa4d507 Replace "ok" with a close glyph 2013-03-21 16:11:05 -04:00
Robin Ward
5c4b794a8c Fixed a bunch of 'best of' errors and cleaned up JS. 2013-03-21 16:04:06 -04:00
Robin Ward
b6f49e5b68 Refactor PostView 2013-03-21 14:48:16 -04:00
Robin Ward
c541d9699c Merge pull request #510 from ZogStriP/fix-can-t-click-on-avatars-when-on-my-profile-page
fix: can't click on avatars when on my profile page
2013-03-21 10:58:47 -07:00
Robin Ward
97b2f5b86a Merge pull request #509 from wojciechka/master
Topic and admin dashboard not retrieving data properly when using prefix
2013-03-21 10:58:13 -07:00
Régis Hanol
d84309a7ba fix: can't click on avatars when on my profile page 2013-03-21 18:55:42 +01:00
Robin Ward
babcfe6234 Cache oneboxes in Redis now instead of postgres. 2013-03-21 13:11:54 -04:00
Wojciech Kocjan
910a622371 topic and admin dashboard not retrieving data properly when using prefix 2013-03-21 16:24:05 +01:00
Sam
4a8563461a Merge pull request #508 from ZogStriP/fix-unban-button-on-user-admin-page
fix the issue regarding the unban button
2013-03-20 21:58:29 -07:00
Sam
0089619ed9 Eyeline will no fire any events if the window has no focus
After posts are rendered a debounced eyeline is fired
Dont trigger eyeline from TopicPostsView, its the wrong spot, will only fire on first render
2013-03-20 21:45:27 -07:00
Régis Hanol
ad8d078c87 fix the issue regarding the unban button 2013-03-21 01:25:41 +01:00
Jeff Atwood
002fab358b slightly reduce read time req for trust level 1 2013-03-20 16:49:32 -07:00
Sam
a78287a021 Merge pull request #507 from ZogStriP/keep-french-l10n-up-to-date-3
keep French l10n up to date
2013-03-20 16:30:57 -07:00
Sam
cd9d99aab8 Merge pull request #505 from ZogStriP/updated-preloadstore-api
updated PreloadStore API
2013-03-20 16:30:15 -07:00
Régis Hanol
6dc630383e keep French l10n up to date 2013-03-20 23:52:51 +01:00
Neil Lalonde
5db196315c Improve message when you change your password 2013-03-20 16:55:56 -04:00
Neil Lalonde
23cee77310 Merge pull request #506 from tangramor/master
Update the zh_CN and zh_TW translations to the latest en.yml
2013-03-20 13:17:42 -07:00
Neil Lalonde
d28d81a590 Dashboard warning when GC params are default 2013-03-20 16:16:23 -04:00
Neil Lalonde
c8508d3f26 Dashboard warning when host_names is localhost 2013-03-20 15:38:28 -04:00
Neil Lalonde
c3c25b894a Cache dashboard data in the controller, not the report model 2013-03-20 13:54:32 -04:00
tangramor
dc7b690921 Add I18n support for "The topic has been deleted" message 2013-03-21 00:10:41 +08:00
Neil Lalonde
1e4dd3ea0c Start detecting install problems and report them on the admin dashboard. This commit adds check for Rails.env 2013-03-20 12:00:52 -04:00
Régis Hanol
f1015fd73a updated PreloadStore API
so that it is more clear that we are deleting preloaded data once read
2013-03-20 16:26:46 +01:00
Sam
381e280228 we should not be mixing this in to our serializers
1. it gives the class broken methods (like cache in production)
2. it conflicts with am serializers
2013-03-19 22:13:37 -07:00
Sam
62c60540be pull moderator into own column, rename trust levels 2013-03-19 21:06:11 -07:00
Sam
0f5046a9cc Merge pull request #499 from wojciechka/master
Logging in with username and password does not work when using prefix URLs
2013-03-19 20:37:47 -07:00
Sam
7ec0288c85 slight optimisation 2013-03-19 18:12:05 -07:00
Sam
e541c2ae2c these mousemove events trigger an insane amount of get calls, I really need my patch accepted in ember 2013-03-19 17:17:39 -07:00
Sam
6127b29e4c this should be optimised at some point 2013-03-19 16:54:23 -07:00
Sam
2a047df4f1 cache reply_to_user_id in post to eliminate a very nasty n+1 query 2013-03-19 16:54:23 -07:00
Neil Lalonde
1bdb318704 Revert "Add encoding: utf-8 to locales/ js.erb files to fix rake assets:precompile:all" 2013-03-19 16:10:04 -04:00
Robin Ward
98847a9eb4 Update Ember.js 2013-03-19 15:41:36 -04:00
Neil Lalonde
7ecfc0be9c Add encoding: utf-8 to locales/ js.erb files to fix rake assets:precompile:all 2013-03-19 15:36:30 -04:00
Neil Lalonde
7b35a93db6 Installed version is a link to the commit you're on 2013-03-19 14:43:04 -04:00
Neil Lalonde
de84718894 Move 'upgrade often' nag to the commits widget 2013-03-19 14:43:04 -04:00
Neil Lalonde
70f5ee5fa9 New layout for version check on admin dashboard 2013-03-19 14:43:04 -04:00
Robin Ward
96ac0c5569 A site setting for how many similar topics are returned 2013-03-19 13:51:25 -04:00
Wojciech Kocjan
14689a4f13 Logging in with username and password does not work in prefixed discourse 2013-03-19 17:15:14 +01:00
Neil Lalonde
dab49c70bb Dashboard metrics link to their report pages 2013-03-19 12:04:40 -04:00
Sam
851cd2637c hmmm jshint should warn about this.... 2013-03-19 05:19:07 -07:00
Jeff Atwood
f595ace213 tighten composer spacing a bit for topics too 2013-03-19 02:42:08 -07:00
Jeff Atwood
f40e21ede3 tighten up reply to spacing on composer 2013-03-19 02:24:18 -07:00
Sam
9805f7d2f5 max upload size message when images are too big. 2013-03-19 00:19:05 -07:00
Sam
1cd26a7dcf oops 2013-03-18 23:44:21 -07:00
Sam
dd03f44968 optimise 2013-03-18 23:18:15 -07:00
Sam
0e1174dbe8 Merge pull request #487 from ZogStriP/keep-favorite-title-in-sync-with-status
keep favorite/star button's title in sync with starred status
2013-03-18 21:48:12 -07:00
Sam
c8b891db4a Merge pull request #491 from ZogStriP/better-topic-title-for-crawlers
provide a better title on topic pages for crawlers
2013-03-18 21:46:17 -07:00
Régis Hanol
feecb1374a consistent behavior of the composer's create button 2013-03-19 01:24:10 +01:00
Robin Ward
59fc3bfac4 PostDestroyer to replace callbacks for destroying 2013-03-18 17:55:11 -04:00
Robin Ward
c1e40f5d19 Convert Post type constants to Enum 2013-03-18 17:55:05 -04:00
Robin Ward
897d48b145 Moved more Post callbacks into service classes 2013-03-18 17:54:55 -04:00
Robin Ward
d5e4243f02 Move draft sequence incrementing out of after_save 2013-03-18 17:54:50 -04:00
Robin Ward
5aec5261a7 Converted flag threshold constants to enums 2013-03-18 17:54:43 -04:00
Robin Ward
aea848f164 Move MessageBus observer into PostCreator 2013-03-18 17:54:39 -04:00
Neil Lalonde
c24f6d3d51 Username change: check length in js, we don't need the server to do it 2013-03-18 15:38:19 -04:00
Régis Hanol
125ac9a204 provide a better title on topic pages for crawlers 2013-03-18 19:24:27 +01:00
Régis Hanol
967b03fcfc keep favorite/star button's title in sync with starred status 2013-03-18 18:57:03 +01:00
Robin Ward
b6224b014c Move a bunch of callbacks into PostCreator 2013-03-18 13:56:26 -04:00
Neil Lalonde
12768f1d42 Fix admin dashboard layout on smaller widths 2013-03-18 13:44:28 -04:00
Neil Lalonde
766f437e44 Say 'mod' instead of '5' on users per trust level table 2013-03-18 13:25:40 -04:00
Robin Ward
c4a5f9d47b Merge pull request #489 from ZogStriP/fix-editing-a-category-and-cancelling
fix some issues when editing a topic title and then cancelling it
2013-03-18 07:41:49 -07:00
Robin Ward
c1298979bb Merge pull request #472 from ZogStriP/fixes-random-login
fixes the random login on dev
2013-03-18 07:30:06 -07:00
Robin Ward
e1e1bdd0b1 Merge pull request #469 from wojciechka/master
Support for running discourse with a prefix (i.e. as http://servername/discourse)
2013-03-18 07:24:11 -07:00
Neil Lalonde
50b04b2209 Add email counts to admin dashboard 2013-03-18 10:08:09 -04:00
Neil Lalonde
6a99d12784 Add likes to admin dashboard 2013-03-18 10:08:08 -04:00
Régis Hanol
33c100da17 fix some issues when editing a topic title and then cancelling it 2013-03-18 12:00:50 +01:00
Robin Ward
0b4339c103 For Evil Trout blog part 2: switch between bar chart and table 2013-03-17 15:03:34 -04:00
Robin Ward
42c234e927 Merge pull request #483 from ZogStriP/site-setting-for-category-color
site setting for category colors
2013-03-17 04:48:01 -07:00
Robin Ward
4e057335d5 Merge pull request #464 from ZogStriP/fix-issues-when-a-failure-happen-while-creating-a-new-category
displays a message when a failure happen while creating a new category
2013-03-17 04:47:44 -07:00
Régis Hanol
bc9e931304 site setting for category colors 2013-03-17 01:24:52 +01:00
Sam
ee1460e932 Merge pull request #480 from ZogStriP/fix-reply-draft-wont-save
fix: reply draft won't save
2013-03-16 15:01:50 -07:00
Régis Hanol
83b8a3386f fix: reply draft won't save 2013-03-16 18:14:54 +01:00
Robin Ward
e4dfb0a935 Merge pull request #474 from ZogStriP/bind-category-text-field-to-category-badge
bind the text entered in the category name text field to the badge
2013-03-16 08:20:10 -07:00
Kuba Brecka
94c0e73ca6 extract string from commits widget 2013-03-16 12:39:20 +01:00
Régis Hanol
a500f6b307 bind the text entered in the category name text field to the badge 2013-03-16 00:59:11 +01:00
Régis Hanol
89815878d9 fixes the random login on dev 2013-03-16 00:26:32 +01:00
Wojciech Kocjan
e6ccc300dc Support for running discourse with a prefix (i.e. as http://servername/discourse) 2013-03-16 00:01:21 +01:00
Neil Lalonde
d9cdde9aa7 Add user counts for each trust level to admin dashboard 2013-03-15 18:09:02 -04:00
Neil Lalonde
1d9764d8fc Remove admin_report_total_users_view.js 2013-03-15 18:09:01 -04:00
Neil Lalonde
8983df9856 Show current user count for now, not at different points in time 2013-03-15 18:09:01 -04:00
Jeff Atwood
0db31b3398 just set opacity of links on archived not row 2013-03-15 14:17:47 -07:00
Jeff Atwood
e22b4fe229 fancier favorite star on topics 2013-03-15 14:06:04 -07:00
Robin Ward
67f0de4b8b Fixed some merge conflicts 2013-03-15 16:59:10 -04:00
Robin Ward
1a60301a17 Merge branch 'fixes-topic-title-length-too-short' of git://github.com/ZogStriP/discourse
Conflicts:
	app/assets/javascripts/discourse/controllers/composer_controller.js
	app/assets/javascripts/discourse/views/composer_view.js
	config/locales/client.en.yml
2013-03-15 16:49:17 -04:00
Robin Ward
76d8df6ac6 Merge pull request #462 from kubabrecka/colorpicker3
implement color picking from predefined set for category badges + option to change foreground color
2013-03-15 13:43:59 -07:00
Robin Ward
be01e7be60 Slightly offset the second popup if two are on at once 2013-03-15 16:05:57 -04:00
Robin Ward
dd5885bf12 FIX: Twitter tags were using property instead of name. 2013-03-15 15:42:21 -04:00
Robin Ward
ad082cea70 Big commit:
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
2013-03-15 14:35:33 -04:00
Robin Ward
7714e2050e Merge pull request #465 from ZogStriP/extracted-hard-coded-string-in-admin-javascript-files
extracted hard coded strings in the admin javascript files [ci skip]
2013-03-15 06:49:03 -07:00
Régis Hanol
aef014f439 displays the number of characters left when editing the topic title 2013-03-15 12:56:14 +01:00
Nick Sahler
fb0da25b2d Wrong file. :| 2013-03-15 05:35:26 -03:00
Neil Lalonde
6c4d9ecfdc Use one request to fetch dashboard report data and check version 2013-03-14 18:26:26 -04:00
Régis Hanol
cad55bf244 extracted hard coded strings in the admin javascript files 2013-03-14 23:03:13 +01:00
Régis Hanol
3bf6625aa4 displays a message when a failure happen while creating a new category 2013-03-14 22:25:55 +01:00
Neil Lalonde
4f42110e39 Change layout of the admin dashboard 2013-03-14 12:42:45 -04:00
Robin Ward
1715220d77 FIX: Hide topics list when loading new topics by category 2013-03-14 12:38:05 -04:00
Robin Ward
f47240483c FIX: On refresh, wouldn't say "You liked this" 2013-03-14 12:15:24 -04:00
Robin Ward
8760f58f3d Merge pull request #450 from ZogStriP/fixes-category-bug-on-cancel
fixes bug when modifying the category of a topic but cancelling the edit
2013-03-14 08:08:26 -07:00
Robin Ward
18133caf25 Merge pull request #449 from kubabrecka/composer_wider_placeholder
make the "add user" placeholder in composer wider, so other languages can fit into that
2013-03-14 08:06:04 -07:00
Neil Lalonde
91bd27ec0a Keep a jQuery object of hidden login form 2013-03-14 11:03:57 -04:00
nsahler
d398d13aed - Mobile Reply-as-new fix
- Documentation
2013-03-14 11:02:13 -04:00
Robin Ward
42621859d1 Merge pull request #459 from tangramor/master
Fixed issue #435. Add zh_TW translations. Add missed translations according to newest en.yml
2013-03-14 06:38:37 -07:00
Kuba Brecka
8784c55188 implement color picking from predefined set for category badges + option to change foreground color 2013-03-14 14:16:57 +01:00
Regis Hanol
6abfa5342c extracted a few missing strings 2013-03-14 11:59:40 +01:00
tangramor
30f6561623 Fix #435 increased the lenghth of category.topic_prefix string; also added zh_TW translations by converting the Simplified Chinese to Traditional Chinese
New I18n entries added, added in both zh_CN and zh_TW
Start to translate FAQ, TOS and Privacy docs
Add missed zh_TW.js.erb
Make translation more precise
2013-03-14 18:18:59 +08:00
Robin Ward
a8c44d90a3 FIX: Title changes didn't always apply. Cleaned up some ugly JS. 2013-03-13 18:38:38 -04:00
Neil Lalonde
7777b3f650 Autofocus on first field in signup form 2013-03-13 17:59:51 -04:00
Robin Ward
21b5183d6a Fix linting errors. 2013-03-13 16:04:48 -04:00
Robin Ward
518910a54d FIX: Don't include link counts when selecting text to quote a post. 2013-03-13 15:51:41 -04:00
Neil Lalonde
213d3e5c10 Remove unused code and routes that don't exist in session_controller 2013-03-13 15:21:45 -04:00
Robin Ward
45674ef8e7 FIX: When a moderator made a post, their name wasn't highlighted until refresh 2013-03-13 13:59:42 -04:00
Neil Lalonde
58004d44cd Support for browser password managers, but doesn't quite work in IE 2013-03-13 13:55:33 -04:00
Robin Ward
ea20993bed FIX: Don't create a new version when a post is recovered. Also display username instead of full name for consistency. 2013-03-13 12:35:55 -04:00
Robin Ward
42c7a65a05 When editing a post that is in reply to another post, show display meta data to that effect. 2013-03-13 12:00:38 -04:00
Regis Hanol
5b2c8362b8 fixes bug when modifying the category of a topic but cancelling the edit 2013-03-13 11:19:58 -04:00
Kuba Brecka
57398a4707 make the "add user" placeholder in composer wider, so other languages can fit into that 2013-03-13 15:22:09 +01:00
Kuba Brecka
4db4fc27c5 support "short without year" date format in all locales 2013-03-13 15:05:28 +01:00
Robin Ward
572a87d5d8 Merge pull request #447 from kubabrecka/history_date_i18n
move date formatting from server side to javascript, so we can reuse Sugar's i18n
2013-03-13 06:57:42 -07:00
Robin Ward
fd6967f703 Merge pull request #446 from kubabrecka/dashboard_js_date_fix
fixing admin dashboard english date parsing in other locales
2013-03-13 06:55:49 -07:00
Robin Ward
dff9d65cc9 Merge pull request #437 from kubabrecka/i18n_serverside_date_2
2nd try: localize date formats on server side
2013-03-13 06:54:27 -07:00
Robin Ward
50fcab557a Merge pull request #443 from kubabrecka/i18n_sugarjs_production
external sugarjs was not the same package as development
2013-03-13 06:52:23 -07:00
Robin Ward
e899af4bf0 Merge pull request #444 from kubabrecka/fix_chinese_dates_js
fix js dates in chinese
2013-03-13 06:51:05 -07:00
Kuba Brecka
921a658548 move date formatting from server side to javascript, so we can reuse Sugar's i18n 2013-03-13 13:38:41 +01:00
Kuba Brecka
8003c63fa6 fixing admin dashboard english date parsing in other locales 2013-03-13 13:04:10 +01:00
Sam
a663251bd4 regression 2013-03-13 02:33:32 -07:00
Kuba Brecka
74afb25c2e fix js dates in chinese 2013-03-13 10:03:05 +01:00
Kuba Brecka
999cd9fc87 external sugarjs was not the same package as development 2013-03-13 09:35:17 +01:00
Sam
d1fa3dd9b3 change icon for Jeff 2013-03-12 23:08:37 -07:00
Sam
1d360a4f69 correct broke use streams 2013-03-12 21:45:55 -07:00
Sam
38f185355d added options to disable quoting and open links in new tabs
fixed a some regressions
removed some dead code
fixed messages about constants being re-defined
2013-03-12 20:06:58 -07:00
Régis Hanol
439ac95b73 the composer will now count only significant whitespaces 2013-03-12 23:54:29 +01:00
Robin Ward
59c52a6c12 Small JSHint issue 2013-03-12 14:54:05 -04:00
Robin Ward
9d4c8ed323 Fixes bug with creating new topic due to edit text changing. 2013-03-12 14:43:41 -04:00
Neil Lalonde
40c27ff3cf Add flag counts to admin dashboard 2013-03-12 14:40:59 -04:00
Neil Lalonde
9422adfe66 Better alignment of judgemental faces 2013-03-12 14:40:59 -04:00
Neil Lalonde
4eda422cdf Add total users report; restructure dashboard reports js 2013-03-12 14:40:59 -04:00
Kuba Brecka
b97a3c8d34 reports don't work when default_locale != en + some missing translations 2013-03-12 14:38:15 -04:00
Kuba Brecka
cf5deaba6c 2nd try: localize date formats on server side 2013-03-12 19:30:56 +01:00
Robin Ward
a5a97f88cd When editing a post, provide more information in the composer title 2013-03-12 13:34:27 -04:00
Robin Ward
1103dde5cd Fix: When you split topics, featured users and like counts were incorrect. 2013-03-12 12:33:42 -04:00
Kuba Brecka
ac47c36f8b extract hardcoded "post {{number}}" into locale strings 2013-03-12 14:41:27 +01:00
Kuba Brecka
f5f502d2a0 extract hardcoded string into locale 2013-03-12 11:29:59 +01:00
Sam
a5b2c0c476 use font awesome for the composer toolbar (not very happy with heading and hr icon, but can not find anything better) 2013-03-11 23:33:36 -07:00
Sam
91b507f4c4 if you try posting a reply and are looking at a different topic, pop this window up 2013-03-11 20:57:06 -07:00
Régis Hanol
1d7aa1f6cf globalized some missing strings 2013-03-12 02:17:45 +01:00
Sam
babb5b7b52 Merge pull request #418 from tms/always-allow-reply-as-new
Always allow reply as new topic, for users who can reply as new topic
2013-03-11 17:27:54 -07:00
Jeff Atwood
2115c36c84 Merge pull request #426 from ZogStriP/fix-highlight-issue
fixes the highlight issue @coding-horror reported
2013-03-11 13:14:38 -07:00
Régis Hanol
8a143bacaf fixes the highlight issue @coding-horror reported 2013-03-11 20:58:02 +01:00
Neil Lalonde
bf37e1b995 Convert github commits widget to ember 2013-03-11 15:27:06 -04:00
Robin Ward
3b7ac014de Fixes JSHint error on PageDown. Updated for Uniform Access Principle. 2013-03-11 12:30:13 -04:00
Robin Ward
1205e0d3d4 Merge branch 'master' of github.com:discourse/discourse 2013-03-11 11:32:09 -04:00
Robin Ward
dad71a78f7 Merge pull request #414 from awbergs/pagedown_observe
added observer to Discourse.PagedownEditor value to refresh previewer
2013-03-11 08:31:47 -07:00
Robin Ward
d175da6816 Merge pull request #392 from kubabrecka/date_i18n_support
1st attempt to support i18n in dates and times
2013-03-11 08:15:58 -07:00
Robin Ward
de1d488d91 Merge branch 'date_i18n_support' of git://github.com/kubabrecka/discourse 2013-03-11 11:14:17 -04:00
Robin Ward
4360d1bd61 Cleaned up probe code a little. 2013-03-11 11:13:28 -04:00
Robin Ward
866e0d4e87 Merge pull request #413 from ZogStriP/submit-create-account-form-by-pressing-enter
allows the submission of the create account form by pressing enter
2013-03-11 07:27:01 -07:00
tms
52b1d13af7 Always allow reply as new topic, for users who can reply as new topic 2013-03-11 10:20:41 -04:00
Jeff Atwood
3414e2bb92 increase default minimum topic title length to 15 2013-03-10 22:45:55 -07:00
Sam
e62bb9922e exceptions are BAD
the old code wacked on 10ms to every home page request, for no real reason.
2013-03-10 19:11:33 -07:00
Sam
a2facaa4d0 Merge pull request #411 from potthast/german-l10n
German l10n of Discourse. Works so far, but lots of fine-tuning still required.
2013-03-10 18:30:53 -07:00
Sam
22a4580df5 added profile environment for perftools profiling (1.9.3 only) 2013-03-10 17:21:56 -07:00
Austin Bergstrom
ba80ca2ee5 added observer to Discourse.PagedownEditor value to refresh previewer 2013-03-10 19:56:32 -04:00
Régis Hanol
4a9c30bf33 allows the submission of the create account form by pressing enter 2013-03-11 00:46:28 +01:00
Martin Potthast
cfc93ad4b9 Added locale to assets. 2013-03-10 17:15:29 +01:00
Sam
22f8100919 requiring is mega expensive, lets not do it every request. 2013-03-10 07:14:52 -07:00
Neil Lalonde
3d7dfd3168 Fix a jshint failure 2013-03-09 15:53:30 -05:00
Neil Lalonde
8927432a93 Add stats to the admin dashboard 2013-03-09 15:34:27 -05:00
Sam
325e28c3c8 wrong conditional 2013-03-08 17:24:54 -08:00
Robin Ward
8c02d2f48d Robin sucks at merging! This fixes a n+1 query. 2013-03-08 16:48:56 -05:00
Robin Ward
4c7b0a42b5 Oops escape everything but image urls 2013-03-08 16:17:56 -05:00
Robin Ward
908bba8c13 First stab at oneboxing of meta.discourse.org 2013-03-08 15:59:12 -05:00
Robin Ward
d1d4530efd User Profile enhancements:
- Added PreloadStore support to avoid duplicate requests
- preliminary SEO
- Support for opengraph/twitter cards
2013-03-08 15:04:37 -05:00
tangramor
c5761eae8a Support for Simplified Chinese thanks to tangramor 2013-03-08 11:56:17 -05:00
Robin Ward
c5c1ddfa83 Merge pull request #385 from ZogStriP/highlight-first-of-loaded-topics
highlight the first of the newly loaded topics when scrolling
2013-03-08 08:48:30 -08:00
Robin Ward
82b7d3a843 Merge pull request #380 from alxndr/master
Keep track of state/content between multiple quotes in a single post
2013-03-08 08:39:37 -08:00
Robin Ward
b8fd734d0e Merge branch 'refactor-category' of git://github.com/goshakkk/discourse
Conflicts:
	app/models/category.rb
2013-03-08 10:49:25 -05:00
Robin Ward
fb573b917f Merge pull request #390 from ZogStriP/min-search-term-length-site-setting
added the min-search-term-length site setting
2013-03-08 06:58:45 -08:00
Sam
d6ca23a75b remove N+1 queries 2013-03-08 05:34:19 -08:00
Robin Ward
d848a9fedc Add opengraph and twitter card support to topics 2013-03-07 17:46:43 -05:00
Neil Lalonde
2ebe0336ae On signup, handle duplicate key errors on email and username better 2013-03-07 14:56:55 -05:00
Neil Lalonde
1133d90dcc Disable submit button on signup form when you've submitted the form 2013-03-07 14:56:55 -05:00
Kuba Brecka
2e76e337a6 1st attempt to support i18n in dates and times 2013-03-07 20:05:18 +01:00
Robin Ward
052887c296 Category Topics are no longer invisible, they are pinned. 2013-03-07 12:46:23 -05:00
Robin Ward
c7359145aa Merge pull request #384 from kubabrecka/fix_html_escapes
fix wrongly escaped HTML in <noscript> tags
2013-03-07 09:24:16 -08:00
Robin Ward
f8d8272406 Cleaned up TopicUserSpec, introduces clearing of pinned topics 2013-03-07 12:19:25 -05:00
Regis Hanol
5703d6c730 added the min-search-term-length site setting 2013-03-07 16:52:01 +01:00
Régis Hanol
002776808f highlight the first of the newly loaded topics when scrolling 2013-03-07 03:38:38 +01:00
Kuba Brecka
69d9856d43 fix wrongly escaped HTML in <noscript> tags 2013-03-06 22:25:44 +01:00
Jeff Atwood
985cbb92f1 Merge pull request #382 from nsahler/patch-1
Reply-new fades in
2013-03-06 11:44:53 -08:00
Nick Sahler
7490012b20 Resubmitting 2013-03-06 14:41:24 -05:00
Neil Lalonde
fab04dbb58 Add github commits widget 2013-03-06 14:39:01 -05:00
Nick Sahler
5f9093f21d "reply-new" transitions instead of instantly popping in 2013-03-06 14:26:38 -05:00
Alexander
02f29cd43f Prevent quote content collisions with multiples in one post
[Fixes #142]
2013-03-06 09:53:34 -08:00
Robin Ward
c123e40638 Merge pull request #373 from alxndr/master
Raise 404 from Admin::UsersController#show if no user found
2013-03-06 09:17:47 -08:00
Robin Ward
610be79061 Merge pull request #375 from ZogStriP/autofocus-login
autofocus the login input in the login modal
2013-03-06 09:17:10 -08:00
Robin Ward
3b645383fb Merge pull request #372 from kubabrecka/markdown_fix1
Markdown editor translations into client.en.yml + tiny translation fixes
2013-03-06 09:15:52 -08:00
Robin Ward
6a63178411 Merge pull request #377 from kubabrecka/typos5
various typos in comments
2013-03-06 09:14:16 -08:00
Robin Ward
1e43eac600 Simple CSS changes to help with lower width screens such as Surface tablet 2013-03-06 12:08:06 -05:00
Neil Lalonde
f129693942 Use a github commits widget hosted on discourse.org 2013-03-06 12:04:45 -05:00
Robin Ward
30aae8e793 Topic was not sanitizing <b> and <img> tags from titles 2013-03-06 11:36:42 -05:00
Neil Lalonde
e8eb60fe78 Use the cog in header dropdown menu admin link, not the wrench 2013-03-06 11:07:44 -05:00
Neil Lalonde
83f89b5c55 Fix check if you're up to date in javascript 2013-03-06 10:34:29 -05:00
Sam Saffron
8f56a09e82 PBKDF2 gem is trouble, removing and hand coding for now 2013-03-06 23:12:16 +11:00
Kuba Brecka
dc62136642 various typos in comments 2013-03-06 08:52:24 +01:00
Neil Lalonde
f8e04a5c48 Version check gets how many versions behind you are, and shows judgemental faces on the dashboard 2013-03-05 18:15:33 -05:00
Régis Hanol
21407d1df4 autofocus the login input in the login modal 2013-03-05 23:42:12 +01:00
Robin Ward
3c1388bbd7 Don't include closed or archived topics in the "new topics" section of the daily digest 2013-03-05 17:22:02 -05:00
Alexander
c4f1cb0d7b Raise 404 from Admin::UsersController#show if no user found
[Fixes #353]
2013-03-05 14:02:23 -08:00
Robin Ward
030857ac8c Give a pretty "from" address to the digest emails 2013-03-05 16:53:49 -05:00
Kuba Brecka
da7a41f5b9 Markdown editor translations into client.en.yml + tiny translation fixes 2013-03-05 21:58:37 +01:00
Robin Ward
86af49e663 More Markdown refactoring - fixed bug with Pagedown not showing on user profile - replaced jQuery occurrences with $. 2013-03-05 15:39:21 -05:00
Robin Ward
cf09e200a5 Moved Markdown out of Discourse.Utilities -> Discourse.Markdown 2013-03-05 14:56:43 -05:00
Robin Ward
1416bc7475 Some javascript refactoring: Move markdown functions into their own classs, remove extraneous window. calls. 2013-03-05 14:53:55 -05:00
Neil Lalonde
e2ead81818 Use wrenches instead of cogs for admin buttons that let you change something/someone's settings 2013-03-05 14:52:33 -05:00
Robin Ward
09880ce9f9 Merge pull request #369 from kubabrecka/cz_privacy
CZ privacy policy translation
2013-03-05 11:11:25 -08:00
Robin Ward
e4277757c4 Fix onebox loading on every keystroke after a request fails. 2013-03-05 14:06:39 -05:00
Kuba Brecka
8da2c93b18 CZ privacy policy translation 2013-03-05 19:31:39 +01:00
Gosha Arinich
a1825fece9 refactor Category
* move callback bodies to separate methods (easier to test)
2013-03-05 21:09:13 +03:00
Neil Lalonde
d30fbcd491 Remove welcome to the dashboard 2013-03-05 13:02:16 -05:00
Robin Ward
6edabdfec1 Merge pull request #362 from ZogStriP/repeated-clicks
Repeated click on header icons should close popped out dropdowns
2013-03-05 07:29:56 -08:00
Robin Ward
0c5ca30188 Merge pull request #361 from ZogStriP/enforce-coding-convention
enforce coding convention
2013-03-05 07:25:19 -08:00
Robin Ward
3cf3fee781 Merge pull request #319 from alxndr/rss-caching
Basic caching for topic/category RSS feeds
2013-03-05 07:20:15 -08:00
Robin Ward
0c41e80f41 Merge pull request #367 from kubabrecka/extract_strings5
extract some strings from views/modal
2013-03-05 06:43:01 -08:00
Robin Ward
97a2d6d0fe Merge pull request #366 from ZogStriP/moar-globalization
globalizing the image selector modal
2013-03-05 06:41:49 -08:00
Robin Ward
cd4d908023 Merge pull request #363 from ZogStriP/autofocus
autofocus the input in the "insert image" dialog when clicking on...
2013-03-05 06:39:16 -08:00
Robin Ward
de1dd9c651 Merge pull request #368 from kubabrecka/cs_faq
CZ translation of FAQ
2013-03-05 06:37:30 -08:00
Kuba Brecka
9573847caf CZ translation of FAQ 2013-03-05 11:22:08 +01:00
Kuba Brecka
5afd6cc8a1 extract some strings from views/modal 2013-03-05 08:30:47 +01:00
Régis Hanol
5b456a6a3f globalizing the image selector modal 2013-03-05 03:38:12 +01:00
Régis Hanol
61dcd61a5e autofocus the input in the "insert image" dialog when clicking on the "on the web" tab 2013-03-05 03:09:13 +01:00
Régis Hanol
c72f65879f Repeated click on header icons should close popped out dropdowns 2013-03-05 02:44:34 +01:00
Régis Hanol
239cbd2d58 enforce coding convention
replaced every `and` by `&&` and every `or` by `||`
2013-03-05 01:42:44 +01:00
Robin Ward
f544e1d4f7 Crap, we can't use Ember.Handlebars because some places don't use Ember (such as autocomplete.js) 2013-03-04 17:39:21 -05:00
Robin Ward
9c0b4572a3 Updated helpers, upgraded Ember to latest master. 2013-03-04 15:25:30 -05:00
Robin Ward
4385a174a2 Merge branch 'keep-title-and-category-in-sync' of git://github.com/ZogStriP/discourse 2013-03-04 15:25:24 -05:00
Robin Ward
9a66c416af Merge pull request #343 from kubabrecka/localize_static_pages
implement translations into static pages (FAQ, TOS) + an example of CZ translation
2013-03-04 11:51:28 -08:00
Robin Ward
09e9e34b8b Merge pull request #340 from tms/post-scroll-peekaboo
Position the selected post more reliably below the header
2013-03-04 11:40:00 -08:00
Alexander
d6e665f888 Caching for topic/category RSS feeds
Using anonymous_etag() now
2013-03-04 11:21:01 -08:00
Robin Ward
51f6ae69c9 Check when logging in whether a auth provider is enabled, including specs 2013-03-04 13:44:41 -05:00
Robin Ward
ccbd3b2841 Let's default Persona to off right now, change button text 2013-03-04 12:01:20 -05:00
Robin Ward
f7c9efb101 Merge branch 'persona-integration' of git://github.com/callahad/discourse 2013-03-04 11:51:26 -05:00
Robin Ward
3287dcf754 Merge pull request #345 from tms/fatten-up-static-pages
Don't double-up on #main-outlet when static content is preloaded
2013-03-04 06:45:55 -08:00
Neil Lalonde
40f5b9170d Merge pull request #347 from ZogStriP/put-a-gear-button-on-it
added the gear icon to the "Admin" button on the user page
2013-03-04 06:27:37 -08:00
Kuba Brecka
9bf5e31f94 some more extracted strings for translation 2013-03-03 23:00:16 +01:00
Régis Hanol
ccb715fba3 update both the title & the category when editing the first post
using the "edit this post" action beneath the post.
2013-03-03 19:21:29 +01:00
Régis Hanol
d7edca203c added the gear icon to the "Admin" button on the user page 2013-03-03 18:04:02 +01:00
tms
f46c819956 Don't double-up on #main-outlet when static content is rendered through Ember 2013-03-03 10:47:40 -05:00
Kuba Brecka
778cad5d2f implement translations into static pages (FAQ, TOS) + an example of CZ translation 2013-03-03 16:27:32 +01:00
tms
fba50c3f7a Position the selected post more reliably below the header 2013-03-03 00:43:08 -05:00
Robin Ward
dfafadfe41 Merge pull request #327 from tms/name-changing
Change the name displayed in the header on profile update
2013-03-02 08:10:26 -08:00
Robin Ward
6c97e5ad09 Merge pull request #333 from goshakkk/refactor-incoming-link
Move IncomingLink callbacks into their own methods
2013-03-02 08:09:13 -08:00
Robin Ward
e145a81809 Merge pull request #334 from kubabrecka/minor_tos_fixes
minox TOS HTML fixes
2013-03-02 07:58:51 -08:00
Kuba Brecka
821ad9f51d server side of Czech language localization + update of client side + update of pseudo-localization 2013-03-02 14:22:53 +01:00
Kuba Brecka
77eafc62cb minox TOS HTML fixes 2013-03-02 10:56:11 +01:00
Gosha Arinich
5066682e7a move IncomingLink callbacks into their own methods 2013-03-02 12:33:29 +03:00
tms
66a7b3162f Change the name displayed in the header on profile update 2013-03-01 22:46:33 -05:00
Robin Ward
3901ddd153 Fix jshint issue with [^] in regexp. 2013-03-01 15:16:21 -05:00
Robin Ward
d410f043a9 Merge pull request #290 from alxndr/category-rss
RSS for topics in a category
2013-03-01 12:01:26 -08:00
Dan Callahan
7c87359e02 Make Persona configurable 2013-03-01 14:00:56 -06:00
Dan Callahan
23d812a4ab Use AJAX for submitting Persona credentials.
Fixes issue with needing to unblock popups.
2013-03-01 14:00:56 -06:00
Dan Callahan
ef8cf2f734 Add basic Persona functionality
1. No session integration yet, so automatic login/logout events are suppressed.

2. Popup blockers must be disabled: submits form to target="_blank"
2013-03-01 14:00:56 -06:00
Dan Callahan
81c545539e Add (ui-only) Persona button to login modal 2013-03-01 14:00:53 -06:00
Robin Ward
72cbb948b8 Fixes broken "From" header in Private Message emails. 2013-03-01 14:56:52 -05:00
Robin Ward
7c68224763 Merge pull request #309 from goshakkk/enums
Introduce Enum
2013-03-01 11:34:48 -08:00
Robin Ward
d2596c3c4c Remove unusued site_settings, show checkbox in UI for boolean values, remove restrict_access
boolean to avoid locking yourself out by setting access_password to empty string. Minor
UI tweaks.
2013-03-01 14:27:41 -05:00
Gosha Arinich
0c99dea153 introduce Enum 2013-03-01 21:16:36 +03:00
Alexander
fd240c1967 RSS for topics in a category
Creates a new route for category RSS
2013-03-01 09:52:59 -08:00
Robin Ward
25494529d2 Merge pull request #314 from kubabrecka/extract_strings2
extracting some more hardcoded strings
2013-03-01 08:36:46 -08:00
Kuba Brecka
9993e0e665 extracting some more hardcoded strings 2013-03-01 17:04:13 +01:00
Robin Ward
b66b17bf19 Merge pull request #300 from goshakkk/cleanup
Minor cleanup, using AR querying DSL over raw SQL in some places
2013-03-01 07:52:34 -08:00
Robin Ward
27ba923fd4 Merge pull request #307 from kubabrecka/html_syntax_fixes
some minor HTML syntax fixes
2013-03-01 07:39:03 -08:00
Robin Ward
2106d72d4c Merge pull request #304 from ZogStriP/minimum-character-count
Quoting another reply won't satisfy the minimum character count (fixes #180)
2013-03-01 07:30:26 -08:00
Robin Ward
c3b0cf0744 Merge pull request #303 from kirushik/gravatar_https
Secure gravatar
2013-03-01 07:12:56 -08:00
Kuba Brecka
8a03afb35f some minor HTML syntax fixes 2013-03-01 08:44:58 +01:00
Régis Hanol
4fa4c15559 Quoting another reply won't satisfy the minimum character count (fixes #180) 2013-02-28 23:58:40 +01:00
Neil Lalonde
c9140a2441 Add a nag to update often 2013-02-28 16:19:22 -05:00
Kirill Pimenov
a168dc915e Secure gravatar 2013-03-01 00:58:36 +04:00
Neil Lalonde
f0c2d012b7 Add a github widget to the admin dashboard showing the 10 most recent commits 2013-02-28 15:35:47 -05:00
Robin Ward
628927a79f Added Site Setting to change locale. 2013-02-28 14:34:38 -05:00
Robin Ward
e37c7f1e1d Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse 2013-02-28 14:34:13 -05:00
Neil Lalonde
a3b1ae7793 Remove the secret_token site_setting since it's not used 2013-02-28 14:07:26 -05:00
Gosha Arinich
6e5399d544 minor cleanup, using AR querying DSL over raw SQL in some places 2013-02-28 21:54:12 +03:00
Neil Lalonde
fce4c66d93 Improve js username validation so it's done only when necessary 2013-02-28 12:24:57 -05:00
Robin Ward
6c25eca2d6 Merge pull request #296 from goshakkk/refactor-user
Refactor User and TrustLevel a bit
2013-02-28 08:17:21 -08:00
Gosha Arinich
d2f3c829db refactor User and TrustLevel a bit
* rename `User#password_required` to `User#password_required!`
* emails with "i" @ something are a special case as well
* get rid of `self.` and returns where possible
* prefer "unless a" instead of "if !a"
* `unread_notifications` without manually iterating
* introduce `User#moderator?`
* introduce `TrustLevel#valid_key?`, `TrustLevel#compare`, and
  `TrustLevel#level_key`
2013-02-28 19:15:54 +03:00
Robin Ward
9c0cbe8311 Merge pull request #298 from nverba/login-buttons
added option to enable/disable login buttons individually
2013-02-28 08:13:04 -08:00
Robin Ward
5d0d958a45 Merge pull request #289 from ZogStriP/bbcode-component
added more tests & documentation to the BBCode component
2013-02-28 08:03:44 -08:00
Bryson Holland
50cd44df2d Saved ~46KB through image optimization. 2013-02-28 10:58:12 -05:00
Robin Ward
3b47562738 We don't need content here because it uses an ObjectController as a proxy. 2013-02-28 10:01:38 -05:00
nverba
b0f3a74a1f added option to enable/disable login buttons individually 2013-02-28 03:46:56 +00:00
Robin Ward
dc8e1196fd Code to support EmberJS + Discourse Tutorial feature: Admin Reports 2013-02-27 22:40:36 -05:00
Régis Hanol
f93a26e03d added more tests & documentation to the BBCode component 2013-02-28 03:29:52 +01:00
Jeff Atwood
416f981f92 change 404 page to use /new link under "New topics" 2013-02-27 16:48:53 -08:00
Robin Ward
a086635add Swap out "@" for "via" in email From field 2013-02-27 19:03:57 -05:00
Robin Ward
c62729b5b6 Merge pull request #285 from alxndr/rss-for-topics
Specify type in topic RSS autodiscovery tag
2013-02-27 15:33:11 -08:00
Robin Ward
421f048458 Add a better from address to the email 2013-02-27 18:30:14 -05:00
Alexander
9b541b1c0a Specify type in topic RSS autodiscovery tag 2013-02-27 14:55:04 -08:00
Robin Ward
7c1ae451fe Send emails to users who are watching topics 2013-02-27 15:38:44 -05:00
Robin Ward
cf867a35ff Merge pull request #271 from goshakkk/topic-refactor
Refactor Topic
2013-02-27 10:32:44 -08:00
Robin Ward
007118b00c Merge branch 'github-auth' of git://github.com/nverba/discourse
Conflicts:
	config/locales/server.en.yml
	db/structure.sql
	spec/views/omniauth_callbacks/complete.html.erb_spec.rb
2013-02-27 12:09:22 -05:00
Robin Ward
2184763d4a Merge pull request #222 from alxndr/rss-for-topics
RSS view of topics
2013-02-27 08:30:08 -08:00
Robin Ward
7d6e1f3e1c Show likes even while logged out. 2013-02-27 11:22:03 -05:00
Jeff Atwood
d8687f1bfa broaden the /faq "search" advice to browse 2013-02-27 02:14:28 -08:00
Jeff Atwood
b757f06fde /faq tweaks 2013-02-27 02:07:31 -08:00
Kuba Brecka
acc7718c67 first attempt to serve correct localized js files as rails pipeline assets 2013-02-27 09:00:49 +01:00
Alexander
8855a0bfbe RSS of a topic via new route
Adds TopicView#recent_posts; Post#by_newest, #with_user, #author_readable; User#readable_name
Autodiscovery tag in topic show HTML.
2013-02-26 14:54:17 -08:00
Robin Ward
e363950bf5 Merge pull request #272 from kubabrecka/extract_some_strings
extract some more strings into locales/*.yml
2013-02-26 14:38:40 -08:00
Robin Ward
0df2034dc8 Fixes #264 - replaceState was wonky 2013-02-26 17:27:01 -05:00
Neil Lalonde
4e15227fd0 Admin dashboard: use ember's class name binding 2013-02-26 17:05:17 -05:00
Kuba Brecka
e9fb46c251 extract some more strings into locales/*.yml 2013-02-26 22:13:07 +01:00
Neil Lalonde
cd6c1de5b0 Add site settings for company name and domain, and use them in the Terms of Service 2013-02-26 15:50:42 -05:00
Robin Ward
0f48414a72 The avatar helper should be smart enough to find a nested avatar_template. Fixes #243 2013-02-26 15:31:49 -05:00
Robin Ward
1492464158 fixes: http://meta.discourse.org/t/discourse-logo-link-back-to-top-of-thread-list-on-home-page/3592 2013-02-26 15:20:13 -05:00
Robin Ward
1caf1e6b45 Clean up discourse.js 2013-02-26 15:20:06 -05:00
Neil Lalonde
b9ccf4d09c Show discourse version in an html comment 2013-02-26 13:47:07 -05:00
Robin Ward
ddf1f27633 Fixes #157 - Add mention of seed_fu to docs. 2013-02-26 12:45:56 -05:00
Robin Ward
6c30e0b09c Add 'descrption' to categories, even when in a Combobox 2013-02-26 12:17:23 -05:00
Gosha Arinich
12d664a610 refactor Topic
* move finding by username/email to User
* make SiteSetting return a range of possible post title lengths
* remove unnecessary conditions
2013-02-26 19:27:59 +03:00
Robin Ward
0e087e040f Fixes title regression 2013-02-26 11:13:13 -05:00
Robin Ward
88267429c5 Remove fastclick for now -- we saw some regressions on iPad and want to make sure they weren't caused by
it.
2013-02-26 10:47:23 -05:00
Robin Ward
1221c393a3 Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse
Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
2013-02-26 10:42:49 -05:00
nverba
b45f872c04 Added Github authentication option, disabled by default with enable options in settings. 2013-02-26 05:00:21 +00:00
Gosha Arinich
cafc75b238 remove trailing whitespaces ❤️ 2013-02-26 07:31:35 +03:00
tms
7088dfce9f Prevent event bubbling on search toggles to keep dropdown open 2013-02-25 22:14:58 -05:00
Robin Ward
e28594b94e Ack! Messed up the jshint again. I gotta get better about this. 2013-02-25 18:43:45 -05:00
Robin Ward
397c6ca761 Better error messages when topics can't load 2013-02-25 18:38:38 -05:00
Robin Ward
3e201fc9f3 Oops I missed a couple of jshint errors :) 2013-02-25 17:53:29 -05:00
Robin Ward
2ba28096e1 Merge pull request #262 from goshakkk/no-unused-var-warn
Avoid unused variable (post) warning in Topic
2013-02-25 14:20:50 -08:00
Robin Ward
e461c84253 Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline 2013-02-25 17:16:57 -05:00
Neil Lalonde
0321643636 Dashboard JS checks version every 12 hours 2013-02-25 16:21:52 -05:00
Gosha Arinich
054a699886 avoid unused variable warning in Topic 2013-02-25 22:13:36 +03:00
Sam Saffron
77a2d8ccc4 fixed a pile of notification craziness
addes some tests around post timings
2013-02-25 18:42:42 +11:00
Sam Saffron
cb3d839104 fix hinting 2013-02-25 11:18:10 +11:00
Sam Saffron
b9f3666f5a fast click instead of hacky double event binding 2013-02-25 11:11:46 +11:00
Sam Saffron
b0b0e222f7 missed a spot where channel can be out of sync 2013-02-25 09:32:06 +11:00
Sam
14c2a4568d Merge pull request #247 from balpha/master
Update PageDown to latest
2013-02-24 13:54:16 -08:00
Sam Saffron
419ecf70b2 remove events from ember that seem to be firing too much PR in progress 2013-02-25 08:37:11 +11:00
Sam Saffron
997b436210 attempt at fixing google analytics 2013-02-25 08:36:46 +11:00
balpha
378b594b2d apparently discourse allows single-quoted attribute values in HTML; fix the lookahead in the PageDown auto-linker to account for that 2013-02-24 14:13:00 +01:00
balpha
1640616c06 PageDown update overwrote a discourse customization; put it back in 2013-02-24 13:52:46 +01:00
balpha
22caa7b6a8 merge upstream PageDown changes up to current revision c06c6e0d465e 2013-02-24 13:40:06 +01:00
Sam Saffron
47fedd8f4d correct breakage
don't set permanent cookie, kill session if it conflicts
2013-02-24 22:56:08 +11:00
Sam Saffron
b66db4153d refactor and organise current_user better 2013-02-24 21:42:04 +11:00
Sam
d42a87ec8a Merge pull request #235 from tms/autocomplete-right-away
Tweak autocomplete/caret_position logic to not exclude the index 0 case
2013-02-23 19:05:23 -08:00
Sam
7081b958b9 Merge pull request #239 from tms/avatar-should-be-glowier
Make avatar glow more...glowier
2013-02-23 19:03:55 -08:00
Sam
578a38dc27 Merge pull request #241 from tms/auth-token-revert
Unsign auth token cookies per discussion on #215
2013-02-23 19:03:25 -08:00
Sam Saffron
82e2fae1b8 isolate notifications in channel per user 2013-02-24 10:24:06 +11:00
tms
3e6641c07e Unsign auth token cookies per discussion on #215 2013-02-23 13:40:21 -05:00
tms
6cfcdfbfd7 Make avatar glow more...glowier 2013-02-23 10:37:06 -05:00
tms
3a0227f868 Tweak autocomplete/caret_position logic to not exclude the index 0 case 2013-02-22 23:47:23 -05:00
Jeff Atwood
cee3949850 add 3 and 4 minute opts to auto track pref 2013-02-22 13:15:41 -08:00
Jeff Atwood
9464bf5576 remove unused client_setting 2013-02-22 12:55:18 -08:00
Neil Lalonde
fc33c63585 EmailToken.active needs to check created_at too 2013-02-22 15:20:00 -05:00
Robin Ward
c3ba7b9741 Uncategorized doesn't have a topic url 2013-02-22 14:33:43 -05:00
Robin Ward
e2fed6fcef Merge pull request #229 from danneu/topic-patch
make topics consume their own scope
2013-02-22 10:59:07 -08:00
Robin Ward
1c5afc9686 Merge pull request #231 from shapkin/master
Add english locale to page.
2013-02-22 10:58:31 -08:00
Robin Ward
b2e9be68bd Suggested topics weren't using fancy titles 2013-02-22 13:48:07 -05:00
Robin Ward
532b1f5450 Can edit category descriptions, they show up in a title attribute 2013-02-22 13:43:47 -05:00
Neil Lalonde
2d9942ceef Fix my jshint failures 2013-02-22 12:17:07 -05:00
Neil Lalonde
ff3e012034 Add a link that allows you to send activation email again 2013-02-22 11:49:58 -05:00
Robin Ward
45ab3ab892 JS refactoring that fixes presence errors in earlier reverted commit. 2013-02-22 11:00:47 -05:00
Alexander Shapkin
ee8825408b add english locale to page 2013-02-22 15:33:35 +04:00
Sam
4d99dc035e Merge pull request #228 from tms/i-knew-you-cared
Collapse user activity items loaded from message bus
2013-02-21 21:53:49 -08:00
Dan Neumann
65b59f8612 make Topic consume its own scope. 2013-02-21 21:22:02 -06:00
tms
b1c1053cf1 Collapse user activity items loaded from message bus 2013-02-21 22:14:58 -05:00
tms
8ec71657ea Help long titles wrap more cleanly 2013-02-21 21:33:59 -05:00
Sam Saffron
2b5be29d3c Revert "Remove old unused code."
This reverts commit 6a617348e5.
2013-02-22 10:57:11 +11:00
Robin Ward
588c79e637 Updated JSHint settings, include smoke test. 2013-02-21 16:25:40 -05:00
Robin Ward
6a617348e5 Remove old unused code. 2013-02-21 16:17:56 -05:00
Robin Ward
c8a908e81a Remove some useless views 2013-02-21 15:55:58 -05:00
Neil Lalonde
2d1bbf22e9 Refactor functions out of the dashboard controller 2013-02-21 15:03:55 -05:00
Robin Ward
dd6d98f48f More documentation to Admin Controllers 2013-02-21 14:42:48 -05:00
Robin Ward
c1b5803486 Cleaned up admin JS, added YUIDoc headers to all admin classes. 2013-02-21 14:12:09 -05:00
Neil Lalonde
8620024798 Show which SHA is installed on the admin dashboard 2013-02-21 13:48:14 -05:00
Robin Ward
13f8f3c45e Cleaned up JS, added basic documentation support for Admin Controllers 2013-02-21 13:29:21 -05:00
Robin Ward
6096a447b7 Fix Regression: In reply to 2013-02-21 12:59:38 -05:00
Robin Ward
f6263749d4 Fix javascript regression with quoting 2013-02-21 12:54:40 -05:00
Robin Ward
c5393d93f3 Add icons and and archived style to categories list 2013-02-21 11:38:38 -05:00
Robin Ward
c3b03e3cb6 Show fancy title when you scroll down on topics 2013-02-21 11:21:10 -05:00
Robin Ward
42d996aae1 Show empty categories to those who can create them (admins/mods) 2013-02-21 10:43:10 -05:00
Neil Lalonde
560411eece Add site_setting to disable version checks 2013-02-21 10:19:17 -05:00
Robin Ward
84cb08e035 Merge pull request #215 from tms/auth-token-changes
Sign the auth token cookie and make it httpOnly
2013-02-21 07:14:15 -08:00
Régis Hanol
0884318207 update topic-progress z-index to show up in front
of all other items (especially the read-icon)
2013-02-21 14:59:35 +01:00
Sam Saffron
012941ea62 basic smoke test script 2013-02-21 16:01:40 +11:00
Sam Saffron
30f743e185 mobile fix 2013-02-21 16:01:40 +11:00
Robin Ward
26e1cfd12c rake jshint works 2013-02-20 19:09:27 -05:00
Robin Ward
f661fa609e Convert all CoffeeScript to Javascript. See:
http://meta.discourse.org/t/is-it-better-for-discourse-to-use-javascript-or-coffeescript/3153
2013-02-20 19:01:13 -05:00
tms
5616fdc475 Sign the auth token cookie and make it httpOnly 2013-02-20 17:24:19 -05:00
Neil Lalonde
85f8f8f2d5 Better checking of blacklisted emails on create and when email is being updated 2013-02-20 16:25:08 -05:00
Neil Lalonde
6885e6cfa9 Fix login with google in IE9 2013-02-20 15:40:52 -05:00
Jeff Atwood
7ff7fe3d3c add css3 fade in/out transition to post menus 2013-02-20 12:36:07 -08:00
Neil Lalonde
046c330858 Changes to email_domains_blacklist shouldn't invalidate existing users 2013-02-20 12:16:16 -05:00
Régis Hanol
55c7ced2f3 corrected right-arrow html entity encoding
when using a javascript-disabled browser
2013-02-20 17:00:28 +01:00
Neil Lalonde
1dd882ea99 Fix admin dashboard version check losing its css styling 2013-02-20 10:37:51 -05:00
Alexander Shapkin
105ae2a174 fix spaces and use link_to instead of <a> tags 2013-02-20 12:08:22 +04:00
Sam
d81cd6eb80 Merge pull request #207 from danneu/validate-category-user-id
validate category user_id presence to match DB constraint.
2013-02-19 22:48:39 -08:00
Sam Saffron
a02414410f amazing the amount of damage a missing .js extension can cause 2013-02-20 17:17:05 +11:00
Sam Saffron
15c5f5b840 grrrrr asset pipeline hates me 2013-02-20 17:00:24 +11:00
Sam Saffron
ea7b97be34 missing localization on categories 2013-02-20 16:11:56 +11:00
Sam Saffron
70058c9ebe live reload bug
minor sanity check for phone
2013-02-20 16:11:56 +11:00
Sam Saffron
0c085059c9 added sane sanitizer (Google Cajole) that is much more robust than old one ... yay for smilies
added sane way to do $LAB includes - pattern to be expanded
people keep on messing structure.sql
2013-02-20 16:11:56 +11:00
Sam Saffron
a1099ed74e sanitize wip 2013-02-20 16:11:56 +11:00
Dan Neumann
37ca391f50 validate category user_id. 2013-02-19 21:24:38 -06:00
Jeff Atwood
2fdbf8cbc9 give us temporary breathing room on wide names 2013-02-19 16:03:03 -08:00
Neil Lalonde
e914222cb3 Add i18n for the version checking 2013-02-19 17:42:36 -05:00
Robin Ward
a1f8dcebd1 Custom messages for the footers of all list views 2013-02-19 17:39:34 -05:00
Neil Lalonde
3ca2d92b2f Fix the missing {{provider}} value message 2013-02-19 16:28:12 -05:00
Robin Ward
836c3a7379 Support for Fancy topic titles 2013-02-19 16:14:04 -05:00
Neil Lalonde
c0371ff427 Add version checking that shows on the admin dashboard 2013-02-19 15:20:49 -05:00
Robin Ward
da59c15b72 Remove leftover sub-tag support. 2013-02-19 14:21:31 -05:00
Robin Ward
b7e027cfd1 Notifications on PMs respect access rights. 2013-02-19 12:59:46 -05:00
Robin Ward
928e215e57 Update to latest Ember.js 2013-02-19 12:28:18 -05:00
Robin Ward
ae9bee2a91 Merge pull request #172 from jeremybanks/master
Do not strip leading and trailing whitespace from raw posts
2013-02-19 08:15:39 -08:00
Robin Ward
8371ff058a Merge pull request #194 from tms/personal-space
Added restricted route to kick out trespassers on user routes
2013-02-19 08:08:18 -08:00
Sam Saffron
d9531d94d5 basic lightbox support 2013-02-19 17:57:14 +11:00
Jeremy Banks
d42782b318 Using LengthValidator's localized messages for StrippedLengthValidator. 2013-02-18 21:57:46 -05:00
Jeremy Banks
eb2a5e4654 Merge branch 'origin/master'
Conflicts:
	lib/text_sentinel.rb
2013-02-18 21:41:20 -05:00
tms
d2a2ccdb09 Added restricted route to kick out trespassers on user routes 2013-02-18 21:05:12 -05:00
Sam Saffron
d520771c73 move stylesheet cache into the upload dir so its less crazy to sync across servers 2013-02-19 11:02:00 +11:00
Sam Saffron
3be7bde401 stop onebox rapid fire 2013-02-19 10:33:07 +11:00
Kevin Ansfield
1a81c90076 convert plain text in composer template to i18n 2013-02-18 11:20:07 +01:00
Sam Saffron
b9698e8d2f fix loading message am message bus stuff 2013-02-18 19:37:12 +11:00
Sam Saffron
0e48e1c346 clean up git version stuff a tad 2013-02-18 18:01:36 +11:00
Sam
5265c0b790 Merge pull request #192 from tms/date-formatting
Use consistent date formatting in date helpers
2013-02-17 22:41:39 -08:00
Sam Saffron
d9a84ddd01 chuck git version at the bottom of the page 2013-02-18 17:39:54 +11:00
tms
65d71f87a6 Use consistent date formatting in date helpers 2013-02-18 00:28:19 -05:00
Jeremy Banks
6af69f7e77 Do not strip leading and trailing whitespace from raw posts. 2013-02-15 20:58:33 -05:00
Sam Saffron
985b5c59c3 missing h3 2013-02-16 12:27:30 +11:00
Sam Saffron
c81d07c44b clean up the topics footer so it does not flash and is localisable 2013-02-16 12:15:15 +11:00
Sam
8631a6850b Merge pull request #178 from danneu/update-stats-fix
Category year/month/week stats shouldn't include deleted topics.
2013-02-17 14:00:12 -08:00
Sam
e8b3821b41 Merge pull request #179 from tms/users-like-like-posts
Users like like posts
2013-02-17 13:57:52 -08:00
Sam
db66e9facc Merge pull request #181 from danneu/flags-i18n
added "flagged_by" i18n
2013-02-17 13:56:33 -08:00
Sam
1623197b05 Merge pull request #184 from tms/activity-stream-tweaks
Improved action descriptions/links on user stream items
2013-02-17 13:55:45 -08:00
Sam
c7fba796b6 Merge pull request #185 from tms/search-all-the-things
Search all the things
2013-02-17 13:53:58 -08:00
tms
20c723c4fb Fancy 404 should require access too 2013-02-17 15:26:47 -05:00
Jeff Atwood
fa9a2dda6d nav for /tos /privacy /faq pages, h2 anchors 2013-02-17 01:09:54 -08:00
tms
66d56a8b93 Correctly set the typeFilter when the user clicks "show more" 2013-02-17 02:21:49 -05:00
tms
fb5710b5d6 Improved action descriptions/links on user stream items 2013-02-17 01:38:20 -05:00
Dan Neumann
72264e3034 added 'flagged_by' i18n. 2013-02-16 21:40:24 -06:00
Dan Neumann
fac75401ef category stats shouldn't include deleted topics. 2013-02-16 21:10:18 -06:00
tms
b7e392c7a3 Don't count bookmark stats for users who can't see them 2013-02-16 16:46:20 -05:00
tms
b91ac45359 Avoid grouping user stats by archetype (filter happens beforehand) 2013-02-16 16:33:51 -05:00
Jeff Atwood
cecbede5db add tooltip and better color to reply jump arrows 2013-02-16 13:07:14 -08:00
Robin Ward
9ca0615d94 Merge pull request #173 from dbarros/saved_preferences
Clear 'Saved' message when clicking Save button in user preferences.
2013-02-16 12:57:20 -08:00
Robin Ward
91ff0beb56 Merge pull request #177 from danneu/minor-fix
minor word change
2013-02-16 12:56:47 -08:00
Jeff Atwood
0d650972c2 add end nav footer to topic lists by category view 2013-02-16 12:27:24 -08:00
Dan Neumann
6dc088ca16 minor word change 2013-02-16 11:30:46 -06:00
Diego Barros
420614d50d Clear 'Saved' message when clicking Save button in user preferences. 2013-02-16 19:30:01 +11:00
Robin Ward
b440e30f45 Better filtering out private messages on user stream. 2013-02-15 17:08:28 -05:00
Robin Ward
fc1c120014 Arrows to navigate to embedded posts. 2013-02-15 15:17:57 -05:00
Robin Ward
5c4e6c9f2c Merge pull request #153 from xdite/refactor_topic_show_again
use helper again
2013-02-15 07:19:01 -08:00
Robin Ward
036e795e10 Merge pull request #152 from xdite/canonical-url
use canonical-url plugin to make view more clean
2013-02-15 07:18:41 -08:00
Robin Ward
3cdf89d052 Merge pull request #162 from jessepollak/omniauth-failure
Adds failure callback for omniauth
2013-02-15 07:13:17 -08:00
Jeff Atwood
c1a50aae04 add more delete button styles on delete.. buttons 2013-02-15 01:45:37 -08:00
Jesse Pollak
ad5a5b4866 This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml 2013-02-14 18:08:40 -08:00
Sam Saffron
a8085f15c4 grab highest post number from the raw data, so deletions at the end of a topic work 2013-02-15 13:08:37 +11:00
Sam
9eb5c2a66a Merge pull request #163 from anthonyalberto/master
Fixes Issue #37 . Going to a user profile now updates the meta title.
2013-02-14 17:27:47 -08:00
Sam Saffron
6132373fab for some reason people seem to not understand why you can not submit close to empty posts, fix that 2013-02-15 12:20:17 +11:00
Sam Saffron
c833e2f290 migrate to glyph notifications 2013-02-15 11:44:14 +11:00
Sam Saffron
9681cbb6b8 btn danger is a bit too loud there 2013-02-15 11:44:14 +11:00
Sam Saffron
6c73b3a971 bookmarks should only show up in a users stream 2013-02-15 11:44:14 +11:00
Robin Ward
6f4882659a Animate in new user education. Track replies separately from posts. 2013-02-14 18:04:03 -05:00
Robin Ward
37b0c168bf Support non-english topic titles 2013-02-14 17:13:03 -05:00
Robin Ward
5d4efa9100 Support for non-english categories 2013-02-14 16:51:48 -05:00
Anthony Alberto
f00aa30f63 Fixes Issue #37 . Going to a user profile now updates the meta title. Also fixed a minor DEV guide typo. 2013-02-14 16:11:54 -05:00
Robin Ward
b9457197c0 First stab at new user education - configurable messages that pop up on a user's first
few posts/topics.
2013-02-14 15:33:51 -05:00
Neil Lalonde
39eab7c425 Replace mentions of mothership with discourse_hub 2013-02-14 12:57:26 -05:00
Neil Lalonde
68f32af240 User hashed name for local uploads instead of 'blob' 2013-02-14 12:08:37 -05:00
Robin Ward
cba4c9051a Merge pull request #160 from jaimeiniesta/replace_hpricot_with_nokogiri
Replace hpricot with nokogiri
2013-02-14 07:55:19 -08:00
Robin Ward
b94b9d2383 Merge pull request #146 from ismaelga/moderators-buttons
Create moderators
2013-02-14 07:26:50 -08:00
Jaime Iniesta
6995e75d41 Replace Hpricot with Nokogiri 2013-02-14 11:35:50 +01:00
Sam Saffron
3c9cab54aa fix indentation 2013-02-14 18:56:13 +11:00
Sam Saffron
6e6e24ad5c should be 2 not 10 2013-02-14 18:52:57 +11:00
Jeff Atwood
fe7cb0be05 left-align admin buttons, add back btn-danger style 2013-02-13 23:47:19 -08:00
Sam Saffron
87d83802b9 added option that allows users to decide when they consider topics new (default 2 days old or newer)
added site_setting to control the default new_topic_duration_minutes
added 10 minutes option for auto_track_topics_after_msecs, default bumped up to 5 mins
2013-02-14 17:36:14 +11:00
Neil Lalonde
aaf96f1e29 Replace email_blacklist_regexp with email_domains_blacklist site setting 2013-02-13 22:45:43 -05:00
Ismael Abreu
80bec6efc9 Adds grant and revoke moderation buttons so admins can make users moderators 2013-02-14 01:12:23 +00:00
Robin Ward
51473a95b4 Make all quotes multiline. Fixes a bunch of annoying errors. 2013-02-13 17:22:51 -05:00
Robin Ward
8efc4daa5a Fix zooming on mobile. 2013-02-13 16:17:29 -05:00
Robin Ward
4c6379ea56 New users are highlighted when posting. .new-user class 2013-02-13 16:12:30 -05:00
Robin Ward
dee9e9a51f Fix bug where links to posts weren't being tracked 2013-02-13 15:23:09 -05:00
Neil Lalonde
941820ac88 Client-side email validation should allow capital letters 2013-02-13 14:30:00 -05:00
Robin Ward
f00006ee7d Fix broken Yahoo! signup. 2013-02-13 12:37:48 -05:00
Neil Lalonde
f850fe1e75 Implement the email_blacklist_regexp ssite setting 2013-02-13 12:28:39 -05:00
Robin Ward
546016bfd2 Remove unused controllers, apply substitutions to TOS. 2013-02-13 11:50:27 -05:00
xdite
def442164f Refactor last_updated_at 2013-02-13 11:40:32 -05:00
Robin Ward
34329ee598 Merge pull request #137 from shapkin/patch-1
Update app/controllers/categories_controller.rb
2013-02-13 07:20:50 -08:00
Robin Ward
afc23cc8cb Merge pull request #133 from xdite/apply_omniauth
Apply omniauth
2013-02-13 07:19:13 -08:00
xdite
9eca9f9375 use helper again 2013-02-13 19:15:10 +08:00
Alexander Shapkin
b036c9e555 Update app/controllers/categories_controller.rb
Fix extra whitespace and hash style.

Comply with a style guide like in Github.
2013-02-13 15:14:38 +04:00
xdite
cab4d95eaf use canonical-url plugin to make view more clean 2013-02-13 19:04:43 +08:00
Sam Saffron
329f4617a9 less magic numbers 2013-02-13 22:01:16 +11:00
Sam Saffron
93846aecb1 13 sucks 2013-02-13 21:57:58 +11:00
Sam Saffron
3bfdb2dd5b missed this. was inserting dupes when loading more 2013-02-13 21:18:06 +11:00
Sam Saffron
b7c5687b10 Merge branch 'master' of github.com:discourse/discourse 2013-02-13 20:38:59 +11:00
Sam Saffron
161420fac0 Added method for testing ember stuff
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
2013-02-13 20:38:43 +11:00
Jeff Atwood
48e2b8c269 require 50 read posts, not 100, for basic user 2013-02-13 01:23:02 -08:00
Jeff Atwood
ae034a438c scope google search on 404 to domain 2013-02-13 01:05:35 -08:00
Jeff Atwood
ee75980f23 first step of variable-izing the /tos 2013-02-13 00:35:18 -08:00
Jeff Atwood
8078f04769 minor 404 page improvements 2013-02-13 00:25:27 -08:00
Jeff Atwood
b5a25084c0 That 1px makes all the difference, man 2013-02-12 23:17:54 -08:00
xdite
a7908e07d1 merge master 2013-02-13 15:16:39 +08:00
xdite
9189d937f7 move all logic to omniauth
implement omniauth-facebook / omniauth-twitter
2013-02-13 15:08:38 +08:00
xdite
be3d036084 use omniauth-openid to replace google id 2013-02-13 15:08:32 +08:00
Jeff Atwood
4c572ecd8d clean up some copy 2013-02-12 22:43:21 -08:00
Neil Lalonde
4e9d9138d6 Fix broken signup with Twitter 2013-02-12 20:50:31 -05:00
Robin Ward
69c7b5aeed Support category names with spaces 2013-02-12 17:54:56 -05:00
Neil Lalonde
8235d47bdd Add a new default favicon using the pencil drawn logo 2013-02-12 17:47:44 -05:00
Neil Lalonde
824b09389f Don't allow signups without a password 2013-02-12 15:42:16 -05:00
Robin Ward
d7f3241285 Option to supress replies button below a post, when its reply is directly following. 2013-02-12 14:35:21 -05:00
Robin Ward
04c8b20840 Remove a ton of old images we no longer use. They are leftover
from our prototype.
2013-02-12 13:04:40 -05:00
Robin Ward
95c86b0ffa Merge pull request #140 from blom/adjust-regexp
Adjust some regular expressions
2013-02-12 08:47:54 -08:00
Robin Ward
d90235477c Merge pull request #134 from abdulsattar/master
Set window height as maximum height of div_resizer
2013-02-12 08:45:52 -08:00
Robin Ward
84d1ff437a Merge pull request #105 from jamiehoyle/jh
Some mobile optimisations - mainly for the header.
2013-02-12 08:43:55 -08:00
Robin Ward
924ad1dae0 Merge pull request #106 from gammons/master
Refactored TopicsController#show into something that is much more maintainable
2013-02-12 08:36:20 -08:00
Ørjan Blom
bcd5040b11 Adjust some regular expressions
* Match beginning of string instead of beginning of line.
* Escape literal periods.
2013-02-12 17:21:56 +01:00
Neil Lalonde
4636b354b4 Use the new mothership change_nickname API 2013-02-12 10:19:02 -05:00
Neil Lalonde
238032051e Users with no email_tokens return true from email_confirmed 2013-02-12 10:19:02 -05:00
Abdulsattar Mohammed
c4eb5eee53 set window height as maximum height of div_resizer
This fixes the issue where a user can resize the div so that grippie is
no longer visible and is not reize the div back.
2013-02-12 13:56:37 +05:30
Sam Saffron
925925817f remove old buggy code see: http://meta.discourse.org/t/quoted-you-emails/2226/3
notify by display name is silly, display name is not unique in the system
2013-02-12 18:49:57 +11:00
Sam Saffron
99526c33da emoji should not be coupled into the core
avatars were being counted and should not have been for basic users
2013-02-12 18:43:48 +11:00
Sam Saffron
878fcd2c61 sketchy logo, so our techincolor logo is not sprawled across the web leading to confusion 2013-02-12 15:06:34 +11:00
Jeff Atwood
ecbaa45736 remove extraneous text on PM summary 2013-02-11 16:14:44 -08:00
Jamie Hoyle
07f30d445a Some mobile optimisations - mainly for the header./merged all mobile changes into mobile.css.scss 2013-02-11 22:59:13 +00:00
Grant Ammons
f3dc93a0db WIP, a very nice refactoring of TopicsController#show 2013-02-11 17:54:56 -05:00
Robin Ward
da79d6a8ed Merge pull request #122 from cjbell88/fix_minor_button_cut_off
Fix 1px button cut off on topic progress up / down buttons.
2013-02-11 14:48:15 -08:00
Robin Ward
592531be28 Merge pull request #109 from tms/topic-reply-button-state
Disable reply button on archived/closed topics
2013-02-11 14:42:19 -08:00
Robin Ward
7746a4576d Fixes: Bug concatenating string URL with integer id 2013-02-11 16:18:15 -05:00
Robin Ward
57049b55a2 Little things:
- Retries on deadlock when calculating average time
- Removes Warning: When specifying html format for errors
- Doesn't use manual SQL to update user's ip address
2013-02-11 15:47:28 -05:00
Robin Ward
6ce32b8bc4 Trivial: Was not finding files in public for errors due to missing extensions. 2013-02-11 14:39:26 -05:00
Robin Ward
7375566213 Merge pull request #119 from xdite/refactor_topic_view
Refactor topic view
2013-02-11 10:30:30 -08:00
Robin Ward
238aa0d007 Merge pull request #121 from xdite/refactor_application_layout
Refactor application layout
2013-02-11 10:28:09 -08:00
Robin Ward
10c12d05b3 iOS autocomplete bug fix - don't follow link to # 2013-02-11 12:48:34 -05:00
Robin Ward
09e53c72d4 Changed our minds: Let's track internal links, just never to users. Something like FAQ is useful. 2013-02-11 12:36:33 -05:00
Neil Lalonde
c18b85873f Prevent login until email is confirmed 2013-02-11 11:18:37 -05:00
Robin Ward
f21609fe2e Don't track links within discourse unless they're to other topics. 2013-02-11 11:11:48 -05:00
Chris Bell
240a290422 Fix 1px button cut off on topic progress up / down buttons. 2013-02-11 12:08:50 +00:00
xdite
4175341b26 move stylesheet 2013-02-11 19:41:23 +08:00
xdite
c3fd34985d move discourse javascript setting 2013-02-11 19:37:23 +08:00
xdite
c95629a781 move google analytics to partial 2013-02-11 19:34:14 +08:00
xdite
00883842f4 render_topic_next_page_link 2013-02-11 19:18:17 +08:00
xdite
0f54dbb36e use render_topic_title to replace plain link_to 2013-02-11 19:16:08 +08:00
xdite
b609060455 use link_to to replace a href 2013-02-11 19:13:04 +08:00
Sam Saffron
3047d8afa3 Merge branch 'master' of github.com:discourse/discourse 2013-02-11 19:01:52 +11:00
Sam Saffron
f68f59c24f setting to exclude rel nofollow from particular domains 2013-02-11 18:58:19 +11:00
Sam
6d49c35eb5 Merge pull request #115 from tms/stop-talking-to-yourself
Prevent UI from suggesting you can message yourself
2013-02-10 23:39:52 -08:00
tms
ee3d01af1c Prevent UI from suggesting you can message yourself 2013-02-11 02:12:53 -05:00
Sam Saffron
80929ead4b security hole fixed 2013-02-11 17:28:21 +11:00
Sam Saffron
1c12c91d0c forgot to skip a filter 2013-02-11 17:14:36 +11:00
Sam Saffron
3f7a711dd6 I thought this would work but it fails horribly Revert "update markdown converter from showdown source, handles trailing parens etc."
This reverts commit e55b713c59.
2013-02-11 15:54:26 +11:00
tms
29d2f04d87 Disable reply button on archived/closed topics 2013-02-10 23:39:09 -05:00
Sam Saffron
4b92cfe80f Merge branch 'master' of github.com:discourse/discourse 2013-02-11 15:38:26 +11:00
Sam Saffron
e55b713c59 update markdown converter from showdown source, handles trailing parens etc. 2013-02-11 15:37:42 +11:00
Sam
14fd671914 Merge pull request #110 from tms/share-box-zindex
Reduce z-index on reply tab so it's below the share box
2013-02-10 20:05:09 -08:00
tms
a07adc01bc Reduce z-index on reply tab so it's below the share box 2013-02-10 22:36:24 -05:00
Sam Saffron
a6fc46599f Merge branch 'master' of github.com:discourse/discourse 2013-02-11 11:43:20 +11:00
Sam Saffron
543845c673 rel nofollow, on by default to protect forums from spam etc. we should consider lifting it at high trust by default. 2013-02-11 11:43:07 +11:00
Sam
8eed88da27 Merge pull request #108 from tms/searchbox-key-interceptions
Prevent click from being trapped in the editor field
2013-02-10 16:36:43 -08:00
Sam Saffron
c50a9e4d01 added support for disabling indexing by google using SiteSetting.allow_index_in_robots_txt = false 2013-02-11 11:02:57 +11:00
tms
0dc5b9be39 Prevent click from being trapped in the editor field 2013-02-10 18:36:11 -05:00
Sam Saffron
8250586306 add to_date so its more explicit 2013-02-11 09:11:02 +11:00
Sam
1264f628c8 Merge pull request #104 from kubabrecka/fix_non_us_locale
fix user listing and search on non-US locale
2013-02-10 14:08:13 -08:00
Sam Saffron
c06f1438d3 ilike is slow in theory, unless some sophisticated index is in place 2013-02-10 23:47:04 +11:00
Sam Saffron
af810f38dd UserSearch refactor
Added .sql_builder to all AR models
2013-02-10 23:37:24 +11:00
Sam Saffron
6fb78809c2 better support for multi host in site customization 2013-02-10 23:05:11 +11:00
Kuba Brecka
d0c1d94918 fix user listing and search on non-US locale 2013-02-10 12:18:11 +01:00
Sam
4b0eec334f Merge pull request #101 from tms/profile-stream-cleanup
Tweaked profile stream activity entries
2013-02-09 21:46:39 -08:00
tms
86d8326e30 Allow forcing username as image title when generating avatar 2013-02-10 00:12:27 -05:00
tms
9e653ad370 Show "You" to same-user on activity stream items 2013-02-09 23:44:03 -05:00
Sam
ca0c4926f6 Merge pull request #99 from tms/firefox-placeholders
Prevent Firefox from using the wrong placeholder colour
2013-02-09 19:53:35 -08:00
tms
f6b4d0d57a Swap name / title in activity stream, link post number 2013-02-09 22:33:07 -05:00
tms
a588939d81 Prevent Firefox from using a more-specific text color definition in place of the placeholder color 2013-02-09 20:04:01 -05:00
Jeff Atwood
c2bac8358e update /faq more after sleeping on it 2013-02-09 12:57:34 -08:00
Jeff Atwood
bfb28b3d54 add local greyscale dev logos 2013-02-09 12:32:53 -08:00
Robin Ward
272a1e567f Merge pull request #92 from gammons/master
Factored out @post.revise into a new PostRevisor class
2013-02-09 08:13:12 -08:00
Grant Ammons
701ecddac2 factor out @post.revise into its own class. clean up PostRevisor class to be more readable 2013-02-09 10:33:25 -05:00
Kuba Brecka
12fa6e9a4e correct noscript link to next page 2013-02-09 14:12:31 +01:00
Jeff Atwood
f44dba5fc5 edit id anchors on /faq 2013-02-09 03:46:41 -08:00
Jeff Atwood
99f1d40748 Omit Needless Words, again 2013-02-09 03:38:40 -08:00
Jeff Atwood
c868283813 li height, copy on /faq 2013-02-09 03:22:03 -08:00
Jeff Atwood
6af0d0789c correct TOS links, correct ul/li body-page style 2013-02-09 02:50:13 -08:00
Jeff Atwood
5d21745dcf minor /faq improvements, Omit Needless Words 2013-02-09 02:41:27 -08:00
Jeff Atwood
91b306d159 normalize on H2 in FAQs, copyedits 2013-02-09 01:32:08 -08:00
Jeff Atwood
a03676ac62 simplify faq/tos/privacy HTML and CSS 2013-02-09 01:20:57 -08:00
Robin Ward
03a798b202 Can clear flags on deleted posts if you're a moderator 2013-02-08 19:07:29 -05:00
Robin Ward
33757c201a Twitter logins were broken. 2013-02-08 17:57:01 -05:00
Robin Ward
7c11c3fe0f Can edit deleted posts. 2013-02-08 17:49:15 -05:00
Robin Ward
25e9cfe3b8 Remove the distinction between "x replies below" and "x replies" 2013-02-08 17:10:18 -05:00
Robin Ward
12d3c3b66b Enforce entropy on flag text 2013-02-08 17:01:43 -05:00
Neil Lalonde
1635d8e553 Add email_blacklist_regexp to site settings. Not implemented yet. 2013-02-08 16:31:21 -05:00
Robin Ward
db0c73e874 Replace all those deleted_ats with acts_as_paranoid 2013-02-08 16:16:09 -05:00
Robin Ward
50ef0c16bb Removed most manual SQL from PostAction 2013-02-08 16:16:03 -05:00
Neil Lalonde
d73baa23dd Better username change validation messages 2013-02-08 16:08:45 -05:00
Neil Lalonde
d1a04fa06a Enforce max username length on client 2013-02-08 16:08:45 -05:00
Jeff Atwood
24cf672c7d need word-wrap:break-word on preview 2013-02-08 12:07:32 -08:00
Neil Lalonde
ce7088f081 check_username api now returns correct error message for invalid lengths etc 2013-02-08 14:12:48 -05:00
Cyril Mougel
84191802df Extract the validation of Username format in own class to avoid
complexity in user model object
2013-02-08 12:54:47 -05:00
tms
b502a40b36 Button container should be no wider than suggested topics
The button container sticks out farther than necessary because of the
left margin, causing unnecessary horizontal scrolling at supported
resolutions
2013-02-07 21:18:22 -05:00
Neil Lalonde
79dfccf717 Username validation in signup and username change forms 2013-02-07 18:23:52 -05:00
Robin Ward
2c8c602086 Always show username on hover, unless there's something else more interesting to say. 2013-02-07 17:41:32 -05:00
Sam Saffron
14a807f433 Merge branch 'master' of github.com:discourse/discourse 2013-02-08 08:50:08 +11:00
Sam Saffron
470ecf97cc I have no objection to the removing of haml, but breaking our templates ... bad 2013-02-08 08:49:58 +11:00
Robin Ward
2d064571df Fixes some minor issues with users deleting their own posts. 2013-02-07 16:42:31 -05:00
Jeff Atwood
b8ded55450 a few minor copyedits, 1px adjust 2013-02-07 13:41:33 -08:00
Robin Ward
63c0fdda44 Merge pull request #57 from blowmage/user_search_refactor
Refactor UserController#search_users
2013-02-07 12:38:39 -08:00
Robin Ward
e98fb5592d Delete button on OP deletes topic 2013-02-07 15:31:53 -05:00
Robin Ward
084a873b91 Give regular users a delete button. If they click it, their post will be revised to
say it was deleted.
2013-02-07 15:14:23 -05:00
Jeff Atwood
af11547108 shift post metadata closer to post 2013-02-07 11:56:22 -08:00
Jeff Atwood
18b0be7a3a need break-word on user page excerpts 2013-02-07 11:45:20 -08:00
Mike Moore
d72c26ff92 Refactor UserSearch tests 2013-02-07 09:35:38 -07:00
Mike Moore
e41b6537f9 Remove expectation of term case 2013-02-07 09:35:38 -07:00
Mike Moore
5b01ac9288 Return User objects instead of hashes 2013-02-07 09:35:38 -07:00
Mike Moore
1cd565ec0d Extract SQL generation method 2013-02-07 09:35:38 -07:00
Mike Moore
972b9d735c Extract search logic to UserSearch model 2013-02-07 09:35:38 -07:00
Jakub Arnold
61654ab8f0 Fix all the trailing whitespace 2013-02-07 16:45:24 +01:00
Robin Ward
1839614bcc Merge pull request #36 from fenprace/master
Remove some gems in the Gemfile
2013-02-07 07:09:28 -08:00
Sam Saffron
4fcd924797 I committed a regression around multi site today and site customization, added tests so it don't happen again 2013-02-08 00:55:04 +11:00
Sam Saffron
168bb01439 allow for empty headers properly 2013-02-07 18:25:18 +11:00
Sam Saffron
85973ce6b0 added delete all posts button
wired up the ability to enable all themes
2013-02-07 18:11:56 +11:00
Sam Saffron
8f4417f962 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 16:00:55 +11:00
Sam Saffron
7b123e12dd improving flag handling, links and delete button 2013-02-07 16:00:40 +11:00
Sam Saffron
c7461622a9 admins can now clear flags inline 2013-02-07 15:15:48 +11:00
Robin Ward
7d7d8c7d4f Merge branch 'master' of github.com:discourse/discourse 2013-02-06 20:59:07 -05:00
Robin Ward
40da901e5d Introduction of TextSentinel to enforce title and body quality. 2013-02-06 20:53:34 -05:00
Sam Saffron
554ba7b676 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 12:32:39 +11:00
Sam Saffron
7cdf1266ad remove unused var 2013-02-07 12:32:29 +11:00
Neil Lalonde
471c61fd69 Add honeypot and challenge to signup form 2013-02-06 19:25:36 -05:00
Sam Saffron
f79f0e740a Don't allow users to double flag stuff
Correct seed fu to match model
2013-02-07 10:45:58 +11:00
Robin Ward
94e58d733e Add moderator style while in topic 2013-02-06 17:36:07 -05:00
Robin Ward
c4b1c10955 Merge pull request #25 from mlinksva/patch-1
Update app/views/static/faq.html.erb
2013-02-06 13:27:39 -08:00
Robin Ward
c24e1122b6 Merge pull request #39 from bendoerr/patch-1
Split -vendor-placeholder selector by vendor.
2013-02-06 13:24:38 -08:00
Robin Ward
c77dea41b8 Merge pull request #7 from mutewinter/fix_at_dot
Removed unnecessary @.'s
2013-02-06 13:22:13 -08:00
Robin Ward
8c54a97800 Merge pull request #33 from sebasoga/remove_empty_helpers
Remove empty helpers
2013-02-06 13:20:54 -08:00
Robin Ward
2d2b907d2c Temporary Nuclear option on topic titles - disallow non ascii characters so we
can stay on top of the trolls. This is meant to be replaced soon with a more
permissive and safe method of sanitizing.
2013-02-06 15:47:36 -05:00
Robin Ward
2ce69c73eb Use double quotes in image uploads instead of single quotes. Our sanitizer seems to
hate single quotes.
2013-02-06 14:27:11 -05:00
Ben Doerr
77908ed3d8 Split -vendor-placeholder selector by vendor.
Some browsers (specifically Firefox(18) that I know of) fail to select
correctly if the selectors are combined. This was fixed in bootstrap
(https://github.com/twitter/bootstrap/blob/master/less/forms.less#L210).
Not sure of the exact commit but there is a nice comment.
2013-02-06 12:39:15 -05:00
Robin Ward
6043a370ad Oops, that should be 1.minute 2013-02-06 12:07:22 -05:00
Robin Ward
8d568b05c4 Don't enable Cache-Control if the site has restricted access. 2013-02-06 11:55:54 -05:00
Prace Fen
b60be8889f Remove some gems because they are never used in this project. 2013-02-06 22:48:55 +08:00
Sebastian Sogamoso
24584ae916 Remove empty helpers 2013-02-06 08:32:41 -05:00
Jeff Atwood
27e1a81b34 increase default max_likes_per_day to 30 2013-02-06 00:32:46 -08:00
Mike Linksvayer
28c25940d2 Update app/views/static/faq.html.erb
remove example.com from example.com/tos
2013-02-05 22:48:55 -08:00
Sam Saffron
2e3bcec5c7 also for about me 2013-02-06 17:24:49 +11:00
Sam Saffron
d4bc423320 hook up sanitizer 2013-02-06 17:22:11 +11:00
Sam Saffron
31c5859bbe Merge branch 'master' of github.com:discourse/discourse 2013-02-06 16:28:38 +11:00
Sam Saffron
0f88947279 fix onebox for your own site 2013-02-06 16:22:11 +11:00
Andy
66022f9faa Updated email hash to Gravatar specifications
Gravatar email hashes have two requirements:
* Whitespace must be trimmed
* Email should be downcased
2013-02-05 21:16:15 -07:00
Sam Saffron
6f2f7b0589 flagging work, we should be clearing from the mod menu if a topic or post is deleted 2013-02-06 12:13:41 +11:00
Sam Saffron
3fd019c6bd fix firefox focus bug on flagging dialog 2013-02-06 11:47:08 +11:00
Jeremy Mack
87ff4373f5 Removed unnecessary @.'s
Since CoffeeScript automatically converts @ to this. when immediately followed by a character.
2013-02-05 15:59:17 -05:00
Robin Ward
21b5628528 Initial release of Discourse 2013-02-05 14:16:51 -05:00