Commit Graph

433 Commits

Author SHA1 Message Date
Kuba Brecka 9993e0e665 extracting some more hardcoded strings 2013-03-01 17:04:13 +01:00
Robin Ward b66b17bf19 Merge pull request #300 from goshakkk/cleanup
Minor cleanup, using AR querying DSL over raw SQL in some places
2013-03-01 07:52:34 -08: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
Robin Ward 2106d72d4c Merge pull request #304 from ZogStriP/minimum-character-count
Quoting another reply won't satisfy the minimum character count (fixes #180)
2013-03-01 07:30:26 -08:00
Robin Ward c3b0cf0744 Merge pull request #303 from kirushik/gravatar_https
Secure gravatar
2013-03-01 07:12:56 -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
Kirill Pimenov a168dc915e Secure gravatar 2013-03-01 00:58:36 +04: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 a3b1ae7793 Remove the secret_token site_setting since it's not used 2013-02-28 14:07:26 -05:00
Gosha Arinich 6e5399d544 minor cleanup, using AR querying DSL over raw SQL in some places 2013-02-28 21:54:12 +03: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 6c25eca2d6 Merge pull request #296 from goshakkk/refactor-user
Refactor User and TrustLevel a bit
2013-02-28 08:17:21 -08:00
Gosha Arinich d2f3c829db refactor User and TrustLevel a bit
* rename `User#password_required` to `User#password_required!`
* emails with "i" @ something are a special case as well
* get rid of `self.` and returns where possible
* prefer "unless a" instead of "if !a"
* `unread_notifications` without manually iterating
* introduce `User#moderator?`
* introduce `TrustLevel#valid_key?`, `TrustLevel#compare`, and
  `TrustLevel#level_key`
2013-02-28 19:15:54 +03: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
Jeff Atwood 416f981f92 change 404 page to use /new link under "New topics" 2013-02-27 16:48:53 -08:00
Robin Ward a086635add Swap out "@" for "via" in email From field 2013-02-27 19:03:57 -05:00
Robin Ward c62729b5b6 Merge pull request #285 from alxndr/rss-for-topics
Specify type in topic RSS autodiscovery tag
2013-02-27 15:33:11 -08:00
Robin Ward 421f048458 Add a better from address to the email 2013-02-27 18:30:14 -05:00
Alexander 9b541b1c0a Specify type in topic RSS autodiscovery tag 2013-02-27 14:55:04 -08:00
Robin Ward 7c1ae451fe Send emails to users who are watching topics 2013-02-27 15:38:44 -05:00
Robin Ward cf867a35ff Merge pull request #271 from goshakkk/topic-refactor
Refactor Topic
2013-02-27 10:32:44 -08: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 2184763d4a Merge pull request #222 from alxndr/rss-for-topics
RSS view of topics
2013-02-27 08:30:08 -08:00
Robin Ward 7d6e1f3e1c Show likes even while logged out. 2013-02-27 11:22:03 -05:00
Jeff Atwood d8687f1bfa broaden the /faq "search" advice to browse 2013-02-27 02:14:28 -08:00
Jeff Atwood b757f06fde /faq tweaks 2013-02-27 02:07:31 -08:00
Kuba Brecka acc7718c67 first attempt to serve correct localized js files as rails pipeline assets 2013-02-27 09:00:49 +01:00
Alexander 8855a0bfbe RSS of a topic via new route
Adds TopicView#recent_posts; Post#by_newest, #with_user, #author_readable; User#readable_name
Autodiscovery tag in topic show HTML.
2013-02-26 14:54:17 -08: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
Neil Lalonde cd6c1de5b0 Add site settings for company name and domain, and use them in the Terms of Service 2013-02-26 15:50:42 -05: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
Neil Lalonde b9ccf4d09c Show discourse version in an html comment 2013-02-26 13:47:07 -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
Gosha Arinich 12d664a610 refactor Topic
* move finding by username/email to User
* make SiteSetting return a range of possible post title lengths
* remove unnecessary conditions
2013-02-26 19:27:59 +03: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 2ba28096e1 Merge pull request #262 from goshakkk/no-unused-var-warn
Avoid unused variable (post) warning in Topic
2013-02-25 14:20:50 -08: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
Gosha Arinich 054a699886 avoid unused variable warning in Topic 2013-02-25 22:13:36 +03:00
Sam Saffron 77a2d8ccc4 fixed a pile of notification craziness
addes some tests around post timings
2013-02-25 18:42:42 +11: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 Saffron b0b0e222f7 missed a spot where channel can be out of sync 2013-02-25 09:32:06 +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
Sam Saffron 997b436210 attempt at fixing google analytics 2013-02-25 08:36:46 +11:00
balpha 378b594b2d apparently discourse allows single-quoted attribute values in HTML; fix the lookahead in the PageDown auto-linker to account for that 2013-02-24 14:13:00 +01:00
balpha 1640616c06 PageDown update overwrote a discourse customization; put it back in 2013-02-24 13:52:46 +01:00
balpha 22caa7b6a8 merge upstream PageDown changes up to current revision c06c6e0d465e 2013-02-24 13:40:06 +01:00
Sam Saffron 47fedd8f4d correct breakage
don't set permanent cookie, kill session if it conflicts
2013-02-24 22:56:08 +11:00
Sam Saffron b66db4153d refactor and organise current_user better 2013-02-24 21:42:04 +11:00
Sam d42a87ec8a Merge pull request #235 from tms/autocomplete-right-away
Tweak autocomplete/caret_position logic to not exclude the index 0 case
2013-02-23 19:05:23 -08:00
Sam 7081b958b9 Merge pull request #239 from tms/avatar-should-be-glowier
Make avatar glow more...glowier
2013-02-23 19:03:55 -08:00
Sam 578a38dc27 Merge pull request #241 from tms/auth-token-revert
Unsign auth token cookies per discussion on #215
2013-02-23 19:03:25 -08:00
Sam Saffron 82e2fae1b8 isolate notifications in channel per user 2013-02-24 10:24:06 +11:00
tms 3e6641c07e Unsign auth token cookies per discussion on #215 2013-02-23 13:40:21 -05:00
tms 6cfcdfbfd7 Make avatar glow more...glowier 2013-02-23 10:37:06 -05:00
tms 3a0227f868 Tweak autocomplete/caret_position logic to not exclude the index 0 case 2013-02-22 23:47:23 -05:00
Jeff Atwood cee3949850 add 3 and 4 minute opts to auto track pref 2013-02-22 13:15:41 -08:00
Jeff Atwood 9464bf5576 remove unused client_setting 2013-02-22 12:55:18 -08:00
Neil Lalonde fc33c63585 EmailToken.active needs to check created_at too 2013-02-22 15:20:00 -05:00
Robin Ward c3ba7b9741 Uncategorized doesn't have a topic url 2013-02-22 14:33:43 -05:00
Robin Ward e2fed6fcef Merge pull request #229 from danneu/topic-patch
make topics consume their own scope
2013-02-22 10:59:07 -08:00
Robin Ward 1c5afc9686 Merge pull request #231 from shapkin/master
Add english locale to page.
2013-02-22 10:58:31 -08:00
Robin Ward b2e9be68bd Suggested topics weren't using fancy titles 2013-02-22 13:48:07 -05:00
Robin Ward 532b1f5450 Can edit category descriptions, they show up in a `title` attribute 2013-02-22 13:43:47 -05:00
Neil Lalonde 2d9942ceef Fix my jshint failures 2013-02-22 12:17:07 -05:00
Neil Lalonde ff3e012034 Add a link that allows you to send activation email again 2013-02-22 11:49:58 -05:00
Robin Ward 45ab3ab892 JS refactoring that fixes presence errors in earlier reverted commit. 2013-02-22 11:00:47 -05:00
Alexander Shapkin ee8825408b add english locale to page 2013-02-22 15:33:35 +04:00
Sam 4d99dc035e Merge pull request #228 from tms/i-knew-you-cared
Collapse user activity items loaded from message bus
2013-02-21 21:53:49 -08:00
Dan Neumann 65b59f8612 make Topic consume its own scope. 2013-02-21 21:22:02 -06:00
tms b1c1053cf1 Collapse user activity items loaded from message bus 2013-02-21 22:14:58 -05:00
tms 8ec71657ea Help long titles wrap more cleanly 2013-02-21 21:33:59 -05:00
Sam Saffron 2b5be29d3c Revert "Remove old unused code."
This reverts commit 6a617348e5.
2013-02-22 10:57:11 +11:00
Robin Ward 588c79e637 Updated JSHint settings, include smoke test. 2013-02-21 16:25:40 -05:00