summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-02-11186-1014/+779
* Merge pull request #1601 from owncloud/lightbox-iconsBernhard Posselt2013-02-1014-0/+510
|\
| * split close and delete icon, add red hover for deleteJan-Christoph Borchardt2013-02-104-0/+146
| * add big white icons for lightbox, slideshow etcJan-Christoph Borchardt2013-02-1010-0/+364
* | 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 #1597 from owncloud/cache_largesizesicewind19912013-02-102-2/+2
|\ \ \
| * | | Cache: allow file sizes >2GBRobin Appelman2013-02-102-2/+2
* | | | Merge pull request #1552 from raghunayyar/personalpage-style-fixBjörn Schießle2013-02-102-9/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Personal Page Password Toggle Also Loads Well.raghunayyar2013-02-092-9/+10
* | | | Merge pull request #1592 from owncloud/display_name_settingblizzz2013-02-103-4/+13
|\ \ \ \
| * | | | add switch to enable/disable the possibility to change the display name by th...Björn Schießle2013-02-103-4/+13
* | | | | Merge pull request #1581 from owncloud/mapper_md5Frank Karlitschek2013-02-102-8/+24
|\ \ \ \ \
| * | | | | Mapper: use md5 hashes for database indexesRobin Appelman2013-02-102-8/+24
* | | | | | 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 #1588 from owncloud/etag_quotesFrank Karlitschek2013-02-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | wrap etags in quotes when doing a propfind on a folderRobin Appelman2013-02-101-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #1590 from owncloud/fix_470Lukas Reschke2013-02-102-2/+24
|\ \ \ \ \ \ \
| * | | | | | | append .part to put filesJörn Friedrich Dreyer2013-02-102-2/+24
| |/ / / / / /
* | | | | | | 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 #1589 from owncloud/use-sanitizeHTMLLukas Reschke2013-02-101-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Coding styleLukas Reschke2013-02-101-1/+2
| * | | | | | | Use sanitizeHTML instead of stripslashes + htmlspecialcharsLukas Reschke2013-02-101-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #1030 from hkjolhede/masterLukas Reschke2013-02-1027-1/+25992
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | 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
| * | | | | Merge branch 'master' of https://github.com/hkjolhede/owncloud_coreHenrik Kjölhede2013-02-091-2/+1
| |\ \ \ \ \
| | * | | | | Update lib/filestorage/common.phphkjolhede2013-01-271-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-091174-33898/+64400
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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