summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9562 from owncloud/users-groupfilterThomas Müller2014-07-155-59/+153
|\
| * fixing PHPDocThomas Müller2014-07-141-16/+16
| * remove dead codeArthur Schiwon2014-07-145-43/+137
* | Merge pull request #9620 from owncloud/search-fileinfo-pathicewind19912014-07-141-1/+2
|\ \ | |/ |/|
| * 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
|\
| * 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 downloaded arc...Thomas Müller2014-07-111-9/+4
* | | Merge pull request #9546 from owncloud/user-publicicewind19912014-07-147-3/+236
|\ \ \
| * | | 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 #9422Daniel Hansson2014-07-091-14/+11
* | | | Merge pull request #9572 from owncloud/deleteunsharetooltipBjörn Schießle2014-07-145-5/+30
|\ \ \ \
| * | | | Added mountType attribute and adapted Delete action textVincent Petry2014-07-145-5/+30
* | | | | Merge pull request #9605 from owncloud/sftp-missing-streamwrapperVincent Petry2014-07-141-0/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|\ \ \ \
| * | | | 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 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 testsVincent Petry2014-07-111-0/+4
|/ / / /
* | | | Merge pull request #9569 from owncloud/fix-require-of-blowfish-masterMorris Jobke2014-07-102-2/+0
|\ \ \ \
| * | | | 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 listsVincent Petry2014-07-097-43/+137
* | | | | Merge pull request #9525 from owncloud/incrementuser2Vincent Petry2014-07-104-37/+109
|\ \ \ \ \
| * | | | | use .filterAttr()Thomas Müller2014-07-091-4/+4
| * | | | | use .filterAttr()Thomas Müller2014-07-091-7/+8
| * | | | | some more cleanupThomas Müller2014-07-091-38/+36
| * | | | | magic strings - bad kungfuThomas Müller2014-07-091-0/+3
| * | | | | remove the group in case the last user has removed from that groupThomas Müller2014-07-091-0/+12
| * | | | | fixing JS synatx errorsThomas Müller2014-07-092-5/+5
| * | | | | avoid global selectorArthur Schiwon2014-07-091-1/+1
| * | | | | increase/decrease everyone count on user creation/deletionArthur Schiwon2014-07-093-8/+42
| * | | | | decrease user count in affected groups after user deleteArthur Schiwon2014-07-091-0/+14
| * | | | | increment group counters when a user is createdArthur Schiwon2014-07-093-3/+13
| | |_|/ / | |/| | |
* | | | | Merge pull request #9536 from owncloud/default-app-groups-masterMorris Jobke2014-07-101-97/+97
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | adding 'groups' entry to remote appsThomas Müller2014-07-091-1/+2
| * | | | fixing typosThomas Müller2014-07-091-97/+96
* | | | | Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8Vincent Petry2014-07-109-881/+3
|\ \ \ \ \
| * | | | | Kill legacy encryption migrationThomas Müller2014-07-089-881/+3