summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | 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
| * | | | | adapt unit tests to the modified stream wrapperBjoern Schiessle2013-07-305-35/+35
| * | | | | encrypt/decrypt file versionsBjoern Schiessle2013-07-301-3/+124
| * | | | | check if app is enabledBjoern Schiessle2013-07-301-7/+8
| * | | | | only write keyfiles if it was a new file, otherwise nothing changedBjoern Schiessle2013-07-301-38/+45
| * | | | | use path relative to data/Bjoern Schiessle2013-07-301-4/+1
| * | | | | improved error handlingBjoern Schiessle2013-07-301-10/+26
| * | | | | working decrypt files methodBjoern Schiessle2013-07-292-18/+97
| * | | | | add ajax call to decrypt all filesBjörn Schießle2013-07-291-0/+4
| * | | | | user interface to allow user to decrypt all his files once the encryption app...Björn Schießle2013-07-294-9/+40
* | | | | | Merge pull request #4498 from owncloud/uploadprogress-near-uploadbuttonChristopher2013-08-181-4/+14
|\ \ \ \ \ \
| * | | | | | remove unneeded extra ID selectorsJan-Christoph Borchardt2013-08-181-2/+2
| * | | | | | move upload progress bar near upload button, more contextualJan-Christoph Borchardt2013-08-181-3/+13
* | | | | | | Merge pull request #4497 from owncloud/newlines_at_eof_kondouKondou2013-08-1843-43/+43
|\ \ \ \ \ \ \
| * | | | | | | Add _many_ newlines at the end of fileskondou2013-08-1843-43/+43
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #4483 from owncloud/compare-true-falseBart Visscher2013-08-187-14/+14
|\ \ \ \ \ \ \
| * | | | | | | Use boolean casting for bitwise and result.Andreas Fischer2013-08-171-1/+1
| * | | | | | | Fix spacing of all touched lines.Andreas Fischer2013-08-171-1/+1
| * | | | | | | Compare result are already true/falseBart Visscher2013-08-177-14/+14
* | | | | | | | Merge pull request #4486 from owncloud/ldap_adjust_cacheBart Visscher2013-08-181-1/+6
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | LDAP: use memcache if availableArthur Schiwon2013-08-171-1/+6
| |/ / / / / /
* | | | | | | Merge pull request #4426 from owncloud/ldap_settings_designJan-Christoph Borchardt2013-08-185-9/+49
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 10:53:07 +0000