github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 21:43:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
16,821 Commits 214 Branches 500 Tags 960 MiB
de95573d23
Commit Graph

6972 Commits

Author SHA1 Message Date
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
cpradio
979331f762 UX: Add mobile love to admin-nav for Plugin Pages 2015-10-07 09:57:05 -04: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
Jeff Atwood
ccb55b82e6 adjust alignment of topic progress popup 2015-10-02 02:41:37 -07: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
Jeff Atwood
0237bece88 Revert "FIX: align topic-progress with topic-progress-expanded" 2015-10-01 10:13:31 -07:00
scossar
de61ae272a align topic-progress with topic-progress-expanded 2015-10-01 10:01:57 -07: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
Arpit Jalan
97fbf09259 UX: post action glyphs color on mobile should match desktop color 2015-09-30 20:30:52 +05:30
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
Jeff Atwood
980c0196a8 FIX: similar topics lacked badge left margin 2015-09-29 02:14:44 -07: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
Jeff Atwood
0d69a827fd correct composer top bar spacing 2015-09-25 17:32:46 -07:00
Jeff Atwood
a8d6b5ed6e loosen up composer title spacing 2015-09-25 12:56:53 -07:00
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
Régis Hanol
d5712f051e Merge pull request #3816 from cpradio/small-action-responsiveness 
Make the small-action width responsive on desktops
 2015-09-25 15:25:50 +02:00
cpradio
e47e4f7169 Make the small-action width responsive on desktops 2015-09-25 08:34:34 -04:00
Régis Hanol
aee2c535bd Revert "UX: Topic link should not take full width." 2015-09-25 09:49:04 +02:00
Jeff Atwood
42f252d3ba make bar and bullet drop-down cat fullwidth 2015-09-25 00:26:41 -07: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
855370b242 Merge pull request #3813 from tgxworld/fix_link 
UX: Topic link should not take full width.
 2015-09-25 13:37:02 +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
Guo Xiang Tan
f7ae9a8187 UX: Topic link should not take full width. 2015-09-25 08:32:49 +08:00
Robin Ward
a24afe30d7 FIX: Reply as new topic was broken when you quoted something 2015-09-24 14:44:15 -04:00
Guo Xiang Tan
fe8a93bdc0 UX: Fix links in gutter taking up full width. 2015-09-25 02:22:15 +08: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
ef0804fbb0 FIX: only disable the composer grip when the device is touch-only 2015-09-23 16:05:41 +02: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
Arpit Jalan
07ead44187 UX: make old twitter oneboxes look good 2015-09-23 18:02:28 +05:30
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
Jeff Atwood
bcb070f1ca FIX: progress bar popup was misaligned 2015-09-22 16:36:15 -07:00
scossar
9a93a43905 reduce z-index 2015-09-22 11:01:43 -07: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
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
Arpit Jalan
4f31745e10 UX: improve twitter onebox 2015-09-21 17:40:17 +05:30
Guo Xiang Tan
e3d5cc54a1 UX: Disable button when Notification permission is denied. 2015-09-21 18:14:13 +08:00
Sam
45ab42dea9 UX: upgrade font awesome to 4.4 2015-09-21 12:46:58 +10: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
Robin Ward
8489118811 FIX: Cropped embedding footer 2015-09-18 15:36:40 -04:00
Arpit Jalan
7abd4687e2 FIX: redirect to original URL when logging in via OAuth 2015-09-18 18:34:57 +05:30
Jeff Atwood
f37f6f7673 minor embed style tweak 2015-09-18 02:44:13 -07:00
Jeff Atwood
01782affe2 clearer call to action in embed CSS styles 2015-09-18 00:40:04 -07:00
Sam
a4ace3f08e FEATURE: ui for ordering search results in full page mode 2015-09-18 17:16:53 +10:00
Sam
d97e78b942 FIX: jitter in ui when expanding select 2 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
7468f85818 Merge pull request #3783 from scossar/fix-comment-in-menu-panel-scss 
FIX: remove incorrect comment and rule from menu-panel.scss
 2015-09-17 14:46:55 -07:00
Jeff Atwood
0dc11e3a26 remove useless extra <div> around topic-avatar 2015-09-17 14:30:28 -07:00
scossar
6b1eb8df8f remove comment, remove unused rule 2015-09-17 14:19:38 -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
Robin Ward
901380224b Merge pull request #3775 from xfalcox/patch-2 
Fix composer for FF14+
 2015-09-17 10:47:35 -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
Jeff Atwood
518262ce58 allow wider mobile header 2015-09-17 00:17:35 -07:00
Jeff Atwood
0627a58b8b FIX: too much whitespace at bottom of mobile posts 2015-09-17 00:00:53 -07:00
Jeff Atwood
0969bd0f0d tighten up post spacing on mobile 2015-09-16 23:48:15 -07: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
Jeff Atwood
2ac9f6a1b0 Merge branch 'master' of https://github.com/discourse/discourse 2015-09-16 17:16:20 -07:00
Jeff Atwood
4714483612 copyedits on anon user call to signup action 2015-09-16 17:16:17 -07: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
Rafael dos Santos Silva
45a7e200a8 Fix composer for FF14+ 
Fix the preview for old versions of Firefox.
 2015-09-16 15:13:44 -03: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
Régis Hanol
468b04db86 FIX: force wrapping on the filename of lightboxed images 2015-09-16 11:58:06 +02: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
Jeff Atwood
a14d7f16c8 fix reply glyph color on mobile editor 2015-09-15 15:39:59 -07:00
Jeff Atwood
0a3388d19f on mobile submit-panel must have width 2015-09-15 15:22:22 -07:00
Jeff Atwood
74da57f77f minor category page style tweaks for mobile 2015-09-15 14:37:14 -07:00
Jeff Atwood
a47a71dd82 fix cancel button alignment on mobile editor 2015-09-15 14:28:31 -07:00
Jeff Atwood
d4db1949a7 fix search help on mobile 2015-09-15 14:22:33 -07: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
Régis Hanol
9c740ffa7e UX: top period chooser was misaligned on mobile 2015-09-15 18:33:46 +02: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
Régis Hanol
c46269e7ec Merge pull request #3766 from tgxworld/fix_selected_posts_mobile 
Fix selected posts mobile
 2015-09-15 11:24:15 +02:00
Guo Xiang Tan
6360420aed FIX: Make category combobox in modal take 100% width. 2015-09-15 16:53:49 +08:00
Guo Xiang Tan
9977599ca9 FIX: Input on modal was overflowing. 2015-09-15 16:53:49 +08:00
Guo Xiang Tan
46c93a2687 FIX: Selected posts buttons not clickable. 2015-09-15 16:53:41 +08: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