Commit Graph

518 Commits

Author SHA1 Message Date
Jeff Atwood f40e21ede3 tighten up reply to spacing on composer 2013-03-19 02:24:18 -07:00
Sam 9805f7d2f5 max upload size message when images are too big. 2013-03-19 00:19:05 -07:00
Sam 0e1174dbe8 Merge pull request #487 from ZogStriP/keep-favorite-title-in-sync-with-status
keep favorite/star button's title in sync with starred status
2013-03-18 21:48:12 -07:00
Régis Hanol feecb1374a consistent behavior of the composer's create button 2013-03-19 01:24:10 +01:00
Neil Lalonde c24f6d3d51 Username change: check length in js, we don't need the server to do it 2013-03-18 15:38:19 -04:00
Régis Hanol 967b03fcfc keep favorite/star button's title in sync with starred status 2013-03-18 18:57:03 +01:00
Neil Lalonde 12768f1d42 Fix admin dashboard layout on smaller widths 2013-03-18 13:44:28 -04:00
Neil Lalonde 766f437e44 Say 'mod' instead of '5' on users per trust level table 2013-03-18 13:25:40 -04:00
Robin Ward c4a5f9d47b Merge pull request #489 from ZogStriP/fix-editing-a-category-and-cancelling
fix some issues when editing a topic title and then cancelling it
2013-03-18 07:41:49 -07:00
Robin Ward c1298979bb Merge pull request #472 from ZogStriP/fixes-random-login
fixes the random login on dev
2013-03-18 07:30:06 -07:00
Robin Ward e1e1bdd0b1 Merge pull request #469 from wojciechka/master
Support for running discourse with a prefix (i.e. as http://servername/discourse)
2013-03-18 07:24:11 -07:00
Neil Lalonde 50b04b2209 Add email counts to admin dashboard 2013-03-18 10:08:09 -04:00
Neil Lalonde 6a99d12784 Add likes to admin dashboard 2013-03-18 10:08:08 -04:00
Régis Hanol 33c100da17 fix some issues when editing a topic title and then cancelling it 2013-03-18 12:00:50 +01:00
Robin Ward 0b4339c103 For Evil Trout blog part 2: switch between bar chart and table 2013-03-17 15:03:34 -04:00
Robin Ward 42c234e927 Merge pull request #483 from ZogStriP/site-setting-for-category-color
site setting for category colors
2013-03-17 04:48:01 -07:00
Robin Ward 4e057335d5 Merge pull request #464 from ZogStriP/fix-issues-when-a-failure-happen-while-creating-a-new-category
displays a message when a failure happen while creating a new category
2013-03-17 04:47:44 -07:00
Régis Hanol bc9e931304 site setting for category colors 2013-03-17 01:24:52 +01:00
Sam ee1460e932 Merge pull request #480 from ZogStriP/fix-reply-draft-wont-save
fix: reply draft won't save
2013-03-16 15:01:50 -07:00
Régis Hanol 83b8a3386f fix: reply draft won't save 2013-03-16 18:14:54 +01:00
Robin Ward e4dfb0a935 Merge pull request #474 from ZogStriP/bind-category-text-field-to-category-badge
bind the text entered in the category name text field to the badge
2013-03-16 08:20:10 -07:00
Kuba Brecka 94c0e73ca6 extract string from commits widget 2013-03-16 12:39:20 +01:00
Régis Hanol a500f6b307 bind the text entered in the category name text field to the badge 2013-03-16 00:59:11 +01:00
Régis Hanol 89815878d9 fixes the random login on dev 2013-03-16 00:26:32 +01:00
Wojciech Kocjan e6ccc300dc Support for running discourse with a prefix (i.e. as http://servername/discourse) 2013-03-16 00:01:21 +01:00
Neil Lalonde d9cdde9aa7 Add user counts for each trust level to admin dashboard 2013-03-15 18:09:02 -04:00
Neil Lalonde 1d9764d8fc Remove admin_report_total_users_view.js 2013-03-15 18:09:01 -04:00
Neil Lalonde 8983df9856 Show current user count for now, not at different points in time 2013-03-15 18:09:01 -04:00
Jeff Atwood 0db31b3398 just set opacity of links on archived not row 2013-03-15 14:17:47 -07:00
Jeff Atwood e22b4fe229 fancier favorite star on topics 2013-03-15 14:06:04 -07:00
Robin Ward 67f0de4b8b Fixed some merge conflicts 2013-03-15 16:59:10 -04:00
Robin Ward 1a60301a17 Merge branch 'fixes-topic-title-length-too-short' of git://github.com/ZogStriP/discourse
Conflicts:
	app/assets/javascripts/discourse/controllers/composer_controller.js
	app/assets/javascripts/discourse/views/composer_view.js
	config/locales/client.en.yml
2013-03-15 16:49:17 -04:00
Robin Ward 76d8df6ac6 Merge pull request #462 from kubabrecka/colorpicker3
implement color picking from predefined set for category badges + option to change foreground color
2013-03-15 13:43:59 -07:00
Robin Ward be01e7be60 Slightly offset the second popup if two are on at once 2013-03-15 16:05:57 -04:00
Robin Ward ad082cea70 Big commit:
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
2013-03-15 14:35:33 -04:00
Robin Ward 7714e2050e Merge pull request #465 from ZogStriP/extracted-hard-coded-string-in-admin-javascript-files
extracted hard coded strings in the admin javascript files [ci skip]
2013-03-15 06:49:03 -07:00
Régis Hanol aef014f439 displays the number of characters left when editing the topic title 2013-03-15 12:56:14 +01:00
Nick Sahler fb0da25b2d Wrong file. :| 2013-03-15 05:35:26 -03:00
Neil Lalonde 6c4d9ecfdc Use one request to fetch dashboard report data and check version 2013-03-14 18:26:26 -04:00
Régis Hanol cad55bf244 extracted hard coded strings in the admin javascript files 2013-03-14 23:03:13 +01:00
Régis Hanol 3bf6625aa4 displays a message when a failure happen while creating a new category 2013-03-14 22:25:55 +01:00
Neil Lalonde 4f42110e39 Change layout of the admin dashboard 2013-03-14 12:42:45 -04:00
Robin Ward 1715220d77 FIX: Hide topics list when loading new topics by category 2013-03-14 12:38:05 -04:00
Robin Ward 8760f58f3d Merge pull request #450 from ZogStriP/fixes-category-bug-on-cancel
fixes bug when modifying the category of a topic but cancelling the edit
2013-03-14 08:08:26 -07:00
Robin Ward 18133caf25 Merge pull request #449 from kubabrecka/composer_wider_placeholder
make the "add user" placeholder in composer wider, so other languages can fit into that
2013-03-14 08:06:04 -07:00
Neil Lalonde 91bd27ec0a Keep a jQuery object of hidden login form 2013-03-14 11:03:57 -04:00
nsahler d398d13aed - Mobile Reply-as-new fix
- Documentation
2013-03-14 11:02:13 -04:00
Robin Ward 42621859d1 Merge pull request #459 from tangramor/master
Fixed issue #435. Add zh_TW translations. Add missed translations according to newest en.yml
2013-03-14 06:38:37 -07:00
Kuba Brecka 8784c55188 implement color picking from predefined set for category badges + option to change foreground color 2013-03-14 14:16:57 +01:00
Regis Hanol 6abfa5342c extracted a few missing strings 2013-03-14 11:59:40 +01:00
tangramor 30f6561623 Fix #435 increased the lenghth of category.topic_prefix string; also added zh_TW translations by converting the Simplified Chinese to Traditional Chinese
New I18n entries added, added in both zh_CN and zh_TW
Start to translate FAQ, TOS and Privacy docs
Add missed zh_TW.js.erb
Make translation more precise
2013-03-14 18:18:59 +08:00
Robin Ward a8c44d90a3 FIX: Title changes didn't always apply. Cleaned up some ugly JS. 2013-03-13 18:38:38 -04:00
Neil Lalonde 7777b3f650 Autofocus on first field in signup form 2013-03-13 17:59:51 -04:00
Robin Ward 21b5183d6a Fix linting errors. 2013-03-13 16:04:48 -04:00
Robin Ward 518910a54d FIX: Don't include link counts when selecting text to quote a post. 2013-03-13 15:51:41 -04:00
Robin Ward 45674ef8e7 FIX: When a moderator made a post, their name wasn't highlighted until refresh 2013-03-13 13:59:42 -04:00
Neil Lalonde 58004d44cd Support for browser password managers, but doesn't quite work in IE 2013-03-13 13:55:33 -04:00
Robin Ward 42c7a65a05 When editing a post that is in reply to another post, show display meta data to that effect. 2013-03-13 12:00:38 -04:00
Regis Hanol 5b2c8362b8 fixes bug when modifying the category of a topic but cancelling the edit 2013-03-13 11:19:58 -04:00
Kuba Brecka 57398a4707 make the "add user" placeholder in composer wider, so other languages can fit into that 2013-03-13 15:22:09 +01:00
Kuba Brecka 4db4fc27c5 support "short without year" date format in all locales 2013-03-13 15:05:28 +01:00
Robin Ward 572a87d5d8 Merge pull request #447 from kubabrecka/history_date_i18n
move date formatting from server side to javascript, so we can reuse Sugar's i18n
2013-03-13 06:57:42 -07:00
Robin Ward fd6967f703 Merge pull request #446 from kubabrecka/dashboard_js_date_fix
fixing admin dashboard english date parsing in other locales
2013-03-13 06:55:49 -07:00
Robin Ward 50fcab557a Merge pull request #443 from kubabrecka/i18n_sugarjs_production
external sugarjs was not the same package as development
2013-03-13 06:52:23 -07:00
Robin Ward e899af4bf0 Merge pull request #444 from kubabrecka/fix_chinese_dates_js
fix js dates in chinese
2013-03-13 06:51:05 -07:00
Kuba Brecka 921a658548 move date formatting from server side to javascript, so we can reuse Sugar's i18n 2013-03-13 13:38:41 +01:00
Kuba Brecka 8003c63fa6 fixing admin dashboard english date parsing in other locales 2013-03-13 13:04:10 +01:00
Sam a663251bd4 regression 2013-03-13 02:33:32 -07:00
Kuba Brecka 74afb25c2e fix js dates in chinese 2013-03-13 10:03:05 +01:00
Kuba Brecka 999cd9fc87 external sugarjs was not the same package as development 2013-03-13 09:35:17 +01:00
Sam d1fa3dd9b3 change icon for Jeff 2013-03-12 23:08:37 -07:00
Sam 1d360a4f69 correct broke use streams 2013-03-12 21:45:55 -07:00
Sam 38f185355d added options to disable quoting and open links in new tabs
fixed a some regressions
removed some dead code
fixed messages about constants being re-defined
2013-03-12 20:06:58 -07:00
Régis Hanol 439ac95b73 the composer will now count only significant whitespaces 2013-03-12 23:54:29 +01:00
Robin Ward 59c52a6c12 Small JSHint issue 2013-03-12 14:54:05 -04:00
Robin Ward 9d4c8ed323 Fixes bug with creating new topic due to edit text changing. 2013-03-12 14:43:41 -04:00
Neil Lalonde 40c27ff3cf Add flag counts to admin dashboard 2013-03-12 14:40:59 -04:00
Neil Lalonde 9422adfe66 Better alignment of judgemental faces 2013-03-12 14:40:59 -04:00
Neil Lalonde 4eda422cdf Add total users report; restructure dashboard reports js 2013-03-12 14:40:59 -04:00
Kuba Brecka b97a3c8d34 reports don't work when default_locale != en + some missing translations 2013-03-12 14:38:15 -04:00
Robin Ward a5a97f88cd When editing a post, provide more information in the composer title 2013-03-12 13:34:27 -04:00
Kuba Brecka ac47c36f8b extract hardcoded "post {{number}}" into locale strings 2013-03-12 14:41:27 +01:00
Kuba Brecka f5f502d2a0 extract hardcoded string into locale 2013-03-12 11:29:59 +01:00
Sam a5b2c0c476 use font awesome for the composer toolbar (not very happy with heading and hr icon, but can not find anything better) 2013-03-11 23:33:36 -07:00
Sam 91b507f4c4 if you try posting a reply and are looking at a different topic, pop this window up 2013-03-11 20:57:06 -07:00
Régis Hanol 1d7aa1f6cf globalized some missing strings 2013-03-12 02:17:45 +01:00
Jeff Atwood 2115c36c84 Merge pull request #426 from ZogStriP/fix-highlight-issue
fixes the highlight issue @coding-horror reported
2013-03-11 13:14:38 -07:00
Régis Hanol 8a143bacaf fixes the highlight issue @coding-horror reported 2013-03-11 20:58:02 +01:00
Neil Lalonde bf37e1b995 Convert github commits widget to ember 2013-03-11 15:27:06 -04:00
Robin Ward 3b7ac014de Fixes JSHint error on PageDown. Updated for Uniform Access Principle. 2013-03-11 12:30:13 -04:00
Robin Ward 1205e0d3d4 Merge branch 'master' of github.com:discourse/discourse 2013-03-11 11:32:09 -04:00
Robin Ward dad71a78f7 Merge pull request #414 from awbergs/pagedown_observe
added observer to Discourse.PagedownEditor value to refresh previewer
2013-03-11 08:31:47 -07:00
Robin Ward d175da6816 Merge pull request #392 from kubabrecka/date_i18n_support
1st attempt to support i18n in dates and times
2013-03-11 08:15:58 -07:00
Robin Ward de1d488d91 Merge branch 'date_i18n_support' of git://github.com/kubabrecka/discourse 2013-03-11 11:14:17 -04:00
Robin Ward 4360d1bd61 Cleaned up probe code a little. 2013-03-11 11:13:28 -04:00
Robin Ward 866e0d4e87 Merge pull request #413 from ZogStriP/submit-create-account-form-by-pressing-enter
allows the submission of the create account form by pressing enter
2013-03-11 07:27:01 -07:00
Austin Bergstrom ba80ca2ee5 added observer to Discourse.PagedownEditor value to refresh previewer 2013-03-10 19:56:32 -04:00
Régis Hanol 4a9c30bf33 allows the submission of the create account form by pressing enter 2013-03-11 00:46:28 +01:00
Martin Potthast cfc93ad4b9 Added locale to assets. 2013-03-10 17:15:29 +01:00
Neil Lalonde 3d7dfd3168 Fix a jshint failure 2013-03-09 15:53:30 -05:00
Neil Lalonde 8927432a93 Add stats to the admin dashboard 2013-03-09 15:34:27 -05:00
Robin Ward 908bba8c13 First stab at oneboxing of meta.discourse.org 2013-03-08 15:59:12 -05:00
Robin Ward d1d4530efd User Profile enhancements:
- Added PreloadStore support to avoid duplicate requests
- preliminary SEO
- Support for opengraph/twitter cards
2013-03-08 15:04:37 -05:00
tangramor c5761eae8a Support for Simplified Chinese thanks to tangramor 2013-03-08 11:56:17 -05:00
Robin Ward c5c1ddfa83 Merge pull request #385 from ZogStriP/highlight-first-of-loaded-topics
highlight the first of the newly loaded topics when scrolling
2013-03-08 08:48:30 -08:00
Robin Ward 82b7d3a843 Merge pull request #380 from alxndr/master
Keep track of state/content between multiple quotes in a single post
2013-03-08 08:39:37 -08:00
Robin Ward fb573b917f Merge pull request #390 from ZogStriP/min-search-term-length-site-setting
added the min-search-term-length site setting
2013-03-08 06:58:45 -08:00
Neil Lalonde 2ebe0336ae On signup, handle duplicate key errors on email and username better 2013-03-07 14:56:55 -05:00
Neil Lalonde 1133d90dcc Disable submit button on signup form when you've submitted the form 2013-03-07 14:56:55 -05:00
Kuba Brecka 2e76e337a6 1st attempt to support i18n in dates and times 2013-03-07 20:05:18 +01:00
Robin Ward f8d8272406 Cleaned up TopicUserSpec, introduces clearing of pinned topics 2013-03-07 12:19:25 -05:00
Regis Hanol 5703d6c730 added the min-search-term-length site setting 2013-03-07 16:52:01 +01:00
Régis Hanol 002776808f highlight the first of the newly loaded topics when scrolling 2013-03-07 03:38:38 +01:00
Jeff Atwood 985cbb92f1 Merge pull request #382 from nsahler/patch-1
Reply-new fades in
2013-03-06 11:44:53 -08:00
Nick Sahler 7490012b20 Resubmitting 2013-03-06 14:41:24 -05:00
Neil Lalonde fab04dbb58 Add github commits widget 2013-03-06 14:39:01 -05:00
Nick Sahler 5f9093f21d "reply-new" transitions instead of instantly popping in 2013-03-06 14:26:38 -05:00
Alexander 02f29cd43f Prevent quote content collisions with multiples in one post
[Fixes #142]
2013-03-06 09:53:34 -08:00
Robin Ward 610be79061 Merge pull request #375 from ZogStriP/autofocus-login
autofocus the login input in the login modal
2013-03-06 09:17:10 -08:00
Robin Ward 3b645383fb Merge pull request #372 from kubabrecka/markdown_fix1
Markdown editor translations into client.en.yml + tiny translation fixes
2013-03-06 09:15:52 -08:00
Robin Ward 1e43eac600 Simple CSS changes to help with lower width screens such as Surface tablet 2013-03-06 12:08:06 -05:00
Neil Lalonde f129693942 Use a github commits widget hosted on discourse.org 2013-03-06 12:04:45 -05:00
Neil Lalonde e8eb60fe78 Use the cog in header dropdown menu admin link, not the wrench 2013-03-06 11:07:44 -05:00
Neil Lalonde 83f89b5c55 Fix check if you're up to date in javascript 2013-03-06 10:34:29 -05:00
Neil Lalonde f8e04a5c48 Version check gets how many versions behind you are, and shows judgemental faces on the dashboard 2013-03-05 18:15:33 -05:00
Régis Hanol 21407d1df4 autofocus the login input in the login modal 2013-03-05 23:42:12 +01:00
Kuba Brecka da7a41f5b9 Markdown editor translations into client.en.yml + tiny translation fixes 2013-03-05 21:58:37 +01:00
Robin Ward 86af49e663 More Markdown refactoring - fixed bug with Pagedown not showing on user profile - replaced jQuery occurrences with $. 2013-03-05 15:39:21 -05:00
Robin Ward cf09e200a5 Moved Markdown out of Discourse.Utilities -> Discourse.Markdown 2013-03-05 14:56:43 -05:00
Robin Ward 1416bc7475 Some javascript refactoring: Move markdown functions into their own classs, remove extraneous `window.` calls. 2013-03-05 14:53:55 -05:00
Neil Lalonde e2ead81818 Use wrenches instead of cogs for admin buttons that let you change something/someone's settings 2013-03-05 14:52:33 -05:00
Robin Ward e4277757c4 Fix onebox loading on every keystroke after a request fails. 2013-03-05 14:06:39 -05:00
Neil Lalonde d30fbcd491 Remove welcome to the dashboard 2013-03-05 13:02:16 -05:00
Robin Ward 6edabdfec1 Merge pull request #362 from ZogStriP/repeated-clicks
Repeated click on header icons should close popped out dropdowns
2013-03-05 07:29:56 -08:00
Robin Ward 0c41e80f41 Merge pull request #367 from kubabrecka/extract_strings5
extract some strings from views/modal
2013-03-05 06:43:01 -08:00
Robin Ward 97a2d6d0fe Merge pull request #366 from ZogStriP/moar-globalization
globalizing the image selector modal
2013-03-05 06:41:49 -08:00
Kuba Brecka 5afd6cc8a1 extract some strings from views/modal 2013-03-05 08:30:47 +01:00
Régis Hanol 5b456a6a3f globalizing the image selector modal 2013-03-05 03:38:12 +01:00
Régis Hanol 61dcd61a5e autofocus the input in the "insert image" dialog when clicking on the "on the web" tab 2013-03-05 03:09:13 +01:00
Régis Hanol c72f65879f Repeated click on header icons should close popped out dropdowns 2013-03-05 02:44:34 +01:00
Robin Ward f544e1d4f7 Crap, we can't use Ember.Handlebars because some places don't use Ember (such as autocomplete.js) 2013-03-04 17:39:21 -05:00
Robin Ward 9c0b4572a3 Updated helpers, upgraded Ember to latest master. 2013-03-04 15:25:30 -05:00
Robin Ward 4385a174a2 Merge branch 'keep-title-and-category-in-sync' of git://github.com/ZogStriP/discourse 2013-03-04 15:25:24 -05:00
Robin Ward 09e9e34b8b Merge pull request #340 from tms/post-scroll-peekaboo
Position the selected post more reliably below the header
2013-03-04 11:40:00 -08:00
Robin Ward f7c9efb101 Merge branch 'persona-integration' of git://github.com/callahad/discourse 2013-03-04 11:51:26 -05:00
Robin Ward 3287dcf754 Merge pull request #345 from tms/fatten-up-static-pages
Don't double-up on #main-outlet when static content is preloaded
2013-03-04 06:45:55 -08:00
Régis Hanol ccb715fba3 update both the title & the category when editing the first post
using the "edit this post" action beneath the post.
2013-03-03 19:21:29 +01:00
Régis Hanol d7edca203c added the gear icon to the "Admin" button on the user page 2013-03-03 18:04:02 +01:00
tms f46c819956 Don't double-up on #main-outlet when static content is rendered through Ember 2013-03-03 10:47:40 -05:00
tms fba50c3f7a Position the selected post more reliably below the header 2013-03-03 00:43:08 -05:00
Robin Ward dfafadfe41 Merge pull request #327 from tms/name-changing
Change the name displayed in the header on profile update
2013-03-02 08:10:26 -08:00
Kuba Brecka 821ad9f51d server side of Czech language localization + update of client side + update of pseudo-localization 2013-03-02 14:22:53 +01:00
tms 66a7b3162f Change the name displayed in the header on profile update 2013-03-01 22:46:33 -05:00
Robin Ward 3901ddd153 Fix jshint issue with `[^]` in regexp. 2013-03-01 15:16:21 -05:00
Dan Callahan 7c87359e02 Make Persona configurable 2013-03-01 14:00:56 -06:00
Dan Callahan ef8cf2f734 Add basic Persona functionality
1. No session integration yet, so automatic login/logout events are suppressed.

2. Popup blockers must be disabled: submits form to target="_blank"
2013-03-01 14:00:56 -06:00
Dan Callahan 81c545539e Add (ui-only) Persona button to login modal 2013-03-01 14:00:53 -06:00
Robin Ward d2596c3c4c Remove unusued site_settings, show checkbox in UI for boolean values, remove restrict_access
boolean to avoid locking yourself out by setting access_password to empty string. Minor
UI tweaks.
2013-03-01 14:27:41 -05:00
Robin Ward 27ba923fd4 Merge pull request #307 from kubabrecka/html_syntax_fixes
some minor HTML syntax fixes
2013-03-01 07:39:03 -08:00
Kuba Brecka 8a03afb35f some minor HTML syntax fixes 2013-03-01 08:44:58 +01:00
Régis Hanol 4fa4c15559 Quoting another reply won't satisfy the minimum character count (fixes #180) 2013-02-28 23:58:40 +01:00
Neil Lalonde c9140a2441 Add a nag to update often 2013-02-28 16:19:22 -05:00
Neil Lalonde f0c2d012b7 Add a github widget to the admin dashboard showing the 10 most recent commits 2013-02-28 15:35:47 -05:00
Robin Ward 628927a79f Added Site Setting to change locale. 2013-02-28 14:34:38 -05:00
Robin Ward e37c7f1e1d Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse 2013-02-28 14:34:13 -05:00
Neil Lalonde fce4c66d93 Improve js username validation so it's done only when necessary 2013-02-28 12:24:57 -05:00
Robin Ward 9c0cbe8311 Merge pull request #298 from nverba/login-buttons
added option to enable/disable login buttons individually
2013-02-28 08:13:04 -08:00
Robin Ward 5d0d958a45 Merge pull request #289 from ZogStriP/bbcode-component
added more tests & documentation to the BBCode component
2013-02-28 08:03:44 -08:00
Bryson Holland 50cd44df2d Saved ~46KB through image optimization. 2013-02-28 10:58:12 -05:00
Robin Ward 3b47562738 We don't need `content` here because it uses an ObjectController as a proxy. 2013-02-28 10:01:38 -05:00
nverba b0f3a74a1f added option to enable/disable login buttons individually 2013-02-28 03:46:56 +00:00
Robin Ward dc8e1196fd Code to support EmberJS + Discourse Tutorial feature: Admin Reports 2013-02-27 22:40:36 -05:00
Régis Hanol f93a26e03d added more tests & documentation to the BBCode component 2013-02-28 03:29:52 +01:00
Robin Ward 007118b00c Merge branch 'github-auth' of git://github.com/nverba/discourse
Conflicts:
	config/locales/server.en.yml
	db/structure.sql
	spec/views/omniauth_callbacks/complete.html.erb_spec.rb
2013-02-27 12:09:22 -05:00
Robin Ward 7d6e1f3e1c Show likes even while logged out. 2013-02-27 11:22:03 -05:00
Kuba Brecka acc7718c67 first attempt to serve correct localized js files as rails pipeline assets 2013-02-27 09:00:49 +01:00
Robin Ward e363950bf5 Merge pull request #272 from kubabrecka/extract_some_strings
extract some more strings into locales/*.yml
2013-02-26 14:38:40 -08:00
Robin Ward 0df2034dc8 Fixes #264 - replaceState was wonky 2013-02-26 17:27:01 -05:00
Neil Lalonde 4e15227fd0 Admin dashboard: use ember's class name binding 2013-02-26 17:05:17 -05:00
Kuba Brecka e9fb46c251 extract some more strings into locales/*.yml 2013-02-26 22:13:07 +01:00
Robin Ward 0f48414a72 The avatar helper should be smart enough to find a nested avatar_template. Fixes #243 2013-02-26 15:31:49 -05:00
Robin Ward 1492464158 fixes: http://meta.discourse.org/t/discourse-logo-link-back-to-top-of-thread-list-on-home-page/3592 2013-02-26 15:20:13 -05:00
Robin Ward 1caf1e6b45 Clean up discourse.js 2013-02-26 15:20:06 -05:00
Robin Ward ddf1f27633 Fixes #157 - Add mention of seed_fu to docs. 2013-02-26 12:45:56 -05:00
Robin Ward 6c30e0b09c Add 'descrption' to categories, even when in a Combobox 2013-02-26 12:17:23 -05:00
Robin Ward 0e087e040f Fixes title regression 2013-02-26 11:13:13 -05:00
Robin Ward 88267429c5 Remove fastclick for now -- we saw some regressions on iPad and want to make sure they weren't caused by
it.
2013-02-26 10:47:23 -05:00
Robin Ward 1221c393a3 Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse
Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
2013-02-26 10:42:49 -05:00
nverba b45f872c04 Added Github authentication option, disabled by default with enable options in settings. 2013-02-26 05:00:21 +00:00
Gosha Arinich cafc75b238 remove trailing whitespaces ❤️ 2013-02-26 07:31:35 +03:00
tms 7088dfce9f Prevent event bubbling on search toggles to keep dropdown open 2013-02-25 22:14:58 -05:00
Robin Ward e28594b94e Ack! Messed up the jshint again. I gotta get better about this. 2013-02-25 18:43:45 -05:00
Robin Ward 397c6ca761 Better error messages when topics can't load 2013-02-25 18:38:38 -05:00
Robin Ward 3e201fc9f3 Oops I missed a couple of jshint errors :) 2013-02-25 17:53:29 -05:00
Robin Ward e461c84253 Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline 2013-02-25 17:16:57 -05:00
Neil Lalonde 0321643636 Dashboard JS checks version every 12 hours 2013-02-25 16:21:52 -05:00
Sam Saffron cb3d839104 fix hinting 2013-02-25 11:18:10 +11:00
Sam Saffron b9f3666f5a fast click instead of hacky double event binding 2013-02-25 11:11:46 +11:00
Sam 14c2a4568d Merge pull request #247 from balpha/master
Update PageDown to latest
2013-02-24 13:54:16 -08:00
Sam Saffron 419ecf70b2 remove events from ember that seem to be firing too much PR in progress 2013-02-25 08:37:11 +11:00