summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* enable user to inform recipients about a shared file by mailBjoern Schiessle2013-08-302-1/+3
* Merge pull request #3926 from owncloud/improve_filesummaryThomas Müller2013-08-284-40/+127
|\
| * Reimplement filesummary in JSkondou2013-08-284-40/+127
* | also move empty folders to the trash bin as discussed here #4590Bjoern Schiessle2013-08-281-5/+0
* | Merge pull request #4489 from owncloud/clean-3rdparty-mess-masterBart Visscher2013-08-2815-2/+1506
|\ \ | |/ |/|
| * fixing require pathThomas Müller2013-08-182-2/+2
| * moving Dropbox and smb4php 3rdparty code over to the appsThomas Müller2013-08-1715-2/+1506
* | Merge pull request #4601 from owncloud/fixing-4341-masterMorris Jobke2013-08-283-27/+33
|\ \
| * | backport of #4357 to masterThomas Müller2013-08-273-27/+33
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-281-1/+3
|/ /
* | Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacementMorris Jobke2013-08-271-1/+1
|\ \
| * | Fix "select all" checkbox displacement when checkedPellaeon Lin2013-08-261-1/+1
* | | LDAP: case insensitive replace for more robustnessArthur Schiwon2013-08-271-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2751-85/+63
* | | the trash bin can also contain empty files. Don't use the trash bin size as i...Bjoern Schiessle2013-08-271-4/+5
* | | Merge pull request #4586 from owncloud/fixing-3431-masterMorris Jobke2013-08-277-186/+0
|\ \ \
| * | | kill zh_CN.GB2312Thomas Müller2013-08-277-186/+0
* | | | storage information is path specificThomas Müller2013-08-272-2/+2
|/ / /
* | | 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
* | | [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
* | | | 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