Robin Ward
b2d478a6fc
Merge branch 'master' of github.com:awesomerobot/discourse into awesomerobot-master
...
Conflicts:
app/assets/javascripts/discourse/templates/header.hbs
2014-10-08 13:48:26 -04:00
Robin Ward
32441ebcac
FIX: Don't escape HTML content on category descriptions
2014-10-08 13:04:22 -04:00
Robin Ward
a98b8251a6
FIX: Private messages were getting the `has-category` style
2014-10-08 12:59:00 -04:00
Kris Aubuchon
75cf1a1953
adding animation to extra-info title, and mild restructure
2014-10-08 12:20:44 -04:00
Régis Hanol
dcd4956ea4
remove `console.log`
2014-10-08 17:37:44 +02:00
Robin Ward
89fdc87402
Add back CSS classes to sortable headings.
2014-10-08 10:50:49 -04:00
Sam
b9a9fb54da
FIX: streaming incorrect events into all tab
2014-10-08 13:35:07 +11:00
Sam
67429b29a5
FIX: after visiting "top" unread/new tip rendered in large font
2014-10-08 13:11:26 +11:00
Sam
7ef2f48660
FIX: not showing any search results when scoped on user
2014-10-08 13:03:18 +11:00
Sam
168c690427
FIX: handle paste events for auto completed fields
2014-10-08 11:59:46 +11:00
Robin Ward
11b52d1334
More deprecations to allow us to work on future versions of Ember
2014-10-07 16:04:19 -04:00
Neil Lalonde
0ab9a0867a
Merge branch 'master' of github.com:discourse/discourse
2014-10-07 15:53:11 -04:00
Neil Lalonde
a30e70e8f1
FEATURE: trust level 3: likes received must be on min_likes_received/3 different days, and be from min_likes_received/4 different users
2014-10-07 15:52:54 -04:00
Robin Ward
e20c82436d
FIX: Clicking "Latest" while ordering by a column should reset the
...
order.
2014-10-07 15:19:17 -04:00
Robin Ward
bb192dd0a3
UX: Remove sortable column from "Topic" and "Users" column.
2014-10-07 14:45:36 -04:00
Kris Aubuchon
f4f6236902
changes: topic title editor layout, badge alignment in scrolled header
2014-10-07 11:41:04 -04:00
Régis Hanol
c46b9c0ac3
FIX: allow admins to search users by email
2014-10-07 12:05:38 +02:00
Jeff Atwood
e8563c7d57
tweaks to make flagging page better on mobile
2014-10-07 01:29:44 -07:00
Jeff Atwood
1146ad3a63
use proper trash watermark
2014-10-07 00:24:24 -07:00
Jeff Atwood
03d440095f
clean up /about page styles on mobile
2014-10-07 00:18:54 -07:00
Jeff Atwood
a0d78290f2
incorrect fix for avatar height in topic map
2014-10-07 00:03:39 -07:00
Sam
a7618ec4f6
FIX: select + replies could not be selected
2014-10-07 16:53:19 +11:00
Sam
620c3b3dcd
UX: improve select2 category picker styling
2014-10-07 16:28:11 +11:00
Sam
dde8ae7e96
FIX: analytics universal not sending correct location
2014-10-07 12:23:04 +11:00
Jeff Atwood
b4c38dbc5a
correct star spacing for topics with no category
2014-10-06 16:19:27 -07:00
Jeff Atwood
7c386035d1
remove float-left from title-wrapper
2014-10-06 16:02:16 -07:00
Jeff Atwood
8474e3b77f
oops
2014-10-06 15:33:25 -07:00
Jeff Atwood
93e7aa832c
tweaks to has-category docked layout
2014-10-06 15:32:38 -07:00
Robin Ward
e383a8ab01
Merge pull request #2854 from techAPJ/patch-1
...
Feature: resend invites
2014-10-06 17:25:36 -04:00
Neil Lalonde
ad387a1150
FEATURE: posts will be deleted immediately if delete_removed_posts_after is set to 0
2014-10-06 16:30:07 -04:00
Robin Ward
76a9eca5b0
FIX: Malformed HTML really screws with the renderer
2014-10-06 16:29:13 -04:00
Robin Ward
52298faaa0
Revert "Revert "Add striped category badges under title""
...
This reverts commit 85b6b2550e
.
2014-10-06 16:29:13 -04:00
Robin Ward
02814f0d89
Revert "Revert "new docked title category style - needs additional work""
...
This reverts commit e886cc2dad
.
2014-10-06 16:29:13 -04:00
Régis Hanol
aa3a658bb1
remove float from the 'show email' button on user's profile on mobile
2014-10-06 22:24:43 +02:00
Robin Ward
e886cc2dad
Revert "new docked title category style - needs additional work"
...
This reverts commit 43467a8aaa
.
2014-10-06 16:13:51 -04:00
Robin Ward
85b6b2550e
Revert "Add striped category badges under title"
...
This reverts commit 331e63e3af
.
2014-10-06 16:13:51 -04:00
Arpit Jalan
78fd99fc40
Feature: resend invites
2014-10-07 01:43:17 +05:30
Robin Ward
331e63e3af
Add striped category badges under title
2014-10-06 15:58:57 -04:00
Kris Aubuchon
43467a8aaa
new docked title category style - needs additional work
2014-10-06 15:58:57 -04:00
Régis Hanol
ac069d22a9
FIX: delete spammer modal doesn't show the email address
2014-10-06 21:55:52 +02:00
Régis Hanol
baee5c95ac
add more context to allow better translation of 'max' in TL3 requirements
2014-10-06 21:32:19 +02:00
Régis Hanol
67c10a7eab
UX: add topic admin button to the bottom of the topic
2014-10-06 20:19:07 +02:00
Jeff Atwood
948f4a59e9
Merge pull request #2852 from awesomerobot/master
...
restructuring post titles a bit
2014-10-06 09:57:00 -07:00
Robin Ward
90e3242a3c
FIX: `topic-admin-menu` controller was not a proper singleton.
2014-10-06 12:27:12 -04:00
Kris Aubuchon
1224ffa1c5
restructuring post titles a bit
2014-10-06 11:50:18 -04:00
Sam
6391dc7f28
FIX: hitting edit while replying does nothing
2014-10-06 10:51:02 +11:00
Jeff Atwood
fa830c8d69
fix avatar expanded topic map height
2014-10-03 15:58:02 -07:00
Jeff Atwood
3483c7b0de
UX: drop text from loading spinner, make bigger
2014-10-03 13:38:55 -07:00
Jeff Atwood
ce8a4266b6
FIX: mobile layout was too wide
2014-10-03 12:49:48 -07:00
Robin Ward
1e5195e68f
FIX: Could sometimes open two category drop downs at once.
2014-10-03 15:42:45 -04:00
Robin Ward
e55b437eb9
Replace the rest of the deprecated `{{action xyz}}` with `{{action
...
"xyz"}}`
2014-10-03 14:43:27 -04:00
Robin Ward
41db949e9d
FIX: Allow HTML in custom fields
2014-10-03 13:06:54 -04:00
Jeff Atwood
4343b19c1b
Revert "Fix: CSS to reveal hidden or partially visible avatars on 2nd line"
...
This reverts commit a6d6f6b42a
.
2014-10-03 09:25:36 -07:00
Régis Hanol
d4f9228058
Merge pull request #2841 from lidel/fix-min-username
...
FIX: fix @mentions for 1 character usernames
2014-10-03 17:37:47 +02:00
Neil Lalonde
83fc88e965
FIX: when site is in read-only mode, create account action should show a warning like login does.
2014-10-03 11:02:05 -04:00
Neil Lalonde
eb473696ff
Refactor showLogin and showCreateAccount actions for extensibility
2014-10-03 11:02:05 -04:00
Marcin Rataj
a56f5a9b65
FIX: fix @mentions for usernames shorter than 2 characters
...
Super short usernames were enabled by
https://github.com/discourse/discourse/pull/2838
This is just a fix for @mentions
2014-10-03 13:20:40 +02:00
Sam
f5912a5500
amend previous fix
2014-10-03 16:35:35 +10:00
Sam
8c214c35e4
FIX: clicking on heading could insert a broken heading
2014-10-03 16:35:02 +10:00
lidlanca
a6d6f6b42a
Fix: CSS to reveal hidden or partially visible avatars on 2nd line
...
clear:left was added to an existing selector that match other elements that may no need it.
in case of a negative affect it should be moved to its own selector
.topic-map .links {
}
2014-10-02 23:47:34 -04:00
Jeff Atwood
5fe1f99bf5
drop text from loading spinner
2014-10-02 14:50:13 -07:00
Jeff Atwood
75804d8fa8
remove some unused images
2014-10-02 13:23:36 -07:00
Jeff Atwood
23258d5109
switch to white spinner
2014-10-02 13:19:42 -07:00
Jeff Atwood
57eb435a69
remove unneeded topics-loading styles
2014-10-02 13:14:11 -07:00
Robin Ward
ad5e4f98d9
Revert "Merge pull request #2833 from mamhoff/new-bugfix-autocomplete"
...
This reverts commit 2450d284c5
, reversing
changes made to 489078bfcf
.
2014-10-02 16:00:50 -04:00
Robin Ward
381814fd5d
Adds support for a description to user fields.
2014-10-02 15:56:52 -04:00
Jeff Atwood
295a3c108e
tighten up title bottom margin a bit
2014-10-02 12:26:57 -07:00
Jeff Atwood
cd3461dde8
remove "Loading more topics.." text
2014-10-02 12:16:16 -07:00
Robin Ward
9564ecde76
FEATURE: Site setting for words to censor in posts
2014-10-02 13:58:58 -04:00
Jeff Atwood
96afdb173d
add ▼ to show more in search, remove show less
2014-10-02 03:16:49 -07:00
Jeff Atwood
442b22252e
increase inline title edit pencil size slightly
2014-10-02 03:08:44 -07:00
Jeff Atwood
5857c94662
allow mobile edit topic, fix hamburger fontsize
2014-10-02 03:00:54 -07:00
Jeff Atwood
5234189581
margin-bottom on mobile star to align cats/title
2014-10-02 02:52:13 -07:00
Jeff Atwood
f96e6e2376
remove extra space in front of mobile topic title
2014-10-02 02:39:55 -07:00
Jeff Atwood
8e751541df
margin-bottom on star to align cats under title
2014-10-02 02:30:12 -07:00
Jeff Atwood
f442fca5af
add mobile spacing for category under title
2014-10-02 02:18:47 -07:00
Sam
2450d284c5
Merge pull request #2833 from mamhoff/new-bugfix-autocomplete
...
BUGFIX: Handle text input in keypress handler for I18n
2014-10-02 17:04:41 +10:00
lidlanca
725af87980
Fix: remove hardcoded minimum for username length validation
2014-10-02 01:51:23 -04:00
Sam
890346f0b0
FIX: if quoting ends with link, quote reply does not show up
2014-10-02 15:24:11 +10:00
Kris Aubuchon
eb252bd670
category badge now falls below topic title & other small fixes
2014-10-01 22:54:03 -04:00
Jeff Atwood
ffae4929f0
hide category in docked header
2014-10-01 13:48:07 -07:00
Régis Hanol
98b6b9821a
FEATURE: log topic/post deletions from staff members
2014-10-01 17:40:13 +02:00
Robin Ward
be93f224a6
Revert "add user email on account created page"
...
This reverts commit 164fc1108a
.
2014-10-01 10:30:26 -04:00
Martin Meyerhoff
3fd8fc97a2
BUGFIX: Handle text input in keypress handler for I18n
...
While the `keydown` handler is the only way of reliably catching special keys,
for textual input `keypress` is preferable, as it can handle thing like parens
without having to hardcode a keyboard.
I moved that code and in the process converted some magic numbers to constants
- mostly so I can read stuff better.
2014-10-01 15:50:09 +02:00
Arpit Jalan
164fc1108a
add user email on account created page
2014-10-01 13:53:50 +05:30
Robin Ward
6746d96336
More deprecation fixes for `{{action}}`
2014-09-30 16:04:04 -04:00
Jeff Atwood
91cbdb565d
remove "required information" header on custom fields
2014-09-30 11:43:06 -07:00
Robin Ward
d7a8d053f5
Change deprecated `{{action xyz}}` to `{{action "xyz"}}`
2014-09-30 12:36:58 -04:00
Robin Ward
8b5a1cd20f
Migrate `tosAccepted` to new user fields
2014-09-30 10:45:18 -04:00
Robin Ward
edb34c178a
FEATURE: Show user fields when the user is signing up
2014-09-30 10:45:18 -04:00
Sam
c42b3ca657
fix messy merge
2014-09-30 13:22:45 +10:00
Sam
0fc6c751cb
FEATURE: implement lock/unlock trust level mechanics
2014-09-30 13:16:34 +10:00
riking
bff95a6a97
Rename 'leader' -> 'tl3'
2014-09-30 13:16:34 +10:00
riking
4aabc44264
Display grace period note even if not below requirements
2014-09-30 13:15:14 +10:00
riking
c8111ada6e
FEATURE: Allow admins to lock users from TL3 promotion/demotion
...
Also, update the display logic for the leader promotion screen to
account for the demotion grace period.
2014-09-30 13:15:13 +10:00
riking
41d53c7222
FIX: Leader requirements weren't loading when visited directly
2014-09-30 13:15:13 +10:00
Régis Hanol
7e309a21cf
FEATURE: hide emails behind a button for staff members
2014-09-29 22:31:05 +02:00
Robin Ward
5d91a4ef0c
FIX: Back button broke on customize routes in admin
2014-09-29 11:54:14 -04:00
Sam
4d1d5ca928
Merge pull request #2825 from lidlanca/patch-5
...
Onebox Github Pull Request Styling
2014-09-29 16:47:57 +10:00
Sam
8371837b21
Merge pull request #2808 from gschlager/i18n_fix07
...
FIX: Category creation failed when translation was missing
2014-09-29 16:20:02 +10:00
lidlanca
48289dbc4f
Onebox Github Pull Request Styling
2014-09-29 00:33:20 -04:00
Sam
a6fcacec6b
FIX: missing white space github onebox styling
2014-09-29 14:26:16 +10:00
Sam
85e885fcfa
FIX: sync up all counts when visiting new and unread
2014-09-29 13:49:38 +10:00
Sam
fdd6bcf38d
less lines
2014-09-29 11:55:25 +10:00
Sam
a659019ff6
Merge pull request #2823 from lidlanca/github-blob-style
...
Add Styling for Github Code blob + Line numbers
2014-09-29 11:52:15 +10:00
lidlanca
1cc3c8ff15
Add Styling for Github Code blob + Line numbers
2014-09-28 00:37:21 -04:00
Robin Ward
d0fb8bbcfc
Instead of `.js.handlebars` use `.hbs` for handlebars templates
2014-09-26 15:23:15 -04:00
Sam
1daff24e7c
FIX: typo, no grey unread in suggested topic list
2014-09-26 09:41:08 +10:00
Robin Ward
0fc0533134
FEATURE: Admin interface for adding custom fields for users
2014-09-25 16:17:51 -04:00
Robin Ward
d37ed80e8a
FIX: CSS Customizations were showing as undefined
2014-09-25 12:08:58 -04:00
Sam
8f8ea735ee
FIX: allow retry activation of account by username or password
2014-09-25 17:42:48 +10:00
Sam
c4fb7dce23
fix style
2014-09-25 16:38:44 +10:00
Sam
c248d28c38
FEATURE: display associated accounts in admin user
2014-09-25 16:15:01 +10:00
Sam
239d4d9d47
Revert "FIX: reply after like does nothing"
...
This reverts commit 52a94090c4
.
2014-09-25 13:02:43 +10:00
Sam
52a94090c4
FIX: reply after like does nothing
...
(attempt to fix)
2014-09-25 12:47:49 +10:00
Sam
e14e8f64bc
FIX: don't stop youtube when liking a post
...
Also fixes post action create/destroy api not to include post raw.
2014-09-25 12:02:41 +10:00
Sam
1d2c7206e6
Merge pull request #2820 from Elberet/fix-url-bbcode
...
FIX: reworked handling URL bbcode tags
2014-09-25 09:36:55 +10:00
Robin Ward
6c275cd64d
Update i18n keys for site_content rename
2014-09-24 16:13:48 -04:00
Robin Ward
bc53d48bd7
Renaming site contents to site text
2014-09-24 16:08:14 -04:00
Robin Ward
98d21ed21f
Remove deprecated `Ember.Deferred`
2014-09-24 14:17:29 -04:00
Jens Maier
dcd7a149e2
FIX: reworked handling URL bbcode tags
2014-09-24 20:02:02 +02:00
Jeff Atwood
cef3cdff86
remove unnecessary pre/code base CSS
2014-09-24 10:46:45 -07:00
Robin Ward
21de00f9f9
FIX: If an observer fires to rerender, schedule it once so that click
...
events are not destroyed.
2014-09-24 12:21:18 -04:00
Sam
b1567488b7
FIX: liking a post with replies expanded would cause glitch
2014-09-24 18:24:02 +10:00
Robin Ward
3afe274ccd
Rename "Content" header to "Text Content" to make it more clear
2014-09-23 17:27:48 -04:00
Robin Ward
b21d653e4b
Build was broken due to load order.
2014-09-23 17:15:49 -04:00
Robin Ward
fc32a0920d
Move "Content" under "customize" in admin.
2014-09-23 17:12:31 -04:00
Robin Ward
d1d3e5dd8c
Remove broken `debouncePromise` and clean up some deprecations
2014-09-23 16:16:44 -04:00
Neil Lalonde
6fafebc4c8
after deleting a user, don't show a popup saying you deleted the user. jeff hates that.
2014-09-23 16:07:26 -04:00
Robin Ward
d073b908a9
Merge pull request #2818 from techAPJ/patch-4
...
Trigger browser password manager after signing up
2014-09-23 15:43:31 -04:00
Arpit Jalan
b3838c2c1c
Trigger browser password manager after sigining up
2014-09-24 01:04:36 +05:30
Robin Ward
3980d14d5e
FIX: On mobile, allow topic entrance from suggested topics
2014-09-23 14:36:21 -04:00
Jeff Atwood
ab2a56624b
suppress only short avatar list on mobile, not full
2014-09-23 11:29:31 -07:00
Robin Ward
dc789502f9
FEATURE: Site setting to enable displaying email on user profiles for
...
staff users (and the user themselves.)
2014-09-23 13:01:44 -04:00
Jeff Atwood
cfb3c322c5
tighten up topic map spacing on mobile
2014-09-23 03:06:07 -07:00
Jeff Atwood
aa4e54f759
add tap space for mobile date field in suggested topics
2014-09-23 01:09:51 -07:00
Jeff Atwood
de2274a301
mobile need space between dismiss posts/topic btn
2014-09-23 00:49:14 -07:00
Jeff Atwood
cdb69c9494
more mobile login form tweaks
2014-09-22 23:23:29 -07:00
Jeff Atwood
696cf179ff
mobile login form tweaks
2014-09-22 23:13:30 -07:00
Jeff Atwood
fee9f834b6
bigger mobile topic list post count and date tap targets
2014-09-22 22:56:46 -07:00
Jeff Atwood
8db0ae0210
few more mobile login style fixes
2014-09-22 22:35:39 -07:00
Jeff Atwood
d188a75da4
tighten spacing on mobile dialog headers
2014-09-22 22:20:44 -07:00
Jeff Atwood
b874b31b02
correct mobile login form layout error
2014-09-22 17:26:22 -07:00
Sam
e8bbc147ad
Merge pull request #2815 from cpradio/tab-to-first-link-on-post-when-using-keyboard
...
FIX: j/k place tab focus accordingly so tab will go to the first linked ...
2014-09-23 07:38:49 +10:00
Robin Ward
537e6b193d
FIX: Allow proper escaping of bold and italics markdown, even when
...
nested.
2014-09-22 16:52:14 -04:00
cpradio
caac05dbba
FIX: j/k place tab focus accordingly so tab will go to the first linked item in the selected post/row
...
Allow tabbing to continue from the selected post/topic when using the j/k keyboard shortcuts
https://meta.discourse.org/t/when-a-post-is-selected-tab-should-take-you-to-the-first-link/16212
2014-09-22 15:07:50 -04:00
Neil Lalonde
e86407940c
add a plugin outlet under avatars beside posts
2014-09-22 15:07:44 -04:00
Robin Ward
223f3eebfc
Merge pull request #2814 from cpradio/add-bulk-archive-option
...
FEATURE: Add Archive Topics to Bulk actions
2014-09-22 15:01:40 -04:00
cpradio
afdbb2bb96
FEATURE: Add Archive Topics to Bulk actions
...
Add the ability to archive topics in bulk
https://meta.discourse.org/t/archive-topics-via-bulk/20302
2014-09-22 14:56:48 -04:00
Robin Ward
914217f78a
FIX: Allow BBCode images within BBCode links
2014-09-22 14:42:24 -04:00