summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* enable admin to change the recovery passwordBjörn Schießle2013-05-155-28/+118
* check if the user knows the correct recovery password before changing the rec...Björn Schießle2013-05-154-20/+62
* Merge branch 'files_encryption' of github.com:owncloud/core into files_encryp...Björn Schießle2013-05-15203-673/+1327
|\
| * workaround for blank page need an other solutionFlorin Peter2013-05-151-20/+20
| * improved files_encryption testsFlorin Peter2013-05-154-4/+4
| * Merge branch 'files_encryption' of https://github.com/owncloud/core into file...Florin Peter2013-05-1548-832/+2463
| |\
| * \ Merge branch 'master' into files_encryptionFlorin Peter2013-05-15220-758/+1653
| |\ \
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1545-45/+45
| | * | Merge pull request #2821 from owncloud/fix-2159-rename-to-sharedThomas Müller2013-05-143-19/+230
| | |\ \
| | | * | [files] add private declaration of $viewMorris Jobke2013-05-141-0/+1
| | | * | [files] fix mock creation and remove hardcoded 'require' statementMorris Jobke2013-05-122-7/+2
| | | * | [files] rename lib to "App"Morris Jobke2013-05-123-7/+7
| | | * | [files] ownCloud typoMorris Jobke2013-05-121-1/+1
| | | * | [files] rename test class and add rename testMorris Jobke2013-05-121-1/+22
| | | * | [files] remove realpath in testMorris Jobke2013-05-121-1/+1
| | | * | [files] rename testsMorris Jobke2013-05-121-0/+99
| | | * | [files] remove normalizePath on rename and dependency injectionMorris Jobke2013-05-122-7/+8
| | | * | [files] kill stripslashesMorris Jobke2013-05-121-3/+3
| | | * | [files] fix typosMorris Jobke2013-05-121-5/+5
| | | * | [files] refactoringMorris Jobke2013-05-122-19/+111
| | | * | string comparisionMorris Jobke2013-05-121-1/+1
| | | * | wrong root dir nameMorris Jobke2013-05-121-2/+2
| | | * | fix allowed rename of folder in root directory to reserved name "Shared"Morris Jobke2013-05-121-2/+4
| | * | | fix history template, print_unescaped() needs to include closing tagsBjörn Schießle2013-05-141-4/+4
| | * | | Merge pull request #3338 from owncloud/button_color_fixRaghu Nayyar2013-05-141-2/+4
| | |\ \ \
| | | * | | color change to crumb elements as well.raghunayyar2013-05-141-1/+1
| | | * | | Keeping Font Colors Consistant on the headers.raghunayyar2013-05-131-1/+3
| | * | | | Merge pull request #3330 from owncloud/preselect_filename_on_renameMorris Jobke2013-05-141-0/+7
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | peselect filename without extension on renameJörn Friedrich Dreyer2013-05-131-0/+7
| | * | | | Merge branch 'master' into update_etags_on_restoreBjörn Schießle2013-05-1327-84/+224
| | |\| | |
| | | * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-131-0/+16
| | | |/ /
| | | * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-1226-84/+208
| | * | | touch() needs to be performed relative to user/files otherwise ownCloud doesn...Björn Schießle2013-05-101-1/+4
| | |/ /
| | * | rename a file if it gets restored so that it no longer exists as a version. O...Björn Schießle2013-05-081-1/+1
| | * | touch file relative to users file folder, otherwise the hooks will be ignoredBjörn Schießle2013-05-081-4/+5
| | * | Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-appBart Visscher2013-05-0710-42/+42
| | |\ \
| | | * | Use !== and === in user_ldap app – Part 2kondou2013-04-205-23/+23
| | | * | Use !== and === in user_ldap app – Part 1kondou2013-04-205-19/+19
| | * | | Merge pull request #3044 from owncloud/backgroundwatchericewind19912013-05-071-1/+3
| | |\ \ \
| | | * | | Cache: add a backgroundjob to check for external changes to the filesystemRobin Appelman2013-04-201-1/+3
| | * | | | Merge pull request #3246 from owncloud/newfile-mimetypeMorris Jobke2013-05-072-3/+3
| | |\ \ \ \
| | | * | | | Files: set the proper mimetype when creating a new text fileRobin Appelman2013-05-062-3/+3
| | * | | | | Use $dir instead of $fullpathLukas Reschke2013-05-061-2/+1
| | * | | | | Use the internal ownCloud viewLukas Reschke2013-05-061-1/+1
| | |/ / / /
| | * | | | LDAP: do not reset UUID attribute setting when guid is detectedArthur Schiwon2013-05-061-1/+3
| | * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-042-0/+2
| | * | | | LDAP: cachekey in set method needs to match with that one from getArthur Schiwon2013-05-031-1/+1
| | * | | | Merge pull request #3229 from owncloud/fix_3210Bart Visscher2013-05-031-1/+1
| | |\ \ \ \
| | | * | | | LDAP: remove restriction from group names to be in line with core behaviour a...Arthur Schiwon2013-05-031-1/+1
| | * | | | | Merge pull request #3222 from owncloud/fix-3218Bart Visscher2013-05-032-5/+26
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |