aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added function documentationJens-Christian Fischer2014-01-241-0/+4
* Add 'mail_from_address' configurationJens-Christian Fischer2014-01-242-0/+10
* Merge pull request #6736 from owncloud/tests-jsunittestsThomas Müller2014-01-2311-2/+4824
|\
| * adding code coverage supportThomas Müller2014-01-212-2/+14
| * Added Javascript unit testsVincent Petry2014-01-1611-2/+4812
* | Merge pull request #6234 from owncloud/change-email-by-enterJan-Christoph Borchardt2014-01-231-0/+17
|\ \
| * | fix double call of changeEmailAddress()Morris Jobke2014-01-181-0/+5
| * | fix typoMorris Jobke2013-12-091-1/+1
| * | change mail address by pressing enter - fixes #6179Morris Jobke2013-12-071-0/+12
* | | Merge pull request #6898 from owncloud/encryption_infinite_loopBjörn Schießle2014-01-232-45/+30
|\ \ \
| * | | fix infinite loop if folder and subfolder has the same nameBjoern Schiessle2014-01-221-39/+13
| * | | add path relative to the files folder of the currently logged in user to the ...Bjoern Schiessle2014-01-221-6/+17
* | | | Merge pull request #6890 from owncloud/version_fix_array_orderBjörn Schießle2014-01-223-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | fix array orderBjoern Schiessle2014-01-222-5/+4
| * | | code clean-upBjoern Schiessle2014-01-221-1/+2
| * | | fix size calculation of getAllVersions()Bjoern Schiessle2014-01-221-1/+1
* | | | Merge pull request #6719 from tripflex/fix_pubup_progbarMorris Jobke2014-01-224-27/+21
|\ \ \ \
| * | | | change publicUploadButtonMock to public_uploadMyles McNamara2014-01-201-1/+1
| * | | | change em to pxMyles McNamara2014-01-151-1/+1
| * | | | modify js to move upload wrapper, modify css to match core valuesMyles McNamara2014-01-102-8/+12
| * | | | remove extra upload controlsMyles McNamara2014-01-101-13/+1
| * | | | fix upload button layoutMyles McNamara2014-01-101-5/+7
* | | | | Merge pull request #6856 from owncloud/fixing-gallery-password-protected-acce...Vincent Petry2014-01-213-5/+84
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-2119-118/+336
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #6863 from owncloud/versioning_expire_function_testsThomas Müller2014-01-213-77/+265
|\ \ \ \ \
| * | | | | add first unit test for the versioning appBjoern Schiessle2014-01-212-0/+189
| * | | | | isolate getExpireList function to make it testableBjoern Schiessle2014-01-211-77/+76
* | | | | | Merge pull request #6868 from owncloud/enc-fixrandomfailunittestVincent Petry2014-01-217-35/+35
|\ \ \ \ \ \
| * | | | | | Replaced time() with uniqid() to make sure the file name is uniqueVincent Petry2014-01-217-35/+35
* | | | | | | Merge pull request #6844 from owncloud/fix-css-loading-masterJörn Friedrich Dreyer2014-01-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 20:09:44 +0000