summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* use random string as id for checkboxGeorg Ehrke2013-08-261-1/+2
* fix background size in filelist.jsGeorg Ehrke2013-08-261-1/+1
* Merge master into oc_previewGeorg Ehrke2013-08-2614-217/+52
|\
| * Merge pull request #4542 from owncloud/fixing-4504-masterMorris Jobke2013-08-262-198/+7
| |\
| | * remove duplicate codeThomas Müller2013-08-222-198/+7
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-258-13/+28
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-234-0/+11
* | | fix preview issue when uploading a file with parenthesesGeorg Ehrke2013-08-261-1/+3
* | | move path generation for previews to dedicated functionGeorg Ehrke2013-08-232-3/+8
* | | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-2396-477/+243
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-225-10/+16
| * | Merge pull request #4537 from owncloud/no-realpathThomas Müller2013-08-228-76/+76
| |\ \
| | * | Use __DIR__ instead of dirname(__FILE__).Andreas Fischer2013-08-218-76/+76
| | * | Also remove other unnecessary realpath() calls.Andreas Fischer2013-08-213-14/+14
| | * | Do not use realpath() on includes.Andreas Fischer2013-08-218-62/+62
| * | | LDAP: fix wrong hook nameArthur Schiwon2013-08-221-1/+1
| | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2115-5/+34
| * | Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-206-19/+20
| |\ \
| | * | Merge branch 'master' into fix_jslint_kondoukondou2013-08-18536-2086/+2813
| | |\|
| | * | Fix a syntax error & have if-conds in an own linekondou2013-08-013-3/+7
| | * | Fix some JSLint warningskondou2013-07-316-26/+25
| * | | Merge pull request #4512 from owncloud/readdir-strict-equalsThomas Müller2013-08-205-6/+6
| |\ \ \
| | * \ \ Merge branch 'master' into readdir-strict-equalsGeorg Ehrke2013-08-193-5/+5
| | |\ \ \
| | * | | | use strict equals in readdir loops to prevent issues with '0' filesRobin Appelman2013-08-195-6/+6
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1963-354/+82
| | |/ / / | |/| | |
| * | | | Merge pull request #4510 from owncloud/f_e_webdav_urlencodingThomas Müller2013-08-191-2/+2
| |\ \ \ \
| | * | | | replace ' ' with '%20' in urls for curlJörn Friedrich Dreyer2013-08-191-2/+2
| | |/ / /
| * | | | Merge pull request #4467 from owncloud/storage-wrapper-quotaicewind19912013-08-193-3/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge master in storage-wrapper-quotaRobin Appelman2013-08-18549-2936/+3487
| | |\ \ \ | | | | |/ | | | |/|
| | * | | use renamed constantsRobin Appelman2013-07-253-4/+4
| * | | | adding file templates for ods, odt and odpThomas Müller2013-08-181-1/+3
* | | | | move isMimeSupported out of template filesGeorg Ehrke2013-08-215-5/+12
* | | | | outsource sharing and deleted files previews to appsGeorg Ehrke2013-08-194-0/+137
* | | | | style fixes for preview libGeorg Ehrke2013-08-191-1/+2
* | | | | Merge master into oc_previewGeorg Ehrke2013-08-19225-1661/+1433
|\| | | |
| * | | | Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-1815-122/+418
| |\ \ \ \
| | * | | | don't change the etags if a file gets encrypted/decrypted to avoid that the s...Bjoern Schiessle2013-08-181-24/+32
| | * | | | Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-17541-1799/+2770
| | |\ \ \ \
| | * | | | | remove whitespaces and some leftover code from testingBjoern Schiessle2013-08-152-2/+2
| | * | | | | check if some encrypted files are left after the app was disabled and warn th...Bjoern Schiessle2013-08-123-0/+16
| | * | | | | preserve mtime if file gets encrypted/decryptedBjoern Schiessle2013-08-121-1/+13
| | * | | | | fix array declarationBjoern Schiessle2013-08-121-1/+1
| | * | | | | don't know why it works locally but not on the build server... let's keep it ...Bjoern Schiessle2013-07-311-0/+3
| | * | | | | use OC\Files\View to read encrypted file, so that it also works with external...Bjoern Schiessle2013-07-311-4/+7
| | * | | | | this hopefully fixes testRecoveryForUser(), works locallyBjoern Schiessle2013-07-311-7/+10
| | * | | | | this test works locally, let's see what out build server says...Bjoern Schiessle2013-07-311-3/+0
| | * | | | | fixing some unit testsBjoern Schiessle2013-07-302-6/+6
| | * | | | | we need to use the path relative to data/Bjoern Schiessle2013-07-301-4/+1
| | * | | | | handle error if we can't handle the given pathBjoern Schiessle2013-07-302-2/+7
| | * | | | | remove unused method, the right one is in util.phpBjoern Schiessle2013-07-301-4/+0