summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into core-em-to-pxraghunayyar2014-01-162107-70802/+150645
|\
| * Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfixVincent Petry2014-01-153-19/+33
| |\
| | * Fixed Dropbox/Google storage async save callVincent Petry2013-12-063-19/+33
| * | Merge pull request #6780 from owncloud/trash_bin_copy_recursivelyBjörn Schießle2014-01-152-5/+5
| |\ \
| | * | remove old codeBjoern Schiessle2014-01-151-3/+0
| | * | don't try to encrypt/decrypt cache chunks or files in the trash binBjoern Schiessle2014-01-151-2/+2
| | * | copy files to owner trash recursivelyBjoern Schiessle2014-01-151-3/+6
| * | | Merge pull request #6779 from owncloud/sharing-breadcrumb-folder-nameJan-Christoph Borchardt2014-01-152-1/+7
| |\ \ \
| | * | | Show the name of the shared folder in the breadcrumb when viewing a publicly ...Robin Appelman2014-01-152-1/+7
| |/ / /
| * | | Merge pull request #6774 from owncloud/versions_update_cacheicewind19912014-01-151-2/+4
| |\ \ \
| | * | | call getFileInfo to enforce a file cache entry for the new version, fix #6286Bjoern Schiessle2014-01-151-2/+4
| | |/ /
| * | | Merge pull request #3234 from owncloud/mjob-password-strengthThomas Müller2014-01-1510-7/+72
| |\ \ \
| | * | | Indicate password strength using strengthifyMorris Jobke2014-01-1510-7/+72
| | |/ /
| * | | Merge pull request #6744 from owncloud/fix_ocs_response_messagesThomas Müller2014-01-152-31/+46
| |\ \ \ | | |/ / | |/| |
| | * | extended test to also check the status messagesBjoern Schiessle2014-01-141-11/+24
| | * | keep response messageBjoern Schiessle2014-01-131-20/+22
| * | | Merge pull request #6768 from owncloud/scanner-use-storage-mtimeVincent Petry2014-01-154-3/+20
| |\ \ \
| | * | | update another testRobin Appelman2014-01-141-1/+1
| | * | | use different value for mtime and storage_mtime in testRobin Appelman2014-01-141-1/+1
| | * | | remove duplicate test classRobin Appelman2014-01-142-23/+17
| | * | | Use storage_mtime when determining if we can reuse cached data while scanningRobin Appelman2014-01-143-2/+25
| * | | | typo, grammarArthur Schiwon2014-01-141-1/+1
| * | | | LDAP: only read config from database, if configID is given. Not what we want ...Arthur Schiwon2014-01-141-1/+2
| * | | | remove unused variablesArthur Schiwon2014-01-141-2/+2
| * | | | LDAP: fix TLS detectionArthur Schiwon2014-01-141-2/+5
| * | | | Merge pull request #6704 from owncloud/encryptedfoldersizecalcVincent Petry2014-01-142-5/+62
| |\ \ \ \
| | * | | | Fix calculated folder size to use unencrypted sizeVincent Petry2014-01-092-5/+62
| * | | | | Merge pull request #6759 from owncloud/extstorage-smbtimezonefixVincent Petry2014-01-141-1/+1
| |\ \ \ \ \
| | * | | | | Fixed timezone issue with SMB storageVincent Petry2014-01-141-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #6767 from owncloud/sharing_error_messagesBjörn Schießle2014-01-141-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | it is not an urgent error... a DEBUG message is enough at this pointBjoern Schiessle2014-01-141-1/+1
| * | | | | Merge pull request #6752 from owncloud/silence-test-listenerThomas Müller2014-01-131-3/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | no warnings within unlinkDir() within the TestCleanupListenerThomas Müller2014-01-131-3/+3
| * | | | | Merge pull request #6755 from owncloud/remove-ru_RU-masterAndreas Fischer2014-01-1419-3359/+0
| |\ \ \ \ \
| | * | | | | remove ru_RU - it has bee removed from transifexThomas Müller2014-01-1319-3359/+0
| * | | | | | don't unshare on deleteBjoern Schiessle2014-01-131-8/+0
| |/ / / / /
| * | | | | Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-bla...Vincent Petry2014-01-132-16/+32
| |\ \ \ \ \
| | * | | | | Fix ```createCertificateBundle``` and ```getCertificates``` methodsCarlos Cerrillo2013-12-171-4/+2
| | * | | | | Fixing tab/space coding styleCarlos Cerrillo2013-12-171-17/+21
| | * | | | | Fixing Issue #6301 on master branchCarlos Cerrillo2013-12-151-6/+20
| * | | | | | Merge pull request #6734 from st3so/redirectfixFrank Karlitschek2014-01-131-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | fixing typo in redirection query stringst3so2014-01-121-1/+1
| * | | | | | Merge pull request #6694 from owncloud/fix-email-template-l10nThomas Müller2014-01-131-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | fix email template l10n, emphasize filenameJan-Christoph Borchardt2014-01-091-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #6713 from owncloud/files-filenameescapingfixesLukas Reschke2014-01-129-50/+75
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fixed various file name escaping issues in core appsVincent Petry2014-01-109-50/+75
| |/ / / /
| * | | | Merge pull request #6687 from owncloud/sharing-fixpartfilehandlingVincent Petry2014-01-092-22/+16
| |\ \ \ \
| | * | | | Removed special handling of part files in shared storage renameVincent Petry2014-01-082-22/+16
| * | | | | Merge pull request #6693 from owncloud/fixing-apache-loginThomas Müller2014-01-093-9/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | rename user-id to loginname to stay consistentThomas Müller2014-01-091-2/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-23 01:47:02 +0000