Shane Kilkelly
03aa9b87f1
Add debug query string origin
to invocations of the updateSubscription endpoint.
2016-08-22 10:09:54 +01:00
Paulo Reis
f4b8cc7fc8
Use first and last name instead of full name as input.
2016-08-19 16:46:44 +01:00
Paulo Reis
53c6e48da9
Remove left-hand panel experiment.
2016-08-19 16:03:15 +01:00
Paulo Reis
6a1f0de912
Add i18n keys.
2016-08-19 15:12:05 +01:00
Paulo Reis
452abe94be
Add coupon code, VAT and pricing breakdown. Styling adjustments.
2016-08-19 14:51:07 +01:00
Henry Oswald
3d36dc7d6c
mvp for not using cdn when blocked
2016-08-19 11:05:35 +01:00
Paulo Reis
26e21732f8
Added validations + minor fixes.
2016-08-18 17:41:55 +01:00
Paulo Reis
43b832965f
Layout and styling for simple subscription form.
2016-08-18 16:56:23 +01:00
Paulo Reis
4814fc2606
Simple layout for subscription form.
2016-08-17 17:34:17 +01:00
Paulo Reis
672d4f8767
Setup AB test (alternative is still empty).
2016-08-17 12:11:17 +01:00
Shane Kilkelly
c98e473bc3
Fix layout of notifications
2016-08-17 10:31:05 +01:00
Shane Kilkelly
4805c96584
Merge branch 'master' into pr-email-tokens
2016-08-17 08:52:24 +01:00
Shane Kilkelly
158afbb157
Merge branch 'master' into pr-email-tokens
...
Conflicts:
app/coffee/Features/Notifications/NotificationsBuilder.coffee
public/coffee/ide/share/controllers/ShareController.coffee
2016-08-15 10:29:21 +01:00
Shane Kilkelly
d547bff4e5
Blur the resend
button after response
2016-08-12 11:25:03 +01:00
Shane Kilkelly
a9042ff324
Enable enter key on share dialog button
2016-08-11 15:24:35 +01:00
Brian Gough
9a399d3dd3
move "run syntax check" compile option out of beta
2016-08-11 13:55:47 +01:00
Brian Gough
a862592138
added syntax check to beta page, removed mendeley
2016-08-11 13:43:33 +01:00
Paulo Reis
b405b4dce6
Remove Countly integration.
2016-08-10 17:34:32 +01:00
Brian Gough
abcfb2dd16
Merge pull request #290 from sharelatex/enable-chktex
...
Enable chktex
2016-08-10 11:49:31 +01:00
Shane Kilkelly
e0444cfc62
Make notification column layout explicit.
2016-08-05 16:41:11 +01:00
Paulo Jorge Reis
60f8e577a8
Merge pull request #293 from sharelatex/pr-wrap-long-words-chat
...
Wrap long words chat
2016-08-03 16:32:36 +01:00
Brian Gough
42388f8b76
fix missing space in pdf jade template
2016-08-03 16:30:33 +01:00
Brian Gough
7ce406dd38
switch the compile dropdown menu to left, to avoid overflow into editor
2016-08-03 16:30:18 +01:00
Brian Gough
4d3629e5db
add beta feature badge to syntax check
2016-08-03 16:29:46 +01:00
Paulo Reis
73f115fc57
Add i18n keys.
2016-08-03 16:09:45 +01:00
Paulo Reis
cf5c8e27e1
UI fix - do not allow multiple clicks to restore a deleted file.
2016-08-03 16:05:19 +01:00
Shane Kilkelly
e7251aab53
Small wording changes
2016-08-03 14:06:08 +01:00
Paulo Reis
e6898d64c9
Track hovering of header features.
2016-08-03 12:17:19 +01:00
Shane Kilkelly
8cb93511df
Update UI of share modal
2016-08-03 11:55:24 +01:00
Brian Gough
38f76b305b
change message to "Run syntax check"
2016-08-02 14:43:09 +01:00
Shane Kilkelly
dca1c9be5d
Load invites on project load, rather than asynchronously.
2016-08-01 17:05:37 +01:00
Paulo Reis
ff62e50530
Integrate word wrapping filter in the chat component.
2016-08-01 16:42:54 +01:00
Brian Gough
e508f7b8a9
don't try to display a log hint link if there isn't one
2016-07-29 15:11:34 +01:00
Brian Gough
0742db7732
enable validation option only for beta programme users
2016-07-29 15:11:34 +01:00
Brian Gough
ef85f1014c
add menu option for checking with chktex
2016-07-29 14:59:48 +01:00
Shane Kilkelly
7b18f88145
Merge branch 'master' into pr-email-tokens
2016-07-28 14:53:36 +01:00
Paulo Reis
f4d78a856c
Disable page view and session tracking.
2016-07-27 14:20:39 +01:00
Shane Kilkelly
46ec17f2c4
Add redir query string to login link
2016-07-27 13:51:52 +01:00
Shane Kilkelly
e1af171534
Add a dot to end of sentence.
2016-07-27 11:07:26 +01:00
Shane Kilkelly
6f39813a56
Add translations
2016-07-27 10:56:22 +01:00
Shane Kilkelly
78948251a1
Change the Close button color
2016-07-27 10:28:01 +01:00
Shane Kilkelly
827629a74a
Invalid-invite page, and re-jigg the share modal
2016-07-27 10:10:44 +01:00
Paulo Reis
6d0779b8f8
Add forgotten name attribute.
2016-07-26 14:47:48 +01:00
Paulo Reis
a3ee3134b1
Support for i18n.
2016-07-26 11:56:15 +01:00
Shane Kilkelly
2dede5f793
WIP: Working "accept invite" page
2016-07-26 11:46:41 +01:00
Paulo Reis
bfe3e160c9
Integrate with UI.
2016-07-26 11:37:51 +01:00
Shane Kilkelly
41755212f0
Update the register page with new message
2016-07-26 09:06:21 +01:00
Paulo Reis
32b57f228c
Integrate feedback UI with wufoo service.
2016-07-25 16:12:56 +01:00
Shane Kilkelly
b3add65de1
Start integrating invites into share frontend
2016-07-25 14:27:02 +01:00
Paulo Reis
37eb6252d2
Rewording + animation when shown the feedback panel.
2016-07-22 16:33:19 +01:00
Shane Kilkelly
78570817d5
Render a separate template if the invite is not found.
2016-07-22 16:28:00 +01:00
Paulo Reis
b6cd6c2d7d
UI logic to show or hide the negative feedback panel.
2016-07-22 14:14:58 +01:00
Paulo Reis
54eadf3256
Add textarea for 'other' feedback + styles.
2016-07-22 12:20:26 +01:00
Paulo Reis
95db6ba934
Basic mark-up for the extra log hint feedback.
2016-07-22 11:56:45 +01:00
Henry Oswald
ef6eefe1b1
add comment not to fingerprint worker
2016-07-22 09:05:39 +01:00
Henry Oswald
3029fb6335
add dark host option and don’t load pdfjs worker via cdn
2016-07-21 19:06:53 +01:00
Shane Kilkelly
f7c2fa37ab
Fill out getInviteByToken
2016-07-20 16:44:22 +01:00
Henry Oswald
97b42478d1
don’t fingerprint sentry
2016-07-20 16:03:01 +01:00
Henry Oswald
e8aad2abb1
don’t fingerprint main.js and ide.js
2016-07-20 15:17:01 +01:00
Henry Oswald
596fc2525b
simplified buildJSPath
2016-07-20 14:48:58 +01:00
Henry Oswald
a3e40adbaf
Merge pull request #283 from sharelatex/ho-cdn
...
Ho cdn
2016-07-20 14:19:37 +01:00
Henry Oswald
6c78ab4ace
got requirejs working nicely with cdn
2016-07-20 12:58:32 +01:00
Henry Oswald
f8c38f30a8
got build js path working with mathjax
2016-07-19 15:41:33 +01:00
Shane Kilkelly
4e1df9f476
Fix wording of userHasSubscription
to userHasNoSubscription
2016-07-19 11:37:58 +01:00
Henry Oswald
a2a8b7123b
created buildCssPath img and js path funcs
2016-07-18 17:18:51 +01:00
Brian Gough
a3c97533ae
Merge pull request #281 from sharelatex/stop-compile
...
add support for stopping compile
2016-07-18 15:01:26 +01:00
Brian Gough
ded9bcaa11
remove unwanted styling on 'stop compile' button
2016-07-18 15:00:16 +01:00
Henry Oswald
c21549220c
mvp for cdn
2016-07-18 14:05:07 +01:00
Brian Gough
5a02e8c656
add support for stopping compile
2016-07-15 16:28:52 +01:00
Henry Oswald
0576380811
allow placeholder for sharing project to be changed
2016-07-14 11:40:32 +01:00
Paulo Reis
c23091da94
Always set feature flags, if available.
2016-07-14 11:07:10 +01:00
Paulo Reis
ab995671fc
Namespace feature flags.
2016-07-14 10:10:14 +01:00
Paulo Reis
5d5bc57535
Add user name.
2016-07-14 09:55:11 +01:00
Paulo Reis
fee22db567
Refactor user blocks into a single script tag.
2016-07-14 09:47:25 +01:00
Paulo Reis
a261de9eb1
Set feature flags.
2016-07-14 09:37:04 +01:00
Paulo Reis
68906cb0c5
Avoid unneeded change_id event; id can be set as a Countly property, before initializing.
2016-07-13 16:29:53 +01:00
Henry Oswald
713f2110c1
use translations for title and meta description (google)
2016-07-12 14:25:25 +01:00
Paulo Reis
1e62ce679b
Make 'knowledge base' a link to the KB index page.
2016-07-12 11:44:48 +01:00
Paulo Reis
785bf1b5a2
New key for the message label.
2016-07-11 16:24:06 +01:00
Paulo Reis
af93ac4413
Track suggestions usage.
2016-07-11 14:27:07 +01:00
Paulo Reis
9ef78b4bc2
Merge branch 'master' into pr-contact-form-suggestions
2016-07-11 13:54:06 +01:00
Paulo Reis
7eafa5ca3f
Make Countly server configurable via settings.
2016-07-11 11:02:52 +01:00
Henry Oswald
94d760e32d
import bootstrap font awseome via less not html
2016-07-10 11:10:43 +01:00
Paulo Reis
444120f8b1
Merge branch 'master' into pr-contact-form-suggestions
2016-07-08 13:55:08 +01:00
Paulo Reis
b867c37d49
Merge branch 'master' into pr-log-dropdown
2016-07-06 15:35:28 +01:00
Paulo Jorge Reis
59065395ef
Merge pull request #273 from sharelatex/pr-countly-integration
...
Countly integration
2016-07-06 15:00:47 +01:00
Paulo Reis
7a3d3d3ffd
Make Countly track by internal ids.
2016-07-06 14:44:28 +01:00
Paulo Reis
8e2475afdc
Track hints feedback in both GA and Countly; clean-up.
2016-07-06 14:24:50 +01:00
Paulo Reis
5c121a5f05
Track user log in and sign up.
2016-07-06 12:12:54 +01:00
Paulo Reis
7e1c1f7414
Remove heap integration.
2016-07-06 12:12:22 +01:00
Paulo Reis
c9b1faa1a1
Add user info to correlate with events.
2016-07-06 11:59:33 +01:00
Paulo Reis
909f7c15b5
Track log-related actions.
2016-07-05 16:27:14 +01:00
Paulo Reis
d5efe81a46
Track recompiles.
2016-07-05 16:02:46 +01:00
Paulo Reis
fac3698c40
Better namespacing of sprite CSS classes.
2016-07-05 11:08:58 +01:00
Paulo Reis
7dd1906eaf
Initial Countly integration.
2016-07-04 16:51:31 +01:00
Paulo Reis
4f49a25639
Use a figure element instead of an img, as there is no src attribute.
2016-07-01 16:02:01 +01:00
Henry Oswald
6f4a7f4779
mvp for using sprites for flags, needs border removing
2016-07-01 15:04:39 +01:00
Paulo Reis
c5f53ef431
Track log hints feedback.
2016-06-30 11:30:30 +01:00
Paulo Reis
72d498c6c8
Merge branch 'master' into pr-contact-form-suggestions
2016-06-29 11:58:07 +01:00
Paulo Reis
a6d184358f
Avoid inline-styles.
2016-06-28 15:51:50 +01:00
Paulo Reis
88564ea126
Dynamically determine if the files dropdown should drop up or drop down.
2016-06-28 15:48:11 +01:00
Paulo Reis
d6067b86ac
Merge branch 'master' into pr-ui-feedback-error-nav
2016-06-28 10:49:55 +01:00
Henry Oswald
b8b833b753
moved wiki into module
2016-06-28 10:16:02 +01:00
Paulo Reis
3580d8377f
Merge branch 'master' into pr-contact-form-suggestions
2016-06-27 15:39:00 +01:00
Paulo Reis
d7f67e7931
Integrate translations.
2016-06-27 15:38:13 +01:00
Paulo Reis
81b93ab5a9
Disable links to the docs when the wiki is not available.
2016-06-27 11:34:24 +01:00
Paulo Reis
c82f4481e4
Show search results.
2016-06-24 17:10:18 +01:00
Paulo Reis
f427ce88d9
Better Jade syntax.
2016-06-24 16:37:35 +01:00
Paulo Reis
dfc375adf8
Add more feedback on :hover.
2016-06-24 15:55:19 +01:00
Paulo Reis
c376c807d7
Forgotten href attribute.
2016-06-24 15:22:34 +01:00
Paulo Reis
5f7ffb5a8c
Make hint card area non-clickable.
2016-06-24 12:12:45 +01:00
Paulo Reis
e4a1443d1d
Better handling of whitespace.
2016-06-24 12:07:02 +01:00
Paulo Reis
a587d5ddba
Set up model options.
2016-06-24 11:02:29 +01:00
Paulo Reis
f62a45444d
Prototype mark-up and styles.
2016-06-23 12:08:13 +01:00
Shane Kilkelly
cbdcc874e3
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-22 11:03:32 +01:00
James Allen
b693ced843
Merge pull request #263 from sharelatex/pr-human-readable-logs
...
Human readable logs
2016-06-21 14:28:06 +01:00
Paulo Reis
ed659fd973
Minor UI improvements.
2016-06-21 14:20:23 +01:00
Shane Kilkelly
6f07ea513e
Remove DataJoy link from the project page.
2016-06-21 13:28:08 +01:00
Henry Oswald
5800c88d80
Merge branch 'ha_custom_image_logo'
2016-06-21 12:07:49 +01:00
Paulo Reis
e607de0b91
Safety checks for non-existing values; avoid rendering the hint template when there is no hint.
2016-06-21 12:07:47 +01:00
Paulo Reis
d8e0026bc6
Add class to enable per-hint feedback tracking.
2016-06-20 17:32:57 +01:00
Paulo Reis
fe53083afd
Show thank you note after receiving feedback.
2016-06-20 15:04:47 +01:00
Paulo Reis
baea017adb
Better mark-up for analytics tracking.
2016-06-20 14:59:30 +01:00
Paulo Reis
a8976fd4dc
Use plain links instead of buttons.
2016-06-20 14:42:36 +01:00
Paulo Reis
ada018263a
Merge branch 'master' into pr-human-readable-logs
2016-06-20 11:54:56 +01:00
Paulo Reis
1893ae68a9
Add feedback widget for log hints.
2016-06-20 11:53:10 +01:00
Paulo Reis
605bb07ba3
Hint card styling.
2016-06-20 09:45:14 +01:00
Henry Oswald
fe11a4d835
include sentry below the fold
2016-06-18 12:29:52 +01:00
Henry Oswald
d27d19e02a
added override for navbar background image
2016-06-17 14:18:52 +01:00
Paulo Reis
2bfe0d0ba9
Basic mark-up for hint card.
2016-06-17 14:16:38 +01:00
Paulo Reis
54d48ce0ea
Support extra info URL in human readable hints.
2016-06-17 11:42:32 +01:00
Paulo Reis
40fda6e361
Support HTML in human readable log messages.
2016-06-16 16:29:19 +01:00
Paulo Reis
9b8d695e43
Match logs against ruleset; show human readable message when appropriate.
2016-06-16 15:53:39 +01:00
Shane Kilkelly
3e3dd199a0
Add id's to buttons on beta program page
2016-06-16 10:56:16 +01:00
Shane Kilkelly
241d3bfc14
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-16 10:17:47 +01:00
Shane Kilkelly
9919f5f44a
Refactor heap analytics
2016-06-16 10:17:36 +01:00
Henry Oswald
101e98ed83
simpliyfied dashboard & fixed error with leave group shown to group owner
...
- always show the manage button if you are the group owne
- only show the recurly subscription part if you are the subscription owner
- always try and loop through groups you can leave
2016-06-16 09:17:43 +01:00
Shane Kilkelly
c8302e090f
Merge branch 'master' into sk-heap-analytics
2016-06-15 15:35:47 +01:00
Shane Kilkelly
522ac8b59b
initial port of heap code from DJ into sharelatex.
2016-06-15 15:35:03 +01:00
Paulo Reis
e891a47a9e
Better support for larger text in keyboard tooltips.
2016-06-15 15:27:30 +01:00
Paulo Reis
d7e4009504
Small styling enhancements.
2016-06-15 10:48:40 +01:00
Paulo Reis
3310a3ea3f
Change tooltip copy; get it from i18n catalogue.
2016-06-14 17:20:16 +01:00
Paulo Reis
a9e0185098
Added tooltip with keyboard shortcut in the recompile button.
2016-06-14 17:02:22 +01:00
Shane Kilkelly
ad6e9e039d
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-06-08 15:31:24 +01:00
Shane Kilkelly
6ca2e2204b
If user is in beta program, show link to opt-out page on the settings page.
2016-06-08 15:31:14 +01:00
Shane Kilkelly
8f1fec8c4f
Add opt-out action to beta page
2016-06-08 15:11:39 +01:00
Brian Gough
6c244eb2f4
Merge pull request #251 from sharelatex/fix-download-urls
...
fix filename of downloaded pdf files
2016-06-08 14:33:12 +01:00
Shane Kilkelly
58d7d7bf74
Re-work wording of beta opt-in page.
2016-06-08 11:38:14 +01:00
Shane Kilkelly
90dac348ff
refine beta opt-in workflow.
2016-06-08 11:04:44 +01:00
Shane Kilkelly
20485cbfed
Merge branch 'sk-beta-program'
2016-06-08 10:34:03 +01:00
Shane Kilkelly
009fa79589
remove trailing parens.
2016-06-08 10:33:21 +01:00
Shane Kilkelly
0dfd80d307
Use css to add the beta symbol to the beta-label
2016-06-07 14:04:02 +01:00
Shane Kilkelly
d8f1e8ec93
Add basic BetaProgram
feature.
2016-06-07 11:15:56 +01:00
Henry Oswald
4029b76d9e
- make system messages default tab in admin panel
...
- add manage site tab to dropdown
2016-06-06 16:11:26 +01:00
Henry Oswald
79929eae73
Merge branch 'clsichecks'
2016-06-06 14:34:22 +01:00
Henry Oswald
2339cda318
added contentful uni pages as fallback
2016-06-06 09:28:53 +01:00
Henry Oswald
c284465ba5
added clsiformat checker, wired in
2016-06-02 13:09:32 +01:00
Brian Gough
b8e31dfc71
fix filename of downloaded pdf files
2016-06-01 16:47:55 +01:00
James Allen
35442f7ce9
Prompt the user to open a file on the left if no doc is open
2016-05-23 15:03:26 +01:00
Shane Kilkelly
0c454f5ddd
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-05-20 14:34:55 +01:00
Shane Kilkelly
2441930fe9
Add a spinner when waiting for image preview to load.
2016-05-20 14:28:51 +01:00
Henry Oswald
11724fce13
Merge branch 'master' into clsi-dynamic-load
2016-05-20 12:34:42 +01:00
Shane Kilkelly
9a6876d237
Toggle the dots at the end of bib preview, based on size of payload.
2016-05-20 09:17:25 +01:00
Henry Oswald
2abebd850c
Merge branch 'project_url_query' into clsi-dynamic-load
2016-05-19 13:08:20 +01:00
Shane Kilkelly
b649c13c17
Eliminate weird flicker when loading bibtex
2016-05-19 11:25:24 +01:00
Shane Kilkelly
b70a993572
Make bib previews more robust.
2016-05-19 11:11:23 +01:00
Shane Kilkelly
5df5ba868c
Fix logic for showing error or loading message.
2016-05-19 10:02:07 +01:00
James Allen
d813f45d28
Cherry-pick 0e70320 (Select icon based on file extension) from datajoy
2016-05-18 15:58:01 +01:00
Henry Oswald
dba8d96d11
pass clsiServerId to the client and use it as query stirng for requests
2016-05-18 12:50:50 +01:00
Shane Kilkelly
8621d497b4
Fix view so that bib preview only shows for bib files
2016-05-18 11:14:24 +01:00
Shane Kilkelly
eae82a2b20
Preview bib files.
2016-05-17 17:00:14 +01:00
James Allen
aafdc794cd
Remove text limit in content box of contact us
2016-05-10 10:44:51 +01:00
Henry Oswald
618935b643
hide hidden domains in hreflang head of html
2016-05-04 22:01:02 +01:00
Shane Kilkelly
9738703424
If image preview fails to load, just show the "no preview" message
2016-05-04 09:32:59 +01:00
Henry Oswald
ae522e8b9b
Merge pull request #235 from mdamien/patch-1
...
Correct alignment for word count dialog
2016-04-27 16:12:03 +01:00
Shane Kilkelly
07ad6eb704
actually use the rendering-error state.
2016-04-25 12:42:03 +01:00
Shane Kilkelly
9d027b88ba
Bug fix: re-introduce the project-too-large error message
2016-04-15 09:45:48 +01:00
Damien
77eba3ea22
Correct alignment for word count dialog
...
on less than `md` sized screen
2016-04-04 23:47:40 +02:00
Henry Oswald
633839c98b
for support tickets include browser/os and hide email address if
...
set already. This way we know who they are logged in with which has
caused condfusion.
2016-04-04 16:05:42 +01:00
Henry Oswald
cb3eb88af2
Merge branch 'subscriptionimprovements'
2016-03-31 11:58:56 +01:00
Henry Oswald
db8fb63bb5
fixed change payment details page
...
also increased size of year field for firefox users
and removed unnded options in new plan page
2016-03-31 11:54:52 +01:00
Henry Oswald
6662d4c2cd
wired up modal for learn and added translations
2016-03-24 12:05:54 +00:00
James Allen
9b84e1b164
Improve styling of wiki search
2016-03-24 11:38:56 +00:00
Henry Oswald
ce2cfeaa5b
don't show search bar in templates if its not configured
2016-03-24 09:52:19 +00:00
Henry Oswald
7634fcf3af
added missing page button (not wired up) to /learn
2016-03-23 18:23:09 +00:00
Henry Oswald
90092a0c61
improved styling, not perefect still
2016-03-23 16:05:38 +00:00
Henry Oswald
9cfbbfa504
template search works nicely, needs styling
2016-03-22 22:16:38 +00:00
Henry Oswald
cf45b8bd74
Merge branch 'master' into templatessearch
2016-03-22 21:35:36 +00:00
Henry Oswald
c554b0630d
if user has subscription before joining group is given option to cancel personal one
2016-03-22 16:59:47 +00:00
Shane Kilkelly
b212f33505
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-03-22 15:21:00 +00:00
James Allen
9706585d21
Fix translate in delete modal confirm button
2016-03-22 14:44:13 +00:00
Shane Kilkelly
d566ce3fd2
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-03-22 14:38:56 +00:00
James Allen
a597ebfd90
Only show deleted files in track changes view
2016-03-22 14:13:50 +00:00
Shane Kilkelly
b8c3b427ee
Merge branch 'sk-pdf-error-display'
2016-03-22 14:00:12 +00:00
Henry Oswald
cacb3bf39e
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2016-03-22 12:30:52 +00:00
Henry Oswald
69a7a1508b
modal != modal instance
2016-03-22 12:28:37 +00:00
James Allen
7637c858c8
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-03-22 12:14:18 +00:00
James Allen
4595c90363
Use translations for action in project delete modal
2016-03-22 12:12:11 +00:00
James Allen
aa1f2cc8a9
Remove #s in href on project list buttons
2016-03-22 12:11:59 +00:00
Henry Oswald
c777f498ad
Merge branch 'groove2'
2016-03-22 11:58:04 +00:00