Commit Graph

1525 Commits

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