Commit graph

15097 commits

Author SHA1 Message Date
Neil Lalonde
eb0442159c Precompile the new css files 2013-09-05 17:31:19 -04:00
Robin Ward
63be950e5f FIX: Quotes inside a list 2013-09-05 17:04:01 -04:00
Neil Lalonde
341f8c8877 fix application_helper_spec 2013-09-05 17:01:10 -04:00
Neil Lalonde
f47400fe2d Make post body have font-size 14px again 2013-09-05 16:45:38 -04:00
Neil Lalonde
9b526364ed Merge branch 'mobile' 2013-09-05 16:29:27 -04:00
Neil Lalonde
66d1cacdbd Hide flag modal while flag is submitted 2013-09-05 16:29:13 -04:00
Neil Lalonde
a3f3b086f3 Don't show mobile view unless mobile_view=1 param is used. Still more work to do. 2013-09-05 16:28:57 -04:00
Neil Lalonde
c0b3a0ec45 Merge .deleted-user-avatar into mobile topic-post 2013-09-05 16:28:16 -04:00
Robin Ward
38fb727c00 JSHINT: missing comma 2013-09-05 16:05:04 -04:00
Neil Lalonde
17585c7152 Merge branch 'mobile' of https://github.com/awesomerobot/discourse into mobile 2013-09-05 16:03:06 -04:00
Neil Lalonde
45d7765936 Merge branch 'master' into mobile 2013-09-05 15:54:22 -04:00
Robin Ward
2d6759d5a0 Add cancel button to delete replies dialog 2013-09-05 15:54:16 -04:00
Kris Aubuchon
b8493b024b adding missing files back in 2013-09-05 15:37:07 -04:00
Neil Lalonde
c2f37d36ab Hide flag modal while flag is submitted 2013-09-05 15:14:07 -04:00
Robin Ward
73711bc4b8 Merge pull request #1412 from eparreno/bug/fix_users_controller_spec
fix user_controller_spec when testing too long usernames
2013-09-05 11:56:27 -07:00
Kris Aubuchon
80c4e02335 new mobile styles, some structure changes 2013-09-05 12:09:40 -04:00
Emili Parreno
5d66241f25 fix conflict 2013-09-05 17:38:38 +02:00
Emili Parreno
4a0f3b3ac2 fix user_controller_spec when testing too long usernames 2013-09-05 17:36:53 +02:00
Neil Lalonde
cde631cbd1 Change default of notify_mods_when_user_blocked to false 2013-09-05 11:27:24 -04:00
Robin Ward
71c1b8b9b9 When deleting a post as staff, ask if you want to delete direct replies too 2013-09-05 11:03:34 -04:00
Robin Ward
f157ec1f91 Select +Replies for bulk operations 2013-09-05 11:03:29 -04:00
Sam
dba1d79de2 Merge pull request #1413 from eparreno/chore/refactor_spec_helper
refactor spec_helper
2013-09-05 05:22:25 -07:00
Emili Parreno
9fdabd3b8a refactor spec_helper 2013-09-05 13:22:15 +02:00
Emili Parreno
7ef7208c66 fix user_controller_spec when testing too long usernames 2013-09-05 12:50:53 +02:00
Sam
c9321cae7f Our JS includes belong at the top of the file, that way we can start
downloading and parsing them earlier and not wait for the rest of the page

Our noscript stuff belongs at the bottom, we should not hold off any js work
while noscript is downloading
2013-09-05 10:41:11 +10:00
Sam
5b08f73561 give god rights of impersonation to developers, must be edited into the production.rb config file 2013-09-05 10:27:34 +10:00
Sam
4933e9d6ab todo added to code 2013-09-05 09:33:51 +10:00
Neil Lalonde
d76486a48b Topic can have null user_id when user was nuked 2013-09-04 15:42:24 -04:00
Neil Lalonde
117fc8db58 Change the way nuked users' posts are handled. Allow null in the user_id column of posts. Show these posts in the posts stream. 2013-09-04 15:42:21 -04:00
Robin Ward
1a6170a47c Merge pull request #1407 from einarj/extract_fake_admin_method
Extracted a fake_admin method
2013-09-04 07:59:03 -07:00
Robin Ward
808225f43a FIX: missing comma 2013-09-04 10:57:31 -04:00
Robin Ward
7dedc773bb Merge pull request #1408 from riking/patch-1
Add "nose" faces to the translations table
2013-09-04 07:53:05 -07:00
Sam
61d3e43744 better split logic for names starting with capitols eg: ABBob should split to AB Bob 2013-09-04 15:02:04 +10:00
Sam
9977f3098c fast stack needs upgrading, had a bug 2013-09-04 10:40:53 +10:00
Sam
22f2a0c1f4 update rails 4, use log level info in profile for better accuracy 2013-09-04 09:39:16 +10:00
Neil Lalonde
b47eedba00 Add min_trust_to_create_topic setting to require a certain trust level before users can start new topics 2013-09-03 19:12:22 -04:00
Sam
212f1363ae update fast_stack, to fix gem install issue 2013-09-04 06:45:17 +10:00
Robin Ward
8829e1ae20 Merge pull request #1406 from ZogStriP/content-disposition-s3
Content disposition on S3
2013-09-03 07:22:46 -07:00
Robin Ward
0aee25616c Merge pull request #1409 from ofgeek/patch-2
Update client.zh_CN.yml
2013-09-03 07:21:52 -07:00
Robin Ward
0a1a5e2e4a Merge pull request #1410 from abbat/master
Russian translation (actual version)
2013-09-03 07:21:41 -07:00
Sam
9edef9b017 rails 4 mini profiler update 2013-09-03 19:29:17 +10:00
Sam
438dd9759d latest mini profiler 2013-09-03 19:25:46 +10:00
Sam
7b62f9ccd7 more fixes for rails 4 2013-09-03 19:11:55 +10:00
Sam
5dd199df26 bench fix and new arel patches for rails 4 2013-09-03 18:58:56 +10:00
Sam
ba6576efd1 rails 4 update 2013-09-03 18:32:41 +10:00
Sam
1b9079ed20 centralize logic so mockers stop mocking me 2013-09-03 17:58:56 +10:00
Sam
51eb764345 mini profiler update to use latest flame graph engine 2013-09-03 17:58:56 +10:00
Sam
46d5314ec4 Improve Rails4 performance by 20%, before the median on the page is 53ms, after it is 44ms 2013-09-03 17:58:56 +10:00
Jeff Atwood
f13a408c2a Omit Needless Words on new user JIT popups 2013-09-02 22:41:54 -07:00
Neil Lalonde
dc1efd6c78 If mobile view, don't switch to small logo in the header when scrolled down in a topic 2013-09-02 16:26:12 -04:00