summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1493 from owncloud/fix_ldap_stored_homedirFrank Karlitschek2013-02-114-28/+34
|\
| * LDAP: fix database cleanup in update scriptArthur Schiwon2013-02-092-3/+4
| * LDAP: fix settings handling of homeFolderNamingRule optionArthur Schiwon2013-02-061-1/+6
| * LDAP: version bump -> clean up databaseArthur Schiwon2013-02-062-2/+5
| * code styleArthur Schiwon2013-02-061-1/+1
| * LDAP: do not store user home as it destroys configurability. always fetch it....Arthur Schiwon2013-02-061-25/+22
* | [tx-robot] updated from transifexJenkins for ownCloud2013-02-1113-0/+32
* | Merge pull request #1558 from schiesbn/trashbin_sizelimitBjörn Schießle2013-02-101-27/+135
|\ \
| * | debug output removedBjörn Schießle2013-02-091-1/+0
| * | comment addedBjörn Schießle2013-02-091-2/+1
| * | use never more that 50% of available disc space for the trash binBjörn Schießle2013-02-072-24/+67
| * | keep track of trash bin sizeBjörn Schießle2013-02-071-11/+78
* | | Merge pull request #1594 from hkjolhede/masterLukas Reschke2013-02-101-1/+1
|\ \ \
| * | | Update apps/files_external/lib/config.phphkjolhede2013-02-101-1/+1
* | | | Merge pull request #1585 from owncloud/fix_breadcrumb_resizingLukas Reschke2013-02-101-3/+4
|\ \ \ \
| * | | | count divs in actions instead of action div itself (is set to 100%)Jörn Friedrich Dreyer2013-02-101-3/+4
* | | | | Merge pull request #1030 from hkjolhede/masterLukas Reschke2013-02-1026-1/+25969
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Final changes from icewind1991Henrik Kjölhede2013-02-101-0/+8
| * | | Updated phpseclib from git + requested style changesHenrik Kjölhede2013-02-1017-896/+1413
| * | | Security bugHenrik Kjölhede2013-02-091-1/+1
| * | | Just a little cleaner in touchHenrik Kjölhede2013-02-091-1/+1
| * | | Update to touchHenrik Kjölhede2013-02-091-1/+5
| * | | Spelling mistakeHenrik Kjölhede2013-02-091-1/+1
| * | | Added unittestHenrik Kjölhede2013-02-091-0/+7
| * | | Update to conform to API changesHenrik Kjölhede2013-02-091-3/+4
| * | | corrected namespaceHenrik Kjölhede2013-02-091-2/+1
| * | | Modified to new class structureHenrik Kjölhede2013-02-091-1/+3
| * | | Deleted phpseclib/testsHenrik Kjölhede2013-02-094-375/+0
| * | | Merge branch 'master' of https://github.com/owncloud/coreHenrik Kjölhede2013-02-09384-2358/+6709
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'Henrik Kjölhede2013-01-26325-1892/+6270
| |\ \ \ \
| * | | | | Update apps/files_external/lib/sftp.phphkjolhede2013-01-261-1/+1
| * | | | | 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 #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-1092-246/+298