Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,442 Commits 247 Branches 502 Tags 904 MiB
Commit Graph

4442 Commits

Author SHA1 Message Date
Robin Ward 0d2b4aeb61 Merge pull request #1363 from johnpaulashenfelter/patch-1 
Be consistent with bundle exec
 2013-08-21 07:10:13 -07:00
Robin Ward 3760cba549 Merge pull request #1366 from ZogStriP/do-not-disable-the-radio-button 
do not disable the radio button in the avatar selection modal
 2013-08-21 07:09:58 -07:00
Robin Ward 23d740d5ce Merge pull request #1367 from einarj/cleanup_user_activation 
Moved user activation business logic out of UsersController
 2013-08-21 07:07:43 -07:00
Einar Jonsson 916a3f33f2 Refactored user activation business logic out of UsersController and 
into a UserActivator class.
 2013-08-21 09:22:34 +00:00
Sam 9526415789 em-redis is never used, don't require it 
hiredis was never wired up properly ... use it ... it is way faster
 2013-08-21 10:23:32 +10:00
Sam 8a0a097dfb make message bus more robust to bad inputs, correct issue where notifications channel is not susbcribed 2013-08-21 09:07:38 +10:00
Sam 487788b65b correct missing progress bar on navigation to new topic. 2013-08-21 08:37:30 +10:00
Robin Ward 7546a29d10 FIX: After sharing links and navigating long topics sometimes you'd have a lot of blank space. 2013-08-20 18:04:40 -04:00
Régis Hanol 9204e0f420 do not disable the radio button in the avatar selection modal 2013-08-20 22:54:01 +02:00
Jeff Atwood 3d7e46b42a Merge pull request #1364 from ZogStriP/fix-specs-on-ruby-p247 
FIX: specs for ruby 2.0.0-p247
 2013-08-20 13:46:19 -07:00
Jeff Atwood 36e86036ae Merge pull request #1365 from ZogStriP/remove-useless-text-for-avatars 
remove useless text beneath avatar
 2013-08-20 13:44:49 -07:00
Régis Hanol dcfe4f2061 remove useless text beneath avatar 2013-08-20 21:53:17 +02:00
Régis Hanol 3922c9b6b5 FIX: specs for ruby 2.0.0-p247 2013-08-20 21:45:58 +02:00
John Paul Ashenfelter ab61584549 Be consistent with bundle exec 
You need bundle exec for all of the commands, not just items 5 and 6
 2013-08-20 14:42:10 -04:00
Neil Lalonde 3abeb5f793 Staff action logs can be filtered to changes of one site setting 2013-08-20 13:50:51 -04:00
Sam 31dac4b197 unseen users get no updates 2013-08-20 17:48:04 +10:00
Sam c0c929be5a optimise query that runs every 10 minutes and takes out the user table 2013-08-20 17:40:22 +10:00
Sam b5b22f0f36 move secret token into redis to ease install 2013-08-20 17:17:19 +10:00
Sam 0061fc33cd rack mini profiler updated 2013-08-20 16:51:15 +10:00
Sam f4d833da27 fix onebox exception, if oneboxes fail on save we log a warning to the log 2013-08-20 11:38:10 +10:00
Sam d43bd55e5b HACK: hold back on loading more topics for a bit while we are repositioning the page for Safari 2013-08-20 11:25:15 +10:00
Sam 341a28402d speed up scrolling on android 2013-08-20 11:25:15 +10:00
Jeff Atwood 58b7df5480 change edit to std pencil glyph on avatars 2013-08-19 15:07:48 -07:00
Sam dca0b6b9b8 Merge pull request #1358 from chrishunt/bump-favcount 
Improve readability of count for complex favicons
 2013-08-19 14:58:57 -07:00
Sam 60c740e16e Merge pull request #1361 from ZogStriP/fix-css-on-image-in-preview 
FIX: images in the preview have rounded corners
 2013-08-19 14:58:02 -07:00
Sam df2b0b47bd Merge pull request #1360 from michaelkirk/feature/oauth2 
not recording Oauth2 user email
 2013-08-19 14:57:05 -07:00
Régis Hanol 8107170f08 FIX: images in the preview have rounded corners 2013-08-19 23:45:55 +02:00
Neil Lalonde 1d030666d8 Log site setting changes and show in admin 2013-08-19 16:58:38 -04:00
Michael Kirk 9e8d8870f5 fixed: record Oauth2 user email 2013-08-19 11:21:27 -07:00
Neil Lalonde 3cc8354fe2 Don't trust topic title in template until it has been sanitized by the server 2013-08-19 14:19:59 -04:00
Neil Lalonde 7eaedb84e1 Add notify_mods_when_user_blocked site setting to control whether moderators get a message when someone is automatically blocked 2013-08-19 12:00:48 -04:00
Chris Hunt 53f011e89e Bump to favcount v1.1.0 2013-08-19 08:55:38 -07:00
Neil Lalonde 8431a5c1f5 Merge pull request #1351 from daniely/patch-1 
Update VAGRANT.md
 2013-08-19 08:29:42 -07:00
Robin Ward 103f204e36 Merge pull request #1354 from ofgeek/patch-2 
Update client.zh_CN.yml
 2013-08-19 07:35:36 -07:00
Robin Ward d5335449dd Merge pull request #1355 from abbat/master 
Russian translation (actual version)
 2013-08-19 07:35:14 -07:00
Sam a9393e4a7a paging for flag list 
corrected reload behavior on flag list
refactored post actions ... extracted flag queries
 2013-08-19 21:14:26 +10:00
Sam 22bcb7d412 better errors ... bettered 2013-08-19 21:13:07 +10:00
Viktor Palmkvist febac442d9 Added backwards compatibility for topic creation 2013-08-19 12:28:24 +02:00
Viktor Palmkvist f8129c4e43 Make the composer and TopicCreator use category id instead of category name 
Also fixes #1171
 2013-08-19 11:57:35 +02:00
Anton Batenev 35442a0c79 Russian translation (actual version) 2013-08-19 12:26:02 +04:00
ofGEEK 59a252f535 Update client.zh_CN.yml 2013-08-19 10:53:05 +08:00
Sam 9b5da77855 correct broken logic in screen track that was causing read status not to flush properly when navigating using the suggested topics list. 2013-08-19 11:35:06 +10:00
Sam 4b0a1179e9 link to first unread as opposed to last read in topic lists 2013-08-19 11:34:08 +10:00
Sam 1d74cc60a1 don't try sending emails out in profile mode 2013-08-19 11:33:38 +10:00
Sam beeb86bf91 correct user simulator 2013-08-19 11:33:24 +10:00
daniely d36034620d Update VAGRANT.md 
fix command for `vagrant box add [name] [path]`
 2013-08-18 20:41:04 +08:00
Sam b69d089d06 we need to decalre favcount to keep tests happy 2013-08-18 21:52:13 +10:00
Sam 3b34ab8cab Merge branch 'master' of github.com:discourse/discourse 2013-08-18 21:35:29 +10:00
Sam 82ca61f150 Merge pull request #1350 from michaelkirk/feature/oauth2 
Feature/oauth2
 2013-08-18 17:01:01 -07:00
Sam 1cab98bf78 Merge pull request #1336 from novemberkilo/master 
First pass at fixing rails4 deprecation warnings
 2013-08-18 16:59:07 -07:00