summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Disabled internet checking as mentioned when in proxy modeJoan2014-01-101-0/+5
* | | | | | | Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfixVincent Petry2014-01-192-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fixed isPreviewAvailable warnings in logVincent Petry2014-01-172-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #6721 from tsumi/patch-1Morris Jobke2014-01-181-0/+3
|\ \ \ \ \ \
| * | | | | | Useless else removedtsumi2014-01-151-2/+0
| * | | | | | Added SVG fallback to apps settings popuptsumi2014-01-101-0/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #6784 from owncloud/fix-activation-of-unknown-appsMorris Jobke2014-01-182-12/+15
|\ \ \ \ \ \
| * | | | | | don't enable files_external testsThomas Müller2014-01-171-1/+1
| * | | | | | properly handle app activation for unit testingThomas Müller2014-01-151-12/+12
| * | | | | | error handling in case a requested app doesn't existsThomas Müller2014-01-151-0/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #6818 from owncloud/add_documentation_to_appinfoMorris Jobke2014-01-185-4/+49
|\ \ \ \ \ \
| * | | | | | added website fieldBjoern Schiessle2014-01-173-18/+25
| * | | | | | distinguish app links from doc linksBjoern Schiessle2014-01-173-3/+4
| * | | | | | show link to app documentationBjoern Schiessle2014-01-174-1/+34
| * | | | | | add link to documentationBjoern Schiessle2014-01-171-0/+4
|/ / / / / /
* | | | | | Merge pull request #6812 from owncloud/tests-fixcachesyntaxforoldphpThomas Müller2014-01-171-2/+3
|\ \ \ \ \ \
| * | | | | | Fix array access syntax for older PHPVincent Petry2014-01-171-2/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6810 from kofemann/for-upstreamVincent Petry2014-01-171-1/+1
|\ \ \ \ \ \
| * | | | | | webdav: return SPACE_UNKNOWN if server do not support quotaTigran Mkrtchyan2014-01-171-1/+1
| |/ / / / /
* | | | | | Merge pull request #6807 from owncloud/enc_updated_descriptionVincent Petry2014-01-171-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | updated description of the files encryption appBjoern Schiessle2014-01-171-1/+1
* | | | | | Merge pull request #6264 from owncloud/files-draggabledestroyMorris Jobke2014-01-161-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix to not destroy draggable when no draggable was setVincent Petry2014-01-141-1/+4
* | | | | | Merge pull request #6786 from wakeup/masterBjörn Schießle2014-01-161-1/+1
|\ \ \ \ \ \
| * | | | | | Fix untranslated text when deleting userVolkan Gezer2014-01-151-1/+1
* | | | | | | Merge pull request #6644 from ben-denham/unshare-all-fixBjörn Schießle2014-01-162-5/+63
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | updated the unit test for OCP\Share::unshareAll() to verify that shares by al...ben-denham2014-01-101-4/+54
| * | | | | | Unshare all will now delete all shares for the item, instead of only for a si...ben-denham2014-01-061-1/+9
* | | | | | | 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