summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* fix conflicts and add missing closing tagMorris Jobke2014-01-232-9/+1
* focus link text only on click in the input field - closes #6817Thomas Müller2014-01-231-1/+4
* Merge branch 'master' into mobile-styleThomas Müller2014-01-2348-317/+534
|\
| * 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 branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-2114-116/+307
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #6863 from owncloud/versioning_expire_function_testsThomas Müller2014-01-212-77/+264
| | |\ \
| | | * | add first unit test for the versioning appBjoern Schiessle2014-01-211-0/+188
| | | * | 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 branch 'master' into fix-setupfs-only-for-existing-users-masterThomas Müller2014-01-214-19/+25
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | OC_Util::setupFS($user) will create a data dir for the given string - no matt...Thomas Müller2014-01-215-4/+8
| | | |/ / | | |/| |
| * | | | Merge branch 'master' into fixing-gallery-password-protected-access-masterThomas Müller2014-01-214-19/+25
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | don't use the user id within the versions preview call as it could be used to...Thomas Müller2014-01-213-15/+14
| | * | | user workarount to compare CLOB column with CHAR valueJörn Friedrich Dreyer2014-01-211-4/+11
| | |/ /
| * / / adding password protection check to getShareByToken()Thomas Müller2014-01-211-1/+1
| |/ /
| * | Merge pull request #6849 from owncloud/checkupdate-reuseicewind19912014-01-201-1/+1
| |\ \
| | * | Reuse the data retrieved from the cache in checkUpdateRobin Appelman2014-01-201-1/+1
| * | | 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 #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 #6819 from owncloud/files-ispreviewenabledwarningfixVincent Petry2014-01-192-2/+2
| |\ \ \ \
| | * | | | Fixed isPreviewAvailable warnings in logVincent Petry2014-01-172-2/+2
| * | | | | add link to documentationBjoern Schiessle2014-01-171-0/+4
| * | | | | 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 #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
| | | |/ / / | | |/| | |
| * | | | | Show the name of the shared folder in the breadcrumb when viewing a publicly ...Robin Appelman2014-01-152-1/+7
| * | | | | call getFileInfo to enforce a file cache entry for the new version, fix #6286Bjoern Schiessle2014-01-151-2/+4
| |/ / / /
| * | | | typo, grammarArthur Schiwon2014-01-141-1/+1