summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-1730-42/+70
|
* Merge pull request #21184 from owncloud/cli-logger-embedded-webserverThomas Müller2015-12-161-0/+3
|\ | | | | Let's print error messages to the builtin webserver console ... makes…
| * Let's print error messages to the builtin webserver console ... makes ↵Thomas Müller2015-12-141-0/+3
| | | | | | | | development a bit easier
* | Merge pull request #21232 from owncloud/fix-21230Thomas Müller2015-12-162-1/+42
|\ \ | | | | | | Use name of ICollection for exception message
| * | add unit test for #21230Morris Jobke2015-12-161-0/+41
| | |
| * | Use name of ICollection for exception messageMorris Jobke2015-12-161-1/+1
|/ / | | | | | | * fixes #21230
* | Merge pull request #21229 from owncloud/contrib-linktomaintainerspageforappsThomas Müller2015-12-161-14/+2
|\ \ | | | | | | Replace list of apps with a link
| * | Replace list of apps with a linkVincent Petry2015-12-161-14/+2
|/ / | | | | | | The link points to the maintainers page that already contains a more up to date list of apps and repo links. No need to have this information in two places.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-12-162-0/+20
| |
* | Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-usersC. Montero Luque2015-12-154-9/+203
|\ \ | | | | | | Fix shared files of deleted users, detect DN change when checking for existence on LDAP
| * | fix find DN by UUID for ADArthur Schiwon2015-12-141-13/+56
| | |
| * | unit test on getHome in combination with OfflineUserArthur Schiwon2015-12-111-2/+52
| | |
| * | adjust unit testArthur Schiwon2015-12-111-0/+8
| | |
| * | look for DN changes before marking a user as deletedArthur Schiwon2015-12-113-3/+76
| | |
| * | throw NoUserException in getHome when the requested user does not exist anymoreArthur Schiwon2015-12-111-5/+25
| | |
* | | Merge pull request #21189 from owncloud/fix_21187Thomas Müller2015-12-152-1/+4
|\ \ \ | | | | | | | | File shares can't have create permissions
| * | | File shares can't have create permissionsRoeland Jago Douma2015-12-142-1/+4
| | | | | | | | | | | | | | | | fixes #21187
* | | | Merge pull request #21067 from owncloud/fix_20296Thomas Müller2015-12-1510-8/+105
|\ \ \ \ | | | | | | | | | | don't allow to create a federated share if source and target are the same
| * | | | Fixed JS unit tests for fed owner display nameVincent Petry2015-12-141-0/+4
| | | | |
| * | | | show display name but internally use the user nameBjörn Schießle2015-12-146-6/+11
| | | | |
| * | | | don't allow to create a federated share if source and target server are the sameBjörn Schießle2015-12-144-2/+90
| | | | |
* | | | | Merge pull request #21209 from owncloud/remove-unneeded-ldap-codeThomas Müller2015-12-151-16/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove unneeded upgrade code
| * | | | Remove unneeded upgrade codeMorris Jobke2015-12-151-16/+0
|/ / / / | | | | | | | | | | | | stable8.2 has version 0.7.0 of the user_ldap app
* | | | Merge pull request #21181 from owncloud/files-fixsharedrootdetectionThomas Müller2015-12-142-7/+40
|\ \ \ \ | |_|_|/ |/| | | Fix mount type root detection in web UI
| * | | Fix mount type root detectionVincent Petry2015-12-142-7/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Webdav doesn't contain that information, we need to rely on the parent folder's mount type to find out whether a child item is a shared/external root or not. Fixed the mount type detection logic and added unit test. Also added a fix that ignores detection if no parent folder exists (ex: shared file list, favorites, etc)
* | | | Merge pull request #21148 from owncloud/resetpassword-user-issertThomas Müller2015-12-141-3/+5
|\ \ \ \ | | | | | | | | | | Check if user isset in $_REQUEST first
| * | | | Check if user isset in $_REQUEST firstRobin Appelman2015-12-141-3/+5
| |/ / /
* | | | Merge pull request #21163 from owncloud/fix_20839Thomas Müller2015-12-141-4/+0
|\ \ \ \ | |/ / / |/| | | Files can't have create permissions
| * | | Files can't have create permissionsRoeland Jago Douma2015-12-111-4/+0
| | | | | | | | | | | | | | | | Fixes #20839
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-1316-4/+74
| |/ / |/| |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-1288-0/+156
|/ /
* | Merge pull request #21153 from owncloud/files-deleteactiontextThomas Müller2015-12-113-5/+49
|\ \ | | | | | | Bring back file delete action text to be based on context
| * | Bring back file delete action text to be based on contextVincent Petry2015-12-113-5/+49
| | | | | | | | | | | | | | | | | | | | | | | | For received shares, the delete action becomes "Unshare" and for personal mounts it becomes "Disconnect storage". This also makes it possible from now on to pass a function to a file action's "displayName" attribute.
* | | Merge pull request #20081 from owncloud/trashbin-loggedoutMorris Jobke2015-12-112-2/+16
|\ \ \ | |/ / |/| | Fix trashbin wrapper when no user is loggedin
| * | skip test if we cant use the filesystem when not logged inRobin Appelman2015-12-111-2/+5
| | |
| * | Fix thrashbin wrapper when no user is loggedinRobin Appelman2015-12-112-2/+13
|/ /
* | Merge pull request #20978 from owncloud/fix-dont-show-unsaved-values-in-usermgmtThomas Müller2015-12-111-3/+5
|\ \ | | | | | | reset mailadress/displayname on blur
| * | reset mailadress/displayname on blurmichag862015-12-071-3/+5
| | |
* | | Merge pull request #20878 from ↵Thomas Müller2015-12-113-39/+8
|\ \ \ | | | | | | | | | | | | | | | | owncloud/proper-htaccess-support-in-code-signing-checker Also run .htaccess routine when installing on another system than Apache
| * | | Don't write directives from CLILukas Reschke2015-12-081-0/+5
| | | |
| * | | Run .htaccess updates in any caseLukas Reschke2015-12-082-18/+3
| | | | | | | | | | | | | | | | This is the same what we also do in updater.php and thus this aligns the code. Makes the code paths more consistent.
| * | | Remove version check out of .htaccessLukas Reschke2015-12-082-21/+0
| | | | | | | | | | | | | | | | This can now be achieved using the new code signing.
* | | | Merge pull request #21144 from owncloud/dav-auth-checkduplicateheaderThomas Müller2015-12-111-1/+1
|\ \ \ \ | | | | | | | | | | Properly check X-Requested-With header in case of multiple values
| * | | | Properly check X-Requested-With header in case of multiple valuesVincent Petry2015-12-111-1/+1
| | | | | | | | | | | | | | | | | | | | Saw this happening in IE8...
* | | | | Merge pull request #21135 from owncloud/add-polyfillThomas Müller2015-12-1114-255/+37
|\ \ \ \ \ | | | | | | | | | | | | Add polyfills for PHP55, PHP56 and PHP70 functionalities
| * | | | | Adjust third-party referenceLukas Reschke2015-12-111-0/+0
| | | | | |
| * | | | | Use PHP polyfillsLukas Reschke2015-12-1114-255/+37
| | | | | |
* | | | | | Merge pull request #21020 from owncloud/add-directory-slash-to-setup-codeThomas Müller2015-12-112-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add DirectorySlash to dynamic .htaccess write
| * | | | | | Add DirectorySlash to dynamic .htaccess writeLukas Reschke2015-12-082-3/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `DirectorySlash off` is set then Apache will not lookup folders anymore. This is required for example when we use the rewrite directives on an existing path such as `/core/search`. By default Apache would load `/core/search/` instead `/core/search` so the redirect would fail here. This leads however to the problem that URLs such as `localhost/owncloud` would not load anymore while `localhost/owncloud/` would. This has caused problems such as https://github.com/owncloud/core/pull/21015 With this change we add the `DirectorySlash off` directive only when the `.htaccess` is writable to the dynamic part of it. This would also make `localhost/owncloud` work again as it would trigger the 404 directive which triggers the redirect in base.php.
* | | | | | Merge pull request #21045 from owncloud/scrutinizer-patch-1Thomas Müller2015-12-1114-16/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | Scrutinizer Auto-Fixes
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 06:10:05 +0000