Commit Graph

715 Commits

Author SHA1 Message Date
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
Robin Ward 3922a4f356 Merge pull request #288 from ZogStriP/test-readability
cleaned up all javascript specs for better readability
2013-02-28 08:02: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
Sam Saffron 46a02ae5b1 Wot! Ruby 2.0 support? 2013-02-28 21:27:25 +11: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
Régis Hanol 9a40789f4d cleaned up all javascript specs for better readability 2013-02-28 03:26:20 +01:00
Jeff Atwood 416f981f92 change 404 page to use /new link under "New topics" 2013-02-27 16:48:53 -08:00
nverba 2ca81e8afa fixed SiteSettings without defaults Type of Null 2013-02-28 00:24:43 +00: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 37175c264a Merge pull request #280 from nverba/patch-1
Quick fix for Boolean SiteSettings
2013-02-27 10:35:55 -08:00
Robin Ward cf867a35ff Merge pull request #271 from goshakkk/topic-refactor
Refactor Topic
2013-02-27 10:32:44 -08:00
Robin Ward 0e6cd9410f Fixes lines that were too long. 2013-02-27 12:27:56 -05: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
nverba c6e5e3acd2 Quick fix for Boolean SiteSettings
Boolean SiteSettings are saved as 't' or 'f' on create!, but are being saved as 1 or 0 after update. This quick fix maintains consistency, allowing boolean values to be updated and saved.
2013-02-27 16:19:09 +00:00
Robin Ward 0f770260cf Merge pull request #277 from ZogStriP/master
formatted some tests
2013-02-27 08:10:44 -08: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
Jeff Atwood 348c2b265a more flattening of readme 2013-02-27 01:26:57 -08:00
Jeff Atwood 9e571f6bfd flatten the top of readme.md a bit 2013-02-27 01:20:49 -08:00
Jeff Atwood ff92fc900c update readme and authors 2013-02-27 01:14:44 -08:00
Jeff Atwood 7087c2b847 clarify some /admin site setting descriptions 2013-02-27 00:47:47 -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
Régis Hanol 3a41400d63 formatted some tests
- formatted the bbcode_spec
- added 3 tests regarding the quotes
- corrected a test label in the smoke test
- cleaned up a bit the Guardfile
2013-02-27 03:18:23 +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 f9acff3579 Merge pull request #273 from ZogStriP/misc
updated sublime-project & vagrant file
2013-02-26 14:31:16 -08:00
Robin Ward 0df2034dc8 Fixes #264 - replaceState was wonky 2013-02-26 17:27:01 -05:00
Régis Hanol 1feeeed338 updated sublime-project & vagrant file
added the "trim_trailing_white_space_on_save setting" so developpers
using sublime text will now trim trailing white space one save

updated the vagrant configuration file so it uses ruby convention
2013-02-26 23:12:31 +01: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