Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,272 Commits 243 Branches 500 Tags 876 MiB
Commit Graph

36272 Commits

Author SHA1 Message Date
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
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 74adcf96e4 add minitest 2013-02-24 10:24:28 +11:00
Sam Saffron 82e2fae1b8 isolate notifications in channel per user 2013-02-24 10:24:06 +11:00
Sam f83494d012 Merge pull request #238 from balpha/master 
Add minitest to gemfile
 2013-02-23 13:37:15 -08:00
Jeff Atwood e962ff36a9 copy change on topic not found, curious problems 2013-02-23 12:38:55 -08: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
balpha f8469b8d74 add minitest to gemfile 2013-02-23 14:18:37 +01:00
Kuba Brecka 623cc66968 'pseudo' locale files for testing/development + script to generate these files 2013-02-23 11:38:27 +01:00
Sam 20d6152bb4 Update README.md 2013-02-23 16:47:19 +11:00
Sam Saffron 47be98ed1c diff engine, help needed 2013-02-23 16:30:02 +11:00
tms 3a0227f868 Tweak autocomplete/caret_position logic to not exclude the index 0 case 2013-02-22 23:47:23 -05:00
Neil Lalonde 7f08765ba7 version bump to 0.8.2 2013-02-22 17:17:03 -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
Jeff Atwood 8631c215ad improved admin site setting descriptions 2013-02-22 12:34:42 -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 2d5cddc1b4 Fix broken migration. OOPS 2013-02-22 14:12:31 -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 1c55683f49 Merge pull request #232 from potthast/vagrant-nfs-linux 
Vagrant now mounts NFS on both Linux and Darwin. Updated documentation accordingly.
 2013-02-22 10:57:22 -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
Martin Potthast ac64be720e Vagrant now attempts to mount NFS on both Linux and Darwin. Updated documentation accordingly. 2013-02-22 16:43:56 +01:00
Sam 6347cbe275 HELP NEEDED. Implement Me! 2013-02-22 23:47:26 +11: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
Sam 6f7ec7dc21 Merge pull request #227 from tms/wrap-long-titles 
Help long titles wrap more cleanly
 2013-02-21 18:55:20 -08: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
Sam Saffron 21cc9ab1ff work in progress 2013-02-22 10:56:59 +11:00
Sam 1ce70b49c0 Merge pull request #225 from snapapps/patch-1 
Shorter is better
 2013-02-21 14:37:23 -08:00
Ian Carroll bb78b8c0d4 Shorter is better 2013-02-21 17:33:49 -05:00
Robin Ward 588c79e637 Updated JSHint settings, include smoke test. 2013-02-21 16:25:40 -05:00