summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ownCloud users are exported as address bookThomas Müller2014-07-243-0/+208
|
* Merge pull request #9621 from owncloud/fix_logger_implementationThomas Müller2014-07-152-2/+2
|\ | | | | fix logger implementation
| * fix logger implementation and testJörn Friedrich Dreyer2014-07-152-2/+2
| |
* | throw exception if file is to large for trash binBjoern Schiessle2014-07-153-6/+46
| |
* | Merge pull request #9633 from owncloud/correct-icon-licenseThomas Müller2014-07-157-38/+1
|\ \ | | | | | | Correct icon license
| * | remove unused 3rdparty clock and lock iconsJan-Christoph Borchardt2014-07-156-37/+0
| | |
| * | correct icon license, we use Elementary icons, not Silk anymoreJan-Christoph Borchardt2014-07-151-1/+1
| | |
* | | Merge pull request #9570 from PhilJung/masterblizzz2014-07-152-1/+153
|\ \ \ | |/ / |/| | [Issue #9559] identifiers uid=xxx must be considered as user DN and not ...
| * | File written by blizzzPhilippe Jung2014-07-141-0/+151
| | |
| * | [Issue #9559] identifiers uid=xxx must be considered as user DN and not as ↵Philippe Jung2014-07-101-1/+2
| | | | | | | | | | | | owncloud users
* | | Merge pull request #9596 from owncloud/fixing-9503-masterMorris Jobke2014-07-154-14/+14
|\ \ \ | | | | | | | | reduce share action text to the user name only
| * | | reduce share action text to the user name onlyThomas Müller2014-07-144-14/+14
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-15181-2735/+3649
| | | |
* | | | Merge pull request #9562 from owncloud/users-groupfilterThomas Müller2014-07-155-59/+153
|\ \ \ \ | | | | | | | | | | Do not filter groups, but therefore update the user counts according to the filter
| * | | | fixing PHPDocThomas Müller2014-07-141-16/+16
| | | | |
| * | | | remove dead codeArthur Schiwon2014-07-145-43/+137
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not filter groups. but update the user count according to the filter improve phpdoc improve metadata runtime cache add metadata tests
* | | | Merge pull request #9620 from owncloud/search-fileinfo-pathicewind19912014-07-141-1/+2
|\ \ \ \ | |/ / / |/| | | Use the correct path when building the FileInfo for the search result
| * | | Use the correct path when building the FileInfo for the search resultRobin Appelman2014-07-141-1/+2
|/ / /
* | | Merge pull request #9228 from owncloud/remove-routing-singular-issuesMorris Jobke2014-07-142-16/+6
|\ \ \ | | | | | | | | Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
| * | | use id instead of resourceIdBernhard Posselt2014-06-262-13/+3
| | | |
| * | | dont strip the s from the resourceBernhard Posselt2014-06-262-6/+6
| | | |
* | | | Merge pull request #9598 from owncloud/fix-app-installation-masterThomas Müller2014-07-141-9/+4
|\ \ \ \ | | | | | | | | | | append file extension to the temporary file which contains the downloade...
| * | | | append file extension to the temporary file which contains the downloaded ↵Thomas Müller2014-07-111-9/+4
| | | | | | | | | | | | | | | | | | | | archive - in case of zip files fileinfo doesn't seem to return anything reliable
* | | | | Merge pull request #9546 from owncloud/user-publicicewind19912014-07-147-3/+236
|\ \ \ \ \ | |_|_|_|/ |/| | | | Extends the public user api
| * | | | Expose the user manager in the public server containerRobin Appelman2014-07-141-0/+7
| | | | |
| * | | | Add public interfaces for User, UserManager and UserSessionRobin Appelman2014-07-146-3/+229
|/ / / /
* | | | Merge pull request #9539 from enoch85/patch-1Björn Schießle2014-07-141-14/+11
|\ \ \ \ | | | | | | | | | | Fix for #9422
| * | | | Fix for #9422Daniel Hansson2014-07-091-14/+11
| | | | |
* | | | | Merge pull request #9572 from owncloud/deleteunsharetooltipBjörn Schießle2014-07-145-5/+30
|\ \ \ \ \ | | | | | | | | | | | | mountType attribute + delete hint fix
| * | | | | Added mountType attribute and adapted Delete action textVincent Petry2014-07-145-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added mountType attribute for files/folder to indicated whether they are regular, external or shared. The client side then adapts the "Delete" action hint text based on this information. Only the mount roots must have the delete icon hint adapted. To make this detectable on the client side, the mountType can now be null, "shared", "shared-root", "external" or "external-root". This also gives room to icon customization on the client side.
* | | | | | Merge pull request #9605 from owncloud/sftp-missing-streamwrapperVincent Petry2014-07-141-0/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Re-add missing sftp:// stream wrapper
| * | | | | Add short description explaining how SFTP ext storage class works.Andreas Fischer2014-07-121-0/+4
| | | | | |
| * | | | | The file providing the sftp:// scheme needs to be included manually.Andreas Fischer2014-07-121-0/+11
| | |/ / / | |/| | |
* | | | | Merge pull request #9571 from owncloud/fix_appstore_update_issueVincent Petry2014-07-142-9/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix update to button issue
| * | | | | improve check for duplicate appsGeorg Ehrke2014-07-101-7/+2
| | | | | |
| * | | | | add proper version comparision in OC_Installer::isUpdateAvailableGeorg Ehrke2014-07-101-2/+1
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1420-68/+75
| | | | |
* | | | | Merge pull request #9563 from owncloud/version-delete-cacheMorris Jobke2014-07-131-4/+21
|\ \ \ \ \ | | | | | | | | | | | | Remove deleted versions from the cache
| * | | | | Remove deleted versions from the cacheRobin Appelman2014-07-101-4/+21
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1329-159/+243
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-1241-262/+357
| | | | | |
* | | | | | Merge pull request #9597 from owncloud/enc-removelegacytestsThomas Müller2014-07-111-0/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Disable legacy encryption tests
| * | | | | Disable legacy encryption testsVincent Petry2014-07-111-0/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | It seems these tests are not needed any more, but will now be skipped instead until the case is cleared out.
* | | | | Merge pull request #9569 from owncloud/fix-require-of-blowfish-masterMorris Jobke2014-07-102-2/+0
|\ \ \ \ \ | | | | | | | | | | | | [OC8] remove pointless require of Blowfish.php
| * | | | | remove pointless require of Blowfish.phpThomas Müller2014-07-102-2/+0
|/ / / / /
* | | | | Merge pull request #9538 from owncloud/fileactions-cleanupVincent Petry2014-07-107-43/+137
|\ \ \ \ \ | | | | | | | | | | | | Propagate file action changes to the file lists
| * | | | | Propagate file action changes to the file listsVincent Petry2014-07-097-43/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an app needs to register an event late, it does that on the original file actions object. Since the file actions that the file list work on is a merged list, not the original one, the registration event needs to be propagated there as well.
* | | | | | Merge pull request #9525 from owncloud/incrementuser2Vincent Petry2014-07-104-37/+109
|\ \ \ \ \ \ | | | | | | | | | | | | | | increment/decrement group and user counts when necessary
| * | | | | | use .filterAttr()Thomas Müller2014-07-091-4/+4
| | | | | | |
| * | | | | | use .filterAttr()Thomas Müller2014-07-091-7/+8
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-09 23:04:07 +0000