]>
source.dussan.org Git - nextcloud-server.git/log
Vincent Petry [Tue, 27 May 2014 12:28:47 +0000 (14:28 +0200)]
Merge pull request #8736 from owncloud/appinfo-newrequirefields
App info new fields "requiremin" and "requiremax"
Vincent Petry [Tue, 27 May 2014 10:25:55 +0000 (12:25 +0200)]
Merge pull request #8721 from owncloud/sharing_don_lose_filesize
don't lose file size during rename
Vincent Petry [Tue, 27 May 2014 09:55:33 +0000 (11:55 +0200)]
Merge pull request #8733 from owncloud/l10n-forgotten-tags
unwrapped strings fix
Vincent Petry [Tue, 27 May 2014 09:54:44 +0000 (11:54 +0200)]
Adjust core apps to use "requiremin" instead of "require"
Also added a few missing authors.
Vincent Petry [Tue, 27 May 2014 09:54:12 +0000 (11:54 +0200)]
Added requiremin/requiremax fields for apps
Apps can now specify a minimum and maximum version of ownCloud in which
they are supported.
Vincent Petry [Tue, 27 May 2014 07:02:52 +0000 (09:02 +0200)]
Merge pull request #8728 from owncloud/sharing_fix_reshare
allow resharing of files with only share permissions
Jenkins for ownCloud [Tue, 27 May 2014 05:54:54 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Volkan Gezer [Tue, 27 May 2014 01:48:24 +0000 (03:48 +0200)]
unwrapped strings fix
Bjoern Schiessle [Mon, 26 May 2014 18:32:24 +0000 (20:32 +0200)]
allow resharing of files with only share permissions
Bjoern Schiessle [Mon, 26 May 2014 10:37:43 +0000 (12:37 +0200)]
don't lose file size during rename
Vincent Petry [Mon, 26 May 2014 09:06:13 +0000 (11:06 +0200)]
Merge pull request #8687 from owncloud/recursive-remove-smb
Make the recursive delete more robust
Frank Karlitschek [Mon, 26 May 2014 08:48:44 +0000 (10:48 +0200)]
Merge pull request #8674 from owncloud/watch-policy
Add a config option for setting the filesystem watcher policy
Jenkins for ownCloud [Mon, 26 May 2014 05:55:36 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Volkan Gezer [Sun, 25 May 2014 17:26:37 +0000 (19:26 +0200)]
Merge pull request #8711 from owncloud/l10n-fully-translatable-ldap
make user_ldap fully translatable
Volkan Gezer [Sun, 25 May 2014 10:35:46 +0000 (12:35 +0200)]
make user_ldap fully translatable
Thomas Müller [Sun, 25 May 2014 09:00:34 +0000 (11:00 +0200)]
Merge pull request #8705 from wakeup/master
fix typo
Jenkins for ownCloud [Sun, 25 May 2014 05:54:35 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Volkan Gezer [Sat, 24 May 2014 12:36:10 +0000 (14:36 +0200)]
fix typo
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex
Lukas Reschke [Sat, 24 May 2014 10:49:12 +0000 (12:49 +0200)]
Merge pull request #8688 from owncloud/public-image-positioning
Show less whitespace above publicly shared images
Jenkins for ownCloud [Sat, 24 May 2014 05:55:34 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Björn Schießle [Fri, 23 May 2014 18:53:32 +0000 (20:53 +0200)]
Merge pull request #8699 from owncloud/sharing_improvements
fix share label creation
Jan-Christoph Borchardt [Fri, 23 May 2014 16:13:02 +0000 (18:13 +0200)]
Merge pull request #8690 from owncloud/design-noise
remove noise texture from interface
Bjoern Schiessle [Fri, 23 May 2014 14:21:15 +0000 (16:21 +0200)]
fix share label creation
Jan-Christoph Borchardt [Fri, 23 May 2014 12:15:36 +0000 (14:15 +0200)]
remove noise texture from interface (not necessary, and blurry on high-res)
Robin Appelman [Fri, 23 May 2014 11:36:16 +0000 (13:36 +0200)]
Show less whitespace above publicly shared images
Robin Appelman [Fri, 23 May 2014 11:31:45 +0000 (13:31 +0200)]
Make the recursive delete more robust
Björn Schießle [Fri, 23 May 2014 10:41:34 +0000 (06:41 -0400)]
Merge pull request #8675 from owncloud/sharing-improvements
Sharing improvements
Robin Appelman [Thu, 22 May 2014 11:45:55 +0000 (13:45 +0200)]
Add a config option fro setting the filesystem watcher policy
Vincent Petry [Fri, 23 May 2014 09:33:14 +0000 (11:33 +0200)]
Merge pull request #8671 from owncloud/log-upload-errors
php upload errors are written to log
Bjoern Schiessle [Fri, 23 May 2014 09:16:22 +0000 (11:16 +0200)]
prevent default action when clicking on the share notification
Thomas Müller [Fri, 23 May 2014 08:14:09 +0000 (10:14 +0200)]
Merge pull request #8658 from realriot/master
Changed access mode for Dropbox to 'auto'
Vincent Petry [Fri, 23 May 2014 08:06:51 +0000 (10:06 +0200)]
Merge pull request #8647 from owncloud/public-image-scaling
Dont scale up the preview for publicly shared images
Robin Appelman [Tue, 20 May 2014 11:45:14 +0000 (13:45 +0200)]
Dont scale up the preview for publicly shared images
Bjoern Schiessle [Thu, 22 May 2014 12:29:23 +0000 (14:29 +0200)]
always check for unique filename, if a file gets added from outside the mount
point should be adjusted to ne unique again
Bjoern Schiessle [Thu, 22 May 2014 12:28:29 +0000 (14:28 +0200)]
fileList needs be be declared before the if-statement
Björn Schießle [Thu, 22 May 2014 12:19:27 +0000 (08:19 -0400)]
Merge pull request #8599 from owncloud/sharing_disable_for_groups
allow admin to disable sharing for specific groups of users
Robin Appelman [Thu, 22 May 2014 11:30:32 +0000 (13:30 +0200)]
Fix phpdoc
Vincent Petry [Thu, 22 May 2014 11:17:44 +0000 (13:17 +0200)]
Merge pull request #8163 from Xenopathic/files_external_priority
Priority on external storage mounts
Thomas Müller [Thu, 22 May 2014 10:20:27 +0000 (12:20 +0200)]
php upload errors are written to log
Bjoern Schiessle [Tue, 13 May 2014 13:22:18 +0000 (15:22 +0200)]
allow admin to disable sharing for specific groups of users
Remco Brenninkmeijer [Wed, 21 May 2014 11:19:02 +0000 (13:19 +0200)]
Fix for #8654
Thomas Müller [Thu, 22 May 2014 08:30:33 +0000 (10:30 +0200)]
Merge pull request #8634 from owncloud/handle-excpetions-in-console-master
Handle excpetions in console master
Vincent Petry [Thu, 22 May 2014 07:59:20 +0000 (09:59 +0200)]
Merge pull request #8659 from owncloud/get-preference-multiple-user
Add a method to get the values for multiple users to OC\Preferences
Jenkins for ownCloud [Thu, 22 May 2014 05:54:28 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Robin McCorkell [Wed, 21 May 2014 21:31:18 +0000 (22:31 +0100)]
Use default priority of 100 if backend default is not set
Robin McCorkell [Wed, 21 May 2014 21:29:16 +0000 (22:29 +0100)]
Add priority overriding comments
Robin McCorkell [Wed, 14 May 2014 21:34:38 +0000 (22:34 +0100)]
Fix priority merging logic and add unit test
Robin McCorkell [Wed, 14 May 2014 19:32:19 +0000 (20:32 +0100)]
Add unit tests
Robin McCorkell [Fri, 9 May 2014 19:59:56 +0000 (20:59 +0100)]
Use constants for priority type and add comments
Robin McCorkell [Tue, 29 Apr 2014 09:00:26 +0000 (10:00 +0100)]
Use more strict type comparisons
Robin McCorkell [Thu, 3 Apr 2014 13:57:35 +0000 (14:57 +0100)]
Preserve priority if already set
Robin McCorkell [Fri, 28 Mar 2014 15:22:35 +0000 (15:22 +0000)]
Treat 'all users' as 'global'
A mount applicable to all users is as good a definition of global as can be
Robin McCorkell [Fri, 28 Mar 2014 14:24:38 +0000 (14:24 +0000)]
Add storage priority support
Each storage backend has a default priority, assigned to any system mounts
created in ownCloud. mount.json can be manually modified to change these
priorities.
The priority order is as follows:
* Personal
* User
* Group
* Global
Within each mount type, the mount with the highest priority is active.
The storage backend defaults were chosen to be the following:
* Local - 150
* Remote storage - 100
* SMB / CIFS with OC login - 90
Björn Schießle [Wed, 21 May 2014 18:07:49 +0000 (14:07 -0400)]
Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
[sharing] move the mount point up if the parent folder no longer exists
Morris Jobke [Wed, 21 May 2014 15:55:39 +0000 (17:55 +0200)]
Merge pull request #8652 from owncloud/logfile_rotate
rotate custom logfile if defined
Joas Schilling [Wed, 21 May 2014 14:00:21 +0000 (16:00 +0200)]
Clean the database after the test
Joas Schilling [Wed, 21 May 2014 12:35:59 +0000 (14:35 +0200)]
Correctly create list of placeholders
Bjoern Schiessle [Wed, 30 Apr 2014 14:56:09 +0000 (16:56 +0200)]
move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists
Joas Schilling [Wed, 21 May 2014 11:17:29 +0000 (13:17 +0200)]
Add a lot of users for testing
Joas Schilling [Wed, 21 May 2014 11:10:23 +0000 (13:10 +0200)]
Move return to new line
Björn Schießle [Wed, 21 May 2014 10:27:07 +0000 (06:27 -0400)]
Merge pull request #8612 from owncloud/share-updateshareiconsafterrename
[master] Fixed issues with renaming
Björn Schießle [Wed, 21 May 2014 09:41:35 +0000 (05:41 -0400)]
Merge pull request #8646 from owncloud/publicshare-fixes
[master] Fixed for public link page
Joas Schilling [Wed, 21 May 2014 09:34:26 +0000 (11:34 +0200)]
Add test case for getValueForUsers()
Joas Schilling [Wed, 21 May 2014 09:11:47 +0000 (11:11 +0200)]
Add a method to get the values for multiple users to OC\Preferences
Vincent Petry [Wed, 21 May 2014 07:57:45 +0000 (09:57 +0200)]
Merge pull request #8637 from owncloud/enc_improved_error_handling
[encryption] improved error handling during password change
Sascha Schmidt [Wed, 21 May 2014 07:40:03 +0000 (09:40 +0200)]
Changed access mode for Dropbox to 'auto'
scolebrook [Tue, 20 May 2014 15:29:59 +0000 (11:29 -0400)]
use custom logfile path if defined, otherwise use default of owncloud.log in data directory
Vincent Petry [Tue, 20 May 2014 11:37:58 +0000 (13:37 +0200)]
Fixed JS issues in public page
- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors
Vincent Petry [Tue, 20 May 2014 11:24:52 +0000 (13:24 +0200)]
Fixed download URL in public page
Jenkins for ownCloud [Tue, 20 May 2014 05:54:53 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Mon, 19 May 2014 18:18:32 +0000 (20:18 +0200)]
Merge pull request #8639 from owncloud/drop-brief
Remove all occurences of @brief and @returns from PHPDoc
Morris Jobke [Mon, 19 May 2014 15:50:53 +0000 (17:50 +0200)]
Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
Frank Karlitschek [Mon, 19 May 2014 15:41:31 +0000 (16:41 +0100)]
Merge pull request #6457 from owncloud/db-convert-tool
Command line tool to convert current database to others, except sqlite
Thomas Müller [Mon, 19 May 2014 14:52:03 +0000 (16:52 +0200)]
Merge pull request #8435 from owncloud/fix-8322-master
Expose permission via WebDAV
Thomas Müller [Mon, 19 May 2014 13:58:30 +0000 (15:58 +0200)]
Merge pull request #8557 from owncloud/custom_session_handling
Allow apps to create custom session handlers.
Bjoern Schiessle [Mon, 19 May 2014 13:08:02 +0000 (15:08 +0200)]
only start migration if the encryption was initialized; allow to overwrite keys if no files exists
Thomas Müller [Mon, 19 May 2014 13:29:38 +0000 (15:29 +0200)]
fix description of console command maintenance:repair - fixes #8574
Thomas Müller [Mon, 19 May 2014 13:26:57 +0000 (15:26 +0200)]
adding try/catch + switch to config object as provided by the server container
Andreas Fischer [Mon, 19 May 2014 12:08:42 +0000 (14:08 +0200)]
Merge pull request #8585 from owncloud/phpdoc-improvements-apps
PHPDoc improvements /apps
* owncloud/phpdoc-improvements-apps:
Fix whitespace issues
Reduce double-space with single-space.
Remove spaces around | operator in doc block.
Fix more missing or broken PHPDoc
PHPDoc fixes for user_ldap
Fix PHPDoc in /apps
Morris Jobke [Mon, 19 May 2014 11:14:33 +0000 (13:14 +0200)]
Merge branch 'libasys-patch-1'
libasys [Fri, 14 Mar 2014 11:10:05 +0000 (12:10 +0100)]
Add generic 'share by link' URL generator in share.js
Some more global definition to autogenerate a "Shared by Link" with token! Why we not add these lines for more global use of the public service feature? At the moment there is a pr for sharing a calendar by Link. With this little mod the calendar can work with the core share api and needs no own js share definition!
Morris Jobke [Mon, 19 May 2014 08:26:54 +0000 (10:26 +0200)]
Merge pull request #7286 from owncloud/issue/4823
Set expiration date by default when adding additional shares
Jenkins for ownCloud [Mon, 19 May 2014 05:54:46 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Sun, 18 May 2014 23:53:20 +0000 (01:53 +0200)]
fix wrong conflict resolution
Joas Schilling [Wed, 7 May 2014 10:17:46 +0000 (12:17 +0200)]
Correctly set expiration dates when adding additional shares
Joas Schilling [Wed, 7 May 2014 09:23:50 +0000 (11:23 +0200)]
Automatically copy the share expiration date when new shares are created
Fix #4823
Morris Jobke [Sun, 18 May 2014 23:21:37 +0000 (01:21 +0200)]
Merge pull request #7363 from owncloud/optimize-startup-queries
Optimize some queries that are always executed when loading base.php
Morris Jobke [Sun, 18 May 2014 23:14:03 +0000 (01:14 +0200)]
Merge pull request #8592 from owncloud/login-timezone
Disable login button until the timezone is set
Jenkins for ownCloud [Sun, 18 May 2014 05:55:01 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Vincent Petry [Sat, 17 May 2014 16:20:47 +0000 (18:20 +0200)]
Merge pull request #8609 from owncloud/ie8-svgfallbackforicons
SVG fallback for a few icons
Jenkins for ownCloud [Sat, 17 May 2014 05:57:38 +0000 (01:57 -0400)]
[tx-robot] updated from transifex
Robin McCorkell [Thu, 15 May 2014 20:47:28 +0000 (21:47 +0100)]
Fix whitespace issues
Andreas Fischer [Thu, 15 May 2014 20:42:02 +0000 (22:42 +0200)]
Reduce double-space with single-space.
Andreas Fischer [Thu, 15 May 2014 20:41:39 +0000 (22:41 +0200)]
Remove spaces around | operator in doc block.
Robin McCorkell [Thu, 15 May 2014 12:19:32 +0000 (13:19 +0100)]
Fix more missing or broken PHPDoc
Robin McCorkell [Thu, 15 May 2014 12:12:17 +0000 (13:12 +0100)]
PHPDoc fixes for user_ldap
Robin McCorkell [Tue, 13 May 2014 11:29:25 +0000 (12:29 +0100)]
Fix PHPDoc in /apps
Björn Schießle [Fri, 16 May 2014 18:57:11 +0000 (14:57 -0400)]
Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
use default expire date only for link shares
Björn Schießle [Fri, 16 May 2014 16:23:01 +0000 (12:23 -0400)]
Merge pull request #8604 from owncloud/sharing_encforce_password
allow admin to enforce passwords for public link shares
Bjoern Schiessle [Mon, 12 May 2014 14:15:13 +0000 (16:15 +0200)]
use default expire date only for link shares