]>
source.dussan.org Git - nextcloud-server.git/log
Nmz [Thu, 2 Oct 2014 09:47:39 +0000 (12:47 +0300)]
Preview large TXT files fix
Limit the size of the string generating the preview image for TXT files
Jenkins for ownCloud [Thu, 2 Oct 2014 05:54:48 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Wed, 1 Oct 2014 11:07:28 +0000 (13:07 +0200)]
Merge pull request #10104 from owncloud/s3-overwrite
Fix S3 copy and rename overwriting target directory
Jenkins for ownCloud [Wed, 1 Oct 2014 10:56:17 +0000 (06:56 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Wed, 1 Oct 2014 10:47:43 +0000 (12:47 +0200)]
Merge pull request #11356 from owncloud/redirect-only-to-the-same-domain
Redirect only to absolute URL
Lukas Reschke [Wed, 1 Oct 2014 09:15:50 +0000 (11:15 +0200)]
Merge pull request #11368 from owncloud/use-svg-previews
Use SVG previews for public sharing
Lukas Reschke [Wed, 1 Oct 2014 08:43:18 +0000 (10:43 +0200)]
Merge pull request #11303 from owncloud/addFilelockToConfig
Add flock to config
Morris Jobke [Tue, 30 Sep 2014 14:15:37 +0000 (16:15 +0200)]
Merge pull request #11365 from owncloud/fix-phpdoc
Fix PHPDoc
Morris Jobke [Tue, 30 Sep 2014 14:12:58 +0000 (16:12 +0200)]
Merge pull request #11366 from owncloud/invalid-doc
Remove invalid PHPDoc
Lukas Reschke [Thu, 25 Sep 2014 16:43:04 +0000 (18:43 +0200)]
Add flock to config
This adds a file lock to the config in hope that this prevents race conditions as reported in https://github.com/owncloud/core/issues/11070
Testplan:
- [ ] Delete config.php and make it read-only => Error is thrown that it is not writeable
- [ ] Installation still works
- [ ] Changing config settings works (i.e. using the SMTP config switches in the administration menu)
- [ ] Your PC didn't blow up
- [ ] Installing the news app and the "Disable AppCode checker" app did not destroy your installation
Only skip the main config
Otherwise read only additional configs might not be processed
Test on tmpdir
Lukas Reschke [Tue, 30 Sep 2014 13:23:16 +0000 (15:23 +0200)]
Use SVG previews for public sharing
Fixes https://github.com/owncloud/core/pull/11367#issuecomment-
57306037 and https://github.com/owncloud/core/issues/9218
Lukas Reschke [Tue, 30 Sep 2014 11:42:08 +0000 (13:42 +0200)]
Remove invalid PHPDoc
Despite the documentation this function does not read values from the cookie
Lukas Reschke [Tue, 30 Sep 2014 11:34:50 +0000 (13:34 +0200)]
Fix PHPDoc
Jenkins for ownCloud [Tue, 30 Sep 2014 05:55:11 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Mon, 29 Sep 2014 20:06:00 +0000 (22:06 +0200)]
Merge pull request #11337 from danbartram/better_encryption_recovery_labels
Add clickable labels to encryption recovery radios
Lukas Reschke [Mon, 29 Sep 2014 20:03:33 +0000 (22:03 +0200)]
Merge pull request #11352 from owncloud/close-session-for-previews
Close the session for preview generation
Lukas Reschke [Mon, 29 Sep 2014 19:42:07 +0000 (21:42 +0200)]
Merge pull request #11347 from mark0n/create_empty_config
Add a CLI command that creates an empty LDAP config
Lukas Reschke [Mon, 29 Sep 2014 18:26:41 +0000 (20:26 +0200)]
Merge pull request #10107 from owncloud/sharing_group_shares
[sharing] group shares
Thomas Müller [Mon, 29 Sep 2014 18:25:20 +0000 (20:25 +0200)]
Merge pull request #11357 from owncloud/kill-dead-code
Remove dead code
Lukas Reschke [Mon, 29 Sep 2014 15:20:29 +0000 (17:20 +0200)]
Remove dead code
Lukas Reschke [Mon, 29 Sep 2014 15:07:43 +0000 (17:07 +0200)]
Redirect only to absolute URL
We do not want to redirect to other domains using the "?redirect_url=" feature. Please notice, that the ownCloud project does not consider open redirectors as security issue.
Lukas Reschke [Mon, 29 Sep 2014 12:46:10 +0000 (14:46 +0200)]
Merge pull request #11321 from owncloud/ldap-fix-memberof-detection
dn needs to be fetched to be able to detect memberOf support
Lukas Reschke [Mon, 29 Sep 2014 12:27:44 +0000 (14:27 +0200)]
Close the session for preview generation
Without closing the session every preview image generation is locking the session which makes the webinterface unresponsive.
Lukas Reschke [Mon, 29 Sep 2014 10:22:20 +0000 (12:22 +0200)]
Merge pull request #11324 from owncloud/tryToCreateDatadirectory
Try to create datadirectory to test whether the .htaccess works
Bjoern Schiessle [Mon, 29 Sep 2014 09:23:18 +0000 (11:23 +0200)]
some small fixed, suggested by scrutinizer
Bjoern Schiessle [Mon, 29 Sep 2014 09:13:01 +0000 (11:13 +0200)]
throw a exception if we can't handle the provided path
Jenkins for ownCloud [Mon, 29 Sep 2014 05:54:33 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Martin Konrad [Mon, 29 Sep 2014 03:17:53 +0000 (23:17 -0400)]
Add a CLI command that creates an empty LDAP config
This is needed to configure the user_ldap app without using the
wizard (e.g. using tools like Puppet).
Thomas Müller [Sun, 28 Sep 2014 22:15:14 +0000 (00:15 +0200)]
Merge pull request #11322 from owncloud/adding-unittest-helper
Adding test helper to test private methods
Morris Jobke [Sun, 28 Sep 2014 21:32:47 +0000 (23:32 +0200)]
Merge pull request #11335 from danbartram/imp_logrotate_conf_example
Clear up confusion of log_rotate_size config value
Jenkins for ownCloud [Sun, 28 Sep 2014 05:55:09 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Dan Bartram [Sat, 27 Sep 2014 15:20:06 +0000 (16:20 +0100)]
Add clickable labels to encryption recovery radios
Add clickable radio button labels to the encryption recovery settings
pages:
* settings-admin
* settings-personal
Pressing on the radio button text now toggles the state of the radio
button.
Dan Bartram [Sat, 27 Sep 2014 12:27:42 +0000 (13:27 +0100)]
Clear up confusion of log_rotate_size config value
Remove the second comment which could be confused with suggesting an invalid value: `// 100 MiB`.
To keep the easily readable example value, it has been moved into the comment header for the config item.
Morris Jobke [Sat, 27 Sep 2014 08:41:25 +0000 (10:41 +0200)]
Merge pull request #11304 from owncloud/share-spinner
Added spinners in share dropdown
Morris Jobke [Sat, 27 Sep 2014 08:28:53 +0000 (10:28 +0200)]
Merge pull request #11319 from owncloud/header-owncloud-name
for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar
Jenkins for ownCloud [Sat, 27 Sep 2014 05:54:48 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Fri, 26 Sep 2014 15:25:28 +0000 (17:25 +0200)]
Try to create datadirectory to test whether the .htaccess works
Fixes https://github.com/owncloud/core/pull/11299#issuecomment-
56968588 and also https://github.com/owncloud/core/issues/10628 together with https://github.com/owncloud/core/pull/11299#issuecomment-
56968588 when backported.
Vincent Petry [Fri, 26 Sep 2014 15:06:16 +0000 (17:06 +0200)]
Prevent monkey clicking on labels
Clicking on labels while the spinner is there will not trigger the
hidden checkbox any more.
Bjoern Schiessle [Fri, 26 Sep 2014 14:58:47 +0000 (16:58 +0200)]
on unshare only unshare childrens if there is no other parent available
Clark Tomlinson [Fri, 26 Sep 2014 14:14:59 +0000 (10:14 -0400)]
Adding test helper to test private methods
Jan-Christoph Borchardt [Fri, 26 Sep 2014 13:38:35 +0000 (15:38 +0200)]
for whitelabeled edition, show branding name (e.g. 'ownCloud') instead of appname in header bar
Arthur Schiwon [Fri, 26 Sep 2014 13:36:49 +0000 (15:36 +0200)]
dn needs to be fetched to be able to detect memberOf support
Lukas Reschke [Fri, 26 Sep 2014 12:31:31 +0000 (14:31 +0200)]
Merge pull request #11311 from owncloud/fixing-unhandled-exception-cleanTmp-master
catch and log exception in OC_Helper::cleanTmp()
Lukas Reschke [Fri, 26 Sep 2014 11:42:47 +0000 (13:42 +0200)]
Add ID to markup to have the checkboxes in the right position
Vincent Petry [Thu, 25 Sep 2014 17:46:30 +0000 (19:46 +0200)]
Added spinners in share dropdown
Added spinners for the following actions:
- adding user
- removing user
- changing password
- toggling allowing upload
- setting a password
Bjoern Schiessle [Fri, 26 Sep 2014 11:19:15 +0000 (13:19 +0200)]
only create a new share entry, if the user needs a different target name than the group share
Bjoern Schiessle [Fri, 26 Sep 2014 11:10:31 +0000 (13:10 +0200)]
for group shares we don't need a extra db entry of groupTarget equals itemTarget
Bjoern Schiessle [Fri, 26 Sep 2014 11:01:54 +0000 (13:01 +0200)]
for group shares only the parent has the up-to-date permission. Make sure that we always use this permission, except if the user permission is '0' because in this case the user unshared the group share from self
Thomas Müller [Fri, 26 Sep 2014 07:17:47 +0000 (09:17 +0200)]
catch and log exception in OC_Helper::cleanTmp()
Thomas Müller [Fri, 26 Sep 2014 07:21:32 +0000 (09:21 +0200)]
Merge pull request #11285 from owncloud/dav-permissions-create
Fix dav permissions for folders
Jenkins for ownCloud [Fri, 26 Sep 2014 05:54:59 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Robin Appelman [Thu, 25 Sep 2014 13:53:33 +0000 (15:53 +0200)]
Merge pull request #11282 from owncloud/scanner-memory-stable7
Don't keep the full info of all children in memory
Vincent Petry [Thu, 25 Sep 2014 12:32:32 +0000 (14:32 +0200)]
Merge pull request #10934 from owncloud/datadir-write-setup
Don't complain about non-writable datadirs before we're installed
Bjoern Schiessle [Thu, 25 Sep 2014 11:45:23 +0000 (13:45 +0200)]
call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible
Robin Appelman [Wed, 24 Sep 2014 15:50:33 +0000 (17:50 +0200)]
Fix dav permissions for folders without create permissions
Robin Appelman [Wed, 24 Sep 2014 15:49:52 +0000 (17:49 +0200)]
Expose creatable permissions trough fileinfo
Bjoern Schiessle [Thu, 25 Sep 2014 10:35:11 +0000 (12:35 +0200)]
always select permissions, used in getItems()
Bjoern Schiessle [Thu, 25 Sep 2014 09:29:57 +0000 (11:29 +0200)]
some small fixes
Jenkins for ownCloud [Thu, 25 Sep 2014 05:55:32 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 24 Sep 2014 21:55:21 +0000 (23:55 +0200)]
Merge pull request #11286 from owncloud/clarify-possible-formats
Clarify possible preview providers for type Office
Morris Jobke [Wed, 24 Sep 2014 21:54:06 +0000 (23:54 +0200)]
Merge pull request #11287 from owncloud/kill-with
Disable external code coverage
Lukas Reschke [Wed, 24 Sep 2014 20:35:30 +0000 (22:35 +0200)]
Disable external code coverage
Lukas Reschke [Wed, 24 Sep 2014 19:16:14 +0000 (21:16 +0200)]
Clarify possible preview providers for type Office
a
Clark Tomlinson [Wed, 24 Sep 2014 19:11:11 +0000 (15:11 -0400)]
Merge pull request #11281 from owncloud/scanner-unkown-user
Show a proper error message when trying to scan the filesystem for a non...
Thomas Müller [Wed, 24 Sep 2014 15:51:12 +0000 (17:51 +0200)]
Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON
Show login again instead of JSON if CSRF check fails
Robin Appelman [Wed, 24 Sep 2014 13:48:54 +0000 (15:48 +0200)]
Show a proper error message when trying to scan the filesystem for a non existing user
Robin Appelman [Wed, 24 Sep 2014 13:44:56 +0000 (15:44 +0200)]
Don't keep the full info of all children in memory
Lukas Reschke [Wed, 24 Sep 2014 13:19:11 +0000 (15:19 +0200)]
Merge pull request #11229 from kofemann/for-upstream
user/backed: use pow of two for backed action constants
Morris Jobke [Wed, 24 Sep 2014 12:44:46 +0000 (14:44 +0200)]
Merge pull request #11275 from owncloud/drop-if-e
Drop only if exists
Bjoern Schiessle [Mon, 22 Sep 2014 16:13:40 +0000 (18:13 +0200)]
clear share table after each test run
Bjoern Schiessle [Thu, 18 Sep 2014 12:46:11 +0000 (14:46 +0200)]
only add a new row if it isn't a unique share, otherwise update the existing row
Bjoern Schiessle [Tue, 26 Aug 2014 22:31:39 +0000 (00:31 +0200)]
mark exclude list as deprecated. It neither used by the files app nor by the
calendar or contacts app. It doesn't make sense to build a exclude list by the
share API, the apps knows best which are valid targets.
Bjoern Schiessle [Tue, 26 Aug 2014 22:31:49 +0000 (00:31 +0200)]
fix unit tests
Bjoern Schiessle [Tue, 26 Aug 2014 22:30:13 +0000 (00:30 +0200)]
fix add user to group to work with grouped shares
Bjoern Schiessle [Fri, 22 Aug 2014 13:59:44 +0000 (15:59 +0200)]
generateTarget() will always find a unique target
Lukas Reschke [Wed, 24 Sep 2014 10:37:00 +0000 (12:37 +0200)]
Drop only if exists
Thomas Müller [Wed, 24 Sep 2014 09:39:51 +0000 (11:39 +0200)]
autotest.sh shall not terminate if mysql db could not be dropped
Jenkins for ownCloud [Wed, 24 Sep 2014 05:56:46 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 23 Sep 2014 22:37:42 +0000 (00:37 +0200)]
Merge pull request #11265 from owncloud/fix-11264
Check for blacklisted characters
Volkan Gezer [Tue, 23 Sep 2014 17:49:49 +0000 (19:49 +0200)]
Merge pull request #11254 from owncloud/fix-filepicker-home-icon
fix filepicker home icon being partly hidden, fix #10169
Lukas Reschke [Tue, 23 Sep 2014 17:30:32 +0000 (19:30 +0200)]
Check for blacklisted characters
Fixes https://github.com/owncloud/core/issues/11264
(This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
Lukas Reschke [Tue, 23 Sep 2014 16:36:40 +0000 (18:36 +0200)]
Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser
Do not show exception to the end-user - use a proper error page instead
Vincent Petry [Tue, 23 Sep 2014 14:55:16 +0000 (16:55 +0200)]
Merge pull request #7051 from owncloud/postsetupajaxcheck
Moved WebDAV check to client side JS
Tigran Mkrtchyan [Mon, 22 Sep 2014 14:45:11 +0000 (16:45 +0200)]
user/backed: use pow of two for backed action constants
the current implementation limits number of possible backed actions
to 8 as it uses pow of 16 for constants. This change introduces pow
of two and allows up-to 32 actions to be defined.
The old values are preserved for backward compatibility.
Lukas Reschke [Mon, 22 Sep 2014 13:36:39 +0000 (15:36 +0200)]
Show login again instead of JSON if CSRF check fails
Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login.
With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often.
This can be tested by opening the login page, then clearing the cookies, and trying to login.
Jan-Christoph Borchardt [Tue, 23 Sep 2014 12:28:51 +0000 (14:28 +0200)]
fix filepicker home icon being partly hidden, fix #10169
Jan-Christoph Borchardt [Tue, 23 Sep 2014 12:03:08 +0000 (14:03 +0200)]
Merge pull request #11109 from owncloud/nstamm-patch-1
DragnDrop Upload text style
Thomas Müller [Tue, 23 Sep 2014 11:45:21 +0000 (13:45 +0200)]
Merge pull request #11222 from owncloud/store-users-timezone-master
send browsers timezone back tp the server on login
Jan-Christoph Borchardt [Tue, 23 Sep 2014 11:36:47 +0000 (13:36 +0200)]
adjust text size and opacity of drag'n'drop upload text style
Jan-Christoph Borchardt [Tue, 23 Sep 2014 10:39:06 +0000 (12:39 +0200)]
Merge pull request #11234 from owncloud/fix-icon-classes
Fix icon classes, disappeared delete icon
Vincent Petry [Tue, 23 Sep 2014 10:36:34 +0000 (12:36 +0200)]
Merge pull request #11137 from owncloud/enc-pregfix
Fix share key pattern matching
Vincent Petry [Wed, 17 Sep 2014 16:50:29 +0000 (18:50 +0200)]
Fix share key finding algorithm in various cases
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.
This covers the following cases:
- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
Thomas Müller [Tue, 23 Sep 2014 10:16:58 +0000 (12:16 +0200)]
Merge pull request #11241 from owncloud/use-lower-case
Use only lower-case letters
Lukas Reschke [Tue, 23 Sep 2014 09:34:44 +0000 (11:34 +0200)]
Merge pull request #11032 from owncloud/harden-redirect
Do only follow HTTP and HTTPS redirects
Vincent Petry [Mon, 3 Feb 2014 11:48:17 +0000 (12:48 +0100)]
Moved WebDAV and internet checks to client side JS
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
server
Vincent Petry [Tue, 23 Sep 2014 08:33:50 +0000 (10:33 +0200)]
Merge pull request #11226 from owncloud/kill-postsetupcheck-master
remove post setup check
Lukas Reschke [Tue, 23 Sep 2014 08:13:58 +0000 (10:13 +0200)]
Merge pull request #11224 from owncloud/fix_recovery_admin_user
first check if a private key exists, if not it is always a recovery szenario
Lukas Reschke [Tue, 23 Sep 2014 08:13:03 +0000 (10:13 +0200)]
Merge pull request #11242 from owncloud/fix-10284
Use non-empty defaults for preview cmd line
Jenkins for ownCloud [Tue, 23 Sep 2014 06:05:45 +0000 (02:05 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 23 Sep 2014 05:38:23 +0000 (07:38 +0200)]
Merge pull request #11227 from owncloud/fix-windows-path
fixing directory seperators