Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-25 | 247 | -2599/+8182 |
| | |||||
* | Merge pull request #4331 from owncloud/improve_app-management | Christopher | 2013-08-25 | 7 | -66/+92 |
|\ | | | | | Improve app-management | ||||
| * | Merge branch 'master' into improve_app-management | kondou | 2013-08-21 | 926 | -14253/+14568 |
| |\ | | | | | | | | | | | | | Conflicts: settings/js/apps.js | ||||
| * | | Move .errormsg from settings-css to .warning in core. Reusable! | kondou | 2013-08-18 | 4 | -15/+17 |
| | | | |||||
| * | | Use appitem instead of always recreating a jquery object | kondou | 2013-08-18 | 1 | -15/+13 |
| | | | | | | | | | | | | Also fix some wrong data storages | ||||
| * | | Don't use an alert for displaying app-mgmt-errors | kondou | 2013-08-18 | 4 | -11/+45 |
| | | | | | | | | | | | | | | | | | | Rather display a dominant div and mark the problematic app in the applist. Fix #305 | ||||
| * | | Merge branch 'master' into improve_app-management | kondou | 2013-08-18 | 760 | -14393/+10729 |
| |\ \ | |||||
| * | | | Throw exceptions instead of only logging in \OC_Installer::installApp() | kondou | 2013-08-09 | 1 | -35/+18 |
| | | | | |||||
| * | | | Merge branch 'master' into improve_app-management | kondou | 2013-08-09 | 1257 | -3494/+11388 |
| |\ \ \ | |||||
| * | | | | Log exception at the catching code | kondou | 2013-08-09 | 2 | -5/+6 |
| | | | | | |||||
| * | | | | Improve app-management | kondou | 2013-08-06 | 3 | -15/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better error messages - Translate untranslated strings Basically picks non-app-dependency related stuff from #4017 | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-23 | 29 | -109/+148 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-22 | 39 | -163/+187 |
| | | | | | |||||
* | | | | | 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 "../". | ||||
* | | | | | | Merge branch 'master' of github.com:owncloud/core | Thomas Müller | 2013-08-22 | 2 | -7/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Sharing: only determine path root if owner is available | Arthur Schiwon | 2013-08-22 | 1 | -6/+10 |
| | | | | | | | |||||
| * | | | | | | LDAP: fix wrong hook name | Arthur Schiwon | 2013-08-22 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* / | | | | | additional readdir check in mappedlocal | Thomas Müller | 2013-08-22 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-21 | 178 | -955/+1056 |
| | | | | | |||||
* | | | | | Merge pull request #4262 from owncloud/fix_jslint_kondou | Christopher | 2013-08-20 | 19 | -64/+82 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix some JSLint warnings | ||||
| * | | | | | Merge branch 'master' into fix_jslint_kondou | kondou | 2013-08-18 | 1499 | -15173/+20708 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js | ||||
| * | | | | | Fix a syntax error & have if-conds in an own line | kondou | 2013-08-01 | 5 | -11/+31 |
| | | | | | | |||||
| * | | | | | Fix some JSLint warnings | kondou | 2013-07-31 | 19 | -71/+71 |
| | | | | | | |||||
* | | | | | | Merge pull request #4447 from owncloud/fix_4351_master | Morris Jobke | 2013-08-20 | 4 | -22/+29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use JSON to send/receive group data. | ||||
| * | | | | | | Break long lines into smaller ones. | Owen Winkler | 2013-08-18 | 1 | -3/+10 |
| | | | | | | | |||||
| * | | | | | | Use JSON to send/receive group data. | Owen Winkler | 2013-08-15 | 4 | -22/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commits from PR #4364 for master. | ||||
* | | | | | | | Merge pull request #4512 from owncloud/readdir-strict-equals | Thomas Müller | 2013-08-20 | 14 | -19/+19 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | use strict equals in readdir loops to prevent issues with '0' files | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into readdir-strict-equals | Georg Ehrke | 2013-08-19 | 19 | -149/+456 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | use strict equals in readdir loops to prevent issues with '0' files | Robin Appelman | 2013-08-19 | 14 | -19/+19 |
| | | | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-19 | 686 | -13104/+12471 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | 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 | 19 | -147/+454 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Move quota logic from filesystem proxy to storage wrapper | ||||
| * | | | | | | | merge master in storage-wrapper-quota | Robin Appelman | 2013-08-18 | 1675 | -33543/+39887 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | remove outdated quota proxy | Robin Appelman | 2013-08-16 | 1 | -114/+0 |
| | | | | | | | | |||||
| * | | | | | | | fix quota wrapper reporting negative free_space, breaking user interface | Robin Appelman | 2013-08-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return 0 instead | ||||
| * | | | | | | | use renamed constants | Robin Appelman | 2013-07-25 | 4 | -5/+5 |
| | | | | | | | | |||||
| * | | | | | | | use storage wrapper for quota instead of a filesystem proxy | Robin Appelman | 2013-07-25 | 1 | -2/+22 |
| | | | | | | | | |||||
| * | | | | | | | add conveince function to wrap all storages | Robin Appelman | 2013-07-25 | 1 | -0/+12 |
| | | | | | | | | |||||
| * | | | | | | | use renamed constants | Robin Appelman | 2013-07-25 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | add option to wrap existing mounts | Robin Appelman | 2013-07-25 | 2 | -0/+14 |
| | | | | | | | | |||||
| * | | | | | | | fix getPermissionsCache for storage wrapper | Robin Appelman | 2013-07-25 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | add quota storage wrapper | Robin Appelman | 2013-07-25 | 2 | -0/+165 |
| | | | | | | | | |||||
| * | | | | | | | move storage wrapper test to new namespace | Robin Appelman | 2013-07-25 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | add quota streamwrapper that limits the amount of data that can be written ↵ | Robin Appelman | 2013-07-25 | 3 | -16/+225 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a stream | ||||
| * | | | | | | | rename constants | Robin Appelman | 2013-07-25 | 3 | -4/+5 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #4509 from owncloud/add-odf-templates-master | Morris Jobke | 2013-08-19 | 4 | -1/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | adding file templates for ods, odt and odp |