summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master'Henrik Kjölhede2013-01-261159-20573/+50855
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update apps/files_external/lib/sftp.phphkjolhede2013-01-261-1/+1
| * | | | | | | | | | | Update lib/filestorage/common.phphkjolhede2013-01-261-0/+24
| * | | | | | | | | | | Update apps/files_external/lib/sftp.phphkjolhede2012-12-281-4/+6
| * | | | | | | | | | | Update apps/files_external/lib/sftp.phphkjolhede2012-12-271-1/+3
| * | | | | | | | | | | Added phpseclib to files_external as 3rdpartyHenrik Kjölhede2012-12-2725-0/+25518
| * | | | | | | | | | | Update apps/files_external/lib/sftp.phphkjolhede2012-12-271-0/+7
| * | | | | | | | | | | Update apps/files_external/lib/sftp.phphkjolhede2012-12-261-71/+111
| * | | | | | | | | | | Update apps/files_external/lib/sftp.phphkjolhede2012-12-261-1017/+74
| * | | | | | | | | | | Update apps/files_external/lib/config.phphkjolhede2012-12-261-1/+9
| * | | | | | | | | | | Update apps/files_external/appinfo/app.phphkjolhede2012-12-261-0/+1
| * | | | | | | | | | | Create sftp.phphkjolhede2012-12-261-0/+1170
* | | | | | | | | | | | Merge pull request #1551 from owncloud/fix_files_multiselectJörn Friedrich Dreyer2013-02-103-4/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | remove hascontrols from trash bin file list tableBjörn Schießle2013-02-101-1/+1
| * | | | | | | | | | | Remove hascontrols - use original positioning.Thomas Tanghus2013-02-092-4/+4
| * | | | | | | | | | | Another attempt on the filelist heading.Thomas Tanghus2013-02-091-2/+2
| * | | | | | | | | | | Fix filelist shifting up one row on (multi)selectThomas Tanghus2013-02-081-2/+1
* | | | | | | | | | | | Don't run external storage tests on defaultRobin Appelman2013-02-101-2/+2
* | | | | | | | | | | | Merge pull request #1538 from raghunayyar/admin-password-toggleJan-Christoph Borchardt2013-02-103-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Removed whitespace from installation.phpraghunayyar2013-02-081-3/+3
| * | | | | | | | | | | | Password Toggle Works on Installation as well.raghunayyar2013-02-083-5/+7
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1577 from owncloud/typo_catagoryLukas Reschke2013-02-102-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | TypoLukas Reschke2013-02-092-6/+6
* | | | | | | | | | | | | Merge pull request #1564 from schiesbn/trash_bin_breadcrumbsBernhard Posselt2013-02-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | initialize breadcrumbs arrayBjörn Schießle2013-02-091-1/+2
| * | | | | | | | | | | | | don't add a extra 'Trash' breadcrumb since we have the home-symbol nowBjörn Schießle2013-02-091-1/+0
* | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-10327-5543/+5024
* | | | | | | | | | | | | | Remove uneeded linesLukas Reschke2013-02-091-4/+1
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1546 from owncloud/fix-loading-hooksThomas Müller2013-02-093-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Always load the apps before trying to match a routeBart Visscher2013-02-081-0/+1
| * | | | | | | | | | | | | Better way of getting the navigation entries for an appBart Visscher2013-02-082-4/+18
* | | | | | | | | | | | | | Merge pull request #1543 from owncloud/utf8-locale-masterThomas Müller2013-02-093-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | some systems use en_US.UTF8 instead of en_US.UTF-8Thomas Müller2013-02-083-9/+8
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDirThomas Müller2013-02-091-43/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | extract common codeJörn Friedrich Dreyer2013-02-091-43/+88
* | | | | | | | | | | | | | | Merge pull request #1569 from owncloud/clean-app-idThomas Müller2013-02-098-4/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into clean-app-idThomas Müller2013-02-09310-1265/+5289
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove invalid characters from app id to prevent loading of invalid resourcesBart Visscher2013-02-098-4/+16
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1575 from owncloud/exec_mimetypeBernhard Posselt2013-02-092-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | added icons and mimetypes for .msi and .exe filesBernhard Posselt2013-02-092-0/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1383 from owncloud/files_encryption-style-fixesSam Tuke2013-02-0910-829/+685
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | cleanup - more to come afterThomas Müller2013-02-0910-568/+403
| * | | | | | | | | | | | | | Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-09800-10470/+20042
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Reverted erroneous commitSam Tuke2013-02-061-3/+6
| * | | | | | | | | | | | | | | Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-0525-1436/+1769
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into files_encryption-style-fixesSam Tuke2013-02-05886-18133/+35460
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fixed todos: undefined vars and unreachable codeSam Tuke2013-02-053-34/+33
| * | | | | | | | | | | | | | | | | first style fixes - @samtuke: I added some TODO regarding undefined variables...Thomas Mueller2013-01-302-455/+485
* | | | | | | | | | | | | | | | | | Merge pull request #1561 from Raydiation/masterJörn Friedrich Dreyer2013-02-092-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | moved iframe height and width fix from js to cssBernhard Posselt2013-02-092-2/+5
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |