codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-21 04:52:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3015 commits 7 branches 179 tags 87 MiB
Commit graph

1631 commits

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