github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 03:34:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
614 Commits 214 Branches 500 Tags 960 MiB
12d664a610
Commit Graph

614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sam
14c2a4568d Merge pull request #247 from balpha/master 
Update PageDown to latest
 2013-02-24 13:54:16 -08:00
Sam
3ec7eb63d8 Merge pull request #248 from balpha/documentation 
ActiveRecord requires the postgres server to speak English
 2013-02-24 13:49:38 -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
Gosha Arinich
81d03e6a39 omit explicit route => action mappings where possible 2013-02-24 17:02:11 +03:00
balpha
a64d84d504 ActiveRecord requires the postgres server to speak English; add this fact to the docs 2013-02-24 14:42:37 +01: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
430a397cde comment out missing test 2013-02-24 22:59:09 +11: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
fd2e9a99bf cookie recovery cause we have been messing with it. 2013-02-24 21:50:34 +11:00
Sam Saffron
b66db4153d refactor and organise current_user better 2013-02-24 21:42:04 +11:00
Sam
ab97dc8fd6 Update lib/current_user.rb 2013-02-24 17:24:40 +11:00