Commit Graph

23775 Commits

Author SHA1 Message Date
Thomas Müller 232518ac54 Merge pull request #15234 from owncloud/encryption2_core
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
Bjoern Schiessle ff9c85ce60 implement basic encryption functionallity in core to enable multiple encryption modules 2015-03-26 20:56:51 +01:00
Thomas Müller 0cb133003c Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail
Remove IDE autocomplete fail
2015-03-26 20:21:26 +01:00
Morris Jobke d3ed020d34 Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master
no php execution timeout for webdav
2015-03-26 20:18:01 +01:00
Lukas Reschke 74a9fc29b4 Merge pull request #14399 from owncloud/ignore-empty-plurals
Ignore empty plurals just like with singulars
2015-03-26 20:15:33 +01:00
Lukas Reschke c8c722bc6d Merge pull request #15129 from owncloud/version-command-bus
expire versions in a background command
2015-03-26 19:55:13 +01:00
Lukas Reschke 3e57e9d3e5 Merge pull request #15232 from owncloud/remove-arg-separator-magic
Remove custom `arg_separator.output`
2015-03-26 19:41:22 +01:00
Lukas Reschke 071a339593 Remove IDE autocomplete fail
🙈 *cough* *cough*
2015-03-26 19:39:15 +01:00
Morris Jobke 70e64822b9 Merge pull request #14665 from owncloud/fileid-increment
SQLite autoincrement test
2015-03-26 19:36:18 +01:00
Thomas Müller 9c6649f4f1 Merge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricks
Add navigation entry for tips and tricks setion
2015-03-26 18:21:44 +01:00
Jan-Christoph Borchardt b95139e5b2 Merge pull request #15230 from owncloud/sqlite-notice
move SQLite notice from warnings to tips & tricks
2015-03-26 18:15:22 +01:00
Jan-Christoph Borchardt e3d60ee5b0 Merge pull request #14958 from owncloud/dropdown-style
popover style for apps and user dropdown menus
2015-03-26 18:07:35 +01:00
Robin Appelman 6447962f2a teardown after we're done 2015-03-26 17:30:43 +01:00
Thomas Müller a8b756154a Merge pull request #14495 from owncloud/update-mailmap-01
Updating .mailmap
2015-03-26 17:17:18 +01:00
Jan-Christoph Borchardt d1db727d1f mock up missing elements in the tests 2015-03-26 17:13:50 +01:00
Robin Appelman 1969c8d5c8 save uid instead of user object in command 2015-03-26 17:11:34 +01:00
Lukas Reschke 73af302d39 Remove custom `arg_separator.output`
This seems unrequired nowadays and like a legacy fragment. It should be safe to remove.

Fixes https://github.com/owncloud/core/issues/14782
2015-03-26 17:07:26 +01:00
Robin Appelman 8c903c100f check limit of serialized command in unit tests 2015-03-26 17:07:02 +01:00
Robin Appelman 268f249e8d ensure commands can be serialized in unit tests 2015-03-26 17:07:02 +01:00
Robin Appelman 176fba83ea Setup the filesystem in the expire command 2015-03-26 17:07:02 +01:00
Robin Appelman ddd6a67d2a Handle exceptions thrown during hooks when running unit tests 2015-03-26 17:07:02 +01:00
Robin Appelman 3ed6ed3c36 Force test cases using background commands to handle setting up the filesystem 2015-03-26 17:07:02 +01:00
Robin Appelman 7ec8f12ad4 expire versions in a background command 2015-03-26 17:07:01 +01:00
Jan-Christoph Borchardt e7dcc01017 only move dropdown triangle when navigation is opened, fix timing bug 2015-03-26 17:01:35 +01:00
Jan-Christoph Borchardt 82fc754d3f move SQLite notice from warnings to tips & tricks 2015-03-26 16:53:27 +01:00
Joas Schilling 02ffc6c6ee Merge pull request #15226 from owncloud/fix-upload-placeholder
Fix placeholder in files upload
2015-03-26 16:50:43 +01:00
Joas Schilling 39dbf9509b Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list
Correctly only send the errors of the current file to the event
2015-03-26 16:35:46 +01:00
Joas Schilling cd09b949a6 Add navigation entry for tips and tricks setion 2015-03-26 16:23:21 +01:00
Robin McCorkell a323d781a6 Revert "add https:// placeholder for From Link feature. closes #13255"
This reverts commit 18b5966f3a.
2015-03-26 14:47:21 +00:00
Thomas Müller e66dda83df Merge pull request #15218 from owncloud/revert-oc-etag-master
Revert oc etag master
2015-03-26 15:34:24 +01:00
Joas Schilling db763027bb Correctly only send the errors of the current file to the event 2015-03-26 15:33:31 +01:00
Jan-Christoph Borchardt 6b8f5abf98 detail corrections for search box layout 2015-03-26 15:06:11 +01:00
Vincent Petry a84ade5f32 Revert "adding OC-ETag header"
This reverts commit 30ee8b6f99.
2015-03-26 15:04:41 +01:00
Vincent Petry daceb1a9ac Revert "adding unit tests"
This reverts commit 8d327c94a8.
2015-03-26 15:04:36 +01:00
Jan-Christoph Borchardt fd9214de23 fix user dropdown for IE8 2015-03-26 15:02:31 +01:00
Morris Jobke 0d786c381b Merge pull request #15212 from owncloud/log-width
force log messages to break to alleviate horizontal scroll on Admin page
2015-03-26 14:41:54 +01:00
Vincent Petry cda7f7fd61 Merge pull request #15168 from owncloud/oc-etag-master
adding OC-ETag header
2015-03-26 13:52:43 +01:00
Lukas Reschke 468456e168 Merge pull request #14125 from dratini0/master
[nginx] Extending X-Accel-Redirect support
2015-03-26 13:35:00 +01:00
Thomas Müller 7804d0445b Merge pull request #15206 from owncloud/mark-dot-files-gray
Show hidden files (dot files) in gray
2015-03-26 12:40:47 +01:00
Jan-Christoph Borchardt 7c66e17237 force log messages to break to alleviate horizontal scroll on Admin page 2015-03-26 12:34:57 +01:00
Jan-Christoph Borchardt f0b0287333 adjust animations of Share, Versions and others to OC.menuSpeed 2015-03-26 12:21:40 +01:00
Jan-Christoph Borchardt 30b745fc59 reintroduce quick animation for menus 2015-03-26 11:59:30 +01:00
Thomas Müller f9525b153e no php execution timeout for webdav 2015-03-26 11:55:26 +01:00
Jenkins for ownCloud b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Thomas Müller 653ad63e9b detect MIT licensed files and ignore them for now 2015-03-26 11:38:40 +01:00
Thomas Müller b2b61bdf16 properly break after the first comment ends + allow to pass in one file/folder via commandline argument 2015-03-26 11:38:40 +01:00
Thomas Müller eb066111ed Updating email of nickvergessen and georg 2015-03-26 11:38:40 +01:00
Thomas Müller 1b23f1367b fixing ignorance of 'Not Committed Yet' 2015-03-26 11:38:39 +01:00
Thomas Müller a228b4ccba Updating .mailmap 2015-03-26 11:38:39 +01:00
Jan-Christoph Borchardt 07335c844a fix log in issue, fix arrow position, make dropdown work in Firefox 2015-03-26 11:12:02 +01:00