Sam
3fb0f52574
disable flamegraph while I figure out why fast stack is not working for some people on x32
2013-09-07 08:50:16 +10:00
Robin Ward
b87a78f7b2
Merge branch 'master' of github.com:discourse/discourse
2013-09-06 18:01:33 -04:00
Robin Ward
c8ad977c8a
Revert "Merge pull request #1215 from Elegios/composer_use_category_id"
...
This reverts commit 763859d439b62caf80fb
2013-09-06 18:00:57 -04:00
Neil Lalonde
2ea6a61a17
Show post number in the share dialog
2013-09-06 17:34:31 -04:00
Neil Lalonde
10547848f0
Update importer_spec for system user
2013-09-06 16:51:43 -04:00
Robin Ward
a9f3489237
FIX: Don't onebox links with labels unless the labels are the same as the URL
2013-09-06 16:47:26 -04:00
Jeff Atwood
c996378fc0
improve approval copy
2013-09-06 13:38:23 -07:00
Robin Ward
94917f47ed
Remove brackets from username_filters[] URL
2013-09-06 15:58:54 -04:00
Neil Lalonde
eef34eea80
Fix IE9 bug in browser-update. Unable to get value of the property 'insertBefore': object is null or undefined
2013-09-06 14:57:26 -04:00
Robin Ward
763859d439
Merge pull request #1215 from Elegios/composer_use_category_id
...
Make the composer and TopicCreator use category id instead of category name
2013-09-06 11:55:27 -07:00
Robin Ward
b62caf80fb
Merge pull request #1402 from LaunchAcademy/fix_index_out_of_range_error
...
FIX: Index out of range error
2013-09-06 11:53:59 -07:00
Jeff Atwood
2f8c45b0af
Merge pull request #1417 from ZogStriP/content-disposition
...
proper content-disposition header when downloading attachments
2013-09-06 11:22:36 -07:00
Régis Hanol
45b838009c
proper content-disposition header when downloading attachments
2013-09-06 19:23:56 +02:00
Neil Lalonde
eae7e75611
FIX: recover post by a non-staff user fails because the post is not unique. Uniqueness check shouldn't happen when recovering a deleted post.
2013-09-06 11:50:15 -04:00
Sam
b0573c5f8f
missed a few renames
2013-09-06 18:20:02 +10:00
Sam
fb66dd7953
playing with my script, feel free to ignore
2013-09-06 18:17:46 +10:00
Sam
568a9b1b06
better rename the old values otherwise, trouble
2013-09-06 18:17:46 +10:00
Jeff Atwood
2b9838620d
shorter user deletion text
2013-09-06 01:14:38 -07:00
Sam
641c51367a
fix broken build
...
hack to allow for PMs with no users for flagging needs
2013-09-06 18:03:30 +10:00
Sam
32e3e3f382
update annotations
2013-09-06 17:38:50 +10:00
Sam
2ce4468aa5
rename system_username to site_contact_username , system_user is a special user with -1 id that is only used for certain admin tasks
...
for example system_user will autoclose stuff if needed, it will delete stubs and be the target for flag pms
2013-09-06 17:28:37 +10:00
Sam
41a1b6942d
notify moderators now goes to the "community" user, that saves our poor mods from a flood of pms
...
if any staff respond to a pm they are automatically added to the list of recipients and will start
getting email notifications
2013-09-06 14:07:23 +10:00
Sam
c495a0b996
move seed fu to work with my branch of seed fu while https://github.com/mbleigh/seed-fu/pull/54 is being decided
2013-09-06 14:04:31 +10:00
Sam
ee6882edfb
ATTENTION NEIL, comment out a big pile of importer specs, this is code we never use and running a big slug of tests to ensure it keeps working is pointless.
...
We need to decide what we do with this. Either we get import/export working and used or strip it out till ready.
No point slowing down the test suite and fixing regressions in code this code
2013-09-06 12:56:08 +10:00
Neil Lalonde
e7cf0a454c
Version bump to v0.9.6.3
2013-09-05 18:42:53 -04:00
Neil Lalonde
cbe38075ac
Fix asset compile problems
2013-09-05 18:04:45 -04:00
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
