summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-1631-383/+321
|\
| * Merge pull request #5067 from owncloud/urlParams_fixThomas Müller2013-10-164-16/+17
| |\
| | * Get urlParams registered before Request is instantiatedThomas Tanghus2013-10-014-16/+17
| * | Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backendThomas Müller2013-10-161-5/+1
| |\ \
| | * | there shall be tabsThomas Müller2013-10-141-1/+1
| | * | file system is now initialized with apache authentication as wellThomas Müller2013-10-141-6/+2
| * | | Merge pull request #5333 from owncloud/avater_with_encryptionBjörn Schießle2013-10-161-4/+0
| |\ \ \
| | * \ \ Merge branch 'master' into avater_with_encryptionBjoern Schiessle2013-10-156-22/+78
| | |\ \ \
| | * | | | avatars should also work with encryption after pr #5332 was mergedBjoern Schiessle2013-10-141-4/+0
| | | |/ / | | |/| |
| * | | | Prevent renaming/deleting mount pointsVincent Petry2013-10-151-1/+2
| | |/ / | |/| |
| * | | Merge pull request #5341 from owncloud/fix-logout-link-htmlVincent Petry2013-10-151-1/+1
| |\ \ \
| | * | | Fix logout link HTML.Andreas Fischer2013-10-141-1/+1
| * | | | streamCopy() should return proper structure.Thomas Müller2013-10-141-2/+2
| |/ / /
| * | | Merge pull request #4867 from owncloud/fixing-4546-masterThomas Müller2013-10-144-19/+75
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-1426-349/+202
| | |\ \
| | * | | moving createFileChunked() to OC_Connector_Sabre_FileThomas Müller2013-10-071-15/+34
| | * | | Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-07313-1338/+6557
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-302-13/+101
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-3044-167/+606
| | |\ \ \ \ \
| | * | | | | | adding detection of aborted uploadsThomas Müller2013-09-161-41/+58
| | * | | | | | returning the number of stored bytes in store() and adding cleanup() methodThomas Müller2013-09-161-1/+22
| | * | | | | | adding size() to the file cacheThomas Müller2013-09-161-0/+18
| * | | | | | | case insensitive sortFrank Karlitschek2013-10-141-1/+1
| * | | | | | | fix styleFrank Karlitschek2013-10-141-5/+5
| * | | | | | | finally fix the app sortingFrank Karlitschek2013-10-141-0/+33
| | |_|_|_|/ / | |/| | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-131-0/+3
| * | | | | | Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-e...Tom Needham2013-10-126-1/+92
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-116-1/+92
| | |\ \ \ \ \ \
| | | * | | | | | fixing status code and formattingThomas Müller2013-10-082-18/+17
| | | * | | | | | catch specific file exceptions and convert them to proper http status code vi...Thomas Müller2013-10-081-5/+12
| | | * | | | | | adding additional exceptions for special cases where creating a file might no...Thomas Müller2013-10-076-0/+85
| * | | | | | | | Include exception message in log entry when session fails to startTom Needham2013-10-121-1/+1
| * | | | | | | | Handle ownCloud logging when data dir not createdTom Needham2013-10-112-7/+7
| * | | | | | | | Log the session exception when ownCloud is not installedTom Needham2013-10-111-3/+6
| |/ / / / / / /
| * | | | | | | Merge pull request #5233 from owncloud/enc_filter_usersBjörn Schießle2013-10-111-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | make sure that we only find file/folder sharesBjoern Schiessle2013-10-091-4/+4
| * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-102-0/+10
| * | | | | | | | Merge pull request #5263 from owncloud/fixing-5255-masterVicDeo2013-10-101-1/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | the path need to be normalized before putting it into resolvePath()Thomas Müller2013-10-101-1/+3
| * | | | | | | | | Merge pull request #4780 from AxelRb/masterMorris Jobke2013-10-101-0/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | changed the argument to false for getValue , reformated else statementAxel Roenn2013-10-101-3/+2
| | * | | | | | | | | Changed default behaviour to not log IP address in case of an auth failure. C...Axel Roenn2013-09-101-2/+8
| | * | | | | | | | | On an auth failure the uid and the IP address should be logged to the standar...Axel Roenn2013-09-091-0/+2
| * | | | | | | | | | merge master into hooks-view-same-startRobin Appelman2013-10-106-320/+10
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-103-312/+7
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainerThomas Müller2013-10-081-2/+3
| | | * | | | | | | | | php 5.3 compatibility for \OC\Files\StorageThomas Müller2013-10-081-279/+0
| | | * | | | | | | | | fixing php 5.3 compatibilityThomas Müller2013-10-081-31/+4
| | * | | | | | | | | | Merge pull request #5210 from owncloud/sharing_search_users_fixBjörn Schießle2013-10-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | find users which are in the same groupBjoern Schiessle2013-10-081-1/+1