summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #361 from owncloud/cruds_consts_2Thomas Tanghus2012-11-1112-105/+141
|\ | | | | Implement "Move CRUDS permission consts to OC(P) namespace" take 2
| * Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*Thomas Tanghus2012-11-1110-103/+99
| |
| * Added CRUDS permissions to the OCP namespace. Implements issue #345Thomas Tanghus2012-11-112-2/+42
|/
* Merge pull request #354 from michielbdejong/masterThomas Müller2012-11-101-0/+1
|\ | | | | add /.well-known/host-meta.json to .htaccess (for /apps/unhosted_apps)
| * add /.well-known/host-meta.json to .htaccessMichiel de Jong2012-11-101-0/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-1118-37/+47
|
* Disable loading apps before starting testsBart Visscher2012-11-101-0/+2
| | | | The tests it self should load the app if needed
* Merge pull request #346 from diederikdehaas/patch-checkstyle-build1341Thomas Müller2012-11-107-12/+12
|\ | | | | Patch checkstyle issues from jenkins build1341
| * Fixed new checkstyle issues in apps.php from build #1341.Diederik de Haas2012-11-101-1/+1
| |
| * Fixed new checkstyle issues in ocs.php from build #1341.Diederik de Haas2012-11-101-1/+1
| |
| * Fixed new checkstyle issues in util.php from build #1341.Diederik de Haas2012-11-101-2/+2
| |
| * Fixed new checkstyle issues in migrate.php from build #1341.Diederik de Haas2012-11-101-2/+2
| |
| * Fixed new checkstyle issues in ftp.php from build #1341.Diederik de Haas2012-11-101-2/+2
| |
| * Fixed new checkstyle issues in swift.php from build #1341.Diederik de Haas2012-11-101-2/+2
| |
| * Fixed new checkstyle issues from build #1341.Diederik de Haas2012-11-101-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-10158-6136/+1056
|
* Merge pull request #340 from butonic/fix_quota_zero_cornercaseThomas Müller2012-11-091-8/+8
|\ | | | | fix quota off by one error
| * fix quota off by one errorJörn Friedrich Dreyer2012-11-091-8/+8
| |
* | Merge pull request #337 from seidler2547/masterThomas Müller2012-11-093-1/+21
|\ \ | |/ |/| Fix problem with apache2+fcgid install, e.g. on Debian Squeeze
| * Fix WebDAV (and Android Client) not being able to authorize on Debian ↵Stefan Seidel2012-11-093-1/+21
|/ | | | Squeeze + mod_fcgid installs.
* Merge pull request #330 from owncloud/check_connectionThomas Müller2012-11-094-0/+43
|\ | | | | add a check and a warning if the ownCloud server is not able to establis...
| * add a check and a warning if the ownClodu server is not able to establish ↵Frank Karlitschek2012-11-084-0/+43
| | | | | | | | http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why.
* | [tx-robot] updated from transifexJenkins for ownCloud2012-11-09149-279/+1751
| |
* | l10n support for user_webdavauthThomas Mueller2012-11-092-0/+6
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2012-11-09278-2287/+2640
| |
* | Fix delete link when new user is addedBrice Maron2012-11-081-1/+8
| |
* | Merge pull request #261 from owncloud/fix_opera_file_deleteGeorg Ehrke2012-11-081-0/+3
|\ \ | | | | | | fix file delete in opera - fixes #188
| * | fix file delete in opera - fixes #188Georg Ehrke2012-11-051-0/+3
| | |
* | | Merge pull request #326 from owncloud/add_creditsThomas Müller2012-11-081-1/+6
|\ \ \ | | | | | | | | add credits to personal page too so that non admins can see what they run
| * | | add credits to personal page too so that non admins can see what they run.Frank Karlitschek2012-11-081-1/+6
| | |/ | |/|
* | | Merge pull request #324 from owncloud/fix_imageThomas Müller2012-11-083-2/+2
|\ \ \ | |/ / |/| | fix the broken image path on the apps page
| * | fix the broken image path on the apps pageFrank Karlitschek2012-11-083-2/+2
|/ /
* | Migration: Allow for no app data cases; handle file copying betterTom Needham2012-11-081-7/+5
| |
* | Migration: On import of user accounts only import folders in home dir, use ↵Tom Needham2012-11-082-35/+13
| | | | | | | | | | | | | | | | | | | | OC_Helper::copyr Check files when copying recursivley Remove obsolete method Dont count '.' and '..' as directories when importing.
* | Correct more data vs attr to fix #189Brice Maron2012-11-071-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2012-11-08173-4744/+4368
| |
* | normalize filepaths in OC_Files::getFileInfoRobin Appelman2012-11-071-0/+1
| |
* | Revert "fix blocking drag & drop upload of folders"Robin Appelman2012-11-071-2/+2
| | | | | | | | | | | | Fixes #150 This reverts commit 5b2f3c7f72a002b38da31a6748c0de22cb335203.
* | check if $path is a empty stringBjörn Schießle2012-11-071-1/+1
| |
* | Merge pull request #307 from owncloud/etag-function-overwriteicewind19912012-11-071-2/+14
|\ \ | | | | | | Allow apps to change the way etags are generated
| * | Allow changing the way etags are generatedRobin Appelman2012-11-071-2/+14
| | |
* | | backport from approved patch in stable45:Björn Schießle2012-11-071-4/+1
| | | | | | | | | | | | make root the default parameter for getAbsolutePath()
* | | Fix quoting problem in fs mount. give Big DB error at least in PGBrice Maron2012-11-071-4/+4
| | |
* | | Merge pull request #303 from owncloud/fix_issue_95Björn Schießle2012-11-071-2/+2
|\ \ \ | | | | | | | | urlencode file/dir to allow special characters in filename/path (issue #95)
| * | | urlencode file/dir to allow special characters in filename/path (issue #95)Björn Schießle2012-11-071-2/+2
| | | |
* | | | Merge pull request #306 from owncloud/crumb_drop_fixBjörn Schießle2012-11-071-1/+1
|\ \ \ \ | |_|/ / |/| | | extract the right file name for drag&drop.
| * | | get the right file name for drag&drop. This was necessary after the switch ↵Björn Schießle2012-11-071-1/+1
| |/ / | | | | | | | | | to css to show/hide file actions, otherwise the actions where part of the extracted file name.
* | | fix user specific mount configurationRobin Appelman2012-11-071-2/+2
| | |
* | | Merge pull request #289 from zimba12/masterThomas Müller2012-11-072-21/+24
|\ \ \ | |/ / |/| | Move function that relativizes dates from Files app to core
| * | Moved relative_modified_date from file/js to core/jsAlessandro Cosentino2012-11-062-21/+24
| | |