summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Merge pull request #5232 from owncloud/fixing-webdav-touch-masterFrank Karlitschek2013-10-101-6/+0
| |\ \ \
| | * | | due to internal implementations touch will always be successful - $mtime will...Thomas Müller2013-10-091-6/+0
| * | | | don't trigger the create hooks when if the file already exists for file_put_c...Robin Appelman2013-10-091-1/+2
| |/ / /
* / / / ensure the view's root is a subfolder of the the default root, not only start...Robin Appelman2013-10-091-1/+4
|/ / /
* | | Merge pull request #5219 from owncloud/catch_wrong_timezoneBjörn Schießle2013-10-091-2/+6
|\ \ \
| * | | changed default time format to ISO8601Bjoern Schiessle2013-10-091-1/+1
| * | | catch unknown timezone and fall-back to UTCBjoern Schiessle2013-10-081-1/+5
| | |/ | |/|
* | | Merge pull request #5032 from owncloud/fixing-5006-masterAndreas Fischer2013-10-081-2/+2
|\ \ \
| * | | Use strict comparison === instead of ==.Andreas Fischer2013-10-081-1/+1
| * | | Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.Andreas Fischer2013-10-081-2/+2
| |/ /
* | | Merge pull request #5188 from owncloud/master-delete-userThomas Müller2013-10-081-0/+4
|\ \ \ | |/ / |/| |
| * | User::delete should return boolVictor Dubiniuk2013-10-071-0/+4
* | | Merge pull request #5173 from owncloud/set_timezone_for_logBjörn Schießle2013-10-081-3/+5
|\ \ \
| * | | let admin specify timezone for log file entriesBjoern Schiessle2013-10-071-3/+5
* | | | Merge pull request #5146 from guruz/cache_enabled_apps_listFrank Karlitschek2013-10-081-3/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | OC_App: Cache list of enabled appsMarkus Goetz2013-10-051-3/+10
* | | | Merge pull request #5194 from owncloud/fixing-5172-masterThomas Müller2013-10-081-0/+3
|\ \ \ \
| * | | | adding check isDeletable() on $sourcePathThomas Müller2013-10-081-0/+3
* | | | | Merge pull request #5193 from owncloud/fix_5126_2Björn Schießle2013-10-082-2/+27
|\ \ \ \ \
| * | | | | part file needs to have .part extensionBjoern Schiessle2013-10-081-1/+1
| * | | | | updating a existing large file creates new file chunks. Therefore createFile(...Bjoern Schiessle2013-10-081-2/+16
| * | | | | If a existing file in Shared/ with update permissions gets updated we need to...Bjoern Schiessle2013-10-081-0/+11
| |/ / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-10-081-0/+1
|/ / / /
* | | | Merge pull request #5181 from owncloud/fixing-chunked-upload-masterMorris Jobke2013-10-071-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | the path for reassembling was created the wrong wayThomas Müller2013-10-071-2/+2
* | | | Merge pull request #4796 from owncloud/config-no-catchBart Visscher2013-10-071-10/+2
|\ \ \ \
| * | | | Remove the exception catch, this should be handled by a higher layerBart Visscher2013-10-071-10/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-071-0/+8
| |/ / / |/| | |
* | | | Merge pull request #5072 from owncloud/apache-auth-masterThomas Müller2013-10-074-3/+163
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move backend finding into its own method.Andreas Fischer2013-10-071-16/+26
| * | | move call to print_unescaped() to templateThomas Müller2013-10-071-1/+1
| * | | Also replace ApacheBackend with Authentication\IApacheBackend in user.Andreas Fischer2013-10-021-4/+4
| * | | fixing various PHPDoc commentsThomas Müller2013-10-022-6/+12
| * | | fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBac...Thomas Müller2013-10-021-5/+5
| * | | remove obsolete function login()Thomas Müller2013-10-021-8/+0
| * | | adding PHPDoc commentThomas Müller2013-10-021-1/+3
| * | | code cleanup - remove special case for webdav in handleApacheAuth()Thomas Müller2013-10-023-20/+23
| * | | Merge branch 'master' into apache-auth-masterThomas Müller2013-10-02312-12/+56
| |\ \ \
| * | | | adding getCurrentUserId() to ApacheBackendThomas Müller2013-10-012-6/+11
| * | | | Squashed commit of the following:Thomas Müller2013-10-014-1/+143
* | | | | Merge pull request #5162 from owncloud/fixing-l10n-master-2Morris Jobke2013-10-0786-3387/+0
|\ \ \ \ \
| * | | | | move l10n factory into privateThomas Müller2013-10-071-0/+0
| * | | | | remove outdated translation filesThomas Müller2013-10-0785-3387/+0