github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-05 11:03:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,838 Commits 214 Branches 500 Tags 960 MiB
91efbc1830
Commit Graph

3838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Atwood
193cb3d47b move squash up, remove changelog ref, etc. 2013-07-18 00:36:52 -07:00
Prem Prakash
713735f4c8 updating pt_BR translations 2013-07-18 00:09:54 -03:00
Sam
ad72f96a59 recommend latest redis 2013-07-18 09:11:20 +10:00
Robin Ward
a97c093434 FIX: Don't transition to when viewing a user. Just render it. 2013-07-17 18:13:43 -04:00
Robin Ward
3761ccb018 FIX: Sometimes the total post count could be incorrect 2013-07-17 16:50:20 -04:00
Robin Ward
19f3a8d640 Each user activity filter has its own URL now. 2013-07-17 15:42:31 -04:00
nverba
a61c194e58 Fix some errors. 2013-07-17 15:53:33 +01:00
Robin Ward
3238e0caa4 JSHINT 2013-07-17 10:31:27 -04:00
Robin Ward
86c884aa29 FIX: Only show undelete button when the topic is deleted 2013-07-17 10:21:47 -04:00
Robin Ward
50238d71c8 Merge pull request #1213 from novemberkilo/emoji_update 
Update emojis from latest gemoji
 2013-07-17 07:02:06 -07:00
Robin Ward
5a5e9d0fd1 Merge pull request #1206 from BrentleyJones/fixed_modals 
FIX: Modal dialogs now truly center and work at all screen sizes (mobile), now with working Bootbox
 2013-07-17 06:59:48 -07:00
Robin Ward
e2ff064aa3 Merge pull request #1198 from prem-prakash/master 
Adding Portuguese Brazilian translations
 2013-07-17 06:59:31 -07:00
Robin Ward
b7651474c7 Merge pull request #1205 from nverba/patch-2 
Updated HEROKU.md squashed
 2013-07-17 06:58:25 -07:00
Robin Ward
2d466d72ca Merge pull request #1207 from stephankaag/refactor_topic_query 
Refactor topic_query.rb for better readability
 2013-07-17 06:55:54 -07:00
Robin Ward
6839869170 Merge pull request #1211 from zsj950618/master 
Add some  translation of Simplified Chinese
 2013-07-17 06:53:07 -07:00
Robin Ward
75e636f5a5 FIX: Invalid YAML 2013-07-17 09:51:03 -04:00
Junki Cho
b4cae0f5d3 Korean language pack 2013-07-17 09:36:50 -04:00
Navin
d1d07cc01d Copy over images from latest gemoji 
And update list of emojis
 2013-07-17 10:17:59 +02:00
Sam
81616a46ba db consistency check for mismatching topic_ids in user_actions 
fix up post mover so it remaps user actions as well
move specs for post mover into post_mover_spec
 2013-07-17 16:40:56 +10:00
Sam
c2be81a76e Merge pull request #1199 from ZogStriP/uploads 
adds the `max_attachment_size_kb` setting
 2013-07-16 23:03:42 -07:00
Sam
2573935155 improve security UI 2013-07-17 15:10:49 +10:00
Sam
625204c8bd work in progress category UI 
refactor hack from earlier
 2013-07-17 14:54:21 +10:00
Sam
5a7e78f0fc fix unit tests 2013-07-17 14:22:55 +10:00
Sam
63cbe8dd17 fix links to site contents, fix it so the site contents page is refreshable 2013-07-17 14:15:09 +10:00
SJ Zhu
0956c60c99 add some missing Simplified Chinese translation 2013-07-17 09:47:07 +08:00
Sam
d1dbcf52fc see: https://github.com/emberjs/ember.js/pull/2148 2013-07-17 09:55:30 +10:00
Jeff Atwood
fe0885dd6a Merge pull request #1210 from ZogStriP/fix-composer-toolbar-upload-title 
fix composer toolbar upload title
 2013-07-16 16:38:13 -07:00
Régis Hanol
46ff98f2d3 fix composer toolbar upload title 2013-07-17 01:21:27 +02:00
Jeff Atwood
2b83ff6a68 Merge pull request #1209 from ZogStriP/fix-s3-image-uploads-are-being-improperly-pathed 
Fix s3 image uploads are being improperly pathed
 2013-07-16 15:49:49 -07:00
Régis Hanol
5c27dd175a make sure we handle both s3 url formats 2013-07-17 00:32:09 +02:00
Régis Hanol
7ae2fe304d renamed s3 to s3_store 2013-07-17 00:27:52 +02:00
Régis Hanol
f40cad0f4b changed s3 urls to using the folder convention 2013-07-17 00:27:52 +02:00
Brentley Jones
f26b479458 FIX: History modal having custom (old) setting of min height and width. 
It is functional, but it no longer resizes down. I would look at making this fluid or having a style for mobile.
 2013-07-16 21:05:33 +00:00
Robin Ward
23a57c8d08 Merge pull request #1208 from ZogStriP/fix-cdn-does-not-work-with-s3 
FIX: CDN doesn't work with S3
 2013-07-16 13:27:50 -07:00
Régis Hanol
3136638b4b FIX: CDN doesn't work with S3 2013-07-16 22:16:33 +02:00
Stephan Kaag
6067736562 Refactor topic_query.rb for better readability 
- Available options are defined and validated
- Internal methods are now protected
- Renamed some variables to be more consistent
 2013-07-16 21:20:18 +02:00
Brentley Jones
a03e933eb6 Fix spacing 2013-07-16 19:16:22 +00:00
nverba
f43dc13e6b Updated HEROKU.md squashed 
I've added an extra step to explicitly add the production.rb file.

Added S3 CDN instructions with asset sync gem. Users assets will auto sync with S3 on deploy, using Gziped files where available. This should significantly help with Heroku stability under load.

Added add-on instructions for some load testing services available through Heroku. Hopefully help us hack on performance and stability issues.

Some general houskeeping, fixed h1 h2 muddle and removed bundle exec from foreman commands, as it uses bundler by default, and added some commands for running tests.
 2013-07-16 20:08:16 +01:00
Brentley Jones
e060e952b5 Accidently removed some styles in the merge 2013-07-16 19:06:33 +00:00
Brentley Jones
5e08427dd3 Merge branch 'master' into fixed_modals 
Conflicts:
	app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
	app/assets/stylesheets/application/modal.css.scss
 2013-07-16 18:58:49 +00:00
Brentley Jones
cc28a4ddc3 FIX: Bootbox modals were not coming through properly. Temp have them use the old way of displaying. Will look into how to have them be the same as the "fixed" way. 2013-07-16 18:32:35 +00:00
Robin Ward
7c9bd8e8c9 Remove EvilTrout's stupid mistake. 2013-07-16 13:51:00 -04:00
Robin Ward
980d258f32 Hard code handlebars release 2013-07-16 13:43:43 -04:00
Robin Ward
2577d76e4f Revert "Merge pull request #1201 from BrentleyJones/fixed_modals" 
This reverts commit 7e889c4e24, reversing
changes made to e9d37f395f.
 2013-07-16 13:38:01 -04:00
Robin Ward
4bfb546942 Removed modelReady hack now that the async router exists 2013-07-16 13:24:59 -04:00
Robin Ward
6929ee9f46 Changed HTML again on hamburger menu to make it easier to style 2013-07-16 12:24:18 -04:00
Robin Ward
82c734ec84 FIX: FAQ wasn't loading sometimes 2013-07-16 12:11:30 -04:00
Robin Ward
1927263d1d FIX: Compile templates with the correct ember 2013-07-16 11:47:26 -04:00
Robin Ward
d466d11e71 Ember RC6 update 2013-07-16 10:35:18 -04:00
Robin Ward
75282576b9 Merge pull request #1195 from initforthe/post-analyser-backtrace-fix 
Post analyser backtrace fix
 2013-07-16 07:34:54 -07:00