codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-28 01:56:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
1003 commits 7 branches 179 tags 87 MiB
Commit graph

545 commits

Author SHA1 Message Date
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
Robin Ward
6a617348e5 Remove old unused code. 2013-02-21 16:17:56 -05:00
Robin Ward
c8a908e81a Remove some useless views 2013-02-21 15:55:58 -05:00
Neil Lalonde
2d1bbf22e9 Refactor functions out of the dashboard controller 2013-02-21 15:03:55 -05:00
Robin Ward
dd6d98f48f More documentation to Admin Controllers 2013-02-21 14:42:48 -05:00
Robin Ward
c1b5803486 Cleaned up admin JS, added YUIDoc headers to all admin classes. 2013-02-21 14:12:09 -05:00
Neil Lalonde
8620024798 Show which SHA is installed on the admin dashboard 2013-02-21 13:48:14 -05:00
Robin Ward
13f8f3c45e Cleaned up JS, added basic documentation support for Admin Controllers 2013-02-21 13:29:21 -05:00
Robin Ward
6096a447b7 Fix Regression: In reply to 2013-02-21 12:59:38 -05:00
Robin Ward
f6263749d4 Fix javascript regression with quoting 2013-02-21 12:54:40 -05:00
Robin Ward
c5393d93f3 Add icons and and archived style to categories list 2013-02-21 11:38:38 -05:00
Robin Ward
c3b03e3cb6 Show fancy title when you scroll down on topics 2013-02-21 11:21:10 -05:00
Robin Ward
42d996aae1 Show empty categories to those who can create them (admins/mods) 2013-02-21 10:43:10 -05:00
Neil Lalonde
560411eece Add site_setting to disable version checks 2013-02-21 10:19:17 -05:00
Robin Ward
84cb08e035 Merge pull request #215 from tms/auth-token-changes 
Sign the auth token cookie and make it httpOnly
 2013-02-21 07:14:15 -08:00
Régis Hanol
0884318207 update topic-progress z-index to show up in front 
of all other items (especially the read-icon)
 2013-02-21 14:59:35 +01:00
Sam Saffron
012941ea62 basic smoke test script 2013-02-21 16:01:40 +11:00
Sam Saffron
30f743e185 mobile fix 2013-02-21 16:01:40 +11:00
Robin Ward
26e1cfd12c rake jshint works 2013-02-20 19:09:27 -05:00
Robin Ward
f661fa609e Convert all CoffeeScript to Javascript. See: 
http://meta.discourse.org/t/is-it-better-for-discourse-to-use-javascript-or-coffeescript/3153
 2013-02-20 19:01:13 -05:00
tms
5616fdc475 Sign the auth token cookie and make it httpOnly 2013-02-20 17:24:19 -05:00
Neil Lalonde
85f8f8f2d5 Better checking of blacklisted emails on create and when email is being updated 2013-02-20 16:25:08 -05:00
Neil Lalonde
6885e6cfa9 Fix login with google in IE9 2013-02-20 15:40:52 -05:00
Jeff Atwood
7ff7fe3d3c add css3 fade in/out transition to post menus 2013-02-20 12:36:07 -08:00
Neil Lalonde
046c330858 Changes to email_domains_blacklist shouldn't invalidate existing users 2013-02-20 12:16:16 -05:00
Régis Hanol
55c7ced2f3 corrected right-arrow html entity encoding 
when using a javascript-disabled browser
 2013-02-20 17:00:28 +01:00
Neil Lalonde
1dd882ea99 Fix admin dashboard version check losing its css styling 2013-02-20 10:37:51 -05:00
Alexander Shapkin
105ae2a174 fix spaces and use link_to instead of <a> tags 2013-02-20 12:08:22 +04:00
Sam
d81cd6eb80 Merge pull request #207 from danneu/validate-category-user-id 
validate category user_id presence to match DB constraint.
 2013-02-19 22:48:39 -08:00
Sam Saffron
a02414410f amazing the amount of damage a missing .js extension can cause 2013-02-20 17:17:05 +11:00
Sam Saffron
15c5f5b840 grrrrr asset pipeline hates me 2013-02-20 17:00:24 +11:00
Sam Saffron
ea7b97be34 missing localization on categories 2013-02-20 16:11:56 +11:00
Sam Saffron
70058c9ebe live reload bug 
minor sanity check for phone
 2013-02-20 16:11:56 +11:00
Sam Saffron
0c085059c9 added sane sanitizer (Google Cajole) that is much more robust than old one ... yay for smilies 
added sane way to do $LAB includes - pattern to be expanded
people keep on messing structure.sql
 2013-02-20 16:11:56 +11:00
Sam Saffron
a1099ed74e sanitize wip 2013-02-20 16:11:56 +11:00
Dan Neumann
37ca391f50 validate category user_id. 2013-02-19 21:24:38 -06:00
Jeff Atwood
2fdbf8cbc9 give us temporary breathing room on wide names 2013-02-19 16:03:03 -08:00
Neil Lalonde
e914222cb3 Add i18n for the version checking 2013-02-19 17:42:36 -05:00
Robin Ward
a1f8dcebd1 Custom messages for the footers of all list views 2013-02-19 17:39:34 -05:00
Neil Lalonde
3ca2d92b2f Fix the missing {{provider}} value message 2013-02-19 16:28:12 -05:00
Robin Ward
836c3a7379 Support for Fancy topic titles 2013-02-19 16:14:04 -05:00
Neil Lalonde
c0371ff427 Add version checking that shows on the admin dashboard 2013-02-19 15:20:49 -05:00
Robin Ward
da59c15b72 Remove leftover sub-tag support. 2013-02-19 14:21:31 -05:00
Robin Ward
b7e027cfd1 Notifications on PMs respect access rights. 2013-02-19 12:59:46 -05:00
Robin Ward
928e215e57 Update to latest Ember.js 2013-02-19 12:28:18 -05:00
Robin Ward
ae9bee2a91 Merge pull request #172 from jeremybanks/master 
Do not strip leading and trailing whitespace from raw posts
 2013-02-19 08:15:39 -08:00
Robin Ward
8371ff058a Merge pull request #194 from tms/personal-space 
Added restricted route to kick out trespassers on user routes
 2013-02-19 08:08:18 -08:00
Sam Saffron
d9531d94d5 basic lightbox support 2013-02-19 17:57:14 +11:00
Jeremy Banks
d42782b318 Using LengthValidator's localized messages for StrippedLengthValidator. 2013-02-18 21:57:46 -05:00
Jeremy Banks
eb2a5e4654 Merge branch 'origin/master' 
Conflicts:
	lib/text_sentinel.rb
 2013-02-18 21:41:20 -05:00
tms
d2a2ccdb09 Added restricted route to kick out trespassers on user routes 2013-02-18 21:05:12 -05:00
Sam Saffron
d520771c73 move stylesheet cache into the upload dir so its less crazy to sync across servers 2013-02-19 11:02:00 +11:00
Sam Saffron
3be7bde401 stop onebox rapid fire 2013-02-19 10:33:07 +11:00
Kevin Ansfield
1a81c90076 convert plain text in composer template to i18n 2013-02-18 11:20:07 +01:00
Sam Saffron
b9698e8d2f fix loading message am message bus stuff 2013-02-18 19:37:12 +11:00
Sam Saffron
0e48e1c346 clean up git version stuff a tad 2013-02-18 18:01:36 +11:00
Sam
5265c0b790 Merge pull request #192 from tms/date-formatting 
Use consistent date formatting in date helpers
 2013-02-17 22:41:39 -08:00
Sam Saffron
d9a84ddd01 chuck git version at the bottom of the page 2013-02-18 17:39:54 +11:00
tms
65d71f87a6 Use consistent date formatting in date helpers 2013-02-18 00:28:19 -05:00
Jeremy Banks
6af69f7e77 Do not strip leading and trailing whitespace from raw posts. 2013-02-15 20:58:33 -05:00
Sam Saffron
985b5c59c3 missing h3 2013-02-16 12:27:30 +11:00
Sam Saffron
c81d07c44b clean up the topics footer so it does not flash and is localisable 2013-02-16 12:15:15 +11:00
Sam
8631a6850b Merge pull request #178 from danneu/update-stats-fix 
Category year/month/week stats shouldn't include deleted topics.
 2013-02-17 14:00:12 -08:00
Sam
e8b3821b41 Merge pull request #179 from tms/users-like-like-posts 
Users like like posts
 2013-02-17 13:57:52 -08:00
Sam
db66e9facc Merge pull request #181 from danneu/flags-i18n 
added "flagged_by" i18n
 2013-02-17 13:56:33 -08:00
Sam
1623197b05 Merge pull request #184 from tms/activity-stream-tweaks 
Improved action descriptions/links on user stream items
 2013-02-17 13:55:45 -08:00
Sam
c7fba796b6 Merge pull request #185 from tms/search-all-the-things 
Search all the things
 2013-02-17 13:53:58 -08:00
tms
20c723c4fb Fancy 404 should require access too 2013-02-17 15:26:47 -05:00
Jeff Atwood
fa9a2dda6d nav for /tos /privacy /faq pages, h2 anchors 2013-02-17 01:09:54 -08:00
tms
66d56a8b93 Correctly set the typeFilter when the user clicks "show more" 2013-02-17 02:21:49 -05:00
tms
fb5710b5d6 Improved action descriptions/links on user stream items 2013-02-17 01:38:20 -05:00
Dan Neumann
72264e3034 added 'flagged_by' i18n. 2013-02-16 21:40:24 -06:00
Dan Neumann
fac75401ef category stats shouldn't include deleted topics. 2013-02-16 21:10:18 -06:00
tms
b7e392c7a3 Don't count bookmark stats for users who can't see them 2013-02-16 16:46:20 -05:00
tms
b91ac45359 Avoid grouping user stats by archetype (filter happens beforehand) 2013-02-16 16:33:51 -05:00
Jeff Atwood
cecbede5db add tooltip and better color to reply jump arrows 2013-02-16 13:07:14 -08:00
Robin Ward
9ca0615d94 Merge pull request #173 from dbarros/saved_preferences 
Clear 'Saved' message when clicking Save button in user preferences.
 2013-02-16 12:57:20 -08:00
Robin Ward
91ff0beb56 Merge pull request #177 from danneu/minor-fix 
minor word change
 2013-02-16 12:56:47 -08:00
Jeff Atwood
0d650972c2 add end nav footer to topic lists by category view 2013-02-16 12:27:24 -08:00
Dan Neumann
6dc088ca16 minor word change 2013-02-16 11:30:46 -06:00
Diego Barros
420614d50d Clear 'Saved' message when clicking Save button in user preferences. 2013-02-16 19:30:01 +11:00
Robin Ward
b440e30f45 Better filtering out private messages on user stream. 2013-02-15 17:08:28 -05:00
Robin Ward
fc1c120014 Arrows to navigate to embedded posts. 2013-02-15 15:17:57 -05:00
Robin Ward
5c4e6c9f2c Merge pull request #153 from xdite/refactor_topic_show_again 
use helper again
 2013-02-15 07:19:01 -08:00
Robin Ward
036e795e10 Merge pull request #152 from xdite/canonical-url 
use canonical-url plugin to make view more clean
 2013-02-15 07:18:41 -08:00
Robin Ward
3cdf89d052 Merge pull request #162 from jessepollak/omniauth-failure 
Adds failure callback for omniauth
 2013-02-15 07:13:17 -08:00
Jeff Atwood
c1a50aae04 add more delete button styles on delete.. buttons 2013-02-15 01:45:37 -08:00
Jesse Pollak
ad5a5b4866 This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml 2013-02-14 18:08:40 -08:00
Sam Saffron
a8085f15c4 grab highest post number from the raw data, so deletions at the end of a topic work 2013-02-15 13:08:37 +11:00
Sam
9eb5c2a66a Merge pull request #163 from anthonyalberto/master 
Fixes Issue #37 . Going to a user profile now updates the meta title.
 2013-02-14 17:27:47 -08:00
Sam Saffron
6132373fab for some reason people seem to not understand why you can not submit close to empty posts, fix that 2013-02-15 12:20:17 +11:00
Sam Saffron
c833e2f290 migrate to glyph notifications 2013-02-15 11:44:14 +11:00
Sam Saffron
9681cbb6b8 btn danger is a bit too loud there 2013-02-15 11:44:14 +11:00
Sam Saffron
6c73b3a971 bookmarks should only show up in a users stream 2013-02-15 11:44:14 +11:00
Robin Ward
6f4882659a Animate in new user education. Track replies separately from posts. 2013-02-14 18:04:03 -05:00
Robin Ward
37b0c168bf Support non-english topic titles 2013-02-14 17:13:03 -05:00
Robin Ward
5d4efa9100 Support for non-english categories 2013-02-14 16:51:48 -05:00
Anthony Alberto
f00aa30f63 Fixes Issue #37 . Going to a user profile now updates the meta title. Also fixed a minor DEV guide typo. 2013-02-14 16:11:54 -05:00
Robin Ward
b9457197c0 First stab at new user education - configurable messages that pop up on a user's first 
few posts/topics.
 2013-02-14 15:33:51 -05:00
Neil Lalonde
39eab7c425 Replace mentions of mothership with discourse_hub 2013-02-14 12:57:26 -05:00
Neil Lalonde
68f32af240 User hashed name for local uploads instead of 'blob' 2013-02-14 12:08:37 -05:00
Robin Ward
cba4c9051a Merge pull request #160 from jaimeiniesta/replace_hpricot_with_nokogiri 
Replace hpricot with nokogiri
 2013-02-14 07:55:19 -08:00
Robin Ward
b94b9d2383 Merge pull request #146 from ismaelga/moderators-buttons 
Create moderators
 2013-02-14 07:26:50 -08:00
Jaime Iniesta
6995e75d41 Replace Hpricot with Nokogiri 2013-02-14 11:35:50 +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
Neil Lalonde
aaf96f1e29 Replace email_blacklist_regexp with email_domains_blacklist site setting 2013-02-13 22:45:43 -05: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
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
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
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
ae034a438c scope google search on 404 to domain 2013-02-13 01:05:35 -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
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
9189d937f7 move all logic to omniauth 
implement omniauth-facebook / omniauth-twitter
 2013-02-13 15:08:38 +08:00
xdite
be3d036084 use omniauth-openid to replace google id 2013-02-13 15:08:32 +08:00
Jeff Atwood
4c572ecd8d clean up some copy 2013-02-12 22:43:21 -08:00
Neil Lalonde
4e9d9138d6 Fix broken signup with Twitter 2013-02-12 20:50:31 -05:00
Robin Ward
69c7b5aeed Support category names with spaces 2013-02-12 17:54:56 -05:00
Neil Lalonde
8235d47bdd Add a new default favicon using the pencil drawn logo 2013-02-12 17:47:44 -05:00
Neil Lalonde
824b09389f Don't allow signups without a password 2013-02-12 15:42:16 -05:00
Robin Ward
d7f3241285 Option to supress replies button below a post, when its reply is directly following. 2013-02-12 14:35:21 -05:00
Robin Ward
04c8b20840 Remove a ton of old images we no longer use. They are leftover 
from our prototype.
 2013-02-12 13:04:40 -05:00
Robin Ward
95c86b0ffa Merge pull request #140 from blom/adjust-regexp 
Adjust some regular expressions
 2013-02-12 08:47:54 -08:00
Robin Ward
d90235477c Merge pull request #134 from abdulsattar/master 
Set window height as maximum height of div_resizer
 2013-02-12 08:45:52 -08:00
Robin Ward
84d1ff437a Merge pull request #105 from jamiehoyle/jh 
Some mobile optimisations - mainly for the header.
 2013-02-12 08:43:55 -08:00
Robin Ward
924ad1dae0 Merge pull request #106 from gammons/master 
Refactored TopicsController#show into something that is much more maintainable
 2013-02-12 08:36:20 -08:00
Ørjan Blom
bcd5040b11 Adjust some regular expressions 
* Match beginning of string instead of beginning of line.
* Escape literal periods.
 2013-02-12 17:21:56 +01:00
Neil Lalonde
4636b354b4 Use the new mothership change_nickname API 2013-02-12 10:19:02 -05:00
Neil Lalonde
238032051e Users with no email_tokens return true from email_confirmed 2013-02-12 10:19:02 -05:00
Abdulsattar Mohammed
c4eb5eee53 set window height as maximum height of div_resizer 
This fixes the issue where a user can resize the div so that grippie is
no longer visible and is not reize the div back.
 2013-02-12 13:56:37 +05:30
Sam Saffron
925925817f remove old buggy code see: http://meta.discourse.org/t/quoted-you-emails/2226/3 
notify by display name is silly, display name is not unique in the system
 2013-02-12 18:49:57 +11:00
Sam Saffron
99526c33da emoji should not be coupled into the core 
avatars were being counted and should not have been for basic users
 2013-02-12 18:43:48 +11:00
Sam Saffron
878fcd2c61 sketchy logo, so our techincolor logo is not sprawled across the web leading to confusion 2013-02-12 15:06:34 +11:00
Jeff Atwood
ecbaa45736 remove extraneous text on PM summary 2013-02-11 16:14:44 -08:00
Jamie Hoyle
07f30d445a Some mobile optimisations - mainly for the header./merged all mobile changes into mobile.css.scss 2013-02-11 22:59:13 +00:00
Grant Ammons
f3dc93a0db WIP, a very nice refactoring of TopicsController#show 2013-02-11 17:54:56 -05:00
Robin Ward
da79d6a8ed Merge pull request #122 from cjbell88/fix_minor_button_cut_off 
Fix 1px button cut off on topic progress up / down buttons.
 2013-02-11 14:48:15 -08:00
Robin Ward
592531be28 Merge pull request #109 from tms/topic-reply-button-state 
Disable reply button on archived/closed topics
 2013-02-11 14:42:19 -08:00
Robin Ward
7746a4576d Fixes: Bug concatenating string URL with integer id 2013-02-11 16:18:15 -05:00
Robin Ward
57049b55a2 Little things: 
- Retries on deadlock when calculating average time
- Removes Warning: When specifying html format for errors
- Doesn't use manual SQL to update user's ip address
 2013-02-11 15:47:28 -05:00
Robin Ward
6ce32b8bc4 Trivial: Was not finding files in public for errors due to missing extensions. 2013-02-11 14:39:26 -05:00
Robin Ward
7375566213 Merge pull request #119 from xdite/refactor_topic_view 
Refactor topic view
 2013-02-11 10:30:30 -08:00
Robin Ward
238aa0d007 Merge pull request #121 from xdite/refactor_application_layout 
Refactor application layout
 2013-02-11 10:28:09 -08:00
Robin Ward
10c12d05b3 iOS autocomplete bug fix - don't follow link to # 2013-02-11 12:48:34 -05:00
Robin Ward
09e53c72d4 Changed our minds: Let's track internal links, just never to users. Something like FAQ is useful. 2013-02-11 12:36:33 -05:00
Neil Lalonde
c18b85873f Prevent login until email is confirmed 2013-02-11 11:18:37 -05:00
Robin Ward
f21609fe2e Don't track links within discourse unless they're to other topics. 2013-02-11 11:11:48 -05:00
Chris Bell
240a290422 Fix 1px button cut off on topic progress up / down buttons. 2013-02-11 12:08:50 +00:00
xdite
4175341b26 move stylesheet 2013-02-11 19:41:23 +08:00
xdite
c3fd34985d move discourse javascript setting 2013-02-11 19:37:23 +08:00
xdite
c95629a781 move google analytics to partial 2013-02-11 19:34:14 +08:00
xdite
00883842f4 render_topic_next_page_link 2013-02-11 19:18:17 +08:00
xdite
0f54dbb36e use render_topic_title to replace plain link_to 2013-02-11 19:16:08 +08:00
xdite
b609060455 use link_to to replace a href 2013-02-11 19:13:04 +08:00
Sam Saffron
3047d8afa3 Merge branch 'master' of github.com:discourse/discourse 2013-02-11 19:01:52 +11:00
Sam Saffron
f68f59c24f setting to exclude rel nofollow from particular domains 2013-02-11 18:58:19 +11:00
Sam
6d49c35eb5 Merge pull request #115 from tms/stop-talking-to-yourself 
Prevent UI from suggesting you can message yourself
 2013-02-10 23:39:52 -08:00
tms
ee3d01af1c Prevent UI from suggesting you can message yourself 2013-02-11 02:12:53 -05:00
Sam Saffron
80929ead4b security hole fixed 2013-02-11 17:28:21 +11:00
Sam Saffron
1c12c91d0c forgot to skip a filter 2013-02-11 17:14:36 +11:00
Sam Saffron
3f7a711dd6 I thought this would work but it fails horribly Revert "update markdown converter from showdown source, handles trailing parens etc." 
This reverts commit e55b713c59.
 2013-02-11 15:54:26 +11:00
tms
29d2f04d87 Disable reply button on archived/closed topics 2013-02-10 23:39:09 -05:00
Sam Saffron
4b92cfe80f Merge branch 'master' of github.com:discourse/discourse 2013-02-11 15:38:26 +11:00
Sam Saffron
e55b713c59 update markdown converter from showdown source, handles trailing parens etc. 2013-02-11 15:37:42 +11:00
Sam
14fd671914 Merge pull request #110 from tms/share-box-zindex 
Reduce z-index on reply tab so it's below the share box
 2013-02-10 20:05:09 -08:00
tms
a07adc01bc Reduce z-index on reply tab so it's below the share box 2013-02-10 22:36:24 -05:00
Sam Saffron
a6fc46599f Merge branch 'master' of github.com:discourse/discourse 2013-02-11 11:43:20 +11:00