Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
628 Commits 242 Branches 502 Tags 901 MiB
Commit Graph

628 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 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
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
Robin Ward a42637eb73 Merge pull request #265 from ZogStriP/robots-txt 
corrected spec labels for robots.txt controller
 2013-02-26 07:32:36 -08:00
Robin Ward 465772df72 Merge pull request #267 from tms/onebox-safety 
Tighten up onebox rendering
 2013-02-26 07:31:15 -08:00
Robin Ward 5058b8d284 Merge pull request #268 from tms/vanishing-search 
Prevent event bubbling on search toggles to keep dropdown open
 2013-02-26 07:30:45 -08:00
Robin Ward 19cf5ac0db Merge pull request #270 from ZogStriP/patch-2 
Pluralization bug when hovering on likes
 2013-02-26 07:30:09 -08:00
Régis Hanol 679d955db3 Pluralization bug when hovering on likes 2013-02-26 11:20:49 +01: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
tms 2e230d2661 Be more selective about when we allow oembed discovery 2013-02-25 20:48:17 -05:00
Jeremy Banks a7a2dcebac Include /^http... prefix in onebox whitelist URLs regexes to prevent XSS. 2013-02-25 20:06:16 -05:00
Jeff Atwood b50e0536c7 copyedit topic load failure messages 2013-02-25 17:05:26 -08:00
Jeff Atwood ea9196a8a2 minor copyedits around login / email 2013-02-25 16:23:09 -08: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
Jeff Atwood d9d3419a51 some copyedits on admin / email 2013-02-25 15:07:40 -08:00
Régis Hanol 79c19233bc corrected spec labels 2013-02-25 23:58:16 +01:00
Robin Ward 3e201fc9f3 Oops I missed a couple of jshint errors :) 2013-02-25 17:53:29 -05:00
Robin Ward 2a7345b96e Merge pull request #237 from kubabrecka/pseudolocalization 
'pseudo' locale files for testing/development + script to generate these files
 2013-02-25 14:26:57 -08:00
Robin Ward 4be869db34 Merge pull request #257 from jyggen/master 
Swedish translation of client strings
 2013-02-25 14:24:31 -08:00
Robin Ward c69cac517a Merge pull request #260 from nverba/patch-1 
Update config/routes.rb
 2013-02-25 14:22:35 -08:00
Robin Ward dbfbc34fff Merge pull request #261 from nverba/patch-2 
Fixed broken link to Vagrant Docs
 2013-02-25 14:21:16 -08: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
Jeff Atwood 11bf337b52 add thinkgeek to onebox whitelist 2013-02-25 14:19:07 -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
nverba 602a79f07c Fixed broken link to Vagrant Docs 2013-02-25 17:34:50 +00:00
nverba 5016657506 Fixed broken link to Vagrant Docs 2013-02-25 17:32:19 +00:00
nverba c6eeffec3b Update config/routes.rb 
Facebook and Twitter controllers are no longer defined.
 2013-02-25 17:16:53 +00:00
Jonas Stendahl 4990eab952 Added swedish translation for client strings. 2013-02-25 16:30:08 +01:00
Robin Ward ea861ebb57 Merge pull request #249 from goshakkk/cleaner-routes 
Omit explicit route => action mappings where possible
 2013-02-25 07:05:31 -08: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