Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move \OC\Preview to PSR-4 | Roeland Jago Douma | 2016-04-20 | 25 | -0/+0 |
| | |||||
* | Merge pull request #24075 from owncloud/no-html-on-cli | Lukas Reschke | 2016-04-20 | 3 | -11/+14 |
|\ | | | | | In case of fatal php errors and other unhandled exceptions no html er… | ||||
| * | In case of fatal php errors and other unhandled exceptions no html error ↵ | Thomas Müller | 2016-04-18 | 3 | -11/+14 |
| | | | | | | | | page is expected to be displayed in the console | ||||
* | | Merge pull request #24116 from owncloud/fix_24095 | Thomas Müller | 2016-04-20 | 1 | -3/+4 |
|\ \ | | | | | | | preserve information if it is a rename operation or not | ||||
| * | | preserve information if it is a rename operation or not | Björn Schießle | 2016-04-20 | 1 | -3/+4 |
| | | | |||||
* | | | Merge pull request #23760 from owncloud/fix-setup-mysql | Thomas Müller | 2016-04-20 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix conditional check in MySQL setup | ||||
| * | | | Fix conditional check in MySQL setup | Robin McCorkell | 2016-04-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #24120 from owncloud/mail_psr4 | Thomas Müller | 2016-04-20 | 2 | -0/+0 |
|\ \ \ \ | |/ / / |/| | | | Move \OC\Mail to PSR-4 | ||||
| * | | | Move \OC\Mail to PSR-4 | Roeland Jago Douma | 2016-04-20 | 2 | -0/+0 |
|/ / / | |||||
* | | | Merge pull request #23952 from owncloud/hide-hidden-files | Thomas Müller | 2016-04-20 | 13 | -13/+155 |
|\ \ \ | | | | | | | | | Add option to hide hidden files | ||||
| * | | | filter hidden files on the web interface | Christoph Wurst | 2016-04-19 | 13 | -13/+155 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add checkbox to toggle show/hide hidden files persist show hidden setting fix settings menu layout test ApiController::showHiddenFiles don't show hidden files by default Store config in Backbone model and inject it into FileList Filter files only temporarily when rending the file list Fix file rename validation | ||||
* | | | | Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test | Thomas Müller | 2016-04-20 | 6 | -13/+17 |
|\ \ \ \ | | | | | | | | | | | Move the group dummy backend to test | ||||
| * | | | | Move the group dummy backend to test | Roeland Jago Douma | 2016-04-19 | 6 | -13/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | The dummy backend is only used for testing and should thus reside in tests. | ||||
* | | | | | Merge pull request #24097 from owncloud/fix_23632 | Thomas Müller | 2016-04-20 | 2 | -10/+48 |
|\ \ \ \ \ | | | | | | | | | | | | | init users mount point before recovery | ||||
| * | | | | | we need to initialize the mount points of the given user before we recover | Björn Schießle | 2016-04-19 | 2 | -10/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | access to his files | ||||
* | | | | | | Merge pull request #24104 from tyrylu/accessibility_settings_fix | Thomas Müller | 2016-04-20 | 1 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | App settings screen accessibility fixes | ||||
| * | | | | | | Fix reporting of the categories in app settings as links by screen readers. | Lukáš Tyrychtr | 2016-04-19 | 1 | -3/+3 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #24103 from owncloud/diagnostics_psr4 | Thomas Müller | 2016-04-20 | 6 | -0/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move \OC\Diagnostics to PSR-4 | ||||
| * | | | | | | Move \OC\Diagnostics to PSR-4 | Roeland Jago Douma | 2016-04-19 | 6 | -0/+0 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #23980 from ↵ | Jan-Christoph Borchardt | 2016-04-20 | 5 | -70/+187 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/remember-email-when-setting-expirationdate remember email when setting expiration date | ||||
| * | | | | | | extract mail view for sending share invitations | Christoph Wurst | 2016-04-19 | 5 | -70/+187 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | fixes #22947 | ||||
* | | | | | | Merge pull request #23915 from owncloud/activity-505-always-stream-for-comments | Björn Schießle | 2016-04-20 | 1 | -2/+9 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Always add activities for comments to the stream | ||||
| * | | | | | Always add activities for comments to the stream | Joas Schilling | 2016-04-11 | 1 | -2/+9 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-20 | 16 | -8/+60 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #24062 from owncloud/fix-gitignore | Thomas Müller | 2016-04-19 | 5 | -80/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix gitignore for core/vendor | ||||
| * | | | | | remove unneeded files | Morris Jobke | 2016-04-18 | 4 | -79/+0 |
| | | | | | | |||||
| * | | | | | Fix gitignore for core/vendor | Morris Jobke | 2016-04-18 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | * es6-promise and davclient.js | ||||
* | | | | | | Merge pull request #24079 from owncloud/console_psr4 | Thomas Müller | 2016-04-19 | 2 | -0/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Move \OC\Console to PSR-4 | ||||
| * | | | | | | Move \OC\Console to PSR-4 | Roeland Jago Douma | 2016-04-19 | 2 | -0/+0 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user | Thomas Müller | 2016-04-19 | 7 | -5/+57 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Introduce isReadyForUser and verify in file transfer ownership | ||||
| * | | | | | | Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 | Thomas Müller | 2016-04-15 | 7 | -5/+57 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24076 from ↵ | Lukas Reschke | 2016-04-19 | 2 | -18/+89 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-initial-calendar-and-addressbook-names Fix displayname for initial calendars and address books | ||||
| * | | | | | | | Fix displayname for initial calendars and address books - fixes #24057 | Thomas Müller | 2016-04-18 | 2 | -18/+89 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #24054 from owncloud/data_fingerprint | Roeland Douma | 2016-04-19 | 9 | -12/+232 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Add data-fingerprint property | ||||
| * | | | | | | | Add config text | Roeland Jago Douma | 2016-04-18 | 1 | -0/+13 |
| | | | | | | | | |||||
| * | | | | | | | Add occ command for updating the data-fingerprint | Roeland Jago Douma | 2016-04-18 | 3 | -0/+118 |
| | | | | | | | | |||||
| * | | | | | | | Add data-fingerprint property to webdav | Roeland Jago Douma | 2016-04-18 | 5 | -12/+101 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #23993 from owncloud/update-to-jquery2 | Thomas Müller | 2016-04-19 | 15 | -5257/+4887 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update jquery to version 2.2.3 | ||||
| * | | | | | | | | Turn off jQuery animations when testing | Christoph Wurst | 2016-04-18 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | downgrade jquery, update jquery-migrate | Christoph Wurst | 2016-04-15 | 11 | -3081/+2675 |
| | | | | | | | | | |||||
| * | | | | | | | | add jquery files to git | Christoph Wurst | 2016-04-14 | 4 | -1/+9848 |
| | | | | | | | | | |||||
| * | | | | | | | | update jquery to version 2.2.3 | Christoph Wurst | 2016-04-14 | 7 | -9830/+17 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #24074 from owncloud/integritycheck_psr4 | Thomas Müller | 2016-04-19 | 7 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | Move OC\IntegrityCheck to PSR-4 | ||||
| * | | | | | | | | Fix use statement | Roeland Jago Douma | 2016-04-18 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Move OC\IntegrityCheck to PSR-4 | Roeland Jago Douma | 2016-04-18 | 7 | -0/+0 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #23903 from ↵ | Thomas Müller | 2016-04-19 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-user-data-folder-creation-for-apache-login Ensure the user's data folder is created for IApacheBackend authentication | ||||
| * | | | | | | | | | Fixes #23899 | Thomas Müller | 2016-04-11 | 1 | -0/+4 |
| | | | | | | | | | | |||||
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-19 | 94 | -96/+44 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook | Thomas Müller | 2016-04-19 | 10 | -204/+142 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Move post_removeFromGroup to shareManager | ||||
| * | | | | | | | | | | Move post_removeFromGroup to shareManager | Roeland Jago Douma | 2016-04-13 | 10 | -204/+142 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last sharing hook to be moved over. * Added unit tests * Removed old tests that relied on old behaviour * Removed old hooks.php |