Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | prefix 'tbody tr' to separate app/core css errors | petemcfarlane | 2013-08-30 | 1 | -1/+1 |
| | | | | For specific details see: https://github.com/owncloud/core/pull/4536/files#r6082305 | ||||
* | Merge pull request #3926 from owncloud/improve_filesummary | Thomas Müller | 2013-08-28 | 4 | -40/+127 |
|\ | | | | | Improve filelist summary | ||||
| * | Reimplement filesummary in JS | kondou | 2013-08-28 | 4 | -40/+127 |
| | | | | | | | | Fix #993 | ||||
* | | also move empty folders to the trash bin as discussed here #4590 | Bjoern Schiessle | 2013-08-28 | 1 | -5/+0 |
| | | |||||
* | | Merge pull request #4489 from owncloud/clean-3rdparty-mess-master | Bart Visscher | 2013-08-28 | 15 | -2/+1506 |
|\ \ | |/ |/| | Clean 3rdparty mess master | ||||
| * | fixing require path | Thomas Müller | 2013-08-18 | 2 | -2/+2 |
| | | |||||
| * | moving Dropbox and smb4php 3rdparty code over to the apps | Thomas Müller | 2013-08-17 | 15 | -2/+1506 |
| | | |||||
* | | Merge pull request #4601 from owncloud/fixing-4341-master | Morris Jobke | 2013-08-28 | 3 | -27/+33 |
|\ \ | | | | | | | backport of #4357 to master | ||||
| * | | backport of #4357 to master | Thomas Müller | 2013-08-27 | 3 | -27/+33 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-28 | 1 | -1/+3 |
|/ / | |||||
* | | Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement | Morris Jobke | 2013-08-27 | 1 | -1/+1 |
|\ \ | | | | | | | Fix "select all" checkbox displacement when checked, fix #4571 | ||||
| * | | Fix "select all" checkbox displacement when checked | Pellaeon Lin | 2013-08-26 | 1 | -1/+1 |
| | | | |||||
* | | | LDAP: case insensitive replace for more robustness | Arthur Schiwon | 2013-08-27 | 1 | -1/+1 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-27 | 51 | -85/+63 |
| | | | |||||
* | | | the trash bin can also contain empty files. Don't use the trash bin size as ↵ | Bjoern Schiessle | 2013-08-27 | 1 | -4/+5 |
| | | | | | | | | | | | | indicator to decide if the trash bin is empty or not | ||||
* | | | Merge pull request #4586 from owncloud/fixing-3431-master | Morris Jobke | 2013-08-27 | 7 | -186/+0 |
|\ \ \ | | | | | | | | | kill zh_CN.GB2312 | ||||
| * | | | kill zh_CN.GB2312 | Thomas Müller | 2013-08-27 | 7 | -186/+0 |
| | | | | |||||
* | | | | storage information is path specific | Thomas Müller | 2013-08-27 | 2 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #4542 from owncloud/fixing-4504-master | Morris Jobke | 2013-08-26 | 2 | -198/+7 |
|\ \ \ | |/ / |/| | | remove duplicate code | ||||
| * | | remove duplicate code | Thomas Müller | 2013-08-22 | 2 | -198/+7 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 8 | -13/+28 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-23 | 4 | -0/+11 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-22 | 5 | -10/+16 |
| | | | |||||
* | | | Merge pull request #4537 from owncloud/no-realpath | Thomas Müller | 2013-08-22 | 8 | -76/+76 |
|\ \ \ | | | | | | | | | Do not use realpath() on includes. | ||||
| * | | | Use __DIR__ instead of dirname(__FILE__). | Andreas Fischer | 2013-08-21 | 8 | -76/+76 |
| | | | | | | | | | | | | | | | | This is possible because we require PHP 5.3 or higher. | ||||
| * | | | Also remove other unnecessary realpath() calls. | Andreas Fischer | 2013-08-21 | 3 | -14/+14 |
| | | | | |||||
| * | | | Do not use realpath() on includes. | Andreas Fischer | 2013-08-21 | 8 | -62/+62 |
| | |/ | |/| | | | | | | | | | | | | | | | | If the file does not exist, realpath() returns false and "include false;" produces "Failed opening '' for inclusion" which is a useless error message. 'include' works just fine with symlinks, "./" and "../". | ||||
* | | | LDAP: fix wrong hook name | Arthur Schiwon | 2013-08-22 | 1 | -1/+1 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-21 | 15 | -5/+34 |
| | | |||||
* | | Merge pull request #4262 from owncloud/fix_jslint_kondou | Christopher | 2013-08-20 | 6 | -19/+20 |
|\ \ | | | | | | | Fix some JSLint warnings | ||||
| * | | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 536 | -2086/+2813 |
| |\| | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| * | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 3 | -3/+7 |
| | | | |||||
| * | | Fix some JSLint warnings | kondou | 2013-07-31 | 6 | -26/+25 |
| | | | |||||
* | | | Merge pull request #4512 from owncloud/readdir-strict-equals | Thomas Müller | 2013-08-20 | 5 | -6/+6 |
|\ \ \ | | | | | | | | | use strict equals in readdir loops to prevent issues with '0' files | ||||
| * \ \ | Merge branch 'master' into readdir-strict-equals | Georg Ehrke | 2013-08-19 | 3 | -5/+5 |
| |\ \ \ | |||||
| * | | | | use strict equals in readdir loops to prevent issues with '0' files | Robin Appelman | 2013-08-19 | 5 | -6/+6 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 63 | -354/+82 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #4510 from owncloud/f_e_webdav_urlencoding | Thomas Müller | 2013-08-19 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix files_external webdav up and download when path contains ' ' | ||||
| * | | | | replace ' ' with '%20' in urls for curl | Jörn Friedrich Dreyer | 2013-08-19 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pull request #4467 from owncloud/storage-wrapper-quota | icewind1991 | 2013-08-19 | 3 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | Move quota logic from filesystem proxy to storage wrapper | ||||
| * | | | merge master in storage-wrapper-quota | Robin Appelman | 2013-08-18 | 549 | -2936/+3487 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | use renamed constants | Robin Appelman | 2013-07-25 | 3 | -4/+4 |
| | | | | |||||
* | | | | adding file templates for ods, odt and odp | Thomas Müller | 2013-08-18 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 15 | -122/+418 |
|\ \ \ \ | | | | | | | | | | | Enable user to decrypt files again after encryption app was disabled | ||||
| * | | | | don't change the etags if a file gets encrypted/decrypted to avoid that the ↵ | Bjoern Schiessle | 2013-08-18 | 1 | -24/+32 |
| | | | | | | | | | | | | | | | | | | | | sync client downloads all files again | ||||
| * | | | | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 541 | -1799/+2770 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| * | | | | | remove whitespaces and some leftover code from testing | Bjoern Schiessle | 2013-08-15 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | check if some encrypted files are left after the app was disabled and warn ↵ | Bjoern Schiessle | 2013-08-12 | 3 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | the user | ||||
| * | | | | | preserve mtime if file gets encrypted/decrypted | Bjoern Schiessle | 2013-08-12 | 1 | -1/+13 |
| | | | | | | |||||
| * | | | | | fix array declaration | Bjoern Schiessle | 2013-08-12 | 1 | -1/+1 |
| | | | | | |