summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-25247-2599/+8182
|
* Merge pull request #4331 from owncloud/improve_app-managementChristopher2013-08-257-66/+92
|\ | | | | Improve app-management
| * Merge branch 'master' into improve_app-managementkondou2013-08-21926-14253/+14568
| |\ | | | | | | | | | | | | Conflicts: settings/js/apps.js
| * | Move .errormsg from settings-css to .warning in core. Reusable!kondou2013-08-184-15/+17
| | |
| * | Use appitem instead of always recreating a jquery objectkondou2013-08-181-15/+13
| | | | | | | | | | | | Also fix some wrong data storages
| * | Don't use an alert for displaying app-mgmt-errorskondou2013-08-184-11/+45
| | | | | | | | | | | | | | | | | | Rather display a dominant div and mark the problematic app in the applist. Fix #305
| * | Merge branch 'master' into improve_app-managementkondou2013-08-18760-14393/+10729
| |\ \
| * | | Throw exceptions instead of only logging in \OC_Installer::installApp()kondou2013-08-091-35/+18
| | | |
| * | | Merge branch 'master' into improve_app-managementkondou2013-08-091257-3494/+11388
| |\ \ \
| * | | | Log exception at the catching codekondou2013-08-092-5/+6
| | | | |
| * | | | Improve app-managementkondou2013-08-063-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Better error messages - Translate untranslated strings Basically picks non-app-dependency related stuff from #4017
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2329-109/+148
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-2239-163/+187
| | | | |
* | | | | Merge pull request #4537 from owncloud/no-realpathThomas Müller2013-08-228-76/+76
|\ \ \ \ \ | | | | | | | | | | | | Do not use realpath() on includes.
| * | | | | Use __DIR__ instead of dirname(__FILE__).Andreas Fischer2013-08-218-76/+76
| | | | | | | | | | | | | | | | | | | | | | | | This is possible because we require PHP 5.3 or higher.
| * | | | | Also remove other unnecessary realpath() calls.Andreas Fischer2013-08-213-14/+14
| | | | | |
| * | | | | Do not use realpath() on includes.Andreas Fischer2013-08-218-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/coreThomas Müller2013-08-222-7/+11
|\ \ \ \ \ \
| * | | | | | Sharing: only determine path root if owner is availableArthur Schiwon2013-08-221-6/+10
| | | | | | |
| * | | | | | LDAP: fix wrong hook nameArthur Schiwon2013-08-221-1/+1
| | |_|_|_|/ | |/| | | |
* / | | | | additional readdir check in mappedlocalThomas Müller2013-08-221-1/+1
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-21178-955/+1056
| | | | |
* | | | | Merge pull request #4262 from owncloud/fix_jslint_kondouChristopher2013-08-2019-64/+82
|\ \ \ \ \ | | | | | | | | | | | | Fix some JSLint warnings
| * | | | | Merge branch 'master' into fix_jslint_kondoukondou2013-08-181499-15173/+20708
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/file-upload.js
| * | | | | Fix a syntax error & have if-conds in an own linekondou2013-08-015-11/+31
| | | | | |
| * | | | | Fix some JSLint warningskondou2013-07-3119-71/+71
| | | | | |
* | | | | | Merge pull request #4447 from owncloud/fix_4351_masterMorris Jobke2013-08-204-22/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use JSON to send/receive group data.
| * | | | | | Break long lines into smaller ones.Owen Winkler2013-08-181-3/+10
| | | | | | |
| * | | | | | Use JSON to send/receive group data.Owen Winkler2013-08-154-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commits from PR #4364 for master.
* | | | | | | Merge pull request #4512 from owncloud/readdir-strict-equalsThomas Müller2013-08-2014-19/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | use strict equals in readdir loops to prevent issues with '0' files
| * \ \ \ \ \ \ Merge branch 'master' into readdir-strict-equalsGeorg Ehrke2013-08-1919-149/+456
| |\ \ \ \ \ \ \
| * | | | | | | | use strict equals in readdir loops to prevent issues with '0' filesRobin Appelman2013-08-1914-19/+19
| | | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-19686-13104/+12471
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #4510 from owncloud/f_e_webdav_urlencodingThomas Müller2013-08-191-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix files_external webdav up and download when path contains ' '
| * | | | | | | | replace ' ' with '%20' in urls for curlJörn Friedrich Dreyer2013-08-191-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #4467 from owncloud/storage-wrapper-quotaicewind19912013-08-1919-147/+454
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Move quota logic from filesystem proxy to storage wrapper
| * | | | | | | merge master in storage-wrapper-quotaRobin Appelman2013-08-181675-33543/+39887
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | remove outdated quota proxyRobin Appelman2013-08-161-114/+0
| | | | | | | |
| * | | | | | | fix quota wrapper reporting negative free_space, breaking user interfaceRobin Appelman2013-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return 0 instead
| * | | | | | | use renamed constantsRobin Appelman2013-07-254-5/+5
| | | | | | | |
| * | | | | | | use storage wrapper for quota instead of a filesystem proxyRobin Appelman2013-07-251-2/+22
| | | | | | | |
| * | | | | | | add conveince function to wrap all storagesRobin Appelman2013-07-251-0/+12
| | | | | | | |
| * | | | | | | use renamed constantsRobin Appelman2013-07-251-2/+2
| | | | | | | |
| * | | | | | | add option to wrap existing mountsRobin Appelman2013-07-252-0/+14
| | | | | | | |
| * | | | | | | fix getPermissionsCache for storage wrapperRobin Appelman2013-07-251-1/+1
| | | | | | | |
| * | | | | | | add quota storage wrapperRobin Appelman2013-07-252-0/+165
| | | | | | | |
| * | | | | | | move storage wrapper test to new namespaceRobin Appelman2013-07-251-2/+2
| | | | | | | |
| * | | | | | | add quota streamwrapper that limits the amount of data that can be written ↵Robin Appelman2013-07-253-16/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a stream
| * | | | | | | rename constantsRobin Appelman2013-07-253-4/+5
| | | | | | | |
* | | | | | | | Merge pull request #4509 from owncloud/add-odf-templates-masterMorris Jobke2013-08-194-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | adding file templates for ods, odt and odp