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
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
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
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
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
Neil Lalonde
cbe38075ac
Fix asset compile problems
2013-09-05 18:04:45 -04:00
Robin Ward
63be950e5f
FIX: Quotes inside a list
2013-09-05 17:04:01 -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
Kris Aubuchon
80c4e02335
new mobile styles, some structure changes
2013-09-05 12:09:40 -04: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
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
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
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
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
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
Neil Lalonde
07e6956917
Restructure login form for mobile
2013-09-02 16:02:52 -04:00
Neil Lalonde
1fa6144067
Add span.btn-text around 'Reply' text in the post menu
2013-09-02 15:55:35 -04:00
Einar Jonsson
e06356ebbe
Extracted a fake_admin method
2013-08-30 17:39:31 +00:00
Robin Ward
46efbac40e
Add "Unread" filter to messages tab. Rename the other two views.
2013-08-30 12:32:05 -04:00
Robin Ward
232f5bd743
Merge pull request #1403 from einarj/use_topic_delegators
...
Replaced delegator methods with Forwardable def_delegator in Topic
2013-08-30 08:15:10 -07:00
Robin Ward
63f2187d72
FIX: Don't do intraword italics when prefixed by a forward slash
2013-08-30 10:56:41 -04:00
Robin Ward
df5cbf76e0
Move insideGroup into the helper, not the class for grouped each
2013-08-30 10:44:34 -04:00
Einar Jonsson
23d8f5fec7
Replaced delegator methods with Forwardable def_delegator in Topic
2013-08-30 09:29:34 +00:00
Eric Kelly
b70a38f485
FIX: Index out of range error
...
Fixes 'index out of range error' that occurs when viewing a user's
profile page when they haven't yet posted a reply or created a topic
and is @mentioned in a topic.
2013-08-30 00:43:54 -04:00
Neil Lalonde
82bc6b677f
Add link in hamburger menu to switch between mobile and desktop views
2013-08-29 15:19:28 -04:00
Robin Ward
380a6c9e9d
FIX: Blockquotes prefixed by spaces
2013-08-29 15:18:27 -04:00
Robin Ward
c99cf64d70
FIX: Quoting within code blocks.
2013-08-29 14:42:31 -04:00
