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

38925 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
2847e9f2e3
fix preview tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-02 13:43:48 +02:00
Morris Jobke
23cc309606
Handle more error cases 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-02 13:43:48 +02:00
Morris Jobke
6aac094091
Add PHPDoc 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-02 13:43:47 +02:00
Robin Appelman
4dfd90abc4
better handling of preview generation errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-02 13:43:47 +02:00
Roeland Jago Douma
d25e13ea27
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 12:39:37 +02:00
Roeland Jago Douma
59e27f03b6
Add caching to the imageexport plugin 
Since we now heavily use this endpoint for the contacts menu we better
set proper caching on the images. Else this gets reload over and over
again leading to slow loading menu and unneded bytes transfered.

* cache for 1 hour by default
* added ETag for validation

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 12:30:34 +02:00
Roeland Jago Douma
73b4ef53f0
Bump version 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 11:38:37 +02:00
Roeland Jago Douma
ae7c1504a9
Fix test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 11:38:21 +02:00
Roeland Jago Douma
e79424932a
Make sure the AppFetcher fetches the new applist from the appstore 
When in the upgrade process the version in the config is still the old
version. (Since we only upgrade it after the upgrade is complete).
However the app list fetched from the appstore must be the new list.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 10:24:10 +02:00
Lukas Reschke
94c2f12226 Merge pull request #4638 from nextcloud/fix-copy-tooltip 
Fix "Copied" message for public links
 2017-05-02 10:10:23 +02:00
Lukas Reschke
d4217830c6 Merge pull request #4649 from nextcloud/update-links-to-12 
Update documentation go.php URL to 12
 2017-05-02 10:09:57 +02:00
Lukas Reschke
81ee0673a5 Merge pull request #4650 from nextcloud/appcache_on_update 
Do not use caching for appstore fetchers after upgrade
 2017-05-02 09:15:35 +02:00
Roeland Jago Douma
aa4cebe749
Bump version 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 09:00:09 +02:00
Roeland Jago Douma
762284ce93
Fix and update tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 08:59:53 +02:00
Roeland Jago Douma
095463d568
Do not do ETag caching when the version is updated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 08:44:20 +02:00
Lukas Reschke
6458875dc1
Update documentation go.php URL to 12 
Fixes https://github.com/nextcloud/server/issues/4646

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-02 08:17:59 +02:00
Nextcloud bot
f27d382c47
[tx-robot] updated from transifex 2017-05-02 00:07:20 +00:00
Morris Jobke
af6f5e8fad Merge pull request #4630 from nextcloud/mark-ip-as-whitelisted-if-bruteforce-protection-is-disabled 
Mark IP as whitelisted if brute force protection is disabled
 2017-05-01 18:03:39 -03:00
Morris Jobke
2ce71f8c24
Fix "Copied" message for public links 
* share a file/fodler by public link and click the
  copy to clipboard icon and watch the tooltip
* before: it said "Copy"
* after: it now says "Copied" after clicking the button

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 17:58:12 -03:00
Morris Jobke
242934c016
Remove dependency on jquery-migrate.js for browser detection 
* ref #4628

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 17:53:48 -03:00
Lukas Reschke
72dd4425c9 Merge pull request #4626 from nextcloud/adjust-shipped-json 
Remove apps delivered from the appstore
 2017-05-01 20:49:43 +02:00
Lukas Reschke
8cb3115acf Merge pull request #4615 from nextcloud/js-reduce-share.js-complexity 
Remove abandoned methods in OC.Share that refer to old API endpoints
 2017-05-01 20:44:19 +02:00
Lukas Reschke
dd03fdebec
Add missing space 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-01 20:36:25 +02:00
Roeland Jago Douma
4904117ba8 Merge pull request #4612 from nextcloud/js-fix-long-lines 
Fix some long lines in JS - JSLinut recommendation
 2017-05-01 19:55:56 +02:00
Roeland Jago Douma
92b73db053 Merge pull request #4613 from nextcloud/remove-unused 
Remove unused JS file
 2017-05-01 19:42:12 +02:00
Lukas Reschke
a5ccb31e85
Mark IP as whitelisted if brute force protection is disabled 
Currently, when disabling the brute force protection no new brute force attempts are logged. However, the ones logged within the last 24 hours will still be used for throttling.

This is quite an unexpected behaviour and caused some support issues. With this change when the brute force protection is disabled also the existing attempts within the last 24 hours will be disregarded.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-01 18:31:45 +02:00
Lukas Reschke
0329adbc61 Merge pull request #4599 from nextcloud/contactsmenu-mobile 
Define max-width for Contacts menu for mobile
 2017-05-01 18:05:52 +02:00
Lukas Reschke
4a05ca46d3 Merge pull request #4598 from nextcloud/menu-flashing 
Prevent flashing of apps and user menu on page load
 2017-05-01 18:04:51 +02:00
Morris Jobke
dba55f950a Merge pull request #4594 from nextcloud/theming-image-default 
Delete theming images when logo/background is reset to default
 2017-05-01 12:55:00 -03:00
Morris Jobke
3eba37ac14 Merge pull request #4527 from nextcloud/downstream-27504 
Adjust SMB permissions on the root
 2017-05-01 12:53:49 -03:00
Lukas Reschke
7a2d817c83 Merge pull request #4624 from nextcloud/email-settings-html 
fix email settings
 2017-05-01 17:51:15 +02:00
Lukas Reschke
a2f6fea408 Merge pull request #4610 from nextcloud/js-semicolons 
Fix semicolon at end of JS lines
 2017-05-01 16:55:35 +02:00
Lukas Reschke
99f98ca343 Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate 
Fix variable definitions in oc dialogs
 2017-05-01 16:54:53 +02:00
Lukas Reschke
1e35c9d8b6 Merge pull request #4513 from nextcloud/bump-version-to-beta1 
Bump version to Nextcloud 12.0 beta 1
 2017-05-01 16:53:16 +02:00
Lukas Reschke
a3546b0ec0
Remove apps delivered from the appstore 
Apps that are in shipped.json follow some more requirements such as having a valid code integrity check. This is not something that we require when they come from the appstore as there we verify the download integrity via the signature.

Also the updater treats apps that are shipped differently. We should however handle the apps like any other app from the appstore.

Fixes https://github.com/nextcloud/server/issues/4605

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-01 16:47:58 +02:00
Robin Appelman
6e7359ebfd
fix email settings 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-01 16:32:09 +02:00
Robin Appelman
75b3b72d89
fix permissions of mountpoints 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-01 15:37:02 +02:00
Roeland Jago Douma
18b5e2fced Merge pull request #4616 from nextcloud/js-reduce-complexity-for-sharedialogview.js 
Fix variable definition in sharedialogview.js
 2017-05-01 14:21:28 +02:00
Morris Jobke
23858504eb
Fix variable definition in sharedialogview.js 
* improves readability of conditional statements
  and fixes warning in JSLint for varibale definition

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 01:32:54 -03:00
Morris Jobke
4cd8b3379b
Remove unused methods from OC.Share 
* they do calls against core/ajax/share.php which doesn't exist anymore
* also the methods are not called in any of our apps or any of the apps in the appstore

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 01:29:00 -03:00
Morris Jobke
d222351c87
Fix variable definitions in oc dialogs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 01:09:29 -03:00
Morris Jobke
26b92ada0e
Remove unused JS file 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:59:10 -03:00
Morris Jobke
a9ccfe06d9
Fix some long lines in JS - JSLinut recommendation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:49:00 -03:00
Morris Jobke
80a5e0a735
Use dot notation for array access - JSLint recommendation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:45:41 -03:00
Morris Jobke
11b9d224fd
Fix semicolon at end of JS lines 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:42:53 -03:00
Nextcloud bot
2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Morris Jobke
285a5b98b0 Merge pull request #4602 from nextcloud/make-tooltip-intransparent 
Make tooltip intransparent
 2017-04-30 11:13:36 -03:00
Julius Härtl
7c69c117e2
Delete theming images when logo/background is reset to default 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-30 11:04:55 -03:00
Nextcloud bot
4518f6dc64
[tx-robot] updated from transifex 2017-04-30 00:07:21 +00:00
blizzz
9edd3916ff Merge pull request #4603 from nextcloud/basic-settings 
Rename “Server settings” to “Basic settings”
 2017-04-29 23:28:50 +02:00