summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | fix date display in filepickerJan-Christoph Borchardt2014-07-311-2/+3
| * | | | | | | | fix long filename display in filepickerJan-Christoph Borchardt2014-07-311-0/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0117-50/+54
* | | | | | | | Merge pull request #10048 from owncloud/fix_search_in_shared_filesJörn Friedrich Dreyer2014-07-312-62/+101
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | add test for search() in shared cacheJörn Friedrich Dreyer2014-07-311-3/+75
| * | | | | | | traverse folders in php to search in shared filesJörn Friedrich Dreyer2014-07-311-59/+26
* | | | | | | | Merge pull request #10051 from owncloud/preview-empty-textThomas Müller2014-07-317-7/+75
|\ \ \ \ \ \ \ \
| * | | | | | | | Use svg mimeicons for empty text filesRobin Appelman2014-07-307-7/+75
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-31172-1233/+1330
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #10055 from owncloud/notification-fixSander2014-07-302-5/+19
|\ \ \ \ \ \ \
| * | | | | | | set max width for notifications so they won't overlap the whole headerJan-Christoph Borchardt2014-07-301-0/+1
| * | | | | | | fix yellow notification styleJan-Christoph Borchardt2014-07-302-5/+12
| * | | | | | | fix notification preventing top bar clickability, fix #9680Jan-Christoph Borchardt2014-07-301-1/+7
* | | | | | | | Merge pull request #10054 from owncloud/dont_preload_videosJan-Christoph Borchardt2014-07-301-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | don't preload videos on public sharing, fixes #10042Georg Ehrke2014-07-301-1/+1
* | | | | | | | | Merge pull request #10044 from owncloud/transparency_fixJan-Christoph Borchardt2014-07-301-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | extract transparency fix from #8050Georg Ehrke2014-07-301-0/+8
* | | | | | | | | | Merge pull request #10029 from owncloud/fix-thirdpartyMorris Jobke2014-07-301-11/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Replace exit with returnVictor Dubiniuk2014-07-301-1/+1
| * | | | | | | | | Fix silent crash if 3rdparty dir is not availableVictor Dubiniuk2014-07-301-11/+16
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Fixed wrong brackets in apps settingsDer-Jan2014-07-301-1/+1
* | | | | | | | | Merge pull request #10024 from owncloud/preview-restrict-heightMorris Jobke2014-07-303-10/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Also keep maxY into account when scaling a preview while preserving aspect ratioRobin Appelman2014-07-303-10/+8
| |/ / / / / / / /
* | | | | | | | | Merge pull request #9897 from owncloud/support_webdav_copyBjörn Schießle2014-07-307-42/+272
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | add unit test for rename and copy operationBjoern Schiessle2014-07-304-7/+171
| * | | | | | | | make sure that we always find all versionsBjoern Schiessle2014-07-301-22/+37
| * | | | | | | | make the versions and encryption app aware of the copy operationBjoern Schiessle2014-07-305-14/+65
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #10000 from owncloud/fix-lowlat-cache-autoloadJörn Friedrich Dreyer2014-07-302-11/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add registerAutoloaderCache().Andreas Fischer2014-07-291-15/+18
| * | | | | | | Memcache\Factory: Remove static, use globalPrefix.Andreas Fischer2014-07-292-4/+14
| * | | | | | | InstanceId is properly injected into factory. Remove comment.Andreas Fischer2014-07-291-2/+0
* | | | | | | | Merge pull request #9970 from owncloud/sharing_set_expire_dateMorris Jobke2014-07-302-1/+28
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | add unit testBjoern Schiessle2014-07-281-0/+26
| * | | | | | | make sure that we set the expire date if a date is adefault date is setBjoern Schiessle2014-07-281-1/+2
* | | | | | | | Merge pull request #10032 from owncloud/kill-swift-testsMorris Jobke2014-07-301-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | only if the environment variable RUN_OBJECTSTORE_TESTS is set the object stor...Thomas Müller2014-07-291-0/+3
* | | | | | | | | Merge pull request #10041 from owncloud/design-link-folder-iconMorris Jobke2014-07-302-19/+22
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | also use link icon for the folders ..Jan-Christoph Borchardt2014-07-302-19/+22
* | | | | | | | | Merge pull request #9888 from owncloud/mysql-tinyint-masterThomas Müller2014-07-303-1/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | migration test for sqlite - adding type mapping for 'tinyint unsigned'Thomas Müller2014-07-293-1/+53
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #9914 from owncloud/fix-appframework-blank-templateThomas Müller2014-07-301-1/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix template rendering for 'blank' templatesMorris Jobke2014-07-291-1/+3
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-30157-3181/+3904
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #10022 from owncloud/fix-exec-admin-masterThomas Müller2014-07-291-3/+5
|\ \ \ \ \ \ \
| * | | | | | | only call exec() if allowed toThomas Müller2014-07-291-3/+5
| |/ / / / / /
* | | | | | | Merge pull request #10020 from owncloud/design-link-iconJan-Christoph Borchardt2014-07-292-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | use more understandable 'link' icon for public links (instead of hard to reco...Jan-Christoph Borchardt2014-07-292-2/+5
| |/ / / / /
* | | | | | Merge pull request #9721 from owncloud/enc_define_type_in_pre_hookBjörn Schießle2014-07-291-4/+7
|\ \ \ \ \ \
| * | | | | | define type in pre hookBjoern Schiessle2014-07-181-4/+7
* | | | | | | Merge pull request #9951 from owncloud/enc_inproved_error_messagesBjörn Schießle2014-07-293-3/+13
|\ \ \ \ \ \ \