summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-1519-19/+134
* Merge pull request #5894 from owncloud/readd_sharing_tokenVincent Petry2013-11-152-0/+2
|\
| * readd sharing token to public templateJörn Friedrich Dreyer2013-11-152-0/+2
* | Merge pull request #5772 from owncloud/fix5741blizzz2013-11-153-22/+92
|\ \
| * | LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take...Arthur Schiwon2013-11-132-0/+7
| * | LDAP Wizard: move status indicator in one line with back and continue buttonsArthur Schiwon2013-11-131-3/+2
| * | LDAP Wizard: introduce configuration status indicator, fixes #5741Arthur Schiwon2013-11-133-22/+86
* | | Merge pull request #5833 from owncloud/encryption_fixesBjörn Schießle2013-11-153-22/+83
|\ \ \
| * | | remove debug outputBjoern Schiessle2013-11-141-6/+0
| * | | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ...Bjoern Schiessle2013-11-141-0/+64
| * | | Merge branch 'master' into encryption_fixesBjoern Schiessle2013-11-138-72/+111
| |\ \ \
| * | | | fixPartialFilePath() is now stripPartialFileExtension()Bjoern Schiessle2013-11-121-1/+1
| * | | | only update file cache if the file is already indexed to avoid that we create...Bjoern Schiessle2013-11-121-11/+14
| * | | | make sure that we keep the correct timestamp and etag after encryoption/decry...Bjoern Schiessle2013-11-121-11/+11
* | | | | Merge pull request #5880 from owncloud/replace_etmp_filesVincent Petry2013-11-154-16/+64
|\ \ \ \ \
| * | | | | tests addedBjoern Schiessle2013-11-151-1/+14
| * | | | | instead of writing etmp files we write the dummy file to data/user/cache to a...Bjoern Schiessle2013-11-143-15/+50
| | |/ / / | |/| | |
* | | | | Fix for smb4php fseekVincent Petry2013-11-151-1/+2
| |_|_|/ |/| | |
* | | | Merge pull request #5700 from owncloud/ldapWizSetDisplayNamesThomas Müller2013-11-151-0/+13
|\ \ \ \
| * | | | LDAP Wizard: do not forget to set display name attributes for user and group,...Arthur Schiwon2013-11-051-0/+13
* | | | | Merge pull request #5862 from owncloud/files-singledotdirsThomas Müller2013-11-142-2/+3
|\ \ \ \ \
| * | | | | Files app backend now normalizes paths before rendering templatesVincent Petry2013-11-142-2/+3
* | | | | | Merge pull request #5214 from owncloud/no_extra_slashesFrank Karlitschek2013-11-141-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't double-slash filenames at the root.ringmaster2013-10-081-1/+1
* | | | | | Merge pull request #5805 from owncloud/shared-storage-copy-folderlistFrank Karlitschek2013-11-131-59/+47
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Use View::copy and View::rename when copying or renaming files in the shared ...Robin Appelman2013-11-111-59/+47
* | | | | | Merge pull request #5806 from owncloud/styles-fix-external_storageFrank Karlitschek2013-11-131-0/+4
|\ \ \ \ \ \
| * | | | | | Fix spacing issue for checkboxes, vertically center checkboxes on personal pageMorris Jobke2013-11-111-0/+4
| |/ / / / /
* | | | | | Merge pull request #5809 from owncloud/fix5753Morris Jobke2013-11-135-53/+35
|\ \ \ \ \ \
| * | | | | | LDAP Wizard: make UI behaviour more consistent and more pleasant when determi...Arthur Schiwon2013-11-112-7/+6
| * | | | | | LDAP Wizard: remove ugly whitespace where it should not beArthur Schiwon2013-11-111-2/+1
| * | | | | | LDAP Wizard: determine port without credentials. don't hide the port input fieldArthur Schiwon2013-11-113-13/+12
| * | | | | | LDAP Wizard: improve check for Agent DN and CredentialsArthur Schiwon2013-11-111-26/+16
| * | | | | | LDAP Wizard: keep Base DN always visibleArthur Schiwon2013-11-082-6/+1
* | | | | | | Merge pull request #5831 from owncloud/files-charatissueMorris Jobke2013-11-131-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fixed total dirs/files message hiding conditionVincent Petry2013-11-131-3/+3
* | | | | | | Merge pull request #5447 from owncloud/fixing-5117-masterVincent Petry2013-11-136-72/+107
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | rename fixPartialFilePath() to stripPartialFileExtension(), this name describ...Bjoern Schiessle2013-11-124-12/+12
| * | | | | | missed some replacements... now tests should workBjoern Schiessle2013-11-121-13/+6
| * | | | | | fixing tests for the new part file handlingBjoern Schiessle2013-11-125-42/+86
| * | | | | | let encryption app detect transfer id in path and handle it correctlyBjoern Schiessle2013-11-113-36/+34
* | | | | | | implement delete hooks in file versions libGeorg Ehrke2013-11-121-0/+3
* | | | | | | replace $path with '/files_trashbin/files/' . $fileGeorg Ehrke2013-11-121-1/+1
* | | | | | | add delete hook for trash bin appGeorg Ehrke2013-11-121-0/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #5804 from owncloud/files-selectionsummaryMorris Jobke2013-11-111-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Selection summary is now displayed properlyVincent Petry2013-11-111-1/+1
* | | | | | Merge pull request #5769 from owncloud/files-changedirjseventMorris Jobke2013-11-111-0/+6
|\ \ \ \ \ \
| * | | | | | Added JS event for when the user changes the directoryVincent Petry2013-11-081-0/+6
* | | | | | | Merge pull request #5701 from owncloud/sharing-updateownerfoldersizesMorris Jobke2013-11-115-111/+335
|\ \ \ \ \ \ \
| * | | | | | | Fixed unit tests for files sharing watcherVincent Petry2013-11-062-3/+3