summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | Revert "use getAppWebPath() in here as well"Thomas Müller2014-01-201-1/+1
| * | | | | | | | | | | | Merge pull request #6858 from owncloud/fix-setupfs-only-for-existing-users-ma...Thomas Müller2014-01-218-5/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into fix-setupfs-only-for-existing-users-masterThomas Müller2014-01-215-20/+26
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | OC_Util::setupFS($user) will create a data dir for the given string - no matt...Thomas Müller2014-01-218-5/+35
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | | * | | | | | | | Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-215-20/+26
| | | | |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6864 from owncloud/protect-versions-preview-masterThomas Müller2014-01-213-15/+14
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | don't use the user id within the versions preview call as it could be used to...Thomas Müller2014-01-213-15/+14
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6861 from owncloud/neutral_download_zip_default_nameThomas Müller2014-01-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'Jörn Friedrich Dreyer2014-01-211-1/+1
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracleThomas Müller2014-01-211-4/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | user workarount to compare CLOB column with CHAR valueJörn Friedrich Dreyer2014-01-211-4/+11
| |/ / / / / / / / / /
| | | * | | | | | | | fixing comment + adding unit test for checkPasswordProtectedShareThomas Müller2014-01-212-1/+49
| | | * | | | | | | | in case no share is found for the given token we can return right awayThomas Müller2014-01-211-0/+3
| | | * | | | | | | | adding password protection check to getShareByToken()Thomas Müller2014-01-212-5/+33
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #6820 from owncloud/phpunit-test-configThomas Müller2014-01-204-5/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Move test config folder to tests/configRobin Appelman2014-01-201-2/+2
| | * | | | | | | | | Load a separate config (if present) when running unit testsRobin Appelman2014-01-174-5/+14
| * | | | | | | | | | Merge pull request #6849 from owncloud/checkupdate-reuseicewind19912014-01-203-5/+8
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Reuse the data retrieved from the cache in checkUpdateRobin Appelman2014-01-203-5/+8
| * | | | | | | | | | | Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalcVincent Petry2014-01-202-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | When reading the size of "files" mountpoints need to be excludedVincent Petry2014-01-202-2/+2
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #6842 from owncloud/fix-quotes-again-masterJörn Friedrich Dreyer2014-01-202-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | adding a comment to the database schemaThomas Müller2014-01-201-0/+1
| | * | | | | | | | | | Updating 3rdparty once more ....Thomas Müller2014-01-201-0/+0
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfixVincent Petry2014-01-202-1/+20
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed quota wrapper to not wrap failed fopen streamsVincent Petry2014-01-192-1/+20
| * | | | | | | | | | | Merge pull request #6827 from rnveach/fix_6730Morris Jobke2014-01-202-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | added trigger to redo selection text on a directory changernveach2014-01-171-0/+2
| | * | | | | | | | | | fixed selector string and removed all checkbox if it was selectedrnveach2014-01-171-1/+2
| * | | | | | | | | | | Merge pull request #6676 from aseques/check_internet_proxyThomas Müller2014-01-191-0/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | 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
| |/ / / / / / / / / / /
* | | | | | | | | | | | Add isReadable, isUpdateable, isDeletable, isShareableRobin Appelman2014-01-242-1/+65
* | | | | | | | | | | | undo 3rdparty changeRobin Appelman2014-01-201-0/+0
* | | | | | | | | | | | undo 3rdparty changeRobin Appelman2014-01-201-0/+0
* | | | | | | | | | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-1733-85/+269
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #6812 from owncloud/tests-fixcachesyntaxforoldphpThomas Müller2014-01-171-2/+3
| |\ \ \ \ \ \ \ \ \ \ \