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
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
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
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
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
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
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
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
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
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
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
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
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
Gerhard Schlager
970aafecb4
FIX: Some default group names could not be translated
2014-09-07 14:48:03 +02: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
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
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
0ade9bafff
FIX: highlight in yellow, not blue
...
FEATURE: highlight in title
2014-09-04 15:01:13 +10:00
Sam
b8c36bd2da
FIX: broken search for admins when selecting topics
2014-09-04 12:21:57 +10:00
Robin Ward
a67e400027
FIX: Remove contents
class
2014-09-03 17:17:53 -04: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
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
Sam
d4f08f442c
FIX: correct template for search in post (regression)
2014-09-03 17:09:01 +10: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
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