github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 05:47:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12,364 Commits 190 Branches 500 Tags 938 MiB
b91f9f4142
Commit Graph

4904 Commits

Author SHA1 Message Date
Jeff Atwood
c8ab29fa31 get rid of bad editor media queries in mobile.scss 2014-10-11 15:38:32 -07:00
Martin Meyerhoff
97b60e6422 Fix buggy autocomplete behaviour for non-US keyboards 
This change moves the code for actually entering data from the keydown handler to the
keypress handler, which can reliably catch the character entered (rather than
the key pressed).

This is my second attempt at
https://meta.discourse.org/t/typing-shows-on-non-us-keyboard-layouts/20449
without doing dangerous refactoring.

This does not fix the issue reported in
https://meta.discourse.org/t/overly-aggresive-emoji-autocomplete/20691/7
as that is a different bug.
 2014-10-11 17:55:48 +02:00
Jeff Atwood
b736fb7016 hacky override of inline select2 width in editor 2014-10-11 05:49:18 -07:00
Jeff Atwood
98c8c48f6c add better mobile inline title edit styles 2014-10-11 05:41:10 -07:00
Jeff Atwood
8156518aa6 oops 2014-10-11 05:32:40 -07:00
Jeff Atwood
ab83fbff89 few more mobile editor tweaks 2014-10-11 05:29:50 -07:00
Jeff Atwood
bf5ef3aec3 minor mobile editor tweaks 2014-10-11 05:08:25 -07:00
Jeff Atwood
5dbf707cb3 min-width of 1280px for editor on mobile?? 
OH HELLllll TO THE NO
 2014-10-11 04:37:30 -07:00
Jeff Atwood
15b94acd85 width 100% for editor on mobile; no preview 
also  remove box-sizing mixin, use native CSS3
 2014-10-11 04:30:34 -07:00
Jeff Atwood
27061d5fab move editor spinner css to shared (base) css 2014-10-11 04:08:16 -07:00
Jeff Atwood
b587137302 remove editor preview css styles from mobile 2014-10-11 03:59:26 -07:00
Jeff Atwood
be43d51536 remove admin-loading in favor of spinner css 2014-10-11 03:46:42 -07:00
Arpit Jalan
a682de6331 FIX: css change broke build 2014-10-11 14:33:17 +05:30
Jeff Atwood
6571a9d924 make editor preview cursor default not i-beam 2014-10-10 16:02:14 -07:00
Jeff Atwood
333aafad47 add clip to mobile text site title 2014-10-10 15:48:50 -07:00
Jeff Atwood
1c838513cd FIX: all-text site titles were too wide 2014-10-10 15:43:01 -07:00
Jeff Atwood
70cccb0a06 tweak header box shadow 2014-10-10 15:31:54 -07:00
Jeff Atwood
5c0bb56748 remove unnecessary @includes on box-shadow 2014-10-10 15:02:46 -07:00
Jeff Atwood
66a51729b3 copyedits on relative auto-close 2014-10-10 14:32:52 -07:00
Robin Ward
27e68518df FIX: BBCode was trimming leading space in [code] blocks 2014-10-10 15:11:30 -04:00
Robin Ward
bbbec13606 FIX: Cursor would stay on lightbox when hitting the back button 2014-10-10 13:09:24 -04:00
Régis Hanol
5754e8dd0f FEATURE: auto-close topics based on last post 2014-10-10 18:21:44 +02:00
Robin Ward
ac72b0bcf6 FIX: Bug when sorting by category column, navigating to home 2014-10-10 12:17:53 -04:00
Robin Ward
d3b268cd2c FIX: Broken build 2014-10-09 19:42:50 -04:00
Robin Ward
c1b8943a6f FIX: Category badges in the header should use the primary header color 2014-10-09 16:48:15 -04:00
Robin Ward
3b38667274 FIX: Check for word boundaries with censored words. 2014-10-09 16:35:27 -04:00
Robin Ward
80183f04f5 FIX: CSS on admin referrals broke with the fixed table. See: 
https://meta.discourse.org/t/admin-dashboard-top-referred-topics-links-overlap-with-clicks/20945
 2014-10-09 16:12:02 -04:00
Robin Ward
285c66b899 FIX: Say the file uploaded is too large, not "image" as you can upload 
other kinds of files.
 2014-10-09 16:03:04 -04:00
Robin Ward
1cda92c753 Minor documentation change to PageTracker 2014-10-09 15:07:10 -04:00
Robin Ward
5fc150e057 A mucher saner API for updating the title of routes, even when nested. 
Properly sends the title of the page to google analytics
 2014-10-09 14:55:29 -04:00
Robin Ward
d03e811ab7 UX: Fixed padding on reply to user 2014-10-08 17:17:43 -04:00
Robin Ward
a16d483c3c UX: If there is a reply by email icon, don't overlap with the reply tab 2014-10-08 15:58:49 -04:00
Robin Ward
f9a8f6d6ce FEATURE: Support for a required setting on user fields. 2014-10-08 15:10:19 -04:00
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
Kane York
b79c835c07 Fix data-* behavior (failure to understand own docs) 2014-10-05 15:11:26 -07:00
riking
0532468499 Fix JSHint 2014-10-05 14:58:48 -07:00
riking
1436f75a9f FEATURE: Allow explicit rel="nofollow" on links 2014-10-05 14:58:48 -07:00
riking
0586b3dd25 Clean up validateAttribute() function 
Remove code duplication
 2014-10-05 14:58:47 -07:00
riking
32cc31319f FIX: Use lang- prefixes for HLJS; add nohighlight for ... 
text; use a proper whiteListTag() call.

Old posts are not affected - no global rebake is necessary.
 2014-10-05 14:58:47 -07:00
riking
22a4ceceee Auto-anchor attribute regexes, document _validTags 2014-10-05 12:17:56 -07: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
Régis Hanol
0b13f6572f FEATURE: staff option to unhide a post 2014-09-22 18:55:13 +02:00
Robin Ward
e8522e839b FIX: undefined label on Top dropdown on mobile 2014-09-22 12:23:37 -04:00
Robin Ward
626e896c13 FEATURE: Enable topic entrance on mobile 2014-09-22 11:49:11 -04:00
Sam
7ae72dc2ff FIX: while header drop down is dropped, header is in front 2014-09-22 12:38:48 +10:00
Sam
fd5dde4ab5 Merge pull request #2811 from Elberet/fix-bbcode-blocks 
FIX: BBCode blocks parser no longer mangles JsonML arrays
 2014-09-22 12:01:09 +10:00
Sam
cfa0d66548 Merge pull request #2807 from techAPJ/patch-2 
UX: show category when moving post to exisiting topic
 2014-09-22 11:59:02 +10:00
Sam
aa39a3b4b0 Merge pull request #2810 from cpradio/opera-composer-keyboard-shortucts 
FIX: Opera Composer Keyboard Shortcuts
 2014-09-22 11:50:14 +10:00
Jens Maier
9cca64cf69 FIX: BBCode blocks parser no longer mangles JsonML arrays 2014-09-22 03:27:39 +02:00
Gerhard Schlager
a6714e252e FIX: Category creation failed when translation was missing 2014-09-20 22:06:00 +02:00
cpradio
9e3060a6f7 FIX: Opera Improvements (v12) 
Fix issues with Opera 12 and its ability to utilize Discourse Composer window
https://meta.discourse.org/t/support-for-opera/20218
 2014-09-19 22:47:27 -04:00
Arpit Jalan
ae8f7748f8 UX: show category when moving post to exisiting topic 2014-09-19 21:00:35 +05:30
Sam
14936ed9c9 Merge pull request #2795 from lidlanca/fix-link-release 
Fix: Cancel link click if triggered as part of text selection
 2014-09-19 13:35:13 +10:00
Sam
bf51fbf030 Merge pull request #2806 from Elberet/fix-escape-single-quotes 
FIX: double-escaped single quotes in URLs
 2014-09-19 13:32:43 +10:00
Jeff Atwood
3c6f7908ac adjust track-link alignment in gutter 2014-09-18 20:20:13 -07:00
Jeff Atwood
6aff562883 UX: gutter links use link color, no glyphs 2014-09-18 20:01:49 -07:00
Sam Saffron
5132f217c4 FIX: link to sub category not working in search 2014-09-19 12:55:30 +10:00
Sam Saffron
00776896f6 FIX: word-wrap missing from search 2014-09-19 12:55:15 +10:00
Sam Saffron
4e91059f89 FIX: missing avatar when sizing down window 2014-09-19 12:35:35 +10:00
Jens Maier
543bc53598 FIX: double-escaped single quotes in URLs 2014-09-18 22:07:42 +02:00
Neil Lalonde
c4e285f3ec SECURITY: rate limit change email requests 2014-09-18 10:48:56 -04:00
Sam Saffron
b0875f8332 Revert "Revert "FEATURE: fenced code blocks can hint with "pre" or "text""" 
This reverts commit 4487d6a4c2.
 2014-09-18 15:15:42 +10:00
Robin Ward
4487d6a4c2 Revert "FEATURE: fenced code blocks can hint with "pre" or "text"" 
This reverts commit 943ad8d1d5.
 2014-09-17 12:17:32 -04:00
Robin Ward
c16b8364ab FIX: Support ember app routing to topics with only slugs 2014-09-17 11:18:59 -04:00
Sam Saffron
943ad8d1d5 FEATURE: fenced code blocks can hint with "pre" or "text" 
Use ```pre or ```text for unhiglighted code blocks
 2014-09-17 01:40:10 +10:00
Sam Saffron
b62aaf5a53 FEATURE: display reply to post on mobile 2014-09-17 01:20:15 +10:00
Sam
0855fe5438 Merge pull request #2798 from lidlanca/patch-3 
Fix: rapid/continuous keyboard Next event under Topics List view may lose selected item on "load more"
 2014-09-17 00:25:12 +10:00
Sam
a3276c042d Merge pull request #2802 from cpradio/firefox-use-k-to-scroll-up 
FIX: Firefox - Topic List Keyboard shortcut Previous(K) does not scroll properly leaving selected item hidden
 2014-09-17 00:20:48 +10:00
Sam
9ace1521f6 Merge pull request #2797 from fantasticfears/master 
return true when invoke verbose_localization_session
 2014-09-16 14:42:46 +10:00
cpradio
eaf0cf0519 FIX: Using k on Firefox to navigate up the topic list 
Using k wouldn't always bring the topic in focus as you moved up the topic list
https://meta.discourse.org/t/topic-list-keyboard-shortcut-previous-k-does-not-scroll-properly-leaving-selected-item-hidden-firefox/20050
 2014-09-15 21:10:24 -04:00
Sam Saffron
bb64c2236b SECURITY: Escape strings in logs 2014-09-16 07:53:17 +10:00
Jeff Atwood
10e2c3f693 consolidate <aside> quote CSS styles in base 2014-09-13 23:02:46 -07:00
lidlanca
e277287b2e Fix: rapid/continuous keyboard Next event under Topics List view may lose selected item on "load more" 
Using Next keyboard shortcut (J) rapidly while reaching last item in the topic list and
causing a "load more". The handler might get into a state where it can not detect any selected item due to the delay from Em.run.next
and will result in position reset.

+added boundary check of last item on next, early in the handler to avoid unnecessary computations 


https://meta.discourse.org/t/keyboard-shortcut-next-previous-continues-key-down-reset-to-first-item-in-list-on-load-more/20042
 2014-09-13 23:59:20 -04:00
Erick Guan
bd59a5caba return true when invoke verbose_localization_session 2014-09-14 10:10:48 +08:00
lidlanca
13cedce0cf Fix: Cancel link click if triggered as part of text selection 
Prevent a click if the user select content in a topic and release the mouse over a link.

https://meta.discourse.org/t/selecting-a-link-results-in-it-being-opened/14846
 2014-09-13 04:05:03 -04:00
Jeff Atwood
35ca9525aa move pre/kbd to base css, remove obscure CSS 2014-09-12 22:58:15 -07:00
Robin Ward
0c32bf9c34 Removed stupid {{log}} message that I left in because I'm stupid. 2014-09-12 16:29:25 -04:00
Robin Ward
46d8db3d70 Use dashed names for all templates when using {{render}} for future 
Ember compatibility
 2014-09-12 15:03:33 -04:00
Robin Ward
22fd7fb07d Better resolver support for underscored templates. Eventually we'll 
migrate to dashed only.
 2014-09-12 14:44:35 -04:00
Robin Ward
1de9c3b04a Migrate more helpers to ES6 format. 2014-09-12 14:27:34 -04:00
Robin Ward
6f149edecc FIX: Scroll position when hitting back button to category filter 2014-09-12 14:07:04 -04:00
Zane Beckman
216ee9f2f1 Add css selector for 'star' th element 
Allows custom css rules to hide this column.
 2014-09-12 11:04:47 -04:00
Martin Feckie
b266b16b6a Make style more consistent with rest of site 2014-09-12 16:44:40 +08:00
Robin Ward
fbf86c4e2e FIX: Badge scroll position 2014-09-11 17:50:47 -04:00
Robin Ward
e1826e3025 Remove constants from initializers 2014-09-11 17:50:47 -04:00
Neil Lalonde
9b5f506339 FIX: in activity stream, move category badge to be under topic title. Long titles could cause it to be cut off. Category badge replaces the text that was there. 2014-09-11 17:26:09 -04:00
Robin Ward
52094fe554 Remove the last of the Discourse globals in our templates 2014-09-11 17:13:03 -04:00
Robin Ward
cedc409461 Remove deprecation notices for Discourse.banner 2014-09-11 17:01:35 -04:00
Robin Ward
f322b500a7 Replaced many global Discourse.SiteSetting calls in templates with 
computed properties due to deprecations.
 2014-09-11 16:46:34 -04:00
Robin Ward
8559bbe508 Remove many usages of Discourse in templates as it's deprecated in new 
releases of Ember
 2014-09-11 16:30:47 -04:00
Robin Ward
af6936cf72 Refactor some deprecations for newer versions of Ember. Also set up 
injection for some globals so we can migrate away from them.
 2014-09-11 16:16:21 -04:00
Jeff Atwood
0446a0e19e set maxlength="200" attrib on password field 2014-09-11 12:41:03 -07:00
Neil Lalonde
d492bac587 Remove the git commits widget from the admin dashboard 2014-09-11 14:45:42 -04:00
Robin Ward
15936f4742 Use the {{fa-icon}} helper on user expansion 2014-09-11 14:42:45 -04:00
Jeff Atwood
07a021d050 Merge pull request #2785 from awesomerobot/master 
fixing message highlight in admin
 2014-09-11 11:23:28 -07:00
Kris Aubuchon
6839cd6430 fixing message highlight in admin 2014-09-11 14:07:39 -04:00
Jeff Atwood
c661b6ded5 FIX: home icon was incorrectly sized 2014-09-11 10:42:11 -07:00
Robin Ward
3c26bca56a Migrated more helpers to ES6 preferred format 2014-09-11 13:32:57 -04:00
Robin Ward
d010eee5d8 Remove unused titled-link-to helper 2014-09-11 13:14:11 -04:00
Robin Ward
ad813e57ec FIX: Badges scrolling 2014-09-11 13:10:54 -04:00
Robin Ward
57e3865d18 FIX: Scroll position when using the back button 2014-09-11 13:06:01 -04:00
Jeff Atwood
299013b471 lighten staff post bg color 2014-09-11 09:53:35 -07:00
Robin Ward
4a3e46ee4a Merge pull request #2783 from chapel/proper-responsive-extra-info 
Make extra info header properly responseive
 2014-09-11 12:42:34 -04:00
Neil Lalonde
dd8e7fd7d1 Use a label tag on the checkbox for 'I have read and accept the TOS' 2014-09-11 11:11:14 -04:00
Neil Lalonde
91d114756c FIX: don't always say that an email is not verified in admin 2014-09-11 10:58:07 -04:00
Régis Hanol
9a668a7e7b FIX: clear selection when transitioning out of a topic 2014-09-11 16:35:04 +02:00
Régis Hanol
e56fcf0c43 FEATURE: add 'rebake post' in post wrench menu 2014-09-11 16:04:40 +02:00
Jacob Chapel
0d0d9adb80 FIX: Make extra info header properly responseive 
The current solution assumed the width of the logo which caused
the user info and icons bar to shift down when the title is shown.

This fixes that by making the extra info wrapper responsive
and use up the full width, not needing manual breakpoints.
 2014-09-11 01:21:19 -07:00
Jeff Atwood
0f2e8a65e2 remove optimizelegibility from h1 chrome buggy 2014-09-11 00:40:44 -07:00
Sam
61bcde6284 FEATURE: inform users if forgot password works or not 
FIX: flash dialog in forgot password often had wrong color

(this can be disabled by setting forgot_password_verbose to false)
 2014-09-11 12:04:44 +10:00
Sam
306d31b92e fix test 2014-09-11 11:15:49 +10:00
Sam
5cb7c8ee11 FEATURE: suppress admin glyph for admins 
If you want to a shield you must grant moderation to the admin.
 2014-09-11 10:54:25 +10:00
Sam
70eb7b8fdf FEATURE: All on user page is now only should posts + topics 2014-09-11 10:45:59 +10:00
cpradio
37ad1f96b5 UX: Add Suspension Message to User Card 
Add the suspension message to the user card of the user. This replaces the about me (bio) just like it does on their profile page.
https://meta.discourse.org/t/profile-page-on-mobile-selecting-menu-item-should-jump-to-the-selected-content/19896/2
 2014-09-10 19:30:32 -04:00
cpradio
1ac7a8277d UX: Add Suspension Message to User Card 
Add the suspension message to the user card of the user. This replaces the about me (bio) just like it does on their profile page.
https://meta.discourse.org/t/profile-page-on-mobile-selecting-menu-item-should-jump-to-the-selected-content/19896/2
 2014-09-10 19:16:36 -04:00
Jeff Atwood
abe420b322 darken names in quote titles 2014-09-10 15:17:03 -07:00
Sam
fd29fe503d Merge pull request #2778 from Elberet/fix-parser-block-ordering 
FIX: fix dialect block ordering
 2014-09-11 08:14:17 +10:00
Jeff Atwood
86533a322e remove bg on user profiles 2014-09-10 15:06:20 -07:00
Régis Hanol
18f8038015 FEATURE: add new 'convert to staff message' in post wrench menu 2014-09-10 23:08:33 +02:00
Robin Ward
ffc136e9ac FIX: Category topic new posts were the wrong color 2014-09-10 16:10:49 -04:00
Robin Ward
5dea3720a4 FIX: Only use cached list when we have less than 1 page worth of topics. 
We only need it then to maintain the scroll position.
 2014-09-10 15:17:51 -04:00
Régis Hanol
dbcaf1276a FIX: move wiki/via-email glyphs + add green background on wiki posts 2014-09-10 15:25:31 +02:00
Jens Maier
30dbb570e5 FIX: fix dialect block ordering 2014-09-10 13:29:40 +02:00
Jeff Atwood
c80ef9e3fa remove bgcolor on buttons over user profile 2014-09-10 00:47:31 -07:00
Jeff Atwood
126dfa0ec7 remove hover border for reply as new topic 2014-09-10 00:09:35 -07:00
Sam
b9c8ae588a minor refactor 2014-09-10 16:33:39 +10:00
riking
637371e60a Switch to count of all notifications 2014-09-09 20:13:36 -07:00
riking
bf06878601 FIX: Broken notification history 2014-09-09 17:25:25 -07:00
Sam
51d9a59d53 copy, "notification history" is just too long 2014-09-10 10:14:42 +10:00
riking
5994b630b7 Final dirty diff cleanup 2014-09-09 16:29:08 -07:00
riking
69bc552054 FEATURE: Actually show more notifications 
The "Show more notifications..." link in the notifications dropdown now
links to /my/notifications, which is a historical view of all
notifications you have recieved.

Notification history is loaded in blocks of 60 at a time.

Admins can see others' notification history. (This was requested for
'debugging purposes', though that's what impersonation is for, IMO.)
 2014-09-09 16:29:08 -07:00
Sam
5001e826ff Merge pull request #2756 from cpradio/add-go-to-top-shortcut 
UX: Add g, t keyboard shortcut to modal window for go to top
 2014-09-10 09:11:16 +10:00
Sam
4edbb5b98c Merge pull request #2773 from riking/post-handlebars 
(Trivial) Handlebars structure tweaks to post.handlebars
 2014-09-10 09:04:12 +10:00
Robin Ward
2d32325ac7 FIX: Show user expansion on user stream too 2014-09-09 17:55:55 -04:00
Robin Ward
62c9e4228d Rename {{icon}} helper to {{fa-icon}} for future Ember 
compatibility.
 2014-09-09 17:29:05 -04:00
Robin Ward
cec6b64a45 FIX: Don't show filter on user card if not in topic 2014-09-09 16:53:43 -04:00
Robin Ward
a09ff29dd9 UX: Only intercept Cmd-F/Ctrl-F for search on a topic when not all posts 
are available in the DOM.
 2014-09-09 16:05:17 -04:00
Robin Ward
504d61de94 FIX: Clicking on expanded user actions uses user expansion. Also added 
integration test.
 2014-09-09 15:18:04 -04:00
Jeff Atwood
bcfd2778d7 Merge pull request #2774 from awesomerobot/master 
changing the header now that fullname was dropped
 2014-09-09 11:52:50 -07:00
Kris Aubuchon
ebe71ea491 changing the header now that fullname was dropped 2014-09-09 14:42:44 -04:00
Régis Hanol
79030c874e FIX: allow staff members to restore withdrawn posts that are flagged 2014-09-09 20:26:40 +02:00
riking
7bb1b8bc97 Handlebars structure tweaks to post.handlebars 
- Combine bind-attrs on the <article> (seriously that made no sense)
 - Hoist a bind-attr class to the view, allowing more fancy styling
 - Hoist a <div> outside a conditional
 - Change href='#' to unvalued hrefs
 2014-09-09 11:20:25 -07:00
Robin Ward
8b33e659a1 FIX: Only use cached topic lists on popState 2014-09-09 12:57:51 -04:00
Robin Ward
a96ba8ed78 Revert "FIX: unread/new counts out of sync with tabs" 
This reverts commit c093187d34.
 2014-09-09 12:57:51 -04:00
Régis Hanol
eb34ecfc0c FEATURE: new 'prevent anons from download files' site setting 2014-09-09 18:41:13 +02:00
Régis Hanol
69bc24a16d FIX: clicking a button that disappears in a modal would close the modal (take 2) 2014-09-09 10:44:26 +02:00
Régis Hanol
357c43e941 FIX: clicking the 'edit permission' button would close the category modal 2014-09-09 10:16:12 +02:00
Sam
c093187d34 FIX: unread/new counts out of sync with tabs 
We were serving cached lists of topics to non popstate reqs
 2014-09-09 16:56:20 +10:00
Robin Ward
2f04b53c9f FIX: Clicking outside of modal wasn't closing it 2014-09-08 16:53:05 -04:00
Robin Ward
9d9d93ad3c Merge pull request #2771 from techAPJ/patch-1 
Don't show new topic indicator on New tab
 2014-09-08 15:35:23 -04:00
Arpit Jalan
80510c5114 Don't show new topic indicator on New tab 2014-09-09 01:02:16 +05:30
Robin Ward
56eda5abf9 FIX: Don't allow profile bios longer than 3k chars 2014-09-08 15:23:21 -04:00
Jeff Atwood
0ccb1dcca6 remove border from "reply as new topic" 2014-09-08 10:02:54 -07:00
Régis Hanol
948e0740c9 FEATURE: add glyphs in the composer 'save' button 2014-09-08 19:02:53 +02:00
Régis Hanol
ea6cab66cb FIX: remove curvy arrow on reply to topic button 2014-09-08 19:02:14 +02:00
Régis Hanol
00bd665c96 FEATURE: add count of previous flags on the post 2014-09-08 17:53:29 +02:00
Robin Ward
7d6f3a5089 FIX: Only show warning creation to staff. Server side was OK. 2014-09-08 11:22:11 -04:00
Robin Ward
334e21a03a Revert "Revert "FEATURE: Can create warnings for users via PM"" 
This reverts commit 1c7559380c.
 2014-09-08 11:11:56 -04:00
Robin Ward
1c7559380c Revert "FEATURE: Can create warnings for users via PM" 
This reverts commit b0bfc1f93f.
 2014-09-08 10:38:59 -04:00
Robin Ward
b0bfc1f93f FEATURE: Can create warnings for users via PM 2014-09-08 10:27:06 -04:00
Jeff Atwood
9b2e850553 UX: suppress outgoing right arrow on gutter links 2014-09-08 01:15:40 -07:00
Jeff Atwood
107cffcc84 FIX: revert readonly on share link field 2014-09-08 01:03:50 -07:00
Sam
563a313179 Merge pull request #2767 from gschlager/i18n_fix04 
FIX: Some default group names could not be translated
 2014-09-08 13:06:29 +10:00
Kris Aubuchon
9eed47f7c5 dark themes now carry over to admin without looking absolutely terrible 2014-09-07 22:46:04 -04:00
Sam
2a7355405e FEATURE: add age to results of search 2014-09-08 10:02:47 +10:00
Jeff Atwood
65e941f652 UX: remove current username from header 2014-09-07 14:01:51 -07:00
Jeff Atwood
3cf433ab1e FIX: quote icon in Quote Reply not clickable 2014-09-07 13:55:31 -07:00
Jeff Atwood
aa0d14825a add spaces for flag/admin glyphs on hamburger 2014-09-07 13:24:33 -07:00
Jeff Atwood
f5e1a5a669 UX: remove bookmark icon from Unread topnav 2014-09-07 13:20:40 -07:00
Gerhard Schlager
970aafecb4 FIX: Some default group names could not be translated 2014-09-07 14:48:03 +02:00
Kris Aubuchon
127c2f3d21 making topic/post selection left border stronger 2014-09-06 12:12:22 -04:00
Jeff Atwood
3772102972 better display of topic glyphs in search 2014-09-05 13:17:26 -07:00
Jeff Atwood
3bdc6f9fad UX: remove email display from profile page 2014-09-05 13:11:50 -07:00
Robin Ward
66501190bd FIX: Missing id attribute caused failing test 2014-09-05 13:15:50 -04:00
Robin Ward
4bec839d9d Using Discourse.XYZ in templates is deprecated. This fixes that, plus 
adds some more integration tests to make sure login required is working.
 2014-09-05 13:09:01 -04:00
Neil Lalonde
ca5f361d0a FEATURE: restrict admin access based on IP address 2014-09-05 12:06:01 -04:00
Jeff Atwood
dc8fc8c9e4 UX: move "show more" in search to bottom of results 2014-09-05 02:19:06 -07:00
Arpit Jalan
0db66d3a18 Add education panel for starred tab 2014-09-05 11:15:10 +05:30
Kris Aubuchon
5e9dd7da66 fixing egg-shaped badges on mobile 2014-09-04 21:05:38 -04:00
cpradio
2ef499d021 UX: Add g, t keyboard shortcut to modal window for go to top 
https://meta.discourse.org/t/add-shortcut-g-t-to-go-to-top-page/19586
 2014-09-04 18:28:03 -04:00
Jeff Atwood
ea36daf51a lighten wiki and email left gutter icons a bit 2014-09-04 14:42:41 -07:00
Jeff Atwood
bbbca820d8 FIX: edit history user setting was appearing 2014-09-04 13:47:05 -07:00
Jeff Atwood
fad0394a40 more renaming of trust level settings 2014-09-04 13:32:00 -07:00
Jeff Atwood
fcca64c0cf rename site settings for trust levels as numbers 2014-09-04 13:16:51 -07:00
Robin Ward
229566fc32 Remove deprecated Ember.Set 2014-09-04 15:01:12 -04:00
Robin Ward
52e25c9272 FIX: tabindex was not set on the category chooser when creating a topic. 2014-09-04 13:50:51 -04:00
Jeff Atwood
742e2b1fa9 FIX: add classes to mobile education panels 2014-09-04 10:39:47 -07:00
Robin Ward
1c5e8efa68 FEATURE: Show an email icon beside posts that arrived via email 2014-09-04 13:04:41 -04:00
Robin Ward
8ac955247c Convert category helpers to ES6. 2014-09-04 11:32:30 -04:00
Sam
a3863b52db More highlight tweaking for search, makes it much easier to theme 2014-09-04 18:00:01 +10:00
Sam
9d75f41172 try softening highlight on topic stop highlighting categories 2014-09-04 15:30:17 +10:00
Sam
ce067a404f Update topic-post.scss 
fix read state position
 2014-09-04 15:14:58 +10:00
Sam
f79b2963fb Revert "fixing alignment of unread post dot" 
This reverts commit 80f87e15d2.
 2014-09-04 15:09:07 +10:00
Sam
0ade9bafff FIX: highlight in yellow, not blue 
FEATURE: highlight in title
 2014-09-04 15:01:13 +10:00
Kris Aubuchon
80f87e15d2 fixing alignment of unread post dot 2014-09-04 00:11:43 -04:00
Kris Aubuchon
06e048bf89 minor unread circle alignment fix 2014-09-04 00:02:29 -04:00
Sam
1f42dda939 factor common code 2014-09-04 13:19:10 +10:00
Sam
a050fa887f FIX: regression, go to quoted post missing in quotes 
refactors common code as well
 2014-09-04 13:16:19 +10:00
Sam
b8c36bd2da FIX: broken search for admins when selecting topics 2014-09-04 12:21:57 +10:00
Sam
d6a5552340 tweak new topic styling 2014-09-04 11:07:32 +10:00
Robin Ward
a67e400027 FIX: Remove contents class 2014-09-03 17:17:53 -04:00
Robin Ward
b43359da8e Merge pull request #2749 from riking/css-composer 
FIX: Add .cooked class to composer preview
 2014-09-03 16:49:42 -04:00
Jeff Atwood
7543b37f86 UX: add dot before new topics via css 2014-09-03 13:33:56 -07:00
riking
824dadbc1b FIX: Add .cooked class to composer preview 
This should make any custom styling apply to both the rendered posts and
the composer equally, as long as a .topic-body parent or a #wmd-preview
parent is not specified.
 2014-09-03 13:18:48 -07:00
Robin Ward
17b79fdeda Increase the contrast of the "new" text 2014-09-03 15:37:42 -04:00
Robin Ward
dac4ed5a1e Prune dead code for search keyboard navigation in search, remove bad 
tests.
 2014-09-03 15:05:22 -04:00
Robin Ward
40b1558f83 Merge pull request #2747 from cpradio/remove-additional-search-code 
FIX: Remove additional search code related to the up/down navigation
 2014-09-03 14:46:09 -04:00
Robin Ward
e9600d7cb1 Convert some application helpers to ES6 format. 2014-09-03 13:30:22 -04:00
Robin Ward
0b6c84e292 UX: Remove background color from new badge. DRY up lots of repeated code 
for rendering badges on topics.
 2014-09-03 12:22:18 -04:00
Neil Lalonde
6489c1d7e3 FIX: admin page for users who have not been activated makes it more clear that the account is inactive, and won't offer actions that don't work yet 2014-09-03 10:41:13 -04:00
Neil Lalonde
ff136ddeea FEATURE: accounts that have not been activated are grey in admin user lists 2014-09-03 10:09:30 -04:00
Sam
c6aab831ed Merge pull request #2741 from riking/badges_create_checks 
FIX: Apply contract checks when first creating a badge
 2014-09-03 22:19:09 +10:00
Sam
9c16dee843 Merge pull request #2742 from riking/patch-1 
UX: Change Impersonate to btn-danger
 2014-09-03 22:18:19 +10:00
cpradio
44a25271f1 FIX: Remove additional search code related to the up/down navigation 
Removed additional search code that was related to the up/down navigation and their related tests.
https://meta.discourse.org/t/magic-search-code-for-keyboard-shortcuts/19563
 2014-09-03 06:51:52 -04:00
Jeff Atwood
c41d47b8f5 suppress search topic status color a bit 2014-09-03 01:03:53 -07:00
Jeff Atwood
6681d8ab81 Revert "UX: suppress new indicator style" 
This reverts commit 870fd70525.
 2014-09-03 00:11:25 -07:00
Sam
d4f08f442c FIX: correct template for search in post (regression) 2014-09-03 17:09:01 +10:00
Jeff Atwood
870fd70525 UX: suppress new indicator style 2014-09-02 23:48:41 -07:00
Sam
921dd75dd9 FIX: anonymous had <a> items for pin/unpin 
FEATURE: display category in search results
FEATURE: display topic state (locked/pinned/etc) in search results

UI cleanup for search results, clearing floats and so on.
 2014-09-03 12:13:26 +10:00
Sam
4f09d552ed FEATURE: increase search expansion to 50 results 
refactor search code to deal with proper objects
use proper serializers, test the controllers
 2014-09-03 12:13:25 +10:00
riking
71b7c80257 UX: CSS tweaks for badge query previews 2014-09-02 19:09:51 -07:00
riking
8979020b9d Clean up unused translations 2014-09-02 15:40:23 -07:00
riking
3413228e89 UX: Change Impersonate to btn-danger 2014-09-02 15:33:54 -07:00
Robin Ward
b04a52676e FIX: Don't show wrong flag choices after undo 2014-09-02 17:37:54 -04:00
Jeff Atwood
defe1dd86f Merge pull request #2739 from techAPJ/patch-1 
hide poster avatars when only two posts
 2014-09-02 09:54:52 -07:00
Robin Ward
abd84cd2a1 FIX: Redirect to Top was showing "latest" content because it was in the 
preload store.
 2014-09-02 12:29:22 -04:00
Robin Ward
d09f109b2c FIX: Re-enable filtering on user expansions on topics 2014-09-02 12:08:02 -04:00
Robin Ward
ce745b737e Renamed poster-expansion to user-expansion because it's not specific 
to a poster anymore.
 2014-09-02 12:08:02 -04:00
Robin Ward
2b0e11dad8 Merge pull request #2711 from hydrarulz/localize_romanian 
Add translation for Romanian.
 2014-09-02 10:48:38 -04:00
Robin Ward
065101afac Merge pull request #2734 from cpradio/readd-dismiss-bindings 
FIX: Readd the dismiss keybindings
 2014-09-02 10:42:53 -04:00
Arpit Jalan
8955bf02d8 hide poster avatars when only two posts 2014-09-02 20:10:36 +05:30
Sam
e0c8abc911 Merge pull request #2717 from riking/badge-solid 
Admin badge interface improvements
 2014-09-02 08:21:06 +10:00
Sam
202656a679 Merge pull request #2725 from cpradio/german-keyboard-support 
FIX: Support J/K bindings on German Keyboards
 2014-09-02 08:02:10 +10:00
cpradio
02a7a579f4 FIX: Duplicate badge titles can still occur 
Send false instead of true to .uniq as the badges are not sorted.
https://meta.discourse.org/t/set-title-dialog-shows-multiple-instances-of-the-same-badge-2/19495
 2014-09-01 13:56:19 -04:00
Jeff Atwood
03a7b01e4b Merge pull request #2735 from techAPJ/patch-3 
suppress post count on avatar for single post
 2014-09-01 08:11:32 -07:00
Arpit Jalan
eba3f6b408 suppress post count on avatar for single post 2014-09-01 14:23:34 +05:30
Sam
68cc4fb285 we need more height 2014-09-01 17:42:27 +10:00
Sam
60559b42be got to move inidicator a bit 2014-09-01 17:17:50 +10:00
Sam
69e418facf FEATURE: wider search with more context 2014-09-01 17:04:57 +10:00
cpradio
42c052d21b FIX: Readd the dismiss keybindings 
https://meta.discourse.org/t/new-updated-bar-and-dismiss-new-button-unreachable-by-keyboard/18946/10?u=cpradio
 2014-08-31 21:56:38 -04:00
cpradio
6234284243 FIX: Remove the old keyboard bindings for next/prev section, update client.en.yml to reflect the new bindings 2014-08-31 21:42:03 -04:00
riking
1833b43ae2 FEATURE: Badge query validation, preview results, and EXPLAIN 
Upon saving a badge or requesting a badge result preview,
BadgeGranter.contract_checks! will examine the provided badge SQL for
some contractual obligations - namely, the returned columns and use of
trigger parameters.

Saving the badge is wrapped in a transaction to make this easier, by
raising ActiveRecord::Rollback on a detected violation.

On the client, a modal view is added for the badge query sample run
results, named admin-badge-preview.
The preview action is moved up to the route.
The save action, on failure, triggers a 'saveError' action (also in the
route).

The preview action gains a new parameter, 'explain', which will give the
output of an EXPLAIN query for the badge sql, which can be used by forum
admins to estimate the cost of their badge queries.
The preview link is replaced by two links, one which omits (false) and
includes (true) the EXPLAIN query.

The Badge.save() method is amended to propogate errors.

Badge::Trigger gets some utility methods for use in the
BadgeGranter.contract_checks! method.

Additionally, extra checks outside of BadgeGranter.contract_checks! are
added in the preview() method, to cover cases of null granted_at
columns.

An uninitialized variable path is removed in the backfill() method.

TODO - it would be nice to be able to get the actual names of all
columns the provided query returns, so we could give more errors
 2014-08-31 11:25:44 -07:00
Sam
5c244c6f8f FIX: autocomplete username failing to pop up 
Janky autocomplete behavior due to debounce not being accounted for
correctly when dealing with promises

This also fixes a promise leak
 2014-09-01 01:48:17 +10:00
Jeff Atwood
6d1be665a1 Merge pull request #2729 from cpradio/firefox-kbd-post-navigation 
FIX: j/k navigation for posts using Firefox
 2014-08-30 13:32:15 -07:00
cpradio
37639308c0 FIX: Firefox j/k post navigation is inconsistent 
https://meta.discourse.org/t/j-k-navigation-in-lengthy-topics/18945
 2014-08-30 08:59:08 -04:00
cpradio
3f5d530553 Change SHIFT+J and SHIFT+K to move up/down sections instead of posts. 2014-08-30 07:31:38 -04:00
Arpit Jalan
82d4c29c88 TRIVIAL: add line break before time for post navigator 2014-08-30 16:14:00 +05:30
Jeff Atwood
7a50ba600a Merge pull request #2726 from techAPJ/patch-4 
FIX: use short date format for post navigator
 2014-08-29 23:11:31 -07:00
Arpit Jalan
3c005557e6 FIX: use short date format for post navigator 2014-08-30 11:34:33 +05:30
Jeff Atwood
4281b16616 UX: dim the new and unread education 2014-08-29 22:54:11 -07:00
cpradio
89eb03aff0 FIX: Support J/K bindings on German Keyboards 
J/K are not supported on German keyboards, shift+j and shift+k have been added to remedy this.
https://meta.discourse.org/t/keyboard-shortcuts-for-next-previous-section-do-not-work-with-german-keyboard-layout/18902
 2014-08-29 22:18:03 -04:00
cpradio
8b349b43a5 UX: Add keyboard binding for reply as new topic 
Removed extra translation in the keyboard shortcut modal window
 2014-08-29 20:10:34 -04:00
cpradio
2e200ffbf0 Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics 
Conflicts:
	config/locales/client.en.yml
 2014-08-29 20:05:59 -04:00
cpradio
875b39fb5f Merge remote-tracking branch 'origin/master' into keyboard-binding-incoming-updated-topics 2014-08-29 19:56:39 -04:00
Jeff Atwood
cb45d5fa25 Merge pull request #2724 from cpradio/key-binding-reply-new-topic 
UX: Add keyboard binding for reply as new topic
 2014-08-29 16:46:34 -07:00
Jeff Atwood
d74f94afa1 Merge pull request #2722 from cpradio/dismiss-keyboard-bindings 
UX: Add key-bindings for Dismiss New, Dismiss Posts, and Dismiss Topics
 2014-08-29 16:28:25 -07:00
cpradio
68e807f791 UX: Add keyboard binding for reply as new topic 2014-08-29 19:14:42 -04:00
cpradio
bc07bc4819 Remove incoming/updated topics logic (not sure how that got in here, but it is causing a conflict) 2014-08-29 18:19:06 -04:00
Neil Lalonde
1291e94c78 Merge pull request #2715 from cpradio/master 
UX: Add focus to menu only if it comes from a keyboard shortcut and improve keyboard functionality for search
 2014-08-29 17:04:52 -04:00
Robin Ward
6dcde9ccc3 FIX: Navigating to None was not working 2014-08-29 15:51:28 -04:00
Robin Ward
926e45d030 SECURITY: User action route was returning too much data 2014-08-29 13:46:50 -04:00
Robin Ward
16c9f073b5 FIX: Back button breaks translation of incoming stuff 2014-08-29 12:53:06 -04:00
Neil Lalonde
ec42b61a4d FIX: suspended users cannot be trust level 3 2014-08-29 12:33:34 -04:00
cpradio
8033972536 UX: Add keyboard bidning for incoming/updated topics 
Fixed the selector used to gain access to the clickable div
 2014-08-29 10:01:36 -04:00
cpradio
5ca96e741d UX: Add keyboard bidning for incoming/updated topics 2014-08-29 09:44:26 -04:00
cpradio
096bc0c0ae Merge branch 'keyboard-binding-new-topics-banner' into dismiss-keyboard-bindings 
Conflicts:
	app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
 2014-08-29 09:36:34 -04:00
cpradio
cde64580b1 Change the Dismiss keybindings to use 'x' instead of 'd' - moved it to a function binding 2014-08-29 09:35:38 -04:00
cpradio
3f085c3fd3 Change the Dismiss keybindings to use 'x' instead of 'd' 2014-08-29 09:22:47 -04:00
cpradio
ede9d1e057 Change the Dismiss keybindings to use 'x' instead of 'd' 2014-08-29 08:46:35 -04:00
cpradio
9e72b97a75 Corrected an issue with using the same ID for the header/footer of the buttons 2014-08-29 08:33:45 -04:00
cpradio
e4ce995369 FIX: Changed Dismiss New and Dismiss Posts to use d + r because p is reserved for the profile menu and n is reserved for the notifications menu 2014-08-29 08:11:23 -04:00
cpradio
ed8d828ff1 FIX: Added keyboard bindings for dismiss buttons 2014-08-29 08:04:57 -04:00
Régis Hanol
fd6dd88afb FIX: dual modal when deleting spammer in the flag modal 2014-08-29 13:05:51 +02:00
Régis Hanol
521cb6bd0d FIX: dual modal when selecting 'delete spammer' in flags section 2014-08-29 12:54:24 +02:00
Jeff Atwood
8bda8a2235 Revert "UX: stop displaying "user deleted, OK" dialog" 
This reverts commit 36405287b4.
 2014-08-29 03:49:00 -07:00
Jeff Atwood
36405287b4 UX: stop displaying "user deleted, OK" dialog 2014-08-29 03:34:23 -07:00
riking
3396e6fea3 Centralize MessageBus post updates 
After this change, only two files directly publish to MessageBus with a
topic interpolated in the channel: Post and TopicUser.
 2014-08-28 20:40:36 -07:00
cpradio
0784c52a24 FIX: Remove up/down key bindings for search results 
Up/down key bindings make it difficult to access Show More on search results.
https://meta.discourse.org/t/keyboard-users-cant-select-show-more-in-search-results/19394
 2014-08-28 21:39:19 -04:00
cpradio
3e7084743c FIX: Remove up/down key bindings for search results 
Up/down key bindings make it difficult to access Show More on search results.
https://meta.discourse.org/t/keyboard-users-cant-select-show-more-in-search-results/19394
 2014-08-28 19:58:07 -04:00
Robin Ward
9e2c72e277 Allow restoring from backups in development mode even if the setting is 
off.
 2014-08-28 17:02:48 -04:00
cpradio
1acb2a13f1 Added a:first 2014-08-28 16:06:48 -04:00
cpradio
4fd73a2b2f Set focus on site-map and user menu 
Set focus on first item in the site-map and user drop down for keyboard users, so they can quickly tab to the link/item of their choosing.
https://meta.discourse.org/t/keyboard-shortcuts-wish-list/15952
 2014-08-28 16:04:54 -04:00
Robin Ward
8a6c4234fc FIX: Re-enable searching for topic by id when using the split topic 
interface.
 2014-08-28 15:42:29 -04:00
Robin Ward
b5b13b8c5f Revert "Merge pull request #2713 from cpradio/master" 
This reverts commit a9de189682, reversing
changes made to b7ab43e454.
 2014-08-28 15:08:06 -04:00
Robin Ward
a9de189682 Merge pull request #2713 from cpradio/master 
Set focus on first item in drop down (textbox, link, whatever it may be)
 2014-08-28 14:47:38 -04:00
Robin Ward
8bf27642ad FIX: Refresh was losing top controls after bulk operation. Removed 
console.log
 2014-08-28 14:44:38 -04:00
Robin Ward
69cb5bc425 FIX: Centralize Top rendering, remove old code paths. Fix some bugs. 2014-08-28 14:34:31 -04:00
Robin Ward
30b102aa98 FIX: Show uncategorized with badge/description in the category chooser 2014-08-28 12:42:31 -04:00
cpradio
a40b08f210 Set focus on first item in drop down (textbox, link, whatever it may be) 
Set focus on first item in the drop down for keyboard users, so they can quickly tab to the link/item of their choosing.
https://meta.discourse.org/t/keyboard-shortcuts-wish-list/15952
 2014-08-28 11:33:45 -04:00
Régis Hanol
38f52f0f8e FIX: banner topic's max-width & max-height on both mobile & desktop 2014-08-28 16:15:48 +02:00
Luca Daniel
2cf92dbe7b Add translation for Romanian. 2014-08-28 14:01:14 +03:00
Sam
3a9f0445bb HACK: remove jarring scroll when hitting back from topic 2014-08-28 11:57:24 +10:00
Robin Ward
fc71662a13 FIX: Don't show topics as unread when hitting back 2014-08-27 18:01:02 -04:00
Neil Lalonde
940c0d5dbb FIX: topicCountStats was depending on the wrong properties 2014-08-27 15:58:32 -04:00
Robin Ward
f05d2ed7cf PERF: Do far fewer checks and use a lot less memory when loading more 2014-08-27 15:31:06 -04:00
Robin Ward
aab8eaac03 FIX: Double clicking quote expansion shouldn't break stuff. 2014-08-27 14:04:00 -04:00
Robin Ward
09ea159afc UX: Add link to change username on admin page 2014-08-27 13:52:01 -04:00
Robin Ward
b1c0a3d01c FIX: Retain back button scroll position even if we don't load more. 2014-08-27 13:33:52 -04:00
Arpit Jalan
3a76f9e79f FIX: allow localization in timestamp 2014-08-27 20:57:06 +05:30
Jeff Atwood
009dc7ded3 missed a spot in CSS 2014-08-27 02:58:32 -07:00
Jeff Atwood
f557f7eeb9 change fix for [quote] padding 2014-08-27 02:45:57 -07:00
Jeff Atwood
dc6dd26b10 FIX: [quote][/quote] missing top padding 2014-08-27 02:22:58 -07:00
Sam
f48b78c0bb FEATURE: Allow localization sessions 
use: I18n.verbose_localization_session()
 2014-08-27 17:50:29 +10:00
Jeff Atwood
587f7f56c8 FIX: share link pushing viewport on mobile 2014-08-27 00:46:26 -07:00
Jeff Atwood
b3d896723b Merge pull request #2706 from techAPJ/patch-2 
FIX: use short date format for timestamp
 2014-08-27 00:42:56 -07:00
Arpit Jalan
0453da6fa5 FIX: use short date format for timestamp 2014-08-27 12:56:52 +05:30
Jeff Atwood
180430de93 LAYOUT: add more space around topic map links 2014-08-27 00:24:58 -07:00
Sam
16c34c206d FEATURE: verbose localization option 2014-08-27 14:12:11 +10:00
cpradio
1678a91a60 Add shortcuts for Profile Menu and Hamburger Menu 
Added shortcuts of p and = for the profile and hamburger menu
https://meta.discourse.org/t/keyboard-shortcuts-wish-list/15952
 2014-08-26 20:30:20 -04:00
Robin Ward
105959c402 Merge pull request #2696 from riking/errors 
Fix "Server Error: [missing {{code}} value]" page
 2014-08-26 11:14:57 -04:00
Jens Maier
c58565d09f Fix: dialect block parser should not eat next block's whitespace 2014-08-26 14:11:23 +02:00
Jeff Atwood
d63c6292b3 change "Visit Profile" to just "Profile" 2014-08-26 00:37:10 -07:00
Jeff Atwood
553e0290a6 mods can use shield glyph as well, don't need two 2014-08-25 23:49:39 -07:00
Jeff Atwood
95f9943d28 remove <br/> from top non-mobile layout 2014-08-25 22:42:41 -07:00
Jeff Atwood
b6b0cd5c15 add glyph to move posts to new topic button 2014-08-25 22:38:28 -07:00
Sam
3ea76815e4 Merge pull request #2686 from meglio/ru-plurals 
Update RU pluralization to use 3 keys: one, few, other (as by Transifex)
 2014-08-26 12:42:59 +10:00
Sam
c412d74369 HACK: suppress "1 reply" when directly below for quotes posts 2014-08-26 12:00:16 +10:00
Sam
f331855482 FIX: username autocomplete more reliable, cancel old reqs 2014-08-26 11:32:50 +10:00
riking
5261f2e751 Fix "Server Error: [missing {{code}} value]" page 
The translation was expecting a non-existent parameter.
 2014-08-25 17:20:48 -07:00
Sam
96af48d903 Merge pull request #2694 from riking/logster-link 
Fix Logster link by bypassing Ember router
 2014-08-26 09:30:16 +10:00
riking
4db5c8d617 Add data-auto-route=true to Logster link 2014-08-25 15:59:48 -07:00
Robin Ward
a568696098 FIX: Add the <br/> without removing stuff 2014-08-25 18:56:27 -04:00
Robin Ward
939b7ce7e2 Revert "FIX: Added <br/> for @coding-horror" 
This reverts commit d62218fb5b.
 2014-08-25 18:56:27 -04:00
Sam
64331e2ac1 row style is common, its the way we clear divs 2014-08-26 07:41:29 +10:00
Robin Ward
d62218fb5b FIX: Added <br/> for @coding-horror 2014-08-25 17:21:01 -04:00
Robin Ward
c820c65172 Merge pull request #2692 from riking/sorted_badges 
Sort the badges on the user profile page
 2014-08-25 15:56:27 -04:00
Jeff Atwood
de1e0345df proper fix for top page bottom buttons on mobile 2014-08-25 12:55:45 -07:00
riking
234956234b Fix badge type ordering 2014-08-25 12:48:31 -07:00
Jeff Atwood
a11cc46c73 remove global margin right on mobile btn 2014-08-25 12:47:02 -07:00
riking
99c11e2184 Sort the badges on the user profile page 
Also clean up UserBadgesController so it isn't doing two things in one
method
 2014-08-25 12:40:51 -07:00
Jeff Atwood
024c503870 mobile login tweaks 2014-08-25 12:38:27 -07:00
Jeff Atwood
3a010c34cc smallenate anon drop-down topic counts 2014-08-25 12:14:47 -07:00
Robin Ward
0fba445bc1 FIX: Broken build 2014-08-25 13:35:40 -04:00
Robin Ward
f10f9585ae Better Support for whitelisting caja tags 2014-08-25 13:11:20 -04:00
Régis Hanol
7aaf718cf3 update bbcode dialect and fix vBulletin importer 2014-08-25 10:48:29 +02:00
Jeff Atwood
bd66c67398 whoops, used font awesome 3.2 styles :( 2014-08-24 22:20:59 -07:00
Jeff Atwood
01853fb9d3 replace trophy with shield to indicate admin 2014-08-24 22:05:11 -07:00
Sam
56a0a40175 Merge pull request #2677 from keskuskentta/fi_locale 
Add Finnish
 2014-08-25 08:44:00 +10:00
Sam
643d0dfc13 FIX: use CDN when expanding avatar templates 2014-08-25 08:18:41 +10:00
Anton Andriyevskyy
c42a5551a1 Update RU pluralization to use 3 keys: one, few, other (as by Transifex) 2014-08-23 15:28:14 +03:00
Sam
af71307363 Add 10px margin for buttons in mobile 2014-08-23 10:41:48 +10:00
Sam
e0a74e336a Add SSO diagnostics 2014-08-23 10:34:48 +10:00
Jeff Atwood
ae9fcf17ef make period chooser (/top h2) unselectable on touch 2014-08-22 17:01:12 -07:00
Robin Ward
db376d16d3 FIX: Topic entrance widget wasn't disappearing 2014-08-22 18:45:48 -04:00
Neil Lalonde
bbb358b356 Add likes given and likes received requirement for being TL3. Configure with site settings leader_requires_likes_given and leader_requires_likes_received. 2014-08-22 17:33:39 -04:00
Neil Lalonde
00c28f2391 Show total likes given. Put likes given/received and flags given/received together. 2014-08-22 15:23:19 -04:00
Robin Ward
2ae46b4742 REMOVE: Auto quoting confused more people than it helped. 2014-08-22 14:51:31 -04:00
Neil Lalonde
dafc63e3a0 Show how many likes users received in the last 100 days on their admin profile page 2014-08-22 14:37:07 -04:00
Robin Ward
300dbdc88b FIX: BBCode contents can span multiple lines 2014-08-22 14:32:29 -04:00
Neil Lalonde
7756b72a59 FIX: after bulk change category, refresh topic list 2014-08-22 13:01:08 -04:00
Robin Ward
104b39540a FIX: BBCode with params couldn't span lines 2014-08-22 12:14:10 -04:00
Kris Aubuchon
a8e6e1e3d5 adding highlight back to topic-list 2014-08-22 10:45:51 -04:00