mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,450 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

5738 Commits

Author SHA1 Message Date
Morris Jobke 084050530c Merge pull request #7486 from owncloud/l10n_docstrings 
Fix some docstrings in l10n.php
 2014-03-01 10:38:48 +01:00
Thomas Tanghus eff7667d26 Merge pull request #7433 from owncloud/config_basic_auth 
Config to disable basic_auth username checking
 2014-03-01 06:08:32 +01:00
kondou 5d5306175f Fix some docstrings in l10n.php 2014-03-01 03:38:35 +01:00
Thomas Müller dd32091016 Merge pull request #7444 from owncloud/fix/7443 
remove unused code and fix wrong variable names - some PHPDoc updated
 2014-02-28 14:48:21 +01:00
Morris Jobke d3866754a4 Merge pull request #7471 from owncloud/fix-css-loading 
CSS is now loaded directly instead via PHP
 2014-02-28 14:19:36 +01:00
icewind1991 8a93a2e7d5 Merge pull request #7455 from owncloud/rawlist-fileinfo 
Update rawlist to work with new fileinfo object
 2014-02-28 12:36:56 +01:00
Lukas Reschke 4c4bb70cb6 CSS is now loaded directly instead via PHP 
269f24cf96 was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.
 2014-02-28 11:14:18 +01:00
Morris Jobke 49b331be39 add BMP mimetype for BMP previews 2014-02-27 14:39:16 +01:00
Robin Appelman 7c92e2e3ad Update rawlist to work with new fileinfo object 2014-02-27 14:04:19 +01:00
Vincent Petry 22adc397de Also quote old column name during DB migration 
This fixes alter table commands that didn't quote the old column name
 2014-02-27 09:09:16 +01:00
Thomas Müller ab850b961d remove unused code and fix wrong variable names - some PHPDoc updated 2014-02-26 23:56:46 +01:00
kondou da19109f40 Config to disable basic_auth username chacking 
This can be confusing and/or annoying
 2014-02-26 18:06:13 +01:00
Bart Visscher 7f05c23231 Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash 
- removed slash-adding for logout-header-redirect
 2014-02-26 16:05:09 +01:00
Björn Schießle b7385986ae Merge pull request #7393 from owncloud/fix_path_in_sharing_results 
fix path in sharing results if it is a file in the Shared folder
 2014-02-26 15:19:30 +01:00
icewind1991 59df3ffdf4 Merge pull request #7279 from owncloud/folderid-reuse 
Reuse the folder id in View->getFolderContents
 2014-02-26 12:18:34 +01:00
Jan-Christoph Borchardt 8759c35e74 Merge pull request #7399 from owncloud/themable-doc-links 
introduce new theme function to allow full creation of documentation lin...
 2014-02-26 12:04:52 +01:00
Vincent Petry 5c98e0c7c7 Merge pull request #7328 from owncloud/McNetic-zipstreamer 
McNetic zipstreamer
 2014-02-26 10:19:12 +01:00
Thomas Müller 574883c47a introduce new theme function to allow full creation of documentation links: buildDocLinkToKey() 2014-02-25 23:06:23 +01:00
Bjoern Schiessle e3f676e009 fix path in sharing results if it is a file in the Shared folder 2014-02-25 17:27:23 +01:00
Vincent Petry 7f7d674c2a Merge pull request #7335 from owncloud/fix-7333 
Fix code to search for mount.json in custom data folders
 2014-02-25 15:27:47 +01:00
Vincent Petry 9b4af31bac Merge pull request #7371 from owncloud/core-storagemovedeleteall 
Replace deleteAll call with unlink call on rename
 2014-02-25 14:52:21 +01:00
Björn Schießle e10ca7c2e9 Merge pull request #7374 from owncloud/enc_dont_overwrite_keys 
[encryption] don't overwrite keys if rename was done by a stream copy
 2014-02-25 12:34:49 +01:00
Vincent Petry 432a42d846 Fix case where port is missing 
Forward port of 6d3b5b24fd to master
 2014-02-25 11:40:05 +01:00
Bjoern Schiessle ebd73aee8f don't overwrite keys if rename was done by a stream copy 2014-02-24 17:24:43 +01:00
Thomas Müller 0d78d9c180 Merge branch 'master' into McNetic-zipstreamer 
Conflicts:
	3rdparty
 2014-02-24 12:53:55 +01:00
Vincent Petry a23ef25010 Removed unused deleteAll method on Common storage class 
The "deleteAll" method on the Common storage class isn't used anywhere.
Also, it isn't defined on the Storage interface so this fix removes it
completely.
 2014-02-24 12:21:48 +01:00
Vincent Petry c465835e85 Replace deleteAll call with unlink call 
The method deleteAll() doesn't officially exist on the Storage class as
it's not defined on the interface, which means it fails on the Quota
storage wrapper and might fail on some external storage classes.
Also, this here is the only use case for that one method.
 2014-02-24 12:20:11 +01:00
Lukas Reschke c9ab11a9bd Merge pull request #7259 from owncloud/overwritehost-always 
Add overwritehost config on setup and upgrade
 2014-02-22 07:35:56 +01:00
Robin Appelman 3487a95eab Remove fileid parameter for getFolderContent 2014-02-21 15:36:24 +01:00
Robin Appelman dd98e6333f Split getFolderContentById 2014-02-21 15:35:12 +01:00
Robin Appelman 3980a7d9c6 Merge branch 'master' into folderid-reuse 2014-02-21 15:33:12 +01:00
Lukas Reschke fe44ac264b Add overwritehost config on setup and upgrade 2014-02-21 15:19:01 +01:00
Thomas Müller 27ad69eea5 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-21 14:01:24 +01:00
Thomas Müller a40cedf507 Merge branch 'master' into McNetic-zipstreamer 2014-02-21 13:57:18 +01:00
Robin Appelman 80481a1e41 Merge branch 'master' into mobile-header 2014-02-21 12:46:09 +01:00
Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php 
Conflicts:
	config/config.sample.php
 2014-02-21 09:51:51 +01:00
Lukas Reschke f7fa8662e2 Remove `session_id_regenerate` from here 
Jenkins somewhat complains that there are already sent headers.
 2014-02-21 08:12:45 +01:00
Lukas Reschke 69325c5eeb Move session_regenerate_id to `login()` 2014-02-21 08:11:07 +01:00
Lukas Reschke f11658698d Fix path to the mount file 2014-02-20 18:53:37 +01:00
Thomas Müller ec45a3c0e2 Merge pull request #6962 from owncloud/quota-space-root 
Allow passing a root folder to get the used space from in the quota wrapper
 2014-02-20 16:47:59 +01:00
Thomas Müller b35cd54e87 Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into McNetic-zipstreamer 
Conflicts:
	lib/private/files.php
 2014-02-20 16:36:37 +01:00
Lukas Reschke c869e0116b Merge pull request #6999 from kofemann/mount-config 
mount: make location of mount.json configurable
 2014-02-20 15:15:00 +01:00
Björn Schießle 4eadc36094 Merge pull request #6935 from owncloud/fix_urlGenerator 
Add missing slash in URLGenerator::getAbsoluteURL().
 2014-02-20 14:57:03 +01:00
Lukas Reschke e4c3ef2ca6 Merge pull request #7289 from owncloud/fix-filetype-icons 
Fix filetype icons
 2014-02-20 14:53:41 +01:00
Lukas Reschke 0241ddc759 Merge pull request #6519 from nhirokinet/master 
Security Update: session fixation
 2014-02-20 14:28:26 +01:00
Thomas Müller fbea02bebb kill $coreStyles and $coreScripts 2014-02-20 14:18:01 +01:00
Thomas Müller a0e790227e remove unused functions - have been introduced with the old minimizer approach 2014-02-20 14:11:31 +01:00
Thomas Müller 31bab55847 Merge branch 'master' into no-css-js-delivery-via-php 2014-02-20 13:52:53 +01:00
icewind1991 742f54b6d5 Merge pull request #7301 from owncloud/fix-fuckup 
fix master - #7274 brokes it
 2014-02-20 13:40:12 +01:00
Thomas Müller 8cf73ca42f integrate assetic for asset pipeline-ing 2014-02-20 13:28:27 +01:00