Merge branch 'wopi'
87dfbdac2b18
Actions

Description

Merge branch 'wopi'

Details

Provenance

machniak	Authored on Nov 4 2016, 9:45 AM
machniak	Pushed on Nov 4 2016, 9:45 AM

Parents

rCbd7ebef95dd7: More on unified document editor api
rC939a5a25eab7: Re-generated filetype icons style

Branches

Unknown

Tags

Unknown

Build Status

Buildable 5618
Build 5714: Continuous Integration for Software Development Projects

Event Timeline

machniak committed rC87dfbdac2b18: Merge branch 'wopi' (authored by machniak).Nov 4 2016, 9:45 AM

Harbormaster failed to build B5618: rC87dfbdac2b18: Merge branch 'wopi'!Nov 4 2016, 9:45 AM

Merged Changes

bd7ebef95dd7 More on unified document editor api
Author
machniak
Browse Repository
Failed
No Audits
d7fa4504d64b Present proper icon for more MS Office formats
Author
machniak
Browse Repository
Failed
No Audits
f58d64ecb6b8 Various improvements and unification in detection of editing capabilities
Author
machniak
Browse Repository
Failed
No Audits
849e6e428d45 Fix creating editing sessions (broken in last commit)
Author
machniak
Browse Repository
Failed
No Audits
f29eca27ca9e T1619: Use Collabora Online editor as a document viewer
Author
machniak
Browse Repository
Failed
No Audits
2da3b2ab98ad T1646: Support more document types in file creation dialog.
Author
machniak
Browse Repository
Failed
No Audits
b6947e4d7b8b T1513: Implement document_info action
Author
machniak
Browse Repository
Failed
No Audits
66adfb31f181 T1576: Implemented WOPI discovery
Author
machniak
Browse Repository
Failed
No Audits
e1587f4fbd88 Initiali WOPI support: WOPI session creation (T1512)
Author
machniak
Browse Repository
Failed
No Audits

Changes (26)

Path

Size

config/

config.inc.php.dist

doc/

SQL/

mysql/

oracle/

lib/

api/

	file_document.php
	file_manticore.php

locale/

templates/

viewers/

	viewers/

	doc.php
	file_viewer.php

public_html/

js/

files_api.js

skins/

default/

images/

mimetypes/

_css.sh

rC87dfbdac2b18

View Options

config/config.inc.php.dist

View Options

doc/SQL/mysql.initial.sql

View Options

doc/SQL/mysql/2016101700.sql

View Options

doc/SQL/oracle.initial.sql

View Options

doc/SQL/oracle/2016101700.sql

View Options

lib/api/common.php

View Options

lib/api/document.php

View Options

lib/api/file_get.php

View Options

lib/api/file_info.php

View Options

lib/file_api.php

View Options

lib/file_api_core.php

View Options

lib/file_document.php

View Options

lib/file_manticore.php

View Options

lib/file_viewer.php

View Options

lib/file_wopi.php

View Options

lib/locale/en_US.php

View Options

lib/templates/empty.odp

View Options

lib/templates/empty.ods

View Options

lib/viewers/doc.php

View Options

lib/viewers/doc/file_editor.js

View Options

lib/viewers/image.php

View Options

lib/viewers/odf.php

View Options

lib/viewers/text.php

View Options

public_html/js/files_api.js

View Options

public_html/skins/default/images/mimetypes/_css.sh

Merge branch 'wopi'87dfbdac2b18Actions

Description

Details

Event Timeline

Merged Changes

Changes (26)

rC87dfbdac2b18

config/config.inc.php.dist

doc/SQL/mysql.initial.sql

doc/SQL/mysql/2016101700.sql

doc/SQL/oracle.initial.sql

doc/SQL/oracle/2016101700.sql

lib/api/common.php

lib/api/document.php

lib/api/file_get.php

lib/api/file_info.php

lib/file_api.php

lib/file_api_core.php

lib/file_document.php

lib/file_manticore.php

lib/file_viewer.php

lib/file_wopi.php

lib/locale/en_US.php

lib/templates/empty.odp

lib/templates/empty.ods

lib/viewers/doc.php

lib/viewers/doc/file_editor.js

lib/viewers/image.php

lib/viewers/odf.php

lib/viewers/text.php

public_html/js/files_api.js

public_html/skins/default/images/mimetypes/_css.sh

Merge branch 'wopi'
87dfbdac2b18
Actions