Commit Graph

1086 Commits

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