summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
|
* 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
|\ | | | | | | | | Conflicts: lib/base.php
| * 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 ↵Björn Schießle2012-10-271-1/+0
| | | | | | | | drop-down since no version is selected at the beginning
* | Fix download url generationBart Visscher2012-10-272-2/+2
| |
* | fix paths in preeseed-config.phpThomas Müller2012-10-271-2/+2
| |
* | Add composer command for now, seeBart Visscher2012-10-271-0/+0
| | | | | | | | | | http://getcomposer.org/doc/00-intro.md#installation-nix for local install
* | LDAP: let result processing in Access::search slice the array for ↵Arthur Schiwon2012-10-272-14/+11
| | | | | | | | not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow.
* | LDAP: debug messagedArthur Schiwon2012-10-271-3/+4
| |
* | LDAP: sourced out paged search init into initPagedSearch method, making ↵Arthur Schiwon2012-10-271-28/+46
| | | | | | | | search slicker again
* | Merge branch 'routing'Bart Visscher2012-10-2753-225/+792
|\ \ | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php
| * | 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php
| | * | 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
| | | |
| * | | Fix route nameBart Visscher2012-10-051-1/+1
| | | |
| * | | Make the core ajax calls use the routerBart Visscher2012-10-029-10/+22
| | | |
| * | | Make the settings ajax calls use the routerBart Visscher2012-10-0221-59/+72
| | | |
| * | | fix actionincludeBart Visscher2012-09-291-1/+1
| | | |
| * | | Convert menu entries of settings pages to use routerBart Visscher2012-09-288-14/+34
| | | |
| * | | Implement route for download in OC_Search_Provider_FileBart Visscher2012-09-283-2/+18
| | | |
| * | | Merge branch 'master' into routingBart Visscher2012-09-2814-34/+160
| |\ \ \
| * \ \ \ Merge branch 'master' into routingBart Visscher2012-09-28739-10430/+27881
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php
| * | | | | Add linkToRoute functionalityBart Visscher2012-09-122-6/+37
| | | | | |
| * | | | | Remove redundant loadAppsBart Visscher2012-09-071-1/+0
| | | | | |
| * | | | | Merge branch 'master' into routingBart Visscher2012-09-07852-11512/+19011
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php
| * \ \ \ \ \ Merge branch 'master' into routingBart Visscher2012-08-301916-304209/+16808
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php
| * \ \ \ \ \ \ Merge remote-tracking branch 'gitorious/master' into routingBart Visscher2012-08-291321-15741/+147757
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js