Commit Graph

16403 Commits (2f0db9af07013655393ba199a1890fbf0e55ba0f)
 

Author SHA1 Message Date
Thomas Müller 2f0db9af07 Merge pull request #7409 from owncloud/issue/5361 11 years ago
Thomas Müller 4b8717df9d Merge pull request #7416 from owncloud/share_api_7311 11 years ago
Jan-Christoph Borchardt d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166 11 years ago
Jan-Christoph Borchardt 84eea47991 Merge pull request #7406 from owncloud/settings-apps.js-style 11 years ago
Morris Jobke beff83feb2 Merge pull request #7410 from owncloud/scrutinizer_fix_kondou 11 years ago
Thomas Müller 901afbd4cf Merge pull request #7414 from owncloud/fix-3rdparty-submodule 11 years ago
Joas Schilling 9847912257 Remove unused variables, add doc blocks and break lines 11 years ago
Bjoern Schiessle 3be5e48b0c only add "received_from" if a share was found 11 years ago
Thomas Müller df1a5a2dfa Update 3rdparty submodule 11 years ago
icewind1991 59df3ffdf4 Merge pull request #7279 from owncloud/folderid-reuse 11 years ago
Jan-Christoph Borchardt 8759c35e74 Merge pull request #7399 from owncloud/themable-doc-links 11 years ago
Joas Schilling cb14b1c58d Add owncloud version to JS scope 11 years ago
kondou 593adab258 Fix scrutinizer issue in settings/js/apps.js 11 years ago
Vincent Petry 37a2f8c6cb Merge pull request #7405 from owncloud/files-admin.js-style 11 years ago
Vincent Petry a1600a289c Merge pull request #7401 from owncloud/highlight_selected_app_settings 11 years ago
Jan-Christoph Borchardt bc1c136cd6 coding style fixes: cut long lines, whitespace 11 years ago
Joas Schilling 331bd527a7 Hide SMTP options based on selected send mode 11 years ago
Vincent Petry 5c98e0c7c7 Merge pull request #7328 from owncloud/McNetic-zipstreamer 11 years ago
Jan-Christoph Borchardt 2b423e5a44 coding style fixes, cut long lines, comments not on same lines, curly braces 11 years ago
Jan-Christoph Borchardt 1a561fced0 fix for coding style 11 years ago
kondou e32acf933d Highlight the selected app in app-settings 11 years ago
Thomas Müller 574883c47a introduce new theme function to allow full creation of documentation links: buildDocLinkToKey() 11 years ago
Vincent Petry 7f7d674c2a Merge pull request #7335 from owncloud/fix-7333 11 years ago
Vincent Petry 9b4af31bac Merge pull request #7371 from owncloud/core-storagemovedeleteall 11 years ago
VicDeo ec9fe3f57f Merge pull request #6299 from leo-b/ldap_nested_groups 11 years ago
Björn Schießle e10ca7c2e9 Merge pull request #7374 from owncloud/enc_dont_overwrite_keys 11 years ago
Vincent Petry 432a42d846 Fix case where port is missing 11 years ago
Bjoern Schiessle d3a24e945b add test case if a file gets moved out from the shared folder 11 years ago
Bjoern Schiessle ebd73aee8f don't overwrite keys if rename was done by a stream copy 11 years ago
Morris Jobke 5fb1374b0f Merge pull request #7285 from owncloud/mimeicons-svg 11 years ago
Morris Jobke 8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 11 years ago
icewind1991 ddb8cf32e9 Merge pull request #7344 from owncloud/add-js-config-vars 11 years ago
Robin Appelman 7c4f81bd78 rename url parameter 11 years ago
Thomas Müller 0d78d9c180 Merge branch 'master' into McNetic-zipstreamer 11 years ago
Vincent Petry a23ef25010 Removed unused deleteAll method on Common storage class 11 years ago
Vincent Petry c465835e85 Replace deleteAll call with unlink call 11 years ago
Vincent Petry 539ea0882b Fixed mount config path 11 years ago
Vincent Petry 80c61d480c Added oc_defaults stub in specHelper.js 11 years ago
Lukas Reschke 11ca014034 Merge pull request #7305 from owncloud/extstorage-configclass 11 years ago
Lukas Reschke c9ab11a9bd Merge pull request #7259 from owncloud/overwritehost-always 11 years ago
Morris Jobke 079d64ce75 Merge pull request #7310 from owncloud/no-css-js-delivery-via-php 11 years ago
Morris Jobke e549977d0e update 3rdparty submodule to current master 11 years ago
root 300b1131b4 replace spaces with tabs 11 years ago
Vincent Petry a2000a15f8 Merge pull request #7358 from owncloud/xmlfix-3rdparty 11 years ago
icewind1991 9b9b2255b6 Merge pull request #7355 from owncloud/new-menu-svg 11 years ago
Robin Appelman df35929ed2 Merge branch 'master' into add-js-config-vars 11 years ago
Robin Appelman 59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 11 years ago
Robin Appelman f1475671ab Merge branch 'master' into extstorage-configclass 11 years ago
icewind1991 fa7fa4a6d3 Merge pull request #7088 from owncloud/sharing-userspathbug 11 years ago
Robin Appelman 3487a95eab Remove fileid parameter for getFolderContent 11 years ago