aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-263-0/+7
* merge master into single-user-modeRobin Appelman2013-11-2532-32/+276
|\
| * Merge pull request #6034 from owncloud/fix-api-documentationOwen Winkler2013-11-2529-25/+231
| |\
| | * fix some capital lettersMorris Jobke2013-11-255-5/+14
| | * page level doc blocks and class descriptionsMorris Jobke2013-11-2515-0/+95
| | * AppFramework(Controller|HTTP|HTTP-Responses|Middleware), IContainer API fixesMorris Jobke2013-11-257-4/+58
| | * fix defaults.php docMorris Jobke2013-11-251-10/+18
| | * fix defaults.php docMorris Jobke2013-11-251-6/+44
| | * fix db.php docMorris Jobke2013-11-251-0/+2
| * | Merge pull request #6035 from owncloud/fixing-rawpath-reverseproxy-oc6Jörn Friedrich Dreyer2013-11-251-1/+12
| |\ \
| | * | in case uri and script name don't match we better throw an exceptionThomas Müller2013-11-251-2/+10
| | * | handle duplicate slashes in case of reverse proxy configurationThomas Müller2013-11-251-1/+4
| * | | Merge pull request #6037 from owncloud/fix-6007-oc6Thomas Müller2013-11-251-0/+12
| |\ \ \
| | * | | adding chunked upload handlingThomas Müller2013-11-251-0/+12
| | |/ /
| * / / provide more cli friendly error messagesRobin Appelman2013-11-251-6/+21
| |/ /
* / / Add "single user mode" which restricts access to users in the admin groupRobin Appelman2013-11-251-1/+18
|/ /
* | Merge pull request #6021 from owncloud/show_buildThomas Müller2013-11-242-0/+14
|\ \
| * | add new function to generate the human readable version string based on versi...Thomas Mueller2013-11-241-0/+13
| * | send the build number too to push the next daily build. This is needed for th...Frank Karlitschek2013-11-241-0/+1
* | | Merge pull request #5874 from owncloud/fix-5845Thomas Müller2013-11-242-2/+2
|\ \ \
| * | | Compare dirname() results to DIRECTORY_SEPARATOR, not '/'ringmaster2013-11-141-1/+1
| * | | Alias the aggregate columns so SQL Server doesn't combine them.ringmaster2013-11-141-1/+1
* | | | update PHPDocThomas Mueller2013-11-241-0/+1
* | | | fix overwrite host support and make the code a bit more readableFrank Karlitschek2013-11-241-1/+1
| |/ / |/| |
* | | Merge pull request #5995 from owncloud/extstorage-isreadablefixVincent Petry2013-11-241-0/+13
|\ \ \
| * | | Moved default isReadable/isUpdatable impl into Common classVincent Petry2013-11-221-0/+13
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-246-1/+6
|/ / /
* | | Revert "use relative paths to create images from a file. This way it also wor...Bjoern Schiessle2013-11-221-16/+15
* | | Merge pull request #6003 from owncloud/incognito_modeVincent Petry2013-11-221-1/+13
|\ \ \
| * | | add incognito mode, allows to hide my user ID. For example, this is useful to...Bjoern Schiessle2013-11-221-1/+13
* | | | Merge pull request #5882 from owncloud/preview-movie-5sThomas Müller2013-11-221-4/+6
|\ \ \ \
| * | | | we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.Thomas Müller2013-11-221-1/+3
| * | | | Working on a chunked video can result in a broken frame index the option -vsy...Thomas Müller2013-11-221-1/+1
| * | | | Movie preview - use frame after 5 secondsMorris Jobke2013-11-151-2/+2
* | | | | Merge pull request #6000 from owncloud/use_relative_path_to_create_imagesRaghu Nayyar2013-11-221-15/+16
|\ \ \ \ \
| * | | | | use relative paths to create images from a file. This way it also works ifBjoern Schiessle2013-11-221-15/+16
| | |/ / / | |/| | |
* | | | | Merge pull request #5040 from owncloud/public_api_avatar_masterblizzz2013-11-226-3/+110
|\ \ \ \ \
| * | | | | fixing PHPDoc comments and syntaxThomas Müller2013-11-223-4/+6
| * | | | | Add missing Avatar InterfaceArthur Schiwon2013-11-221-0/+38
| * | | | | Round out Avatar Public APIArthur Schiwon2013-11-214-76/+32
| * | | | | Fix a regression (Tags→TagManager)kondou2013-11-071-1/+1
| * | | | | Remove duplicate getAvatarManager()kondou2013-11-071-9/+0
| * | | | | Add public API for \OC\Avatarkondou2013-11-075-2/+122
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-215-3/+7
* | | | | | Merge pull request #5773 from owncloud/fix-2152-masterThomas Müller2013-11-212-9/+10
|\ \ \ \ \ \
| * | | | | | Fixing the warning notificationsThomas Müller2013-11-211-1/+1
| * | | | | | Update error messagesBart Visscher2013-11-151-1/+1
| * | | | | | Use \Patchwork\Utf8\Bootup::initLocaleBart Visscher2013-11-151-2/+2
| * | | | | | Make working en_US.UTF-8 locale a hard requirementBart Visscher2013-11-082-7/+8
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-2130-29/+1