wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
48103 commits 157 branches 562 tags 714 MiB
Commit graph

48103 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
b69b17f29f
Merge pull request #14078 from nextcloud/backport/14076/master 
[master] Make external storages browsable again in the web UI
 2019-02-07 13:56:47 +01:00
Morris Jobke
b717434f13 Reintroduce status check for external storages 
Fixes #14022

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-02-07 10:07:36 +00:00
Nextcloud bot
8db2f3ec3a
[tx-robot] updated from transifex 2019-02-06 22:18:24 +00:00
Morris Jobke
a1aa6ee70d
Merge pull request #12573 from nextcloud/fix/12568/special_handling_of_logout 
Do not do redirect handling when loggin out
 2019-02-06 15:38:54 +01:00
Nextcloud bot
0df5110127
[tx-robot] updated from transifex 2019-02-06 11:27:29 +00:00
Morris Jobke
b2ae53a44b
Merge pull request #14057 from nextcloud/bugfix/noid/translation-sync-failures 
Ignore compiled assets in settings/
 2019-02-06 12:15:28 +01:00
Morris Jobke
19ee259dc2
Ignore compiled assets 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-02-06 11:33:27 +01:00
Roeland Jago Douma
7942ef80da
Merge pull request #14008 from nextcloud/3rdpart/phpseclib-2.0.14 
[3rdparty] Bump phpseclib to 2.0.14
 2019-02-06 11:31:55 +01:00
Roeland Jago Douma
60e5a5eca4
Do not do redirect handling when loggin out 
Fixes #12568
Since the clearing of the execution context causes another reload. We
should not do the redirect_uri handling as this results in redirecting
back to the logout page on login.

This adds a simple middleware that will just check if the
ClearExecutionContext session variable is set. If that is the case it
will just redirect back to the login page.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-06 11:29:32 +01:00
Morris Jobke
f60e223d57
Merge pull request #14053 from nextcloud/fix/jstz_is_bundled 
Do not load bundled jstimezonedetect
 2019-02-06 10:03:23 +01:00
Roeland Jago Douma
635aa23b8c
Do not load bundled jstimezonedetect 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-06 09:16:45 +01:00
Roeland Jago Douma
5faf6f5186
Merge pull request #14049 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.29.1 
Bump webpack from 4.29.0 to 4.29.1 in /settings
 2019-02-06 08:51:40 +01:00
Roeland Jago Douma
50ca785808
Merge pull request #14047 from nextcloud/dependabot/npm_and_yarn/webpack-4.29.1 
Bump webpack from 4.29.0 to 4.29.1
 2019-02-06 08:51:04 +01:00
Roeland Jago Douma
d6926b03ef
Merge pull request #14046 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.29.1 
Bump webpack from 4.29.0 to 4.29.1 in /apps/updatenotification
 2019-02-06 08:50:23 +01:00
Roeland Jago Douma
4534c6c470
Merge pull request #14044 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.29.1 
Bump webpack from 4.29.0 to 4.29.1 in /apps/accessibility
 2019-02-06 08:50:00 +01:00
dependabot[bot]
7d72ddb385
Bump webpack from 4.29.0 to 4.29.1 in /apps/accessibility 
Bumps [webpack](https://github.com/webpack/webpack) from 4.29.0 to 4.29.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.29.0...v4.29.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-05 21:44:20 +01:00
dependabot[bot]
da1c36e7c4
Bump webpack from 4.29.0 to 4.29.1 in /apps/updatenotification 
Bumps [webpack](https://github.com/webpack/webpack) from 4.29.0 to 4.29.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.29.0...v4.29.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-05 19:44:20 +00:00
dependabot[bot]
095827f232
Bump webpack from 4.29.0 to 4.29.1 
Bumps [webpack](https://github.com/webpack/webpack) from 4.29.0 to 4.29.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.29.0...v4.29.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-05 19:43:16 +00:00
dependabot[bot]
eaa7509f48
Bump webpack from 4.29.0 to 4.29.1 in /settings 
Bumps [webpack](https://github.com/webpack/webpack) from 4.29.0 to 4.29.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.29.0...v4.29.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-05 19:41:12 +00:00
Roeland Jago Douma
780e1485c8
Merge pull request #14042 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-cli-3.2.3 
Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/updatenotification
 2019-02-05 20:39:25 +01:00
dependabot[bot]
1cca285e2d
Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/updatenotification 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-05 19:39:04 +00:00
Roeland Jago Douma
9aaa01d8eb
Merge pull request #14048 from nextcloud/dependabot/npm_and_yarn/settings/webpack-cli-3.2.3 
Bump webpack-cli from 3.2.1 to 3.2.3 in /settings
 2019-02-05 20:38:20 +01:00
Roeland Jago Douma
5ebb4d6075
Merge pull request #14045 from nextcloud/dependabot/npm_and_yarn/webpack-cli-3.2.3 
Bump webpack-cli from 3.2.1 to 3.2.3
 2019-02-05 20:38:00 +01:00
Roeland Jago Douma
b653aa45e0
Merge pull request #14039 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-cli-3.2.3 
Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/oauth2
 2019-02-05 20:36:47 +01:00
Roeland Jago Douma
3ab34eba3f
Merge pull request #14038 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-cli-3.2.3 
Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/accessibility
 2019-02-05 20:36:11 +01:00
dependabot[bot]
db8e02c72d
Bump webpack-cli from 3.2.1 to 3.2.3 in /settings 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-05 18:55:59 +00:00
dependabot[bot]
4649d98c36
Bump webpack-cli from 3.2.1 to 3.2.3 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-05 18:54:14 +00:00
dependabot[bot]
3c049caa77
Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/oauth2 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-05 18:51:30 +00:00
dependabot[bot]
61d103e294
Bump webpack-cli from 3.2.1 to 3.2.3 in /apps/accessibility 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-05 18:51:28 +00:00
Morris Jobke
1ceddc1cc2
Merge pull request #14030 from nextcloud/fix/oc_addstyle 
Fix OC.addStyle and OC.addScript
 2019-02-05 15:42:57 +01:00
Roeland Jago Douma
53a266060f
Fix OC.addStyle and OC.addScript 
With the move to the bundles a comment tag was not removed. So the
loaded array was undefined.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-05 15:24:54 +01:00
Roeland Jago Douma
dbd0bd6b3f
Merge pull request #13954 from nextcloud/bugfix/noid/show-original-location-in-trashbin 
Show original path in trashbin
 2019-02-05 14:08:37 +01:00
Roeland Jago Douma
3d33703ed9
Merge pull request #14024 from nextcloud/fix/installation 
It is getURLParameter not getUrlParameter
 2019-02-05 13:46:20 +01:00
Roeland Jago Douma
31a1eb0c1f
It is getURLParameter not getUrlParameter 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-05 13:15:23 +01:00
Morris Jobke
0bb55f4ed3
Merge pull request #14015 from nextcloud/fix/no_need_to_load_bundle_deps 
No need to explicitly load bundle dependencies
 2019-02-05 10:23:21 +01:00
Roeland Jago Douma
73f1cd7ac2
[3rdparty] Bump phpseclib to 2.0.14 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-05 10:03:46 +01:00
Morris Jobke
979cf79555
Show original path in trashbin via extraData 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-05 09:36:21 +01:00
Roeland Jago Douma
a201f2b4d0
No need to explicitly load bundle dependencies 
oc-webdav-backbone is loaded by default

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-04 19:34:51 +01:00
Roeland Jago Douma
733515f277
Merge pull request #14006 from nextcloud/enh/contactsmenu_templates_to_bundle 
Move contactmenu handlebars templates to bundle
 2019-02-04 11:29:16 +01:00
Roeland Jago Douma
1b27c25dce
Remove from build file 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-04 10:56:54 +01:00
Roeland Jago Douma
a498b72dec
Move the contactsmenu handlebars templates to the bundle 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-04 10:56:52 +01:00
Roeland Jago Douma
a242ec695a
Merge pull request #13877 from IGLOU-EU/master 
SCSS: add background on app section:hover
 2019-02-04 08:53:37 +01:00
Roeland Jago Douma
f705ffcfab
Merge pull request #13989 from nextcloud/dependabot/npm_and_yarn/css-vars-ponyfill-1.16.4 
Bump css-vars-ponyfill from 1.16.3 to 1.16.4
 2019-02-04 08:17:46 +01:00
Roeland Jago Douma
3372459c8b
Merge pull request #13988 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/nextcloud-vue-0.6.1 
Bump nextcloud-vue from 0.6.0 to 0.6.1 in /apps/updatenotification
 2019-02-04 08:17:22 +01:00
dependabot[bot]
e7cb87832d
Bump nextcloud-vue from 0.6.0 to 0.6.1 in /apps/updatenotification 
Bumps [nextcloud-vue](https://github.com/nextcloud/nextcloud-vue) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases)
- [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v0.6.0...v0.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-03 13:59:59 +01:00
dependabot[bot]
5818e0bcbe
Bump css-vars-ponyfill from 1.16.3 to 1.16.4 
Bumps [css-vars-ponyfill](https://github.com/jhildenbiddle/css-vars-ponyfill) from 1.16.3 to 1.16.4.
- [Release notes](https://github.com/jhildenbiddle/css-vars-ponyfill/releases)
- [Changelog](https://github.com/jhildenbiddle/css-vars-ponyfill/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhildenbiddle/css-vars-ponyfill/compare/v1.16.3...v1.16.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-03 13:56:50 +01:00
Iglou.eu
4389b80640
inadvertent error prevention on .row 
Add a 5px border on .row settings section
 2019-02-01 21:14:06 +01:00
Morris Jobke
422dd9dfd6
Merge pull request #11304 from andyg5000/master 
Make the data year in the template dynamic by using date().
 2019-02-01 15:49:18 +01:00
Morris Jobke
e5d8645f00
Merge pull request #13846 from nextcloud/feature/check-if-app-exist-for-group 
Check app path for enableAppForGroups
 2019-02-01 15:23:01 +01:00
splitt3r
42eb1538ef
Update dynamic year in example theme 2019-02-01 15:07:36 +01:00