Commit graph

15097 commits

Author SHA1 Message Date
Sam
162d94aa02 improve secure_category_id query 2013-09-10 14:29:02 +10:00
Sam
df5f9d66e5 bugfix: when expanding "1 person flagged for moderation" target post is not clickable 2013-09-10 09:51:33 +10:00
Robin Ward
858e51c8ab Use no-cache in development mode for assets. Using must-revalidate, which is
Rails' default, seems to have Chrome sometimes not request assets in development
mode even though it's supposed to revalidate every time.
2013-09-09 16:55:41 -04:00
Neil Lalonde
78c15d5810 Move the unique post key storage code into the Post model 2013-09-09 16:17:31 -04:00
Claus Strasburger
286780249b Updated German locale: direct replies, mobile/desktop view and private message labels 2013-09-09 20:57:48 +02:00
Neil Lalonde
48ee89940e Merge pull request #1423 from einarj/nickname_registration_service
Nickname registration service object
2013-09-09 11:37:56 -07:00
Robin Ward
84a8a358c3 Trivial: Rename dialect action to block quotes rather than simple quotes 2013-09-09 14:11:56 -04:00
Robin Ward
49910b860b FIX: Regression that removed the ability to quote code 2013-09-09 13:20:03 -04:00
Neil Lalonde
199584824b Don't show approval on admin user page if the site doesn't require approval of users (must_approve_users) 2013-09-09 12:24:26 -04:00
Robin Ward
360b8e32ca Merge pull request #1404 from ZogStriP/admin-can-always-upload-a-file
staff can always upload a file
2013-09-09 08:55:47 -07:00
Robin Ward
fc4f5a36c6 Merge pull request #1418 from goshakkk/inject-current-user
Inject currentUser into controllers & routes
2013-09-09 08:54:34 -07:00
Robin Ward
d00e0cb96a Merge pull request #1420 from ZogStriP/rake-task-to-regenerate-avatars
rake task to regenerate avatars
2013-09-09 08:49:47 -07:00
Robin Ward
0523e8cda1 Merge pull request #1421 from ofgeek/patch-2
Update client.zh_CN.yml
2013-09-09 08:48:39 -07:00
Neil Lalonde
b73f4e9864 Put category description in meta description tag 2013-09-09 11:38:09 -04:00
Sam
98267d439a fixed ruby 2.0 p0 bug in fast_stack so re-pushing 2013-09-09 21:19:23 +10:00
Sam
b61d5c4092 freedom patches for fixes submitted to rack 2013-09-09 20:35:21 +10:00
Sam
030d2260a7 Perf: don't allocate hashes OVER and OVER in a loop, its bad 2013-09-09 20:35:21 +10:00
Einar Jonsson
724b3aadcf Extracted nickname registration out of the UsersController and into its
own service.
2013-09-09 09:26:50 +00:00
Jeff Atwood
c59c2a4bb3 fix minor copy error on ImageMagick warning 2013-09-09 00:45:03 -07:00
ofGEEK
379007de6c Update client.zh_CN.yml 2013-09-09 09:54:03 +08:00
Régis Hanol
3e80e885ae rake task to regenerate avatars 2013-09-08 12:22:50 +02:00
Jeff Atwood
78b1036db7 fix unsubscribe link in digest emails 2013-09-08 02:25:40 -07:00
Gosha Arinich
7ec34b205a inject currentUser into controllers & routes
Through Ember's DI, instead of doing so via a mixin.
2013-09-07 19:34:25 +03:00
Régis Hanol
eae30d7816 staff can always upload a file 2013-09-07 10:49:11 +02:00
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 763859d439, reversing
changes made to b62caf80fb.
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