Arpit Jalan
9793ea2c8a
UX: change Dismiss button title and add tooltip
2015-10-22 07:52:47 +05:30
Neil Lalonde
ca98f66f7e
FIX: wrong root path on subfolder installs
2015-10-21 13:13:19 -04:00
Neil Lalonde
976692b387
FIX: moderators need to choose a category when uncategorized topics are no allowed
2015-10-20 15:55:17 -04:00
Robin Ward
3ee1dee3eb
UX: If you only had a checkbox user field, it was hoisting Location
2015-10-20 14:55:19 -04:00
Robin Ward
f8ff6fc0b5
FIX: Typo in teardown of d-editor
2015-10-20 12:42:14 -04:00
Robin Ward
0428bacfa9
SECURITY: A user could XSS themselves on their preference page
2015-10-20 12:09:59 -04:00
Régis Hanol
e08c9b8c49
Merge pull request #3867 from cpradio/fix-pin-unpin-shortcut
...
FIX: Fix the shortcut shift+p for pinning/unpinning a topic
2015-10-20 16:06:21 +02:00
cpradio
d2502bd127
FIX: Fix the shortcut shift+p for pinning/unpinning a topic
2015-10-20 09:40:43 -04:00
Régis Hanol
227689d77b
Merge pull request #3866 from cpradio/fix-broken-keyboard-shortcuts
...
FIX: Fix the shortcuts shift+j and shift+k
2015-10-20 15:21:29 +02:00
cpradio
35496cae4f
FIX: Fix the shortcuts shift+j and shift+k
2015-10-20 09:17:40 -04:00
Arpit Jalan
4a880a758f
FEATURE: new Dismiss posts/topics modal
2015-10-20 16:07:02 +05:30
Jeff Atwood
5d341bef57
remove valign-helper hack, let's go flexbox
2015-10-20 00:46:24 -07:00
Guo Xiang Tan
97d11b6656
FIX: Emoji toolbar too wide on mobile.
2015-10-20 09:19:45 +08:00
Régis Hanol
c618478e88
FIX: sorting in a category isn't working
2015-10-19 19:04:47 +02:00
Robin Ward
cca48ce22f
FIX: Default selectionStart/end differences in PhantomJS
2015-10-19 12:18:26 -04:00
Robin Ward
94b60e62a2
FEATURE: New markdown editor re-written in Ember
...
Note this commit leaves out the biggest occurrence of the editor
which is the post/topic composer.
To avoid major breakage, this replaces it everywhere else it was
used:
* User preferences (About Me)
* Admin Customizations > Text Content
* Category Templates
* Editing Queued Posts
A future commit will replace the main composer with this editor
and will remove the unused pagedown code.
2015-10-19 11:01:20 -04:00
James D
44b04e4521
Make @mentions following a slash link to usercards
...
A slash preceding an @mention was causing the markup for the usercard
link to not be generated. For example, the markdown
Pinging @bob/@joe
Would generate a usercard for @bob, but not @joe.
2015-10-16 19:18:46 -04:00
Robin Ward
0547fcf799
UX: Show a loading spinner when loading an post you're editing.
...
cc @coding-horror
2015-10-16 14:57:53 -04:00
Neil Lalonde
14bfeec25e
Merge pull request #3844 from gschlager/patch-1
...
FIX: Pressing Ctrl+F twice should show browser find
2015-10-16 13:16:55 -04:00
Guo Xiang Tan
8e8e787ad0
FIX: Whitelist parentheses and brackets in autocomplete.
2015-10-16 13:17:51 +08:00
Robin Ward
e8424bd54e
SECURITY: Moderators should not see API keys
2015-10-14 15:40:23 -04:00
Robin Ward
a527c58c7d
UX: Show a nicer "Log In" screen if the user follows /my/preferences
2015-10-14 13:39:31 -04:00
Robin Ward
d66a545dd2
FIX: /my/preferences
should prompt users to log in
2015-10-14 12:40:13 -04:00
Neil Lalonde
37c783c348
Merge pull request #3851 from xfalcox/patch-3
...
Fix impersonate redirect on subfolder install
2015-10-14 11:02:41 -04:00
Robin Ward
bf53938ab7
FIX: On IOS9 the topic entrance was resizing the topic list
2015-10-13 16:59:32 -04:00
Rafael dos Santos Silva
dfed999ec8
Remove getUrl on impersonate redirect
...
As said by @riking @nlalonde and @ZogStriP
2015-10-13 16:52:35 -03:00
Robin Ward
ae4ef1e70f
Add spinner to composer saving
2015-10-13 13:06:24 -04:00
Régis Hanol
7ceecb0989
Merge pull request #3852 from tgxworld/fix_conditions_when_flagging_message
...
FIX: Conditions broken in flagging modals.
2015-10-13 11:02:35 +02:00
Guo Xiang Tan
aaff46d67f
FIX: Conditions broken in flagging modals.
2015-10-13 16:56:32 +08:00
Régis Hanol
d863defd3b
convert emoji toolbar to use safe local storage
2015-10-13 10:52:42 +02:00
Régis Hanol
7c369ab2b7
convert desktop notifications to use safe localStorage
2015-10-13 10:34:44 +02:00
Régis Hanol
cafff9bf01
FIX: ensure we can write to the localStorage
2015-10-13 10:21:49 +02:00
Sam
fab51496cb
correct full screen login feature
2015-10-13 13:11:49 +11:00
Sam
b3aebca406
FEATURE: allow auto provider to specify "full screen login"
...
this feature means we attempt to log in without opening a frame.
2015-10-13 12:23:34 +11:00
Régis Hanol
1a3e9cf571
FIX: sorting was not working in /top
...
PERF: remove double request when sorting topics lists
2015-10-12 21:58:40 +02:00
Rafael dos Santos Silva
ccd46bf431
Fix impersonate redirect on subfolder install
...
Impersonate was redirecting to base site, instead of Discourse when using subfolder install.
2015-10-12 16:14:39 -03:00
Sam
e17978a203
FIX: do not notify in title if you created the post
2015-10-12 12:45:04 +11:00
Arpit Jalan
b72434d024
FEATURE: add 'change ownership' button in post admin wrench
2015-10-11 23:53:45 +05:30
Gerhard Schlager
11a6b61cbd
Remove example CSS selectors from locale file
2015-10-11 14:48:37 +02:00
Gerhard Schlager
d10741170f
FIX: Pressing Ctrl+F twice should show browser find
2015-10-08 22:30:33 +02:00
Sam
845c33e4b1
SECURITY: XSS in search results term
...
Thanks to Jerbi Nessim
2015-10-07 10:52:24 +11:00
Jeff Atwood
af7d51e923
Merge pull request #3831 from tgxworld/fix_emoji_toolbar
...
UX: Emoji toolbar on mobile.
2015-10-05 17:30:19 +11:00
Régis Hanol
9f14c197f2
less errors in js tests suite
2015-10-05 17:04:19 +11:00
Sam Saffron
4ade6138d3
FIX: suggested topics showing up when last post not loaded
...
New fix means that was show suggested
1. If all posts are loaded
2. If we are in the process of loading 1 more post due to message bus
2015-10-05 16:10:00 +11:00
scossar
71bc7d2e89
fix typo
2015-10-04 10:49:58 -07:00
Guo Xiang Tan
8b59f76f59
FIX: Don't append when there is nothing to append.
2015-10-03 17:22:13 +08:00
Guo Xiang Tan
904a36eea2
UX: Emoji Toolbar was too wide on mobile.
2015-10-03 17:08:13 +08:00
Régis Hanol
2c384aec83
FIX: reply as new topic wasn't working in FF when the post was only composed of an image
2015-10-01 21:43:43 +02:00
Régis Hanol
9bb7a3884b
fix the build
2015-10-01 01:17:34 +02:00
Jeff Atwood
0b295150e7
UX: clearer delete user action buttons
2015-09-30 16:06:55 -07:00
Régis Hanol
25cb19eeca
FIX: hide 'Quote Reply' button when there's no selection anymore on iOS
2015-10-01 00:11:18 +02:00
Robin Ward
33e58c0587
FIX: You can click to see your own PMs from flags
...
Also refactors post action users to be a new object type since they can
have `post_url` which is not a field of a `User`
2015-09-30 12:28:55 -04:00
Robin Ward
4986314122
Add "more..." to emoji popup in composer.
2015-09-29 16:16:52 -04:00
Régis Hanol
321d1bd0a9
FIX: allow for more than 1 markdown editor instances
2015-09-29 20:21:47 +02:00
Robin Ward
3cd23b45af
PERF: Only render 30 site settings in "All" when filtering
2015-09-29 13:34:09 -04:00
Robin Ward
8e86dbe560
FIX: Avatars weren't tappable on mobile
2015-09-29 12:58:19 -04:00
Robin Ward
3aaa9a8722
Restrict access to the Email admin tab to Admins
2015-09-29 12:37:46 -04:00
Robin Ward
f734a0731e
Use capabilities
object for browser sniffing
2015-09-28 11:44:37 -04:00
Régis Hanol
a7f2741674
FIX: only show the backups link in dashboard to administrators
2015-09-28 16:51:12 +02:00
Régis Hanol
2ca8d08acb
FIX: only display 'show settings' buttons to admins
2015-09-28 16:23:41 +02:00
Régis Hanol
0f49224a60
FIX: don't show the 'new topics' banner in Top
2015-09-28 12:03:37 +02:00
Sam
f269514b6f
FIX: Android is bad at firing touchend, which makes quoting impossible
2015-09-28 18:29:08 +10:00
Sam
855419064c
FIX: don't use Safari hack on Windows Phone
2015-09-28 16:50:24 +10:00
Arpit Jalan
f26bd48ba0
UX: do not default link title tag to label
2015-09-28 12:02:32 +05:30
Robin Ward
1e2f2a244c
FIX: Clicking Reply with quoted text should work like quote button
...
Before this patch, it would ask you if you were sure you wanted to
cancel your draft even if you didn't input anything.
2015-09-25 14:30:20 -04:00
Robin Ward
c4b1b848bc
More extension points for login buttons, used by OAuth2 plugin
2015-09-25 11:29:40 -04:00
Régis Hanol
9e2934f635
FIX: replaceMarkdown should be smart about current caret position
2015-09-25 17:21:44 +02:00
Sam
a890d45cb6
FIX: disable cloaked view while running ios positioning hack
2015-09-25 16:42:57 +10:00
Sam
150ad01111
improve UX remove username said if we have a title
2015-09-25 14:18:38 +10:00
Sam
e5234b38b8
FEATURE: add title expansion for off topic quotes
2015-09-25 13:35:14 +10:00
Sam
7ca75a88ce
UX: always show logout link in user menu, use CSS to hide
...
.menu-panel .logout-link {display: none}
2015-09-25 12:15:34 +10:00
Robin Ward
a24afe30d7
FIX: Reply as new topic was broken when you quoted something
2015-09-24 14:44:15 -04:00
Régis Hanol
a8081c8dd0
FIX: notifications & messages were missing from user profile
2015-09-24 19:04:29 +02:00
Régis Hanol
f29cd5f192
Merge pull request #3808 from gschlager/i18n-patch4
...
FIX: Use translated badge name and slug within notifications
2015-09-24 09:46:34 +02:00
Régis Hanol
3acb00c2a3
Merge pull request #3809 from gschlager/patch1
...
FIX: Only enabled badges can be granted
2015-09-24 09:45:54 +02:00
Sam
e817267dd2
FIX: when replying to a expanded reply, correctly attribute author
2015-09-24 15:32:09 +10:00
Gerhard Schlager
7d5e2d46c5
FIX: Only enabled badges can be granted
...
FIX: Sort badges by displayName
2015-09-24 02:06:04 +02:00
Gerhard Schlager
445bd033d2
FIX: Use correct badge slug within notifications
2015-09-24 00:49:13 +02:00
Neil Lalonde
690f839619
FIX: uncategorized topics list is 404 page when allow_uncategorized_topics is turned off
2015-09-23 15:21:36 -04:00
Robin Ward
4d6c99cb3d
FIX: On mobile flags could cover the topic map
2015-09-23 14:43:15 -04:00
Neil Lalonde
5ca26a7707
FEATURE: add site setting use_admin_ip_whitelist to enable/disable the whitelisting of admins by IP address
2015-09-23 12:15:08 -04:00
Robin Ward
7d4dbc9962
Give example values for CSS rules in embedding
2015-09-23 12:10:15 -04:00
Robin Ward
6b48647fc7
FIX: Double load sometimes on topic lists
2015-09-23 11:48:58 -04:00
Robin Ward
dcdf76a662
FIX: Category Logo preview should not repeat
2015-09-23 11:34:23 -04:00
Régis Hanol
e37ecb9d2f
FIX: pikaday wasn't working when using the mouse with a touch-enabled monitor
2015-09-23 15:35:22 +02:00
Régis Hanol
36309e50cc
Merge pull request #3767 from tgxworld/track_user_profile_views
...
Track user profile views
2015-09-23 11:38:18 +02:00
Régis Hanol
64ef5f79bd
Merge pull request #3788 from getabetterpic/fix-create-topic-when-insufficient-category-permissions
...
Fix bug where create topic is suggested when insufficient permissions
2015-09-23 11:36:58 +02:00
Régis Hanol
ae5134f88e
Merge pull request #3791 from gschlager/i18n-patch2
...
FIX: Slugs for badges
2015-09-23 11:35:38 +02:00
Régis Hanol
1aad58b642
Merge pull request #3781 from tgxworld/feature_log_category_settings
...
Feature log category settings
2015-09-23 11:34:08 +02:00
Guo Xiang Tan
a253bf8698
FIX: Don't subscribe to Desktop Notifications on mobile.
2015-09-23 16:08:38 +08:00
Robin Ward
79beb9f409
FIX: You could set reply_to_post_number
when replying as a new topic
2015-09-22 13:32:19 -04:00
Régis Hanol
e65ddc6c25
FIX: immediately remove upload placeholder when cancelling the upload
...
FIX: prevent post submit when something is uploading
2015-09-22 18:16:53 +02:00
Régis Hanol
6a4b9a3d38
FIX: remove upload placeholder when cancelling the upload
2015-09-22 17:58:12 +02:00
Régis Hanol
a6934a200e
FIX: don't use the filename for the upload placeholder
2015-09-22 17:45:55 +02:00
Sam
6e384cd4c7
highlight title in full page search
2015-09-22 07:39:44 +10:00
Robin Ward
b6155889d5
FIX: Respect sort order when user fields are shown publically
2015-09-21 15:26:11 -04:00
Kane York
c3aaeedc62
FEATURE: Make it easy to override the home logo
2015-09-21 11:47:23 -07:00
Robin Ward
cc0f76e60a
Merge pull request #3798 from riking/patch-6
...
FIX: :( page was never showing the URL
2015-09-21 14:45:42 -04:00
Kane York
e36c0966d0
FIX: :( page was never showing the URL
2015-09-21 11:38:37 -07:00
Régis Hanol
fe656fb04d
FIX: select appropriate period when redirecting to top
2015-09-21 20:28:20 +02:00
Robin Ward
b49e9fb174
FIX: Load order of TopicTrackingState
was off
2015-09-21 14:15:25 -04:00
Robin Ward
9f6ce653a9
FIX: Selecting posts was broken on IOS9 iPad
2015-09-21 13:50:05 -04:00
Régis Hanol
af7f00099f
FIX: uploading a file with a non-ASCII character wasn't removing the placeholder
2015-09-21 16:17:25 +02:00
Guo Xiang Tan
e3d5cc54a1
UX: Disable button when Notification permission is denied.
2015-09-21 18:14:13 +08:00
Sam
5a9517af5e
correct build failure
2015-09-21 10:57:48 +10:00
Sam
f74c21d2e7
FIX: tracking of new/unread/latest in category/subcategory was broken
2015-09-21 10:36:20 +10:00
Sam
da23735062
FEATURE: Add title notification to topics
2015-09-21 08:28:45 +10:00
Sam
330a5e80cd
FIX: regression, not updating incoming count in title
2015-09-21 08:13:12 +10:00
Gerhard Schlager
4cb070f28c
FIX: Use translated badge names for slugs
...
FIX: Use configured slug generater method for badges
2015-09-19 22:41:48 +02:00
Gerhard Schlager
caa1a8231b
FIX: Show translated badge name
2015-09-19 21:33:20 +02:00
Arpit Jalan
0717517332
UX: show user full name on admin profile
2015-09-19 18:08:04 +05:30
getabetterpic
519a50e3a5
Fix bug where create topic is suggested when insufficient permissions
...
When a user is viewing a category they do not have permission to create
a topic in, they are still prompted to create a topic if they are at the
bottom of the topics. This fixes the issue, as well as disabling the
New Topic button if they don't have permission to create a topic for
that category.
2015-09-18 19:27:49 -04:00
Robin Ward
c1d321369b
We don't need to allow track
and meter
2015-09-18 15:37:56 -04:00
Arpit Jalan
7abd4687e2
FIX: redirect to original URL when logging in via OAuth
2015-09-18 18:34:57 +05:30
Sam
a4ace3f08e
FEATURE: ui for ordering search results in full page mode
2015-09-18 17:16:53 +10:00
Guo Xiang Tan
74ca8c3318
UX: Allow users to open search in new tab.
2015-09-18 11:14:56 +08:00
Guo Xiang Tan
f39b9124b6
FEATURE: Log staff actions for Category changes.
2015-09-18 10:53:08 +08:00
Guo Xiang Tan
c29b7ce498
FIX: Set saving to false about model has been saved.
2015-09-18 10:52:49 +08:00
Guo Xiang Tan
25c7450ea7
Use existing function to extract error message.
2015-09-18 10:52:49 +08:00
Sam
086d31d53b
UX: when on full page search header search should not pop open
...
fix `/` handling in full page search to highlight search term
2015-09-18 12:20:59 +10:00
Jeff Atwood
0dc11e3a26
remove useless extra <div> around topic-avatar
2015-09-17 14:30:28 -07:00
Robin Ward
4eaaf4198c
FIX: Liking a post shouldn't contract who liked it
2015-09-17 16:29:17 -04:00
Neil Lalonde
0aee7b8211
move age beside title on mobile categories page
2015-09-17 15:25:37 -04:00
Régis Hanol
07e7b07b63
FIX: refreshing gravatar wasn't working
2015-09-17 19:42:44 +02:00
Robin Ward
b45af1d6c8
FIX: Replies to whispers should default to whispers
2015-09-17 11:48:37 -04:00
Robin Ward
0a78cdbd83
FIX: Clicking users in Private Messages Map should show card
2015-09-17 11:38:21 -04:00
getabetterpic
87725206cd
Fix bug when adding new custom group
...
When adding a new group, if Delete was clicked before saving the
group, the modal would come up, but the Yes confirmation would
do nothing. This fixes that by taking an approach similar to the
Badges and checks to see if the Group is new, and if it is, just
returns to the index instead of invoking the confirm modal.
This also fixes the redirect after saving a new Group.
2015-09-17 10:23:58 -04:00
Régis Hanol
28d3260b30
Merge pull request #3780 from tgxworld/fix_mistake
...
FIX: Only cancel composer for when editing first post.
2015-09-17 09:58:46 +02:00
Sam
183d72f2e9
correct composer in iPad landscape
2015-09-17 17:19:50 +10:00
Sam
527c9158eb
we must hide the header for iPad
2015-09-17 13:19:08 +10:00
Sam
e254030760
FIX: header undocking when opening mobile view
...
FIX: make it possible to upload an image on iphone
FIX: mobile can now upload more than 1 image
2015-09-17 13:05:31 +10:00
Sam
faada383fa
Merge pull request #3779 from riking/signup-cta
...
Allow emoji in translated strings
2015-09-17 11:34:41 +10:00
Kane York
7e8f4286e3
FEATURE: Allow emoji in some translated strings
2015-09-16 18:33:17 -07:00
Guo Xiang Tan
bce8d0632a
FIX: Only cancel composer for when editing first post.
2015-09-17 09:24:02 +08:00
Sam
ec4a1bb2c4
FIX: page tracking was not properly tracking transitions
...
PERF: move closure to self contained method so env is released earlier.
2015-09-17 11:06:33 +10:00
Sam
975837cf0d
Merge pull request #3769 from tgxworld/disable_button_while_searching
...
UX: Disable button while searching.
2015-09-17 10:01:27 +10:00
Kane York
4e587eb68f
Store nothing if anon cta is disabled
2015-09-16 16:32:15 -07:00
Kane York
e16eebb48c
FIX: Don't even bother checking visit count
2015-09-16 15:35:50 -07:00
Kane York
102b6f6fca
FIX: Reduce requirements for signup call-to-action
...
1 visit, 5 minutes, 3 topics
2015-09-16 15:34:39 -07:00
Neil Lalonde
a2e51b0715
FIX: too few topics/posts notice will only show what needs to be done
2015-09-16 17:12:11 -04:00
Neil Lalonde
f321dd2046
UX: mobile /categories page new and unread styles match other topic lists
2015-09-16 17:12:11 -04:00
Régis Hanol
24f09edbed
UX: replace cancel uploading link with icon + fix color (Take 2)
2015-09-16 22:04:48 +02:00
Robin Ward
2546ca3c8e
FIX: Remove attributes
observer, doesn't work in FF/Safari
2015-09-16 15:36:12 -04:00
Robin Ward
97b608f090
FIX: Allow desktop chrome to scroll to bottom of menu panel
2015-09-16 15:30:40 -04:00
Robin Ward
52f7ab3a06
Revert "UX: replace cancel uploading link with icon + fix color"
...
This reverts commit 1689f436d9
.
2015-09-16 15:15:07 -04:00
Robin Ward
63f0247d21
FIX: Better height estimation / observing for menu panels
2015-09-16 14:46:53 -04:00
Robin Ward
d61cfbe2aa
Merge pull request #3773 from tgxworld/fix_composer_bug
...
FIX: Composer being abandoned when transiting between routes.
2015-09-16 14:34:46 -04:00
Robin Ward
62c20ff5f2
Merge pull request #3760 from riking/signup-cta
...
Signup cta
2015-09-16 14:33:25 -04:00
Robin Ward
91db481fae
Merge pull request #3774 from tgxworld/meta_keys_header
...
Fixes for headers.
2015-09-16 14:33:08 -04:00
Guo Xiang Tan
a845e0c498
FIX: Highlight posts was broken.
2015-09-17 01:37:48 +08:00
Guo Xiang Tan
2958b4b0a1
FIX: Don't dismiss dropdown when searching within posts context.
2015-09-17 01:22:19 +08:00
Kane York
390af7118a
Merge branch 'master' into signup-cta
...
Conflicts:
app/assets/javascripts/discourse/templates/topic.hbs
2015-09-16 10:06:47 -07:00
Robin Ward
59c628735f
Use container for appending views in Discourse.ContainerView
2015-09-16 13:05:22 -04:00
Guo Xiang Tan
685471303a
FIX: Don't dismiss headers on modifier keys.
2015-09-17 00:38:05 +08:00
Guo Xiang Tan
a966546843
FIX: Cancel and reopen composer when editing first post.
2015-09-17 00:13:24 +08:00
Régis Hanol
1689f436d9
UX: replace cancel uploading link with icon + fix color
2015-09-16 17:54:09 +02:00
Robin Ward
f427b6639b
FIX: Error showing Unread
posts
2015-09-16 10:43:36 -04:00
Régis Hanol
5277ec1ac0
FIX: ensure we have a bucket before enabling backups to S3
2015-09-16 15:55:26 +02:00
Régis Hanol
cc75890cd4
UX: disable 'Hide results' button when poll is closed
2015-09-16 13:01:08 +02:00
Guo Xiang Tan
28f0a012ca
FIX: Composer being abandoned when transiting between routes.
2015-09-16 18:17:57 +08:00
Sam
66ec6b6e17
FIX: not counting new/unread on categories
2015-09-16 17:41:53 +10:00
Guo Xiang Tan
7acc93b2a0
FEATURE: Track user profile views.
2015-09-16 14:48:31 +08:00
Guo Xiang Tan
5d95b38c65
UX: Disable button while searching.
2015-09-16 14:47:35 +08:00
Sam
afdb15f99f
fix search screen looks white
2015-09-16 15:02:57 +10:00
Sam
77895473e5
don't select text on focus
2015-09-16 14:40:44 +10:00
Sam
31d801ce2c
don't blur on autocomplete click
2015-09-16 13:16:08 +10:00
Sam
7db4ddcb66
correct disappering header on mobile compose
2015-09-16 12:50:42 +10:00
Sam
0b2fa2b0af
FIX: admin menu rendered at incorrect spot
...
make sure we don't unsubscribe all events when menu is destroyed
2015-09-16 11:37:56 +10:00
Sam
3215273091
Merge pull request #3771 from riking/category-reorder
...
Do fix positions upon opening dialog
2015-09-16 11:01:06 +10:00
Sam
ca97b325fd
FIX: moderators should not have a link to site settings
2015-09-16 09:46:57 +10:00
Sam
ded23cc9c5
FIX: don't auto select context on mobile
2015-09-16 09:02:53 +10:00
Sam
c9398eaef9
fix comment
2015-09-16 08:55:05 +10:00
Sam
59c12ce35b
Stop showing wrench for non admins on topics
2015-09-16 08:51:28 +10:00
Robin Ward
975edceff4
Add semi colon linting to Javascript
2015-09-15 17:08:50 -04:00
Kane York
2fa801c014
Do fix positions upon opening dialog
2015-09-15 14:06:20 -07:00
Kane York
fc8539cb90
Merge branch 'master' into signup-cta
...
Conflicts:
.eslintignore
2015-09-15 13:59:36 -07:00
Robin Ward
24991c4016
FIX: ESLint failure
2015-09-15 16:57:57 -04:00
Neil Lalonde
41025be8f7
add download icon
2015-09-15 16:52:46 -04:00
Kane York
d47f1db2be
Merge branch 'master' into signup-cta
...
Conflicts:
app/assets/javascripts/discourse/templates/topic.hbs
2015-09-15 13:52:12 -07:00
Neil Lalonde
b4a724e80a
FEATURE: export dashboard reports to csv file
2015-09-15 16:45:10 -04:00
Robin Ward
b12ace5f9d
FEATURE: Add staff gear icon to composer with options
2015-09-15 16:42:04 -04:00
Kane York
6be78861ca
Merge branch 'master' into signup-cta
...
Conflicts:
app/assets/javascripts/discourse/lib/key-value-store.js.es6
2015-09-15 12:26:25 -07:00
Kane York
41721b0898
Rename variables
2015-09-15 12:25:29 -07:00
Kane York
62444b9a13
Fix the visit tracking logic
2015-09-15 12:25:12 -07:00
Robin Ward
91f3e8e724
For now, restrict whispering to staff only.
2015-09-15 12:29:32 -04:00
Neil Lalonde
721b282d3c
Merge pull request #3701 from xfalcox/patch-1
...
Fix same domains links on subfolder installs
2015-09-15 11:49:09 -04:00
Robin Ward
72f2454290
FIX: Auto close was broken
2015-09-15 11:09:20 -04:00
Régis Hanol
0de00308af
FIX: categories' notification_level wasn't serialized when hitting /categories
2015-09-15 14:58:22 +02:00
Sam
4758144f6a
FIX: avoid horizontal scrollbar on narrow windows
2015-09-15 15:35:58 +10:00
Sam
24520937aa
FEATURE: improve safari editor hack
2015-09-15 13:09:12 +10:00
Sam
e0562894a8
FEATURE: if there is only one category, don't show the category picker
2015-09-15 10:52:42 +10:00
Neil Lalonde
3ebad3e294
show a dot and reply count for new topics on mobile
2015-09-14 18:56:38 -04:00
Sam
8bcb22f52d
Merge pull request #3723 from tgxworld/remove_sequential_rendering_of_time_gap
...
FIX: Timegap only shows up for sequential posts.
2015-09-15 08:28:45 +10:00
Rafael dos Santos Silva
4e39f9662d
Rewrite origin so it matches original behavior
...
As suggested by @nlalonde
2015-09-14 18:29:39 -03:00
Robin Ward
a8b3010617
FIX: Pagination was broken for groups
2015-09-14 15:54:48 -04:00
Régis Hanol
edf54979e4
UX: don't show the top period in the navigation bar since it has its own dropdown
2015-09-14 21:54:39 +02:00
Robin Ward
1853829471
FIX: When switching discovery routes, fill the screen if content changes
2015-09-14 13:52:21 -04:00
Régis Hanol
48c3fa423a
FIX: auto-focus input field on Safari was closing the modal
2015-09-14 12:39:46 +02:00
Kane York
a5f906db69
Merge branch 'master' into category-reorder
2015-09-13 19:07:36 -07:00
Guo Xiang Tan
c1deee772b
UX: Autofocus when input is empty.
2015-09-13 10:06:21 +08:00
Guo Xiang Tan
2ae0ef0ad9
UX: Select search term when focus returns to search box.
2015-09-13 08:56:40 +08:00
Guo Xiang Tan
b4974f5876
UX: Don't allow search if searchTerm is not valid.
2015-09-13 08:56:20 +08:00
Jeff Atwood
4252a2ee1e
switch to eye-slash on whisper, similar to unlisted
2015-09-11 16:53:20 -07:00
Robin Ward
5af0f5f80e
FEATURE: Whisper posts
2015-09-11 14:05:21 -04:00
Robin Ward
62cc029886
FIX: Support using enter to change the hash, clicks should update hash
2015-09-11 12:47:44 -04:00
Kane York
42263ac969
use translations (doh)
2015-09-11 09:46:54 -07:00
Kane York
b3913b5692
doh, computed.or
2015-09-11 09:36:03 -07:00
Kane York
fc5e157395
Sane sendAction() behavior
2015-09-11 09:34:20 -07:00
Robin Ward
7454722247
Merge pull request #3747 from scossar/reorder-menu-components-in-markup
...
FIX: remove 'left: auto' for slide-in menu (required for RTL layouts)
2015-09-11 12:23:16 -04:00
Robin Ward
4f5d42ca69
Merge pull request #3749 from riking/patch-1
...
FIX: Don't allow editing seeded category security settings
2015-09-11 12:22:58 -04:00
Neil Lalonde
3c9a818a2f
fix broken js tests
2015-09-11 12:22:34 -04:00
Neil Lalonde
637b110e76
use setter in topic-tracking-state or else get assertion error
2015-09-11 11:38:39 -04:00
Neil Lalonde
4b43edee91
UX: mobile topic list and suggested topics: show new/unread counts OR total post count, not both.
2015-09-11 11:38:39 -04:00
Régis Hanol
18d7c1c75d
fix the build - take 2
2015-09-11 15:47:48 +02:00
Régis Hanol
8128abe6b9
ES6ify user preferences controller
2015-09-11 15:10:56 +02:00
Régis Hanol
a28df55518
fix the build
2015-09-11 15:10:56 +02:00
Régis Hanol
93f9dcfcec
FIX: don't overwrite custom uploaded avatar when selecting gravatar
...
FIX: remove unecessary serialized fields
2015-09-11 15:10:56 +02:00
Régis Hanol
569f2815d1
FIX: ensure we still works with cookies off
2015-09-11 15:10:56 +02:00
Régis Hanol
0c58f08207
FIX: profile picture selector
2015-09-11 15:10:56 +02:00
Sam
6437cd0341
FEATURE: add support for generic external avatar services
...
This changes it so we only ship an avatar template down to the client
it has no magic, all it knows is how to plug in size
2015-09-11 15:10:56 +02:00
Sam
90d49d1497
correct paths used for external service
2015-09-11 13:18:07 +10:00
Kane York
aca70805f1
FIX: Discourse.BaseUri should not default to /
2015-09-10 17:34:08 -07:00
Régis Hanol
f6380c66ef
oooops
2015-09-11 02:15:45 +02:00
Régis Hanol
2742602254
FEATURE: support for external letter avatars service
2015-09-11 02:12:40 +02:00
Régis Hanol
e43034f08f
Revert "FEATURE: SVG letter avatars (based on @eviltrout's spike)"
...
This reverts commit cd77465788
.
2015-09-11 00:23:52 +02:00
Régis Hanol
cd77465788
FEATURE: SVG letter avatars (based on @eviltrout's spike)
2015-09-11 00:11:48 +02:00
Kane York
f36dcb6a62
Fix build
2015-09-10 14:21:36 -07:00
Kane York
a9d10f454b
Oop
2015-09-10 14:12:08 -07:00
Kane York
d86d4752cb
FIX: Don't allow editing seeded category security settings
2015-09-10 14:04:21 -07:00
Kane York
c038758f8c
FIX: Several fixes related to category reorder
...
- Move "New Category" and "Reorder Categories" into a dropdown
- Always show "New Topic" on categories page, even for admins
- Make category reorder modal full-height (.full-height-modal)
- Move category reorder stylesheet out of admin stylesheet
2015-09-10 13:42:10 -07:00
Kane York
0c5fb207e9
FIX: Fix behavior of category reorder dialog
2015-09-10 13:04:25 -07:00
scossar
20c8bb0494
remove hardcoded left: auto
2015-09-10 11:51:47 -07:00
Robin Ward
9224afacaf
FIX: Don't put the FAQ as "New" if there is a custom faq_url
...
If we do this, it's impossible to ever mark it as read.
2015-09-10 14:01:55 -04:00
scossar
d2a177f1dd
change menu components position in header
2015-09-10 09:50:42 -07:00
Sam
c5e3be0e71
Merge pull request #3744 from tgxworld/fix_autocomplete_avatar_missing
...
FIX: Missing avatar in user autocomplete.
2015-09-10 17:35:55 +10:00
Sam
c386158c33
Merge pull request #3745 from tgxworld/add_plugin_outlet
...
FEATURE: Add a plugin outlet for custom controls.
2015-09-10 17:35:04 +10:00
Sam
7431c6ac3b
FIX: no user card for users with . or - in username
2015-09-10 17:14:34 +10:00
Guo Xiang Tan
fcb4eebde1
FEATURE: Add a plugin outlet for custom controls.
2015-09-10 14:50:18 +08:00
Sam
0b9322d16a
PERF: remove uneeded data, notification count is pointless
...
Getting notification count is expensive, no point shipping it to clients
2015-09-10 16:44:42 +10:00
Guo Xiang Tan
60b9985158
FIX: Missing avatar in user autocomplete.
2015-09-10 12:30:21 +08:00
Régis Hanol
38cb72b329
FEATURE: upload placeholder
2015-09-09 23:14:06 +02:00
Robin Ward
ca8046c7c3
FIX: Switch out topic template if the user hasn't changed it
2015-09-09 16:21:01 -04:00
Robin Ward
3ceadbd5b8
FIX: Allow qunit tests to run in browser by stubbing new functionality
2015-09-09 16:20:36 -04:00
Neil Lalonde
2922cc3036
UX: mobile topic list: move post count to right side of topic title
2015-09-09 16:05:13 -04:00
Robin Ward
9f826f1ad6
UX: Change style of "New" next to unread FAQ
2015-09-09 15:18:26 -04:00
Robin Ward
fe6a4b7d1a
Merge pull request #3739 from scossar/use-outerHeight-to-calculate-header-height
...
FIX: eliminate 3px gap under mobile menu-panel
2015-09-09 15:10:29 -04:00
Robin Ward
8a11f7f6c1
Remove console.log
2015-09-09 15:05:19 -04:00
Robin Ward
9548876c2d
FIX: Some keyboard commands should not fire when anonymous
2015-09-09 13:45:29 -04:00
Régis Hanol
4f890a439c
FIX: automatically load pages of topics list until it fills up the entire screen
2015-09-09 17:41:34 +02:00
Sam
5ed7663a63
FIX: on enter we would double search on full page search
2015-09-09 12:00:31 +10:00
Sam
5eb1fb3bfd
FEATURE: cache search results for 5 route transitions
...
DEV: transientCache that can be used to hold data for N route transitions
FEATURE: remember scroll position when hitting back from full page search
2015-09-09 11:52:11 +10:00
scossar
cb787b99bd
use outerHeight to calculate menu height
2015-09-08 14:37:07 -07:00
Robin Ward
1c90f77d09
Merge pull request #3715 from gwwar/quote_newline_code
...
workaround for code block being parsed before quote block.
2015-09-08 16:52:46 -04:00
Robin Ward
cf114f323d
Merge pull request #3737 from tgxworld/reload_page
...
Reload page when dealing with mass actions on topic.
2015-09-08 16:34:38 -04:00
Robin Ward
d3666d3468
FIX: If private messages are disabled don't show the menu link
2015-09-08 16:32:20 -04:00
Régis Hanol
0e02e0272d
FIX: always-enabled plugins should be, well, enabled
2015-09-08 19:28:05 +02:00
Régis Hanol
e3a80936c8
prefer empty href attribute to #
2015-09-08 18:27:20 +02:00
Robin Ward
c0136eb6e6
FIX: IP lookup was broken with relaxed user routes
2015-09-08 12:16:49 -04:00
Robin Ward
f887637935
Don't use the container to look up the store for drafts
2015-09-08 11:34:52 -04:00
Guo Xiang Tan
b549ed15b9
Reload page when dealing with mass actions on topic.
2015-09-08 23:25:52 +08:00
Régis Hanol
113cb4d3ad
FIX: '@observes' doesn't work that way
2015-09-08 10:34:36 +02:00
Sam
202e30097f
FIX: clicking on number should open user drawer
2015-09-08 18:01:48 +10:00
Sam
f9f52e3edc
FIX: misuse of @observes
...
it is passed "this" and the name of the property that changed, not actual values
2015-09-08 17:16:20 +10:00
Sam
b2633098ee
FIX: regression unable to send any PMs if you have a PM draft
2015-09-08 16:57:52 +10:00
Sam
71892cc5f4
FEATURE: select all / deselect all on search page
2015-09-08 16:11:21 +10:00
Sam
0c5189fa2a
SECURITY: fix possible XSS expanding quotes
2015-09-08 15:25:00 +10:00
Sam
e13ed24122
FEATURE: on mobile take users to full page search
...
UX: improve styling on full page search page
FEATURE: allow search context in full page search
FEATURE: visited color link for full page search
FIX: broken search help on fulls page search page
FEATURE: allow preload store to return a null
FEATURE: "mobileAction" for the header buttons
2015-09-08 11:04:03 +10:00
Régis Hanol
e37dd5a393
FIX: don't reload the page when clicking the number in a notification on mobile
2015-09-07 19:33:04 +02:00
Régis Hanol
d5a2029026
FIX: category permissions weren't properly loaded when /categories is the homepage
...
FIX: don't scope to a specific category when creating a new topic from /categories
2015-09-07 18:52:53 +02:00
Arpit Jalan
d05bc64df8
do not default button title tag to label
2015-09-07 19:24:13 +05:30
Sam
335be272ff
FEATURE: implement capping of new/unread
...
We cap new and unread at 2/5th of SiteSetting.max_tracked_new_unread
This dynamic capping is applied under 2 conditions:
1. New capping is applied once every 15 minutes in the periodical job, this effectively ensures that usually even super active sites are capped at 200 new items
2. Unread capping is applied if a user hits max_tracked_new_unread,
meaning if new + unread == 500, we defer a job that runs within 15 minutes that will cap user at 200 unread
This logic ensures that at worst case a user gets "bad" numbers for 15 minutes and then the system goes ahead and fixes itself up
2015-09-07 12:03:17 +10:00
Kane York
342eba4374
FEATURE: Category reordering dialog
2015-09-06 16:53:52 -07:00
Sam
e06d407153
Merge pull request #3718 from tgxworld/allow_emojis_to_be_copy_and_pasted
...
FIX: Allow user to quote Emojis.
2015-09-07 08:48:34 +10:00
Robin Ward
73526e1211
FIX: Category permissions were broken
2015-09-05 11:40:12 -04:00
Robin Ward
32e2d7963a
FEATURE: Show FAQ at top of the hamburger until the user reads it
2015-09-04 16:56:02 -04:00
Robin Ward
5881f68556
Support for rewiring plugin outlets so we can move Akismet up
2015-09-04 16:09:02 -04:00
Kane York
ea606a348f
FEATURE: post-after-cooked plugin-outlet
2015-09-04 12:45:04 -07:00
Robin Ward
49096e5801
FIX: Logout link was too small
2015-09-04 15:36:48 -04:00
Robin Ward
2d684899f7
Make the whole "view older notifications..." a link target
2015-09-04 13:11:25 -04:00
Robin Ward
a83312513e
Move mobile toggle to the bottom of the hamburger
2015-09-04 13:07:51 -04:00
Robin Ward
8e776d0fd7
Move TopicTrackingState
to injected object
2015-09-04 13:00:24 -04:00
Régis Hanol
064b62199e
FIX: ensure we show the footer in '/categories' when coming from a topics list
2015-09-04 17:38:10 +02:00
Sam
7a5c045399
its not a const anymore
2015-09-04 17:39:52 +10:00
Sam
6709eaeb3c
better have some sane upper bound here.
2015-09-04 17:23:37 +10:00
Sam
b3d6cefef4
FIX: never ask for less than 5 notifications
2015-09-04 17:22:26 +10:00
Sam
a54e8f3c5e
FEATURE: live refresh notifications as they happen
2015-09-04 13:20:33 +10:00
Sam
8bc7423045
UX: On first load of notifications don't use cached data
2015-09-04 10:43:26 +10:00
Sam
f019f5a62d
FIX: return 0 if we are unable to count unread/new topics
2015-09-04 10:33:16 +10:00
Neil Lalonde
64d1c91179
render those links instead of raw html
2015-09-03 18:34:06 -04:00
Robin Ward
531ab65ccf
Add counts to new / unread in hamburger
2015-09-03 16:16:49 -04:00
Robin Ward
035e263356
Two column layout for hamburger
2015-09-03 15:58:27 -04:00
Robin Ward
0818a502f3
Group admin stuff in Hamburger
2015-09-03 15:39:45 -04:00
Robin Ward
ecf21cabe1
Move Keyboard item to bottom. Add d-link
to hamburger
2015-09-03 15:14:04 -04:00
Robin Ward
0e1d6272b9
FIX: highest_post_number
was not being updated from gaps
2015-09-03 13:37:55 -04:00
Régis Hanol
80041b874c
FIX: don't show new topic notifications in homepag for suppressed categories
2015-09-03 19:18:46 +02:00
Robin Ward
7516643f11
Middle clicking the avatar should go to profile
2015-09-03 11:53:42 -04:00
Robin Ward
12e0225c51
FIX: Better metaKey
support for menu panels
2015-09-03 11:47:18 -04:00
Robin Ward
e53d9f0e8b
FIX: Don't use observers to update data
...
Message bus events were triggering users who didn't have access to
update posts to update them. Instead, perform the update in the action
itself.
2015-09-03 11:10:04 -04:00
Régis Hanol
6a25a62e63
FIX: make sure we have a category
2015-09-03 11:59:04 +02:00
Régis Hanol
e43343354a
Merge pull request #3727 from tgxworld/fix_autocomplete_mobile_view
...
UX: Make autocomplete usable on mobile.
2015-09-03 11:43:21 +02:00
Guo Xiang Tan
a77d5d0cef
UX: Make autocomplete usable on mobile.
2015-09-03 17:10:08 +08:00
Sam
48f0323032
Merge pull request #3722 from gdpelican/move-header-plugin-outlet
...
Move plugin menu outlet to live with other menus
2015-09-03 11:34:35 +10:00
Régis Hanol
be6e6dc129
UX: tidy up the category settings tab
2015-09-03 00:22:25 +02:00
Régis Hanol
d34f42d2f7
FIX: hide category column in topic list only when the current category has no children
2015-09-02 23:46:04 +02:00
Robin Ward
0cd393f310
Experiment with variable heights for slide-in menus
2015-09-02 16:46:25 -04:00
Robin Ward
d1717cdb12
FIX: Safer JS code
2015-09-02 15:33:44 -04:00
Robin Ward
f11bdd13fc
FIX: Menu panels scrolled weird in iOS
2015-09-02 15:12:49 -04:00
Robin Ward
e624b7198d
Try to estimate the amount of notifications to return based on height
2015-09-02 14:30:18 -04:00
Robin Ward
b3a930f2ed
DRY up header height calculation
2015-09-02 14:30:18 -04:00
Régis Hanol
a501947d67
FEATURE: suppress categories from the homepage
2015-09-02 20:25:18 +02:00
Robin Ward
a76d1079b2
Support jumping to messages
2015-09-02 13:39:14 -04:00
Neil Lalonde
1fbc142b0c
UX: add screen reader support to notifications. (title attribute is ignored by screen readers)
2015-09-02 12:29:30 -04:00
Guo Xiang Tan
0b20ded4fb
FIX: Timegap only shows up for sequential posts.
2015-09-02 17:23:41 +08:00
Sam
a0dd0bf1af
when looking at your own profile it should be collapsed.
2015-09-02 16:50:40 +10:00
James Kiesel
d8490fb65f
Move plugin menu outlet to live with other menus
2015-09-01 20:25:22 -07:00
Sam
262f561a87
FEATURE: relax username rules to allow - and . and leading _
...
This relaxes our very strict username rules to allow for some long asked for requests
- leading _ is now allowed
- . is allowed except for trailing char and confusing extensions like .gif .json
- dash (-) is now permitted
2015-09-02 12:13:44 +10:00
Kane York
8b37dadec7
remove TODO
2015-09-01 16:52:29 -07:00
Kane York
d7a79aeb8a
Fix mobile styling
2015-09-01 16:49:45 -07:00
Kane York
118f8227f1
Fix never link after clicking maybe later
2015-09-01 16:23:57 -07:00
Kane York
f595e562ea
Signup CTA first attempt
2015-09-01 16:16:19 -07:00
Robin Ward
f5cbaf5609
Have menu panels show up on top of the composer, stop composer at header
2015-09-01 17:34:04 -04:00
Neil Lalonde
1bd0f5b015
FEATURE: group can grant a trust level when a user is added
2015-09-01 16:52:12 -04:00
Robin Ward
f2fa7a39be
FEATURE: Use shift+Z twice to log out
2015-09-01 16:37:54 -04:00
Robin Ward
d18b02d53b
OH NO I DIDN'T
2015-09-01 16:19:47 -04:00
Robin Ward
88e44542f5
FIX: Don't show scrollbar in notifications with logout button
2015-09-01 16:18:12 -04:00
Robin Ward
c36fdccab2
Add d-link
component to simplify menu markup
2015-09-01 16:14:34 -04:00
Robin Ward
6fb69d4434
Notifications cache should use localStorage
wrapper
2015-09-01 14:45:24 -04:00
Robin Ward
bf2c18fddb
Migrate KeyValueStore
to ES6 modules
2015-09-01 14:45:24 -04:00
Robin Ward
11b73e1fb7
Avoid calling Discourse.logout
and use an action instead
2015-09-01 14:41:31 -04:00
Guo Xiang Tan
c2eceaa50d
FIX: Allow user to quote Emojis.
2015-09-02 00:16:08 +08:00
kerryliu
cb9c603b6b
workaround for code block being parsed before quote block.
2015-09-01 09:13:51 -07:00
Robin Ward
da25abfcc9
Merge pull request #3714 from riking/live-settings
...
FEATURE: Live-update site settings
2015-09-01 12:03:30 -04:00
Robin Ward
51eb88a0ea
Merge pull request #3720 from riking/patch-7
...
FIX: First post time not visible in topic list
2015-09-01 12:00:40 -04:00
Robin Ward
b41b176bc6
Support for value_list
in site settings
2015-09-01 11:54:16 -04:00
Kane York
cca621e70a
FIX: First post time not visible in topic list
2015-09-01 08:49:38 -07:00
Sam
a7eabade19
User import no longer needed
2015-09-01 21:48:05 +10:00
Sam
bbf3d772c4
use Discourse.logout, it works with SSO
2015-09-01 21:36:56 +10:00
Guo Xiang Tan
9909c715dc
FIX: Emoji can't be copy and pasted.
2015-09-01 15:45:46 +08:00
cpradio
68659e834a
FIX: Fix the logout functionality in core
2015-08-31 18:39:19 -04:00
Sam
a13e7d10cf
FEATURE: site setting for show log out in header
2015-09-01 07:44:21 +10:00
Robin Ward
6425650931
UX: Make search panel wider
2015-08-31 16:27:36 -04:00
Robin Ward
a4029675bd
FIX: broken spec
2015-08-31 15:41:35 -04:00
Robin Ward
e2b7b2f2cf
FIX: Don't outline buttons when menu is in slide out
2015-08-31 15:30:51 -04:00
Robin Ward
989c915a02
FIX: Custom header sizes and scrolling with menu panels
2015-08-31 15:04:33 -04:00
Robin Ward
e5911e7fc4
FIX: Opening panels by keyboard should respect closing
2015-08-31 14:51:38 -04:00
Robin Ward
ca017facf2
FIX: When navigating to pages close panels
2015-08-31 14:43:11 -04:00
Robin Ward
82ad3e0401
Support for jump to profile
2015-08-31 14:40:52 -04:00
Robin Ward
585fc7a25c
FIX: Couldn't tab to Log Out button
2015-08-31 14:34:34 -04:00
Robin Ward
ddf0db0338
Refactor notifications localStorage
cache into adapter pattern.
...
Sometimes you want stale data right away, then refresh it async.
This adds `findStale` to the store for that case. If it returns
an object with `hasResults` you can get the `results` and display
them.
It also returns a `refresh()` method to freshen up the stale data.
To enable `localStorage` support for stale data, just include the
mixin `StaleLocalStorage` into an adapter for that model. This
commit includes a sample of doing that for `Notifications`.
2015-08-31 14:12:27 -04:00
Kane York
d4c68f2096
FEATURE: Live-update site settings
2015-08-31 10:40:50 -07:00