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

9837 Commits

Author SHA1 Message Date
Michael Gapczynski c6985d6cd4 Merge branch 'master' into fix-shared-links 2013-02-10 00:54:20 -05:00
Michael Gapczynski 71affd528c Fix public links 2013-02-10 00:53:58 -05:00
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Henrik Kjölhede c6622301e5 Security bug 2013-02-09 23:49:21 +01:00
Lukas Reschke 2dde418e99 Remove uneeded lines 2013-02-09 23:43:48 +01:00
Lukas Reschke bd2f8980cd Typo 2013-02-09 23:37:42 +01:00
Henrik Kjölhede bcf98879cb Just a little cleaner in touch 2013-02-09 23:33:01 +01:00
Henrik Kjölhede 9e42a36fd8 Update to touch 2013-02-09 23:29:58 +01:00
Henrik Kjölhede 674955d1b6 Spelling mistake 2013-02-09 20:35:48 +01:00
Henrik Kjölhede 71d3903cfd Added unittest 2013-02-09 20:34:21 +01:00
Bernhard Posselt b2261c31eb added l10n for db error messages 2013-02-09 19:23:36 +01:00
Thomas Müller b9089fe8d9 Merge branch 'master' into fixing-1424-master 2013-02-09 19:15:23 +01:00
Henrik Kjölhede 96cfe37587 Update to conform to API changes 2013-02-09 19:08:39 +01:00
Thomas Müller 0222c589ac Merge pull request #1546 from owncloud/fix-loading-hooks 
Fix loading hooks when going though the routing system
 2013-02-09 09:59:41 -08:00
Thomas Müller e68cf72458 Merge pull request #1543 from owncloud/utf8-locale-master 
some systems use en_US.UTF8 instead of en_US.UTF-8
 2013-02-09 09:58:05 -08:00
Thomas Müller 2a650bcbe9 Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDir 
extract common code
 2013-02-09 09:57:23 -08:00
Thomas Müller 460faf3f97 Merge pull request #1569 from owncloud/clean-app-id 
Remove invalid characters from app id to prevent loading of invalid reso...
 2013-02-09 09:56:26 -08:00
Bernhard Posselt 73c44dfa1f Merge pull request #1575 from owncloud/exec_mimetype 
added icons and mimetypes for .msi and .exe files
 2013-02-09 09:14:40 -08:00
Bernhard Posselt 0664b98b4f added icons and mimetypes for .msi and .exe files 2013-02-09 18:09:03 +01:00
Sam Tuke 9bf1f22d5f Merge pull request #1383 from owncloud/files_encryption-style-fixes 
first style fixes - @samtuke: I added some TODO regarding undefined vari...
 2013-02-09 09:04:47 -08:00
Thomas Müller 7f58e27495 cleanup - more to come after 2013-02-09 18:01:38 +01:00
Jörn Friedrich Dreyer bb656ca2fb Merge pull request #1561 from Raydiation/master 
Moved the iframe height and width fix from js to css
 2013-02-09 08:56:12 -08:00
Thomas Tanghus 419eced65c Remove hascontrols - use original positioning. 
I couldn't get Chromium and FF to agree, so a working hack
is better than a non-working one ;)
 2013-02-09 17:54:56 +01:00
Bernhard Posselt 62122148bf Revert "moved iframe height and width fix from js to css" 
This reverts commit 842fc85b9a.
 2013-02-09 17:46:23 +01:00
Bernhard Posselt 43981e62e2 Revert "added exe and msi filetypes and icon" 
This reverts commit aa1adf42c7.
 2013-02-09 17:46:07 +01:00
Bernhard Posselt aa1adf42c7 added exe and msi filetypes and icon 2013-02-09 17:41:17 +01:00
Bernhard Posselt 842fc85b9a moved iframe height and width fix from js to css 2013-02-09 17:41:17 +01:00
Thomas Müller 2b0b6bb63c Merge pull request #1566 from owncloud/fixing-1505-master 
fixes zip download for folders containing a dot .....
 2013-02-09 08:33:44 -08:00
Thomas Müller d67d9566ce Merge branch 'master' into clean-app-id 2013-02-09 17:28:30 +01:00
icewind1991 5a309c11ca Merge pull request #1572 from owncloud/fix_empty_path_handling 
fix empty path handling
 2013-02-09 08:25:25 -08:00
Thomas Müller e0da721a7d adding ctor to Local and revert call to it within Temporary 2013-02-09 17:16:13 +01:00
Jan-Christoph Borchardt 79511f6d93 fixed database input group having two slightly thicker dividers 2013-02-09 17:14:20 +01:00
Frank Karlitschek 5a0a9564ce alpha 1 2013-02-09 17:13:43 +01:00
Lukas Reschke 06bba59249 Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-master 
Mapped storage unit testing linux master
 2013-02-12 22:58:37 -08:00
Thomas Mueller 92e6409f40 fixing mappedlocal storage to work on non-windows as well 
this allows us to run unit tests on linux - necessary to enable easy regression testing
 2013-02-11 13:53:10 +01:00
Thomas Mueller f223ab796b Merge branch 'master' into mapped-storage-unit-testing-linux-master 2013-02-11 12:59:23 +01:00
Thomas Müller 8174e5faf1 make MappedLocal available and testable within Linux as well 2013-02-09 19:03:03 +01:00
Jan-Christoph Borchardt 8ff20ac683 ellipsize infield labels when too long, specifically fix #871 for database labels on installation 2013-02-09 17:13:02 +01:00
Jörn Friedrich Dreyer 420b63cbe4 fix empty path handling 2013-02-09 16:58:55 +01:00
Bart Visscher 60411f7d3d Remove unneeded __destruct call in OC\Files\Storage\Temporary 2013-02-09 16:18:30 +01:00
Henrik Kjölhede 3b029d551c corrected namespace 2013-02-09 15:57:33 +01:00
Bart Visscher 9dddcae9ca Remove invalid characters from app id to prevent loading of invalid resources 2013-02-09 15:10:40 +01:00
Lukas Reschke 18fa8e2753 json_encode the appid 2013-02-09 15:06:35 +01:00
Jörn Friedrich Dreyer 676f89bbdb extract common code 2013-02-09 14:42:03 +01:00
Henrik Kjölhede d6b4d25d1d Merge branch 'master' of https://github.com/hkjolhede/owncloud_core 2013-02-09 14:13:54 +01:00
Thomas Müller 279cbeb001 Merge pull request #1481 from owncloud/fixing-1354-master 
basic WebDAV test in place now
 2013-02-09 05:13:33 -08:00
Henrik Kjölhede 81a281a140 Modified to new class structure 2013-02-09 14:12:17 +01:00
Henrik Kjölhede 2b4823d62d Deleted phpseclib/tests 2013-02-09 14:07:18 +01:00
Henrik Kjölhede 41fa65e7be Merge branch 'master' of https://github.com/owncloud/core 
Conflicts:
	apps/files_external/appinfo/app.php
 2013-02-09 14:05:33 +01:00
Thomas Tanghus 60344bf1dd Another attempt on the filelist heading. 2013-02-09 14:00:26 +01:00