Commit graph

4613 commits

Author SHA1 Message Date
Sam
420cd7aa2c Merge pull request #1485 from nicksahler/patch-1
Changed rake to bundle exec rake. Seems to be the only thing working now...
2013-09-30 14:42:40 -07:00
Jeff Atwood
84734570c0 Merge pull request #1486 from Supermathie/bluepill-checks
Add process checks to kill/restart too large thins
2013-09-30 14:23:31 -07:00
Wojciech Zawistowski
363a8d6e4f adds unit tests for Discourse.HasCurrentUser 2013-09-30 21:46:42 +02:00
Michael Brown
6f25549668 Add process checks to kill/restart too large thins 2013-09-30 15:17:59 -04:00
Nick Sahler
53e4f4b691 Changed rake to bundle exec rake. Seems to be the only thing working now.
Can anyone provide insight as to why? There have been reports of this around the forums.
2013-09-30 14:48:35 -04:00
Robin Ward
3f0c03a20c FIX: Prevent unauthorized list of private message titles. Also remove some unused code. 2013-09-30 14:35:11 -04:00
Régis Hanol
40c08eab14 do not break oneboxes' favicon after updating favicons 2013-09-30 19:09:57 +02:00
Robin Ward
57f7c794d7 Merge pull request #1483 from velesin/controller_tests
adds unit tests for Discourse.Controller
2013-09-30 10:08:39 -07:00
Robin Ward
ca0c41fd40 Merge pull request #1477 from velesin/remove_builders_from_merge_attributes
removes unused builders param from Discourse.Model.mergeAttributes
2013-09-30 10:07:50 -07:00
Wojciech Zawistowski
f388226217 refactors Discourse.Resolver 2013-09-30 18:18:03 +02:00
Wojciech Zawistowski
2f9a467453 adds unit tests for Discourse.Controller 2013-09-30 18:12:12 +02:00
Robin Ward
e4e8b84ca8 Merge pull request #1481 from squareleaf/mobile_user_page
Adjust user page css for mobile sizes
2013-09-30 07:35:08 -07:00
Tiffany Green
4d9dba6d27 Adjust css for user page to work at mobile sizes
Style user page for mobile sizes

Remove guard

Bundle without guard

Remove guardfile
2013-09-30 09:18:52 -05:00
Robin Ward
ab774fa589 Merge pull request #1482 from abbat/master
Russian translation (actual version)
2013-09-30 07:01:45 -07:00
Régis Hanol
42d9b0ca46 Oopps. Regis doesn't know how to count 2013-09-30 15:12:46 +02:00
Régis Hanol
abe4a19824 fix profile db generator to run even with the system account 2013-09-30 15:10:30 +02:00
Anton Batenev
9241d3b789 Russian translation (actual version) 2013-09-30 14:12:49 +04:00
Sam
5caa7a0e4d improve performance of periodical update job, decrease frequency and shift it by a few minutes 2013-09-30 16:59:16 +10:00
Sam
6fbc5af284 notify_user is not a flag 2013-09-30 15:26:19 +10:00
Sam
a2690efa61 add db time instrumentation to job execution 2013-09-30 13:24:25 +10:00
Robin Ward
37304b7eba FIX: Too many new lines in long quotes 2013-09-27 15:08:56 -04:00
Wojciech Zawistowski
5905669270 removes unused builders param from Discourse.Model.mergeAttributes 2013-09-27 19:46:26 +02:00
Régis Hanol
3f3551f1e2 Merge pull request #1475 from elegos/master
Italian localization (pt. 1)
2013-09-27 09:20:29 -07:00
Robin Ward
19d94f3576 Merge pull request #1467 from velesin/resolver_tests
adds unit tests for Discourse.Resolver
2013-09-27 09:19:11 -07:00
elegos
ca15527d3e Italian localization (pt. 1)
First ~600 lines of italian translation revisited including missing
strings.

TODO: lines 581+
2013-09-27 17:16:34 +02:00
Régis Hanol
ce819b2a92 Merge pull request #1458 from thomas-mcdonald/remove-duplicate-method
Remove duplicate create method in PostCreator
2013-09-27 08:14:42 -07:00
Régis Hanol
7cc4d3186b Merge pull request #1474 from jhilden/patch-1
German typo fix
2013-09-27 07:40:21 -07:00
Jakob Hilden
53731e23a2 German typo fix 2013-09-27 11:55:30 +02:00
Régis Hanol
cd4cda5b4c allow users to specify thumbnail size 2013-09-27 10:57:31 +02:00
Sam
191dc77482 Merge pull request #1451 from velesin/remove_return_from_router_map
remove unnecessary return statement inside Discourse.Router.map
2013-09-26 14:39:47 -07:00
Sam
cf1f98f646 Merge pull request #1472 from velesin/model_tests
adds unit tests for Discourse.Model
2013-09-26 14:39:03 -07:00
Wojciech Zawistowski
95d8014931 adds unit tests for Discourse.Model 2013-09-26 19:03:43 +02:00
Jeff Atwood
bbfcec8d18 add edit and quote admonitions to seq reply warn 2013-09-26 00:45:14 -07:00
Wojciech Zawistowski
9b7b70920a adds unit tests for Discourse.Resolver 2013-09-25 18:30:22 +02:00
Robin Ward
ddbb0e612c Merge pull request #1463 from gaurish/patch-3
Typo fix
2013-09-24 08:58:35 -07:00
Gaurish Sharma
f3c9822142 Typo fix 2013-09-24 18:47:57 +05:30
Neil Lalonde
07d08b81c7 Show mobile view as default for nexus 7 tablet 2013-09-23 17:13:29 -07:00
Neil Lalonde
500a24ebf9 Merge branch 'master' of github.com:discourse/discourse 2013-09-23 09:51:35 -07:00
Neil Lalonde
b06f928568 Fix missing provider param message when using Persona 2013-09-23 09:46:25 -07:00
Robin Ward
175e48b061 Revert "remove unnecessary (empty) view class"
This reverts commit 58ba8a0e49.
2013-09-22 10:38:41 -07:00
Thomas McDonald
5ad8718a87 Remove duplicate create method in PostCreator 2013-09-21 22:02:51 +01:00
Sam
e9e017898c Merge pull request #1449 from seblavoie/patch-1
Added screencast.com to whitelist.rb
2013-09-21 10:31:47 -07:00
Sam
82fb74853e Merge pull request #1456 from Krugloff/patch-1
Fixed russsian localization
2013-09-21 10:30:42 -07:00
Aleksandr Kruglov
d8027d1196 Fixed russsian localization 2013-09-21 10:43:57 +04:00
Robin Ward
a70e9cac4d Merge pull request #1452 from velesin/remove_application_view
remove unnecessary (empty) view class
2013-09-20 17:13:02 -07:00
Robin Ward
dba183efec Merge pull request #1455 from alxndr/category-rss-ordered-by-created_at
make category's RSS feed actually order by topic.created_at
2013-09-20 14:59:35 -07:00
Robin Ward
5bc0f7e9ee Merge pull request #1454 from awesomerobot/master
mobile: fixed quote control jump
2013-09-20 14:42:45 -07:00
Sam Saffron
964809f73b if we have not automatic assets, don't try deleting them 2013-09-20 14:39:14 -07:00
Alexander
e7b5774bc6 make category's RSS feed actually order by topic.created_at 2013-09-20 14:36:19 -07:00
Kris Aubuchon
67c2560f8c mobile: fixed quote control jump 2013-09-20 17:28:00 -04:00