Commit Graph

13487 Commits

Author SHA1 Message Date
Jaime Iniesta e4c1b9702b Use FakeWeb to fake web requests on specs 2013-02-14 11:35:50 +01:00
Jaime Iniesta 6995e75d41 Replace Hpricot with Nokogiri 2013-02-14 11:35:50 +01:00
Jaime Iniesta 84a167725d Add specs for oneboxer components: amazon, android, apple, flickr and wikipedia 2013-02-14 11:34:33 +01:00
Sam Saffron 3c9cab54aa fix indentation 2013-02-14 18:56:13 +11:00
Sam Saffron 6e6e24ad5c should be 2 not 10 2013-02-14 18:52:57 +11:00
Jeff Atwood fe7cb0be05 left-align admin buttons, add back btn-danger style 2013-02-13 23:47:19 -08:00
Sam Saffron 87d83802b9 added option that allows users to decide when they consider topics new (default 2 days old or newer)
added site_setting to control the default new_topic_duration_minutes
added 10 minutes option for auto_track_topics_after_msecs, default bumped up to 5 mins
2013-02-14 17:36:14 +11:00
Jeff Atwood cdff5a5a77 Merge pull request #158 from danneu/readme-fix
README typo fix.
2013-02-13 22:17:30 -08:00
Neil Lalonde aaf96f1e29 Replace email_blacklist_regexp with email_domains_blacklist site setting 2013-02-13 22:45:43 -05:00
Jeff Atwood d9d2565c25 remove extra text in login error 2013-02-13 17:23:30 -08:00
Ismael Abreu 80bec6efc9 Adds grant and revoke moderation buttons so admins can make users moderators 2013-02-14 01:12:23 +00:00
Robin Ward 51473a95b4 Make all quotes multiline. Fixes a bunch of annoying errors. 2013-02-13 17:22:51 -05:00
Sam Saffron fd694e7b83 Merge branch 'master' of github.com:discourse/discourse 2013-02-14 09:12:49 +11:00
Sam Saffron 4ccb7354d1 nuking SSL = bad 2013-02-14 09:12:20 +11:00
Dan Neumann cc77e0e235 README typo fix. 2013-02-13 15:50:02 -06:00
Robin Ward 8efc4daa5a Fix zooming on mobile. 2013-02-13 16:17:29 -05:00
Robin Ward 4c6379ea56 New users are highlighted when posting. .new-user class 2013-02-13 16:12:30 -05:00
Robin Ward dee9e9a51f Fix bug where links to posts weren't being tracked 2013-02-13 15:23:09 -05:00
Neil Lalonde 941820ac88 Client-side email validation should allow capital letters 2013-02-13 14:30:00 -05:00
Robin Ward f00006ee7d Fix broken Yahoo! signup. 2013-02-13 12:37:48 -05:00
Neil Lalonde f850fe1e75 Implement the email_blacklist_regexp ssite setting 2013-02-13 12:28:39 -05:00
Robin Ward 546016bfd2 Remove unused controllers, apply substitutions to TOS. 2013-02-13 11:50:27 -05:00
xdite def442164f Refactor last_updated_at 2013-02-13 11:40:32 -05:00
Robin Ward db949dcde5 Merge pull request #149 from danneu/discourse-plugin-cleanup
cleaned up discourse_plugin
2013-02-13 08:08:55 -08:00
Robin Ward 1ac1bd5267 Merge pull request #154 from marcoceppi/doc-organization
Doc re-organization
2013-02-13 07:43:49 -08:00
Marco Ceppi 6e945041e9 Re-organization of documents
Fix links to new /docs/ directory
2013-02-13 10:37:56 -05:00
Robin Ward 4aa89ed2c0 Merge pull request #156 from kubabrecka/correct_typos
correcting some typos in locales/en.yml
2013-02-13 07:26:28 -08:00
Robin Ward 81f34349a7 Merge pull request #143 from pixelcort/ninja_edit_window_clarification
Clarify the unit of time for ninja_edit_window
2013-02-13 07:24:41 -08:00
Robin Ward a9da9c5fde Merge pull request #148 from danneu/slug-simplify
replace reinvention of #parameterize
2013-02-13 07:23:26 -08:00
Robin Ward 34329ee598 Merge pull request #137 from shapkin/patch-1
Update app/controllers/categories_controller.rb
2013-02-13 07:20:50 -08:00
Robin Ward afc23cc8cb Merge pull request #133 from xdite/apply_omniauth
Apply omniauth
2013-02-13 07:19:13 -08:00
Kuba Brecka 1b5aaa1a7b correcting some typos in locales/en.yml 2013-02-13 16:16:40 +01:00
xdite 9eca9f9375 use helper again 2013-02-13 19:15:10 +08:00
Alexander Shapkin b036c9e555 Update app/controllers/categories_controller.rb
Fix extra whitespace and hash style.

Comply with a style guide like in Github.
2013-02-13 15:14:38 +04:00
xdite cab4d95eaf use canonical-url plugin to make view more clean 2013-02-13 19:04:43 +08:00
Sam Saffron 329f4617a9 less magic numbers 2013-02-13 22:01:16 +11:00
Sam Saffron 93846aecb1 13 sucks 2013-02-13 21:57:58 +11:00
Sam Saffron 3bfdb2dd5b missed this. was inserting dupes when loading more 2013-02-13 21:18:06 +11:00
Sam Saffron b7c5687b10 Merge branch 'master' of github.com:discourse/discourse 2013-02-13 20:38:59 +11:00
Sam Saffron 161420fac0 Added method for testing ember stuff
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
2013-02-13 20:38:43 +11:00
Jeff Atwood 48e2b8c269 require 50 read posts, not 100, for basic user 2013-02-13 01:23:02 -08:00
Jeff Atwood e380ebde40 no uppercasin' 2013-02-13 01:20:02 -08:00
Jeff Atwood ae034a438c scope google search on 404 to domain 2013-02-13 01:05:35 -08:00
xdite 67cc766f0c using redis as backend store 2013-02-13 16:48:44 +08:00
Jeff Atwood ee75980f23 first step of variable-izing the /tos 2013-02-13 00:35:18 -08:00
Jeff Atwood 8078f04769 minor 404 page improvements 2013-02-13 00:25:27 -08:00
Jeff Atwood 1a0ead770e add base_url to all /faq links in emails 2013-02-12 23:33:35 -08:00
Jeff Atwood b5a25084c0 That 1px makes all the difference, man 2013-02-12 23:17:54 -08:00
xdite a7908e07d1 merge master 2013-02-13 15:16:39 +08:00
xdite f232c646a7 move 3 test to 1 2013-02-13 15:15:44 +08:00