Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Merge branch 'master' into fix-shared-links | Michael Gapczynski | 2013-02-10 | 142 | -1027/+1197 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | Fix public links | Michael Gapczynski | 2013-02-10 | 1 | -198/+40 | |
| * | | | | Remove old OC4 link compatibility | Michael Gapczynski | 2013-02-06 | 1 | -46/+0 | |
* | | | | | Merge pull request #1493 from owncloud/fix_ldap_stored_homedir | Frank Karlitschek | 2013-02-11 | 4 | -28/+34 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | LDAP: fix database cleanup in update script | Arthur Schiwon | 2013-02-09 | 2 | -3/+4 | |
| * | | | | LDAP: fix settings handling of homeFolderNamingRule option | Arthur Schiwon | 2013-02-06 | 1 | -1/+6 | |
| * | | | | LDAP: version bump -> clean up database | Arthur Schiwon | 2013-02-06 | 2 | -2/+5 | |
| * | | | | code style | Arthur Schiwon | 2013-02-06 | 1 | -1/+1 | |
| * | | | | LDAP: do not store user home as it destroys configurability. always fetch it.... | Arthur Schiwon | 2013-02-06 | 1 | -25/+22 | |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-11 | 13 | -0/+32 | |
* | | | | | Merge pull request #1558 from schiesbn/trashbin_sizelimit | Björn Schießle | 2013-02-10 | 1 | -27/+135 | |
|\ \ \ \ \ | ||||||
| * | | | | | debug output removed | Björn Schießle | 2013-02-09 | 1 | -1/+0 | |
| * | | | | | comment added | Björn Schießle | 2013-02-09 | 1 | -2/+1 | |
| * | | | | | use never more that 50% of available disc space for the trash bin | Björn Schießle | 2013-02-07 | 2 | -24/+67 | |
| * | | | | | keep track of trash bin size | Björn Schießle | 2013-02-07 | 1 | -11/+78 | |
* | | | | | | Merge pull request #1594 from hkjolhede/master | Lukas Reschke | 2013-02-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update apps/files_external/lib/config.php | hkjolhede | 2013-02-10 | 1 | -1/+1 | |
* | | | | | | | Merge pull request #1585 from owncloud/fix_breadcrumb_resizing | Lukas Reschke | 2013-02-10 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | count divs in actions instead of action div itself (is set to 100%) | Jörn Friedrich Dreyer | 2013-02-10 | 1 | -3/+4 | |
* | | | | | | | | Merge pull request #1030 from hkjolhede/master | Lukas Reschke | 2013-02-10 | 26 | -1/+25969 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | ||||||
| * | | | | | | Final changes from icewind1991 | Henrik Kjölhede | 2013-02-10 | 1 | -0/+8 | |
| * | | | | | | Updated phpseclib from git + requested style changes | Henrik Kjölhede | 2013-02-10 | 17 | -896/+1413 | |
| * | | | | | | Security bug | Henrik Kjölhede | 2013-02-09 | 1 | -1/+1 | |
| * | | | | | | Just a little cleaner in touch | Henrik Kjölhede | 2013-02-09 | 1 | -1/+1 | |
| * | | | | | | Update to touch | Henrik Kjölhede | 2013-02-09 | 1 | -1/+5 | |
| * | | | | | | Spelling mistake | Henrik Kjölhede | 2013-02-09 | 1 | -1/+1 | |
| * | | | | | | Added unittest | Henrik Kjölhede | 2013-02-09 | 1 | -0/+7 | |
| * | | | | | | Update to conform to API changes | Henrik Kjölhede | 2013-02-09 | 1 | -3/+4 | |
| * | | | | | | corrected namespace | Henrik Kjölhede | 2013-02-09 | 1 | -2/+1 | |
| * | | | | | | Modified to new class structure | Henrik Kjölhede | 2013-02-09 | 1 | -1/+3 | |
| * | | | | | | Deleted phpseclib/tests | Henrik Kjölhede | 2013-02-09 | 4 | -375/+0 | |
| * | | | | | | Merge branch 'master' of https://github.com/owncloud/core | Henrik Kjölhede | 2013-02-09 | 384 | -2358/+6709 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | Henrik Kjölhede | 2013-01-26 | 325 | -1892/+6270 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update apps/files_external/lib/sftp.php | hkjolhede | 2013-01-26 | 1 | -1/+1 | |
| * | | | | | | | | 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 #1564 from schiesbn/trash_bin_breadcrumbs | Bernhard Posselt | 2013-02-10 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ |