Joffrey JAFFEUX
d494feaa32
FIX: should not be needed as we have itemprop='url'
2018-07-30 09:31:27 -04:00
Arpit Jalan
dfcb2a0d42
FEATURE: include published_time in metadata
2018-07-30 17:09:56 +05:30
Neil Lalonde
f4b5eccad3
FIX: categories page crawler view had incorrect URLs
2018-07-23 14:54:41 -04:00
OsamaSayegh
decf1f27cf
FEATURE: Groundwork for user-selectable theme components
...
* Phase 0 for user-selectable theme components
- Drops `key` column from the `themes` table
- Drops `theme_key` column from the `user_options` table
- Adds `theme_ids` (array of ints default []) column to the `user_options` table and migrates data from `theme_key` to the new column.
- Removes the `default_theme_key` site setting and adds `default_theme_id` instead.
- Replaces `theme_key` cookie with a new one called `theme_ids`
- no longer need Theme.settings_for_client
2018-07-12 14:18:21 +10:00
Guo Xiang Tan
875008522d
FIX: Discourse.S3BaseUrl
did not account for subfolder bucket names.
2018-07-06 15:53:57 +08:00
Guo Xiang Tan
73e30ff4c2
Revert "Rename s3 vars, change condition when displaying s3 uploads"
...
The new variables do not reflect that they represent S3 settings.
This reverts commit 24dfa1b657
.
2018-07-06 15:53:57 +08:00
Christoph Holtermann
68bfe0260a
Fix typo ( #6043 )
...
typo: state instead of status
2018-07-05 09:26:48 +08:00
Joffrey JAFFEUX
1772b56cda
FIX: minor micro data fixes
2018-06-29 13:41:04 +02:00
Maja Komel
ec3e6a81a4
FEATURE: Second factor backup
2018-06-28 10:12:32 +02:00
Maja Komel
24dfa1b657
Rename s3 vars, change condition when displaying s3 uploads
2018-06-25 17:16:01 +02:00
Joffrey JAFFEUX
803968147c
FIX: ListItem can’t have itemprop=url and itemprop=item together
2018-06-25 14:12:55 +02:00
Christoph Holtermann
bed26ea0b3
fix indentation
2018-06-25 15:01:39 +10:00
Christoph Holtermann
a0af15d525
no redeclaring state
2018-06-25 15:01:39 +10:00
Christoph Holtermann
e874afaf31
read embed state info from data attribute
2018-06-25 15:01:39 +10:00
Christoph Holtermann
6eb0b310fe
add data attributes to reflect embed status
2018-06-25 15:01:39 +10:00
Christoph Holtermann
5914a3db20
Update embed.html.erb
...
Small fix
2018-06-25 15:01:39 +10:00
Christoph Holtermann
2244f19ff9
Update embed.html.erb
...
Add state descriptor to message being sent to parent window
2018-06-25 15:01:39 +10:00
Rafael dos Santos Silva
8fc08aad09
FEATURE: Update the webmanifest
...
- Remove share target because the spec is changing
- Allow any orientation again because natural is too restrictive
- Use correct file and mime types for the manifest
2018-06-14 00:13:28 -03:00
Joffrey JAFFEUX
276526e30e
FIX: improves micro data support
2018-06-13 23:20:48 +02:00
Angus McLeod
0997eb6486
Add theme stylesheet(s) to the crawler layout
2018-06-12 12:47:48 +10:00
Jeff Wong
4599cc8435
FIX: PM participants listed inline
2018-06-11 18:14:25 -07:00
Régis Hanol
0402e97368
FIX: redirect to sso_destination_url after account activation
2018-05-11 19:57:04 +02:00
Régis Hanol
6a006b3646
FIX: format posts for embedded comments as we do for emails
2018-05-09 19:24:44 +02:00
Arpit Jalan
83245aa508
FIX: better handling of invite links after they are redeemed
...
FIX: deprecate invite_passthrough_hours setting
2018-05-08 20:17:57 +05:30
Jeff Wong
62a8904729
Feature: Include participants at the bottom of PM emails ( #5797 )
...
* Feature: Include participants at the bottom of PM emails
... as undecorated links.
https://meta.discourse.org/t/email-notification-recipients-unclear-when-pm-is-sent-to-multiple-users/26934/13?u=featheredtoast
Fix: missing translation for PM mentions
* display membership count as `group (count)`
2018-05-03 15:50:06 -07:00
Robin Ward
a5172a37e0
Allow staff members to enable safe mode, even if disabled
2018-04-25 11:49:57 -04:00
Robin Ward
fd14ee4797
FEATURE: Allow safe mode to be disabled
2018-04-24 11:03:33 -04:00
Sam
54d153068a
DEV: remove qunit rails fork and add a couple of async tests
2018-04-23 16:42:40 +10:00
Arpit Jalan
45cfb61af1
FIX: sanitize click track links
2018-04-17 12:35:16 +05:30
Robin Ward
3d7dbdedc0
FEATURE: An API to help sites build robots.txt files programatically
...
This is mainly useful for subfolder sites, who need to expose their
robots.txt contents to a parent site.
2018-04-16 15:43:20 -04:00
Sam
223379e21a
per spec we need to repeat disallow paths per agent
2018-04-16 15:38:10 +10:00
Arpit Jalan
a1ef455c78
SECURITY: do not show private topic title on /unsubscribed page
2018-04-16 10:35:57 +05:30
Régis Hanol
1a9271dd2f
add a warning in robots.txt when using subfolder
2018-04-12 00:00:15 +02:00
Régis Hanol
df7970a6f6
prefix the robots.txt rules with the directory when using subfolder
2018-04-11 22:05:02 +02:00
Sam
489c22d93c
FEATURE: Disallow tags and categories rss feeds
...
This stops crawlers from hitting tags and category rss feeds to discover
new content, instead they should focus on latest/posts if they need to
consume something regular
2018-04-11 14:36:10 +10:00
Sam
f40f10240c
FEATURE: remove topic rss from robots
...
Crawlers love hitting the rss feeds (confirmed that both Google and Bing do)
Experimenting with the impact of blocking these feeds and forcing Crawlers to hit
the content direct. It is better if they hit the actual page to start with as opposed to
1. Hit RSS feed
2. Find new content
3. Hit post link
4. Get canonical
5. Hit canonical
Lots of pointless work.
We do not know for sure what impact this will have on newsreader apps,
we will listen for feedback.
2018-04-11 11:57:52 +10:00
Jeff Wong
32f919ea34
Fix - service worker registrations
...
* register service workers in a development env
* register service worker from ember initialize fn
2018-04-10 15:17:32 -07:00
Sam
3a7b696703
FEATURE: allow for setting crawl delay per user agent
...
Also moved to default crawl delay bing so no more than a req every 5 seconds is allowed
New site settings:
"slow_down_crawler_user_agents" - list of crawlers that will be slowed down
"slow_down_crawler_rate" - how many seconds to wait between requests
Not enforced server side yet
2018-04-06 10:15:23 +10:00
Neil Lalonde
b7ecdb72d6
FIX: update Google Tag Manager javascript
2018-04-03 14:22:06 -04:00
Arpit Jalan
5e4dd20795
Revert "Prevent robots from indexing uploads"
...
This reverts commit 0fd622e5d1
.
2018-04-02 21:29:29 +05:30
Neil Lalonde
c9216626d8
Merge pull request #5688 from discourse/fix-embed-comments-template-error
...
FIX: Make sure a post has replies before accessing the reply_id
2018-03-27 15:30:53 -04:00
Neil Lalonde
ced7e9a691
FEATURE: control which web crawlers can access using a whitelist or blacklist
2018-03-22 15:41:02 -04:00
scossar
f213dea529
Make sure a post has replies before accessing the reply id
2018-03-20 12:13:41 -07:00
Régis Hanol
89f5c90ce0
FIX: show an error page on click tracking error
2018-03-17 00:33:11 +01:00
Sam
8c1d145f0e
FIX: when visiting post on mobile it is not selected
2018-03-13 14:06:08 +11:00
Dan Nicholson
0fd622e5d1
Prevent robots from indexing uploads
...
Although most user uploads are probably harmless, it's possible someone
has (either maliciously or not) uploaded sensitive information. Prevent
robots from indexing the uploads route.
2018-03-09 05:51:55 -06:00
OsamaSayegh
282f53f0cd
FEATURE: Theme settings (2) ( #5611 )
...
Allows theme authors to specify custom theme settings for the theme.
Centralizes the theme/site settings into a single construct
2018-03-04 19:04:23 -05:00
Sam
e19ae6c55e
FEATURE: disallow groups from being indexed
2018-03-02 13:38:30 +11:00
Guo Xiang Tan
70f14da732
UX: Use 'tel' input type for 2FA token inputs.
2018-02-27 09:30:44 +08:00
Joffrey JAFFEUX
ac701696b3
FEATURE: replaces tag-chooser/tag-group-chooser with select-kit component
...
These component were also the last using select2. As a consequence select2 is removed from Discourse in this commit.
2018-02-26 11:42:57 +01:00
Guo Xiang Tan
a9699da672
UX: Specify pattern and maxlength for 2FA input fields.
2018-02-26 18:29:46 +08:00
Guo Xiang Tan
1f74509a75
FIX: 2FA prompt incorrectly displayed on admin login page.
2018-02-23 11:05:39 +08:00
Maja Komel
76a2fc3d07
UX: Add og metadata for groups.
...
https://meta.discourse.org/t/onebox-for-groups/79155
2018-02-22 15:03:41 +08:00
Guo Xiang Tan
964624f3ab
FIX: No error displayed when 2FA token is invalid on admin login page.
2018-02-22 09:45:57 +08:00
Guo Xiang Tan
edf326a9a5
Fix incorrect translation.
2018-02-22 08:06:37 +08:00
Guo Xiang Tan
14f3594f9f
Review Changes for f4f8a293e7
.
2018-02-21 14:55:49 +08:00
Jeff Wong
f4f8a293e7
FEATURE: Implement 2factor login TOTP
...
implemented review items.
Blocking previous codes - valid 2-factor auth tokens can only be authenticated once/30 seconds.
I played with updating the “last used” any time the token was attempted but that seemed to be overkill, and frustrating as to why a token would fail.
Translatable texts.
Move second factor logic to a helper class.
Move second factor specific controller endpoints to its own controller.
Move serialization logic for 2-factor details in admin user views.
Add a login ember component for de-duplication
Fix up code formatting
Change verbiage of google authenticator
add controller tests:
second factor controller tests
change email tests
change password tests
admin login tests
add qunit tests - password reset, preferences
fix: check for 2factor on change email controller
fix: email controller - only show second factor errors on attempt
fix: check against 'true' to enable second factor.
Add modal for explaining what 2fa with links to Google Authenticator/FreeOTP
add two factor to email signin link
rate limit if second factor token present
add rate limiter test for second factor attempts
2018-02-21 09:04:07 +08:00
Guo Xiang Tan
7902296c11
Oops we should register a service worker as long as it is supported.
2018-02-15 15:02:14 +08:00
Guo Xiang Tan
28365f8ae5
PERF: Have nginx cache and serve the service worker file.
2018-02-15 10:50:39 +08:00
Erick Guan
03b3e57a44
FEATURE: login by a link from email
...
Co-authored-by: tgxworld <tgx@discourse.org>
2018-02-13 16:14:39 +08:00
Robin Ward
0776340b29
SECURITY: Prevent robots from indexing more routes
...
These routes could contain sensitive material and should never be
indexed for content.
2018-02-04 13:24:36 -05:00
Neil Lalonde
2493648f9c
PERF: calculate topic_counts for tags in an async job so tag queries that include counts are much faster
2018-01-12 11:03:03 -05:00
Sam
8ff5f5f2ef
FIX: cache admin locale file for 24 hours
2018-01-09 10:23:49 +11:00
Vinoth Kannan
f08995c390
Remove unused code lines
2017-12-29 12:32:18 +05:30
Gerhard Schlager
44ee388070
FEATURE: omit images from og and twitter description tags
2017-11-28 21:34:02 +01:00
Kris
c2da25dd5c
Cleaning up the 404 page ( #5363 )
2017-11-24 12:41:31 -05:00
Neil Lalonde
66e53f449a
UX: Auth complete page/modal has a link to continue to the site to accomodate auth methods that can't automatically redirect to Discourse
2017-11-21 13:56:19 -05:00
Robin Ward
cef64e8f03
UX: Use no_ember
styling for omniauth error page
2017-11-15 14:04:26 -05:00
Robin Ward
d07ebf9d4c
UX: Support for custom error pages and headers in plugins
2017-11-14 16:31:44 -05:00
Robin Ward
1c56e1c063
Support for HTML builders on the no-ember view
2017-11-14 16:04:27 -05:00
Robin Ward
52480d554a
UX: Support for custom 404 pages
2017-11-14 11:57:17 -05:00
Sam
dfe9f70747
UX: warn that something must be selected with safe mode
2017-11-13 15:59:51 +11:00
Michael Howell
38b8d68c68
FEATURE: Allow the user to select a custom home page ( #5268 )
...
* Add user_home configuration option
* Use the new user_home preference to actually show the right home page
* Fix trailing whitespace
* Update user_option_serializer.rb
* Fix JavaScript default homepage tests
* Use an object instead of a giant switch
* Remove trailing whitespace
* Make the default `user_home` set to `null` instead of `0`
* Rename user_home to homepage_id
2017-11-10 06:45:19 +11:00
Neil Lalonde
7eb5f78343
UX: increase max length of topic titles in summary email html by 40 characters
2017-11-06 10:00:01 -05:00
Neil Lalonde
7dc3671490
FEATURE: remove obsolete settings ga_tracking_code and ga_domain_name. Use ga_universal_tracking_code and ga_universal_domain_name instead.
2017-11-01 11:41:51 -04:00
Penar Musaraj
bd1616d3d9
Add offline route and service worker to fix Android app install banner ( #5217 )
...
* set up static offline.html route and service worker for Android Web App Banner
* add viewport meta tag to offline view for android app banner
* add i18n support for offline.html pages, cleanup
* fix html syntax, add page title, remove license for service-worker.js
2017-10-31 10:46:48 +11:00
Neil Lalonde
a5afc08363
FIX: html links in text part of summary email
2017-10-30 15:43:01 -04:00
Neil Lalonde
28bc5ac10a
FIX: link to about page on subfolder
2017-10-30 14:34:12 -04:00
Neil Lalonde
fec5691064
FIX: unsubscribe links in summary emails were missing subfolder
2017-10-30 14:28:43 -04:00
Neil Lalonde
bf00ab5d4a
FIX: grant admin on subfolder
2017-10-27 16:46:02 -04:00
Arpit Jalan
33f0d80ed5
UX: better title on search page
2017-10-27 09:13:04 +05:30
Guo Xiang Tan
ad9553ff86
Merge pull request #5238 from discourse/jomaxro-patch-1
...
Add div to login-required text
2017-10-24 17:04:18 +08:00
Robin Ward
e9159e49f3
FEATURE: Site Setting to determine whether flags defaults to topics
2017-10-20 12:37:20 -04:00
Arpit Jalan
cafbf506cc
better error message when confirming email change
2017-10-20 20:58:00 +05:30
Joshua Rosenfeld
64e5532b90
Add div to login-required text
2017-10-15 14:45:24 -04:00
Guo Xiang Tan
6fe604b93e
Revert "SECURITY: Fix XSS on unsubscribed page."
...
This reverts commit 190558db9d
.
2017-10-09 09:03:07 +08:00
Guo Xiang Tan
190558db9d
SECURITY: Fix XSS on unsubscribed page.
2017-10-09 08:59:03 +08:00
Sam
70bb2aa426
FEATURE: allow specifying s3 config via globals
...
This refactors handling of s3 so it can be specified via GlobalSetting
This means that in a multisite environment you can configure s3 uploads
without actual sites knowing credentials in s3
It is a critical setting for situations where assets are mirrored to s3.
2017-10-06 16:20:01 +11:00
Sam
ebdf8d6718
remove uneeded code
2017-10-04 15:05:58 +11:00
Sam
14310d2eee
UX: title in JS must match title on Server
...
Corrects title flashing with incorrect value on front page reloads
2017-10-04 15:04:42 +11:00
Guo Xiang Tan
77d4c4d8dc
Fix all the errors to get our tests green on Rails 5.1.
2017-09-25 13:48:58 +08:00
Arpit Jalan
6d35b62238
add image type attribute to icon link tag
2017-09-08 12:48:30 +05:30
Leo McArdle
e183600563
FIX: redirect loop for new users visiting /new-topic using full screen login
2017-09-07 21:02:41 +01:00
Bianca Nenciu
fa69e0dd77
Improved metadata for tags. ( #5067 )
2017-08-28 13:11:34 -04:00
Neil Lalonde
d506e577a5
FEATURE: if full search returns no results, show google search form
2017-08-15 16:46:41 -04:00
Arpit Jalan
b354099252
FEATURE: add custom open graph tag for ignoring canonical url
2017-08-15 19:24:20 +05:30
David Taylor
37300d6777
SECURITY: Do not show latest/top topics on 404 for login_required sites
2017-08-13 19:02:44 +03:00
Arpit Jalan
bf2c35aa99
FEATURE: add RSS feed for badge pages
2017-08-09 13:43:49 +05:30
Robin Ward
2e4b3e9b06
Don't include all html builders on client and server side
2017-08-07 11:29:35 -04:00
Arpit Jalan
2d95b9dfbf
FIX: prevent Cloudflare from obfuscating emails
...
https://support.cloudflare.com/hc/en-us/articles/200170016-What-is-Email-Address-Obfuscation-
2017-08-03 15:06:13 +05:30
Ryan Mulligan
f3f7dd02d1
safely call html_safe on category description
...
The `categories.description` column is not modified as "not null", so it is possible for the description to be nil. This changes the code not call html_safe on nil.
2017-07-25 11:40:02 -07:00
Benjamin Elijah Griffin
4f77ca72a3
Stop Rails from escaping the HTML in this description.
2017-07-24 17:15:15 -07:00
Sam Saffron
d0c5205a52
Feature: Change markdown engine to markdown it
...
This commit removes the old evilstreak markdownjs engine.
- Adds specs to WhiteLister and changes it to stop using globals
(Fixes large memory leak)
- Fixes edge cases around bbcode handling
- Removes mdtest which is no longer valid (to be replaced with
CommonMark)
- Updates MiniRacer to correct minor unmanaged memory leak
- Fixes plugin specs
2017-07-17 11:41:34 -04:00
Neil Lalonde
3ebd8838af
FEATURE: cross-domain tracking for Google universal analytics
2017-07-13 15:21:44 -04:00
Sam
79a084dd58
Revert "remove old markdown engine work-in-progress"
...
This reverts commit ee470b5317
.
2017-07-12 18:10:51 -04:00
Sam Saffron
ee470b5317
remove old markdown engine work-in-progress
2017-07-12 17:44:40 -04:00
Guo Xiang Tan
7b35c55a1e
FIX: Display Google search form when 404 page is rendered by Ember.
2017-06-29 14:37:24 +09:00
Neil Lalonde
eee00b5bb5
UX: include a link to change email preferences at the bottom of summary emails as an alternative to unsubscribing
2017-06-26 12:27:22 -04:00
Sam
234694b50f
Feature: CommonMark support
...
This adds the markdown.it engine to Discourse.
https://github.com/markdown-it/markdown-it
As the migration is going to take a while the new engine is default
disabled. To enable it you must change the hidden site setting:
enable_experimental_markdown_it.
This commit is a squash of many other commits, it also includes some
improvements to autospec (ability to run plugins), and a dev dependency
on the og gem for html normalization.
2017-06-23 12:01:33 -04:00
hosnas
4d62f41fbc
RTL digest emails
...
Allows RTL digest emails.
For this to work, I have done the following major additions:
1- adding appropriate direction to body and tables
2- making text-direction compatible with rtl
3- making float, padding, and margin tags compatible with rtl
2017-06-16 15:20:20 +04:30
Neil Lalonde
0b41046238
don't force SiteSetting.title into meta title tag
2017-06-12 13:50:50 -04:00
Arpit Jalan
6e37f09b19
UX: add email to '/email/unsubscribed' page
2017-06-10 09:51:12 +05:30
Jeff Atwood
5ff986129a
copyedit to unsubscribe email
2017-06-09 00:27:24 -07:00
Arpit Jalan
1c0bbcd580
UX: show user email when unsubscribing
2017-06-09 09:20:24 +05:30
Leo McArdle
59922ce0a4
FEATURE: remove table wrapping posts in notification emails
2017-05-16 10:37:53 -04:00
Pat David
aa009dd2b5
Add @embeddable_css_class from embed_controller
2017-05-11 15:16:16 -04:00
Guo Xiang Tan
71a266b673
Remove daily mailing mode option as it doesn't scale.
...
https://meta.discourse.org/t/daily-updates-option-for-mailing-list-mode/45029/14?u=tgxworld
2017-05-05 12:21:50 +08:00
Robin Ward
b381372184
Use Ember.js for the /u/account-created
path so we can add controls
2017-05-03 11:18:01 -04:00
Guo Xiang Tan
982e3d04f6
PERF: Allow memory to be freed instead of fetching all the objects into memory at once.
...
```
MemoryProfiler.report do
Jobs::UserEmail.new.execute(type: :mailing_list, user_id: user.id)
end.pretty_print
```
Before:
```
Total allocated: 180096119 bytes (1962025 objects)
Total retained: 2194 bytes (16 objects)
allocated memory by gem
-----------------------------------
66979096 activerecord-4.2.8
43507184 nokogiri-1.7.1
43365188 mail-2.6.4
5960201 activesupport-4.2.8
5056267 discourse/lib
4835284 rack-mini-profiler-0.10.1
3825817 arel-6.0.4
2186088 i18n-0.8.1
1719330 discourse/app
```
After:
```
Total allocated: 161935975 bytes (1473940 objects)
Total retained: 2234 bytes (17 objects)
allocated memory by gem
-----------------------------------
45430264 activerecord-4.2.8
43568627 nokogiri-1.7.1
43430754 mail-2.6.4
11233878 rack-mini-profiler-0.10.1
5260825 activesupport-4.2.8
5054491 discourse/lib
2186088 i18n-0.8.1
1822494 arel-6.0.4
```
2017-05-03 17:01:57 +08:00
Guo Xiang Tan
f5b11cb429
PERF: Don't allocate extra array.
2017-05-02 11:54:23 +08:00
Robin Ward
30ebaf6b6a
Update FontAwesome to 4.7.0
2017-04-26 15:16:30 -04:00
Robin Ward
cd4f0393a8
Add a title tag to the search results page
2017-04-26 15:02:07 -04:00
Robin Ward
bf9c4a7828
FEATURE: secure_email site setting to prevent data going out in email
2017-04-26 13:05:56 -04:00
Sam
dfe3c162cc
move stylesheet after js
2017-04-20 12:34:50 -04:00
Sam
bbed29ba57
correct font preloading
2017-04-20 11:18:37 -04:00
Robin Ward
8b8ee2ad61
Pass a context in when using a HTML builder
2017-04-18 12:35:35 -04:00
Sam
b43d2e42f4
missing spots
2017-04-17 12:30:20 -04:00
Sam
81ebe853d1
missed a few spots
2017-04-17 12:05:23 -04:00
Sam
5dd752877e
FEATURE: try adding some preload hints for chrome
2017-04-17 11:52:43 -04:00
Arpit Jalan
fe29fe71c5
FIX: embedding comments was broken
2017-04-14 08:14:22 +05:30
Sam
3f4f0b32a9
FIX: path wizard showing with no style
2017-04-13 15:22:39 -04:00
Sam
a3e8c3cd7b
FEATURE: Native theme support
...
This feature introduces the concept of themes. Themes are an evolution
of site customizations.
Themes introduce two very big conceptual changes:
- A theme may include other "child themes", children can include grand
children and so on.
- A theme may specify a color scheme
The change does away with the idea of "enabled" color schemes.
It also adds a bunch of big niceties like
- You can source a theme from a git repo
- History for themes is much improved
- You can only have a single enabled theme. Themes can be selected by
users, if you opt for it.
On a technical level this change comes with a whole bunch of goodies
- All CSS is now compiled using a custom pipeline that uses libsass
see /lib/stylesheet
- There is a single pipeline for css compilation (in the past we used
one for customizations and another one for the rest of the app
- The stylesheet pipeline is now divorced of sprockets, there is no
reliance on sprockets for CSS bundling
- CSS is generated with source maps everywhere (including themes) this
makes debugging much easier
- Our "live reloader" is smarter and avoid a flash of unstyled content
we run a file watcher in "puma" in dev so you no longer need to run
rake autospec to watch for CSS changes
2017-04-12 10:53:49 -04:00
Arpit Jalan
b3761653b3
FIX: render emoji in title tag on topic page
2017-04-11 00:25:22 +05:30
Neil Lalonde
3957540dd1
FIX: convert emoji to unicode in topic titles in emails
2017-04-10 13:15:25 -04:00
Arpit Jalan
f960505359
FIX: translate badge metadata title
2017-04-06 09:57:52 +05:30
Aashaka Shah
402eaaa773
FEATURE: add og tags to metadata in individual badges page
2017-04-06 09:32:53 +05:30
Robin Ward
17f2974d0a
SECURITY: Confirm new administrator accounts via email
2017-04-04 15:59:01 -04:00
Robin Ward
14410b71fb
Convert server side paths to use /u/
2017-03-30 10:23:24 -04:00
Robin Ward
45a257815a
Convert front end paths from /users/
to /u/
2017-03-30 10:23:24 -04:00
Robin Ward
2fedf1c668
FIX: jQuery include was incorrect for finish-installation
2017-03-27 10:29:25 -04:00
Robin Ward
874e8900af
Display email address in SSO error message.
2017-03-21 15:37:46 -04:00
Robin Ward
aeaf5075bf
Custom errors for when Email is invalid via SSO
2017-03-21 15:23:38 -04:00
Robin Ward
52d78294cc
Render a layout when there's an SSO error
2017-03-21 15:23:38 -04:00
Arpit Jalan
801b5838e1
FIX: do not show faq/guidelines page to anonymous users for private forums
2017-03-08 16:00:49 +05:30
Arpit Jalan
090236b15b
FIX: do not show about page to anonymous users for private forums
2017-03-08 13:15:44 +05:30
Neil Lalonde
ca20cb9941
FEATURE: subcategories can be discovered by web crawlers on page 1 of the parent category topics list
2017-03-02 15:06:56 -05:00
Neil Lalonde
7496f373cd
add headline itemprop to DiscussionForumPosting for crawlers
2017-03-02 12:35:50 -05:00
Blake Erickson
80858bae2c
FEATURE: further restrict downloading of backups
...
- send email to logged in admin when they press the "download" button
- show pop-up that email was sent
- create email template
- require a valid token to download backup
2017-03-01 08:28:34 -07:00
Guo Xiang Tan
0e8c849572
UX: "See more" on not found page should redirect to /top.
2017-02-27 13:33:19 +08:00
Arpit Jalan
068ce19ae2
FEATURE: linked topics should be rendered under posts for crawlers
2017-02-21 12:43:24 +05:30
Neil Lalonde
aa2c527c60
Remove "From" from every post in Popular Posts section of summary emails
2017-02-20 11:04:12 -05:00
Neil Lalonde
d0fbb27f3e
FEATURE: new invite acceptance page, where username can be chosen and password can be set
2017-02-15 16:51:57 -05:00
Sam
07b9c351a4
Merge pull request #4705 from vinothkannans/dev
...
new: server plugin outlet for indexable robots.txt
2017-02-13 11:18:51 -05:00
Vinoth Kannan
08c14dd689
new: server plugin outlet for indexable robots.txt
2017-02-13 17:31:10 +05:30
Vinoth Kannan
1b43c209eb
'Article' to 'DiscussionForumPosting' schema type
...
topic => https://meta.discourse.org/t/invalid-article-schema/57037
Replacing '[Article](https://schema.org/Article )' schema type with '[DiscussionForumPosting](https://schema.org/DiscussionForumPosting )'
2017-02-11 18:44:40 +05:30
Neil Lalonde
a5dfcddc6c
FIX: crawler view of paginated content should have link elements in head for next and previous pages
2017-02-07 16:11:12 -05:00
Neil Lalonde
ece979efd1
add tags to webcrawler view of a topic in an ItemList
2017-02-06 18:12:48 -05:00
Neil Lalonde
c4e10f2a9d
FEATURE: redesign the change password page to use javascript and validations
2017-02-03 16:09:24 -05:00
Neil Lalonde
ae671355da
FIX: add /tags routes to robots.txt
2017-02-03 11:57:00 -05:00
Arpit Jalan
9dd09e453b
FEATURE: add explicit confirmation button to accept the invite
2017-01-25 15:50:30 +05:30
cpradio
d0a3dc10d8
FIX: RSS Language should use a dash/hypen instead of underscore
2017-01-14 14:24:21 -05:00
Neil Lalonde
d9146de080
FIX: an image can be shown twice in summary emails
2017-01-09 13:27:43 -05:00
Guo Xiang Tan
98df6db0eb
FIX: Respect site setting to hide username in mailing list summary.
2017-01-09 12:18:30 +08:00
Jeff Atwood
878af4c8b1
add tiny bit of space to email summary
2017-01-03 15:45:29 -08:00
Rafael dos Santos Silva
d3fb724578
Merge pull request #4632 from xfalcox/native-app-banner
...
FEATURE: Opt-in native Discourse app install banner
2017-01-03 16:32:24 -02:00
Rafael dos Santos Silva
d7c8c2d5e3
FEATURE: Opt-in native Discourse app install banner on Android/iOS
2017-01-03 15:50:45 -02:00
Neil Lalonde
b72014423e
FIX: summary email wrong background colour above popular posts
2017-01-03 11:05:54 -05:00
Neil Lalonde
0f484e11fe
FIX: Popular Posts heading in summary emails was a different style than other headings
2016-12-29 15:33:53 -05:00
Neil Lalonde
67347432b7
Remove unread counts from last section of summary email, and rename it "New for you"
2016-12-28 14:06:01 -05:00
Neil Lalonde
f3b4a889b2
FIX: remove extra space to the right of avatars in summary emails
2016-12-28 13:56:46 -05:00
Neil Lalonde
3256620d5d
FIX: some blank topics and posts in summary email because they're images
2016-12-19 16:21:31 -05:00
Robin Ward
e03d5e2140
Reapply Ember 2.10 for good this time!
...
This reverts commit ddd299f4aa
.
2016-12-19 11:19:10 -05:00
Sam
0599bd0154
FEATURE: add referrer never tag to password reset page
2016-12-19 11:01:58 +11:00
Sam
30e0154e5d
SECURITY: fix reflected XSS with safe_mode param
...
(only applies to beta and master)
2016-12-19 10:11:51 +11:00
Robin Ward
ddd299f4aa
Revert "Revert "Revert Ember 2.10+ for a short while""
...
This reverts commit 76bbc481cb
.
2016-12-16 10:29:30 -05:00
Robin Ward
76bbc481cb
Revert "Revert Ember 2.10+ for a short while"
...
This reverts commit 21682fd60b
.
2016-12-16 09:52:29 -05:00
Robin Ward
21682fd60b
Revert Ember 2.10+ for a short while
2016-12-15 16:43:38 -05:00
Neil Lalonde
f01f95d62d
FEATURE: new settings to customize some colors in emails
2016-12-15 14:43:53 -05:00
Neil Lalonde
62ba5ea33f
Name before username in summary email
2016-12-15 14:43:52 -05:00
Neil Lalonde
a26c3fe2b6
FIX: truncate long topic titles in summary email
2016-12-14 12:59:01 -05:00
Robin Ward
03bc6f70f9
Better error messages when embedding fails
2016-12-13 14:38:05 -05:00
Neil Lalonde
17bc42fe85
FIX: box style category badges in emails, and shrink text and some spacing in summary email
2016-12-09 16:59:54 -05:00
Neil Lalonde
a7ee72649d
FIX: add back support for customizing header in summary email
2016-12-06 12:40:42 -05:00
Neil Lalonde
1f50fcd613
FIX: digest customizations for above/below popular topics were sometimes not being shown
2016-12-06 12:35:02 -05:00
Erick Guan
52763f5115
FEATURE: Allow posting a link with topics
2016-12-05 17:20:54 +01:00
Neil Lalonde
9db3685823
fix another case of double user name in digest
2016-12-02 13:31:12 -05:00
Neil Lalonde
fa395bb43c
fix colour bug in summary email
2016-12-02 10:33:12 -05:00
Neil Lalonde
8a0cf1b90e
FIX: if username and name are the same, don't show both in summary emails
2016-12-01 12:17:23 -05:00
Jeff Atwood
61bcc98c0e
slightly tighten spacing on digests
2016-11-30 17:13:01 -08:00
Neil Lalonde
8cd30cdc8b
FIX: respect the enable_names setting, and fix cases when html is invalid
2016-11-30 17:58:07 -05:00
Jeff Atwood
3f3a0d7b14
make counts fixed width for digest/summary
2016-11-29 17:21:51 -08:00
Neil Lalonde
4d52682267
FIX: wrong font of site title in summary email
2016-11-29 17:12:11 -05:00
Neil Lalonde
a187932126
Counts at top of summary email are links
2016-11-29 17:10:25 -05:00
Neil Lalonde
4e0958051e
FIX: don't try to show svg's in summary email
2016-11-28 14:35:59 -05:00
Jeff Atwood
fc68a7f0c6
tighten spacing on digest "new in"
2016-11-27 10:19:23 -08:00
Jeff Atwood
9b363d6df7
tighten spacing on digest email
2016-11-27 10:03:34 -08:00
Jeff Atwood
e77dbbacea
no vendor specific formatting in digest emails
2016-11-27 09:49:15 -08:00
Neil Lalonde
af4f2d000a
FIX: translation missing messages in digest when showing more than 5 popular topics
2016-11-25 16:37:06 -05:00
Neil Lalonde
9d5ac320f4
FIX: dates in digest email wrapping when they should have plenty of space on one line
2016-11-25 16:29:01 -05:00
Neil Lalonde
655b8a0540
move topic.image_url to same row as avatar in digest email
2016-11-25 15:41:22 -05:00
Neil Lalonde
96daf5431f
digest: don't show stats with 0. try to show new posts and new users counts.
2016-11-24 16:28:24 -05:00
Neil Lalonde
4efb3069e2
FIX: exception in digest email when last_read_post_number is nil
2016-11-23 17:51:57 -05:00
Neil Lalonde
71e4fe9c85
FIX: consistent rendering of categories in digest emails
2016-11-21 17:33:19 -05:00
Neil Lalonde
7d37c2b919
FIX: digest email has broken images in popular topics section
2016-11-21 12:33:48 -05:00
Neil Lalonde
47be1a8be9
FIX: digest email: put topic title and category in the same column in the "New in ... you follow" section
2016-11-21 12:33:48 -05:00
Neil Lalonde
dffefcaa6a
FIX: links in digest with href="#"
2016-11-21 12:33:48 -05:00
Sam
e2c87da42a
FEATURE: Add basic support for Safe Mode
...
In Safe Mode all JS extensions and site customizations are disabled.
To access Safe Mode visit `sitename.org/safe-mode`
2016-11-21 16:46:14 +11:00
Jeff Atwood
18156719bd
downsize digest heading font a tad
2016-11-20 01:52:12 -08:00
Neil Lalonde
45f368126f
FEATURE: New summary/digest email design
2016-11-18 14:03:42 -05:00
Sam
f4c754b389
FEATURE: split JavaScript application bundle, so plugins live in own file
...
This adds plugin.js and plugin_third_party.js files
2016-11-15 11:43:13 +11:00
Rafael dos Santos Silva
24227af9e8
Adds some styling for crawler view
2016-11-14 18:32:59 -02:00
Sam
115c454002
FIX: if prioritizing names in ux choose name over username in email
2016-11-14 11:09:24 +11:00
Robin Ward
19e2eec219
Allow step 0 to resend the confirmation email
2016-10-21 11:34:19 -04:00
Robin Ward
c03d25f170
FEATURE: Configure Admin Account
...
Adds a "Step 0" to the wizard if the site has no admin accounts where
the user is prompted to finish setting up their admin account from the
list of acceptable email addresses.
Once confirmed, the wizard begins.
2016-10-19 11:27:56 -04:00
Sam
f4f5524190
FEATURE: user API now contains scopes so permission is granular
...
previously we supported blanket read and write for user API, this
change amends it so we can define more limited scopes. A scope only
covers a few routes. You can not grant access to part of the site and
leave a large amount of the information hidden to API consumer.
2016-10-14 16:05:42 +11:00
Rafael dos Santos Silva
41d2620d06
Add some styling to print redux version
2016-10-12 14:00:05 -03:00
Sam
6031e692f0
Merge pull request #4366 from xfalcox/print
...
Print Support
2016-10-11 11:47:20 +11:00
Sam
80fc54a16c
Merge pull request #4398 from xfalcox/fix-tags-for-crawlers
...
FIX: Tags on topic crawler view
2016-10-11 11:43:40 +11:00
Rafael dos Santos Silva
03ec480c65
Removes UI for print, adds CTRL+P shortcut
2016-09-26 20:46:55 -03:00
Rafael dos Santos Silva
acc70cc3de
SiteSetting, admin passtrough, CSS, hide on mobile
2016-09-26 20:46:55 -03:00
Rafael dos Santos Silva
70c68f0a7c
Open print dialog automatically
2016-09-26 20:44:50 -03:00
Rafael dos Santos Silva
108e3fdf97
FIX: Hide full names on /about for crawlers when names are disabled
2016-09-26 16:31:39 -03:00
Robin Ward
3d621767cc
FIX: Wizard didn't work with subfolders
2016-09-22 14:39:36 -04:00
Robin Ward
af83c8dc14
Upload Logos Step
2016-09-22 09:52:19 -04:00
Robin Ward
9f12b571ef
Wizard: Server Side Validation + Finished Step
2016-09-22 09:52:19 -04:00
Robin Ward
3a4615c205
Wizard: Step 1
2016-09-22 09:48:58 -04:00
Robin Ward
0471ad393c
Scaffold for new Wizard - Rails / Ember / Tests
2016-09-22 09:48:58 -04:00
Robin Ward
6070939daa
Support for other i18n bundles
2016-09-22 09:48:58 -04:00
Daniel Marquard
5968f39d7e
Allow for search engine updates
2016-09-19 22:25:54 -04:00
Daniel Marquard
d77deaa185
Firefox needs "title" OpenSearch parameter
2016-09-19 22:21:42 -04:00
Daniel Marquard
222ef942ee
Well formed OpenSearch/XML
...
1 of 2 changes for OpenSearch to better support Firefox.
2016-09-19 22:12:43 -04:00
Sam
fe7883eeea
UX: don't allow user scaling in mobile view
...
on iOS 10 behavior of zoom restriction has changed.
This does not disable zooming on iOS 10 but it DOES stop it from randomly
zooming when you are composing
2016-09-15 07:36:16 +10:00
Sam
39e6cbc442
FIX: disable double submission which invalidates nonce
2016-09-04 16:05:25 +10:00
Neil Lalonde
2f68be2c5c
FEATURE: custom html and text can be added to summary emails
2016-08-23 16:06:02 -04:00
Sam
691f739f11
better error handling
...
push notifications imply read access, no need for a special permission
2016-08-23 16:48:00 +10:00
Arpit Jalan
a39929d12e
FEATURE: add opengraph and twitter meta tags on every page
2016-08-21 22:08:49 +05:30
Neil Lalonde
a1363feec8
FIX: don't show post withdrawn by author in summary emails
2016-08-19 12:11:36 -04:00
Régis Hanol
6d1d7b7c8f
UX: new /categories layout
2016-08-17 23:23:16 +02:00
Rafael dos Santos Silva
16f04d96d4
FIX: Tags on topic crawler view
...
- Remove tag object id
- Remove duplicate tag list
- Don't display tags when tagging is disabled
2016-08-17 01:28:31 -03:00
Sam
b7cea24d76
FEATURE: more user API flow, support key creation
2016-08-16 17:06:52 +10:00
Neil Lalonde
d38727efb7
FIX: Google Universal Analytics was tracking two page views on first page view
2016-08-02 12:55:02 -04:00
Robin Ward
215eae9972
FIX: Add a title
to the groups pages
2016-07-25 14:24:43 -04:00
Neil Lalonde
ba637e40b6
FEATURE: Google Tag Manager Universal Analytics support
2016-07-14 16:35:20 -04:00
Jeff Atwood
1386f9c8c9
make the activate account button a btn-primary
2016-07-14 03:40:55 -07:00
Sam Saffron
f369d492b3
FEATURE: stop linking to last post in crawler view
...
This only makes stuff harder for google AND does not even function correctly
2016-07-12 21:11:33 +10:00
Robin Ward
bba0fd0654
REFACTOR: PreloadStore to ES6
2016-07-11 12:57:05 -04:00
Robin Ward
25d6915cac
Migrate discourse.js to ES6
2016-07-11 12:57:05 -04:00
Robin Ward
a546395397
REFACTOR: Migrate markdown functionality in ES6
2016-07-11 12:57:05 -04:00
Robin Ward
f7c303c82e
FIX: If there's no window.opener
use the localStorage method for login
2016-07-08 14:45:34 -04:00
Robin Ward
72560b5260
UX: Apply the category class on initial page load
2016-07-04 12:11:12 -04:00
James Kiesel
7a6bc3f1d7
Apply notification styles to mailing list email manually ( #4283 )
...
* Apply notification styles to mailing list email manually
* Fix failing spec
2016-06-21 20:42:30 +05:30
Jeff Atwood
bf3b68fbd8
fix typo in URL
2016-06-19 23:32:03 -07:00
Arpit Jalan
a4a53d6500
FIX: apply style formatting on post notification emails
2016-06-17 15:09:48 +05:30
Sam
dd1a184955
Correct mailing list mode unsubscribe
2016-06-17 11:57:23 +10:00
Sam
852860de66
FEATURE: simpler and friendlier unsubscribe workflow
...
- All unsubscribes go to the exact same page
- You may unsubscribe from watching a category on that page
- You no longer need to be logged in to unsubscribe from a topic
- Simplified footer on emails
2016-06-17 11:28:49 +10:00
Robin Ward
eff2865278
FIX: Support create account on facebook browser
2016-06-10 11:12:46 -04:00
Robin Ward
171dbd4b09
Allow redirects on Facebook Browser
2016-06-09 15:51:46 -04:00
Robin Ward
f6eb5e823b
Temporarily remove FB browser redirect
2016-06-09 15:35:17 -04:00
Robin Ward
ba5993ae79
FIX: Invalid escaping of URL
2016-06-09 15:10:21 -04:00
Robin Ward
4730c82b3a
FIX: Detect window.opener
2016-06-09 14:51:38 -04:00
Robin Ward
eee15dfe7f
FIX: On facebook browser, don't close the window but redirect instead
2016-06-09 14:20:44 -04:00
Régis Hanol
99ad251731
different email footer when mailing_list_mode is enabled
2016-06-03 15:48:54 +02:00
Régis Hanol
edd80e0298
remove unsubscribe link in invite emails
2016-06-03 12:26:23 +02:00
Robin Ward
a3907e1fbb
UX: Allow the timeline to scroll mid post
2016-05-31 10:51:55 -04:00
Arpit Jalan
cf97efb643
make the text field autofocus on admin-login page
2016-05-25 23:41:07 +05:30
Régis Hanol
c012b18601
FIX: sending email wasn't working anymore when a plugin used 'reduce_cooked' (cc @gdpelican)
2016-05-21 20:13:00 +02:00
James Kiesel
feffe23cc5
FEATURE: More granular mailing list mode ( #4068 )
...
* Rearrange frontend to account for mailing list mode
* Allow update of user preference for mailing list frequency
* Add mailing list frequency estimate
* Simplify frequency estimate; disable activity summary for mailing list mode
* Remove combined updates
* Add specs for enqueue mailing list mode job
* Write mailing list method for mailer
* Fix linting error
* Account for stale topics
* Add translations for default mailing list setting
* One query for mailing list topics
* Fix failing spec
* WIP
* Flesh out html template
* First pass at text-based mailing list summary
* Add user avatar
* Properly format posts for mailing list
* Move make_all_links_absolute into Email::Styles
* Apply first_seen_at to user
* Send mailing list email summary hourly based on first_seen_at
* Branch and test cleanup
* Use existing mailing list mode estimate
* Fix failing specs
2016-05-21 15:17:54 +02:00
Sam Saffron
54cfba56dc
FIX: handle missing user for posts
2016-05-17 09:35:30 +10:00
Damien Caselli
b90159b11d
FIX: tag topic list header href leading to 404
2016-05-06 11:13:06 +02:00
Robin Ward
89e506551a
Add body class to account-created
route
2016-05-05 14:37:09 -04:00
Neil Lalonde
c1aded8b64
FIX: crawler view of tags index page
2016-05-03 16:10:12 -04:00
Arpit Jalan
2a2b0d7803
FIX: do not raise error if tertiary color not found while sending digests
2016-04-28 22:03:28 +05:30
Neil Lalonde
e5918c7d00
FEATURE: Merge tagging plugin into core
2016-04-27 11:58:53 -04:00
Nick Ivanter
d59106cb15
FIX: duplicate subfolder prefix in links in digest ( #4179 )
...
In subfolder installs, the subfolder prefix was getting duplicated in topic and category links in the digest. E.g. http://example.com/forum/forum/t/ ...
2016-04-26 11:18:34 -04:00
Jeff Atwood
9a08bb15d4
Merge pull request #4174 from NickIvanter/digest-log-alt-tag
...
Add 'alt' tag to logo img in digest email
2016-04-25 16:16:50 -07:00
Nick Ivanter
c0d81a298e
Add 'alt' tag to logo img in digest email
...
The rationale for this is that the logo, as any other image, is not loaded by default by many email clients. In absence of an 'alt' tag, it shows an empty space in the email. Having the site title in there seems better.
2016-04-15 22:03:12 +03:00
Régis Hanol
0db0f83787
FIX: remove double <hr> in email notifications
2016-04-14 20:23:52 +02:00
Régis Hanol
379bfac36d
Merge pull request #4010 from riking/patch-sitelinks
...
FEATURE: Add /search discovery
2016-04-14 10:35:13 +02:00
Robin Ward
e91379916b
FIX: Provide the ability to reduce
cooked content
...
This allows us to strip polls from the group posts page.
2016-04-13 13:25:18 -04:00
Neil Lalonde
b782a01148
add server_plugin_outlet topic_list_header
2016-04-13 11:49:43 -04:00
Jeff Atwood
36e3e53798
is it really necessary to specify 'normal' font?
2016-04-11 02:30:11 -07:00
Jeff Atwood
e45243924e
oops
2016-04-11 02:00:16 -07:00
Jeff Atwood
fff03fb7c3
woff and woff2 are all we need for webfonts
...
on any browser that is remotely modern
2016-04-11 01:37:17 -07:00
Guo Xiang Tan
4e7e4cee7d
PERF: Rendering crawler's template is expensive.
2016-04-07 16:28:31 +02:00
Dean Taylor
5cfc83a1a3
FIX: Digest broken anchor tag for blank/SVG logo
...
Highlighted here:
https://meta.discourse.org/t/svg-image-as-digest-logo-has-limited-support/39935/11?u=deanmarktaylor
2016-04-02 17:45:34 +01:00
Arpit Jalan
05164d4cae
FEATURE: add Google Analytics code to more user pages
2016-04-02 01:29:08 +05:30
Kane York
f2ddd44712
FEATURE: Add /search discovery
...
The opensearch.xml results in a "site search engine" being added to
Chrome, while the sitelinks search tag results in "Search this website"
being added to Google Search.
2016-03-28 15:07:59 -07:00
Arpit Jalan
17afdc34cc
UX: user invite email style should be consistent with other user notifications
2016-03-25 19:28:55 +05:30
Sam
c095304d6d
FEATURE: limit daily emails per user to 100 per day via site setting
...
- controlled via max_emails_per_day_per_user, 0 to disable
- when limit is reached user is warned
2016-03-23 15:08:48 +11:00
Sam
49fe5a93b1
tweak logo image
2016-03-17 16:56:47 +11:00
Sam
ecbbbbc98c
FIX: not showing content on topics for mobile crawler
2016-03-17 15:09:08 +11:00
Robin Ward
233aa2ab2f
FIX: If we're using the crawler layout, don't skip on mobile
2016-03-16 14:35:58 -04:00
scossar
1ae14f3b89
don't call translate with a symbol
...
close anchor tag
2016-03-15 10:32:14 -07:00
Robin Ward
5771d2aee2
SECURITY: Support for confirm old as well as new email accounts
2016-03-08 14:52:22 -05:00
Arpit Jalan
dde91a54dc
SECURITY: strip HTML tags in topic title in email digest
2016-03-08 20:24:24 +05:30
Neil Lalonde
df413737d2
FIX: render About page for web crawlers
2016-03-07 15:28:11 -05:00
Arpit Jalan
50e65634d7
FEATURE: new setting min_admin_password_length and better default
2016-03-02 14:43:26 +05:30
Sam Saffron
820a435af8
FEATURE: add "email in-reply-to user option"
...
We no longer include previous replies as "context", instead
we include and excerpt of the post being replied to at the bottom
of notifications, this information was previously missing.
Users may opt in to emailing previous replies if they wish
or opt out of "in-reply-to" which makes sense in some email clients that
are smarter about displaying a tree of replies.
2016-02-26 00:05:59 +11:00
Arpit Jalan
9de5c340b0
FIX: invite link should not auto-accept invitation if user is already logged in
2016-02-23 12:10:25 -05:00
Robin Ward
026bba1876
Merge branch 'master' into vdom
2016-02-22 15:28:07 -05:00