summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add filesystem watcher to detect updatesRobin Appelman2012-10-284-2/+164
* Merge branch 'master' into filesystemRobin Appelman2012-10-28136-2166/+2075
|\
| * Revert "Fix a typo"Lukas Reschke2012-10-282-2/+2
| * Fix a typoLukas Reschke2012-10-282-2/+2
| * [tx-robot] updated from transifexJenkins for ownCloud2012-10-28132-2131/+2026
| * Load all apps in core share ajax file for apps to register their share backendsMichael Gapczynski2012-10-271-0/+1
| * don't enable user_externalThomas Müller2012-10-271-1/+1
| * LDAP: usersInGroup now also does LDAP serverside search.Arthur Schiwon2012-10-271-30/+41
| * LDAP: make filter in readAttribute configurableArthur Schiwon2012-10-271-2/+6
| * don't enable apps twiceThomas Müller2012-10-271-2/+0
* | merge master into filesystemRobin Appelman2012-10-27222-1201/+6382
|\|
| * LDAP: getGroups to use paged searchesArthur Schiwon2012-10-271-12/+20
| * LDAP: improve slicingArthur Schiwon2012-10-271-3/+8
| * LDAP: add error handling for failed searchesArthur Schiwon2012-10-271-0/+5
| * LDAP: be careful which limit is send to possible paged LDAP searchArthur Schiwon2012-10-271-1/+4
| * LDAP: use the correct attribute in filterArthur Schiwon2012-10-271-1/+1
| * LDAP: fix again proper check if groups are enabledArthur Schiwon2012-10-271-1/+3
| * remove TODO comment, it's doneArthur Schiwon2012-10-271-1/+0
| * Fix introduced style errorsBart Visscher2012-10-276-40/+52
| * Remove wrongly committed filesBart Visscher2012-10-272-180/+0
| * remove remaining line from merge conflictBjörn Schießle2012-10-271-2/+1
| * Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'Bart Visscher2012-10-27216-1142/+6469
| |\
| | * Update Sabre to version 1.7.1Susinthiran Sithamparanathan2012-10-17216-1142/+6471
| * | Include copy of Symfony routing component, and don't use composerBart Visscher2012-10-2744-22/+4037
| * | fix function documentationBjörn Schießle2012-10-271-2/+1
| * | fix broken paths in versions appBjörn Schießle2012-10-271-280/+279
| * | don't call $('#found_versions').chosen(); after opening the history drop-down...Björn Schießle2012-10-271-1/+0
* | | delete child entries when a folder gets removed from cacheRobin Appelman2012-10-274-6/+37
* | | add a way to recalucale the size of a folder in the cacheRobin Appelman2012-10-272-0/+36
* | | Include copy of Symfony routing component, and don't use composerBart Visscher2012-10-2744-22/+4037
* | | fix function documentationBjörn Schießle2012-10-271-2/+1
* | | fix broken paths in versions appBjörn Schießle2012-10-271-22/+19
* | | don't call $('#found_versions').chosen(); after opening the history drop-down...Björn Schießle2012-10-271-1/+0
* | | Merge branch 'master' into filesystemRobin Appelman2012-10-272-2/+2
|\| |
| * | Fix download url generationBart Visscher2012-10-272-2/+2
* | | Merge branch 'master' into filesystemRobin Appelman2012-10-2762-275/+996
|\| |
| * | fix paths in preeseed-config.phpThomas Müller2012-10-271-2/+2
| * | Add composer command for now, seeBart Visscher2012-10-271-0/+0
| * | LDAP: let result processing in Access::search slice the array for not-paginat...Arthur Schiwon2012-10-272-14/+11
| * | LDAP: debug messagedArthur Schiwon2012-10-271-3/+4
| * | LDAP: sourced out paged search init into initPagedSearch method, making searc...Arthur Schiwon2012-10-271-28/+46
| * | Merge branch 'routing'Bart Visscher2012-10-2753-225/+792
| |\ \
| | * | More info for composer.jsonBart Visscher2012-10-271-0/+10
| | * | Change Symfony/Component/Routing from submodule to composer fetchingBart Visscher2012-10-275-5/+14
| | * | Resetting the password should also invalidate the token login cookiesBart Visscher2012-10-171-0/+1
| | * | Change the lostpassword flow to a controllerBart Visscher2012-10-176-67/+101
| | * | Merge branch 'master' into routingBart Visscher2012-10-171500-176214/+23713
| | |\ \
| | | * | Check for file exists before loading app version fileBart Visscher2012-10-171-3/+2
| | * | | Add API description to OC_Route and OC_RouterBart Visscher2012-10-052-0/+71
| | * | | Implement routing on javascript sideBart Visscher2012-10-055-1/+96