Commit Graph

1169 Commits

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