Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | Henrik Kjölhede | 2013-01-26 | 1159 | -20573/+50855 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Update apps/files_external/lib/sftp.php | hkjolhede | 2013-01-26 | 1 | -1/+1 | |
| * | | | | | | | | | | | Update lib/filestorage/common.php | hkjolhede | 2013-01-26 | 1 | -0/+24 | |
| * | | | | | | | | | | | Update apps/files_external/lib/sftp.php | hkjolhede | 2012-12-28 | 1 | -4/+6 | |
| * | | | | | | | | | | | Update apps/files_external/lib/sftp.php | hkjolhede | 2012-12-27 | 1 | -1/+3 | |
| * | | | | | | | | | | | Added phpseclib to files_external as 3rdparty | Henrik Kjölhede | 2012-12-27 | 25 | -0/+25518 | |
| * | | | | | | | | | | | Update apps/files_external/lib/sftp.php | hkjolhede | 2012-12-27 | 1 | -0/+7 | |
| * | | | | | | | | | | | Update apps/files_external/lib/sftp.php | hkjolhede | 2012-12-26 | 1 | -71/+111 | |
| * | | | | | | | | | | | Update apps/files_external/lib/sftp.php | hkjolhede | 2012-12-26 | 1 | -1017/+74 | |
| * | | | | | | | | | | | Update apps/files_external/lib/config.php | hkjolhede | 2012-12-26 | 1 | -1/+9 | |
| * | | | | | | | | | | | Update apps/files_external/appinfo/app.php | hkjolhede | 2012-12-26 | 1 | -0/+1 | |
| * | | | | | | | | | | | Create sftp.php | hkjolhede | 2012-12-26 | 1 | -0/+1170 | |
* | | | | | | | | | | | | Merge pull request #1551 from owncloud/fix_files_multiselect | Jörn Friedrich Dreyer | 2013-02-10 | 3 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | remove hascontrols from trash bin file list table | Björn Schießle | 2013-02-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | Remove hascontrols - use original positioning. | Thomas Tanghus | 2013-02-09 | 2 | -4/+4 | |
| * | | | | | | | | | | | Another attempt on the filelist heading. | Thomas Tanghus | 2013-02-09 | 1 | -2/+2 | |
| * | | | | | | | | | | | Fix filelist shifting up one row on (multi)select | Thomas Tanghus | 2013-02-08 | 1 | -2/+1 | |
* | | | | | | | | | | | | Don't run external storage tests on default | Robin Appelman | 2013-02-10 | 1 | -2/+2 | |
* | | | | | | | | | | | | Merge pull request #1538 from raghunayyar/admin-password-toggle | Jan-Christoph Borchardt | 2013-02-10 | 3 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Removed whitespace from installation.php | raghunayyar | 2013-02-08 | 1 | -3/+3 | |
| * | | | | | | | | | | | | Password Toggle Works on Installation as well. | raghunayyar | 2013-02-08 | 3 | -5/+7 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #1577 from owncloud/typo_catagory | Lukas Reschke | 2013-02-10 | 2 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Typo | Lukas Reschke | 2013-02-09 | 2 | -6/+6 | |
* | | | | | | | | | | | | | Merge pull request #1564 from schiesbn/trash_bin_breadcrumbs | Bernhard Posselt | 2013-02-10 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | initialize breadcrumbs array | Björn Schießle | 2013-02-09 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | don't add a extra 'Trash' breadcrumb since we have the home-symbol now | Björn Schießle | 2013-02-09 | 1 | -1/+0 | |
* | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-10 | 327 | -5543/+5024 | |
* | | | | | | | | | | | | | | Remove uneeded lines | Lukas Reschke | 2013-02-09 | 1 | -4/+1 | |
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #1546 from owncloud/fix-loading-hooks | Thomas Müller | 2013-02-09 | 3 | -4/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Always load the apps before trying to match a route | Bart Visscher | 2013-02-08 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | Better way of getting the navigation entries for an app | Bart Visscher | 2013-02-08 | 2 | -4/+18 | |
* | | | | | | | | | | | | | | Merge pull request #1543 from owncloud/utf8-locale-master | Thomas Müller | 2013-02-09 | 3 | -9/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | some systems use en_US.UTF8 instead of en_US.UTF-8 | Thomas Müller | 2013-02-08 | 3 | -9/+8 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #1570 from owncloud/refactor_filelist_addFile_addDir | Thomas Müller | 2013-02-09 | 1 | -43/+88 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | extract common code | Jörn Friedrich Dreyer | 2013-02-09 | 1 | -43/+88 | |
* | | | | | | | | | | | | | | | Merge pull request #1569 from owncloud/clean-app-id | Thomas Müller | 2013-02-09 | 8 | -4/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Merge branch 'master' into clean-app-id | Thomas Müller | 2013-02-09 | 310 | -1265/+5289 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Remove invalid characters from app id to prevent loading of invalid resources | Bart Visscher | 2013-02-09 | 8 | -4/+16 | |
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #1575 from owncloud/exec_mimetype | Bernhard Posselt | 2013-02-09 | 2 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | added icons and mimetypes for .msi and .exe files | Bernhard Posselt | 2013-02-09 | 2 | -0/+2 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge pull request #1383 from owncloud/files_encryption-style-fixes | Sam Tuke | 2013-02-09 | 10 | -829/+685 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | cleanup - more to come after | Thomas Müller | 2013-02-09 | 10 | -568/+403 | |
| * | | | | | | | | | | | | | | Merge branch 'master' into files_encryption-style-fixes | Sam Tuke | 2013-02-09 | 800 | -10470/+20042 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Reverted erroneous commit | Sam Tuke | 2013-02-06 | 1 | -3/+6 | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into files_encryption-style-fixes | Sam Tuke | 2013-02-05 | 25 | -1436/+1769 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into files_encryption-style-fixes | Sam Tuke | 2013-02-05 | 886 | -18133/+35460 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Fixed todos: undefined vars and unreachable code | Sam Tuke | 2013-02-05 | 3 | -34/+33 | |
| * | | | | | | | | | | | | | | | | | first style fixes - @samtuke: I added some TODO regarding undefined variables... | Thomas Mueller | 2013-01-30 | 2 | -455/+485 | |
* | | | | | | | | | | | | | | | | | | Merge pull request #1561 from Raydiation/master | Jörn Friedrich Dreyer | 2013-02-09 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | moved iframe height and width fix from js to css | Bernhard Posselt | 2013-02-09 | 2 | -2/+5 | |
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |