summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* LDAP: get rid of some PHP WarningsArthur Schiwon2013-09-271-1/+6
* LDAP: make Access be a dependency to the user and group backend instead of in...Arthur Schiwon2013-09-2716-173/+225
* WhitespacesArthur Schiwon2013-09-271-2/+0
* LDAP: don't check var type when you can specify the type in the parameter listArthur Schiwon2013-09-271-7/+3
* LDAP: use wrapper, not direct function callArthur Schiwon2013-09-271-1/+1
* LDAP: add phpdocArthur Schiwon2013-09-271-0/+1
* LDAP: establish wrapper interface to allow proper mockingArthur Schiwon2013-09-274-28/+275
* LDAP: move is_resource check to ldap wrapper to make it mockableArthur Schiwon2013-09-273-8/+19
* LDAP: move PHP LDAP functions calls to an LDAP Wrapper for better isolation a...Arthur Schiwon2013-09-273-11/+147
* Resolve merge conflictArthur Schiwon2013-09-271-11/+12
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-274-5/+21
* fix check if app is enabledBjoern Schiessle2013-09-251-4/+3
* check if key exists before reading itBjoern Schiessle2013-09-251-1/+4
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-245-1/+26
* Fix not displaying "Upload something!" messagekondou2013-09-231-1/+1
* implement previews for public uploadGeorg Ehrke2013-09-231-1/+5
* fix previews in shared foldersGeorg Ehrke2013-09-231-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-229-5/+46
* Merge pull request #4927 from owncloud/fix_namespaces_and_autoloadingThomas Müller2013-09-2114-27/+26
|\
| * remove unneccessary lib in namespaceJörn Friedrich Dreyer2013-09-2010-20/+19
| * namespaces use upcasefirst partsJörn Friedrich Dreyer2013-09-2013-26/+26
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-2064-156/+12
* | Merge pull request #4684 from owncloud/improved-consoleBart Visscher2013-09-193-31/+82
|\ \ | |/ |/|
| * Add copyright, remove starting blank lineBart Visscher2013-09-191-0/+7
| * Use appinfo/register_command.php to add commands to the console commandBart Visscher2013-09-131-0/+9
| * Change Files Scan command to use OC\User\ManagerBart Visscher2013-09-021-7/+18
| * Use more object oriented way for console commandsBart Visscher2013-09-012-31/+55
* | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-1965-9/+955
|\ \
| * \ Merge pull request #4900 from owncloud/fixing-4488-masterJörn Friedrich Dreyer2013-09-193-2/+13
| |\ \
| | * \ Merge branch 'master' into fixing-4488-masterThomas Müller2013-09-1964-154/+1094
| | |\ \
| | * | | adding comma to get cleaner diffs in the futureThomas Müller2013-09-181-1/+1
| | * | | no file actions during uploadThomas Müller2013-09-181-1/+0
| | * | | remove file action elements before recreating themThomas Müller2013-09-181-0/+5
| | * | | store the permissions retrieved via ajax within the dom elementThomas Müller2013-09-181-0/+6
| | * | | add permissions of the file to the json responseThomas Müller2013-09-181-1/+2
| * | | | Merge pull request #4263 from owncloud/search_scrolltoJörn Friedrich Dreyer2013-09-193-5/+44
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | initial scrollto implementation:Jörn Friedrich Dreyer2013-09-173-5/+44
| | |/ /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1860-1/+895
* | | | fix race condition in lazy preview loadingJörn Friedrich Dreyer2013-09-191-12/+18
* | | | Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core i...Jörn Friedrich Dreyer2013-09-192-3/+3
|\ \ \ \
| * \ \ \ Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core i...Thomas Müller2013-09-191-26/+26
| |\ \ \ \
| * | | | | fixing typos and l10nThomas Müller2013-09-192-3/+3
* | | | | | fix double translation of error messageJörn Friedrich Dreyer2013-09-191-1/+1
| |/ / / / |/| | | |
* | | | | jsdoc types should go into {}Jörn Friedrich Dreyer2013-09-191-26/+26
|/ / / /
* | | | use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky .....Jörn Friedrich Dreyer2013-09-191-4/+8
* | | | simplify conflict template handling, fix reopen after ESCJörn Friedrich Dreyer2013-09-181-1/+1
* | | | move upload dialog css to separate fileJörn Friedrich Dreyer2013-09-184-85/+121
* | | | hide excessive logging with a trace flagJörn Friedrich Dreyer2013-09-182-23/+26
* | | | Merge branch 'master' into fix_3728_with_file_exists_dialogJörn Friedrich Dreyer2013-09-181-178/+182
|\| | |
| * | | Merge pull request #4872 from owncloud/refactor_upload_progressJörn Friedrich Dreyer2013-09-181-135/+173
| |\ \ \