Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23768 from owncloud/skjnldsv-color-generator-edit | John Molakvoæ | 2016-04-07 | 1 | -5/+23 |
|\ | |||||
| * | Updated color generator | John Molakvoæ | 2016-04-06 | 1 | -5/+23 |
|/ | |||||
* | Merge pull request #23766 from owncloud/replace-getid-3 | Lukas Reschke | 2016-04-06 | 2 | -6/+10 |
|\ | |||||
| * | Replace getid3 with ID3Parser | Lukas Reschke | 2016-04-06 | 2 | -6/+10 |
* | | Merge pull request #23822 from stweil/master | Thomas Müller | 2016-04-06 | 8 | -11/+11 |
|\ \ | |||||
| * | | tests: Fix typos (found by codespell) | Stefan Weil | 2016-04-06 | 8 | -11/+11 |
|/ / | |||||
* | | Merge pull request #23501 from owncloud/alarms_for_birthdayevents | Thomas Müller | 2016-04-06 | 1 | -0/+5 |
|\ \ | |||||
| * \ | Merge branch 'master' into alarms_for_birthdayevents | Achim Königs | 2016-03-26 | 416 | -1162/+1320 |
| |\ \ | |||||
| * | | | add VALARM for birthday events | Achim Königs | 2016-03-23 | 1 | -0/+5 |
* | | | | Merge pull request #23823 from owncloud/drop-js-based-acceptance-tests | Thomas Müller | 2016-04-06 | 30 | -2344/+0 |
|\ \ \ \ | |||||
| * | | | | Drop JS based acceptance tests - we have our behat based integration tests wh... | Thomas Müller | 2016-04-06 | 30 | -2344/+0 |
* | | | | | Merge pull request #23819 from owncloud/move-core-completely-to-psr4 | Roeland Douma | 2016-04-06 | 60 | -4/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Remove OC/Core autoloading from old autoloader | Lukas Reschke | 2016-04-06 | 2 | -4/+2 |
| * | | | | | Rename files to be PSR-4 compliant | Lukas Reschke | 2016-04-06 | 58 | -0/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #23820 from owncloud/move-settings-completely-to-psr4 | Roeland Douma | 2016-04-06 | 13 | -4/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Remove OC/Settings from old autoloader | Lukas Reschke | 2016-04-06 | 2 | -4/+2 |
| * | | | | | Rename files to be PSR-4 compliant | Lukas Reschke | 2016-04-06 | 11 | -0/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #23777 from owncloud/ldap-null-user | Lukas Reschke | 2016-04-06 | 1 | -5/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Handle case where the user is not known - fixes #23759 | Thomas Müller | 2016-04-04 | 1 | -5/+7 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-06 | 6 | -0/+12 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #23818 from owncloud/use-proper-methods | Joas Schilling | 2016-04-06 | 7 | -11/+11 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Use proper shortcut methods in templates | Morris Jobke | 2016-04-06 | 7 | -11/+11 |
|/ / / / | |||||
* | | | | Merge pull request #23763 from owncloud/do_not_export_share_type_2 | Morris Jobke | 2016-04-06 | 1 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | Share type 2 is private | Roeland Jago Douma | 2016-04-04 | 1 | -2/+0 |
* | | | | | Merge pull request #23793 from owncloud/hard-code-dav-endpoints | Thomas Müller | 2016-04-06 | 2 | -12/+22 |
|\ \ \ \ \ | |||||
| * | | | | | All webdav endpoints within remote.php are now hardcoded - helps to prevent m... | Thomas Müller | 2016-04-05 | 2 | -12/+22 |
* | | | | | | Merge pull request #23808 from owncloud/test-lock-with-strange-filename | Roeland Douma | 2016-04-06 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Test locking with strange filename | Jörn Friedrich Dreyer | 2016-04-05 | 1 | -0/+2 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-06 | 178 | -526/+84 |
* | | | | | | | Merge pull request #23811 from owncloud/move-settings-and-oc-core-to-composer | Thomas Müller | 2016-04-05 | 5 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move OC\Core and OC\Settings to composer autoloader | Lukas Reschke | 2016-04-05 | 5 | -1/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #23794 from owncloud/handle-null-in-usermanager | Thomas Müller | 2016-04-05 | 2 | -10/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Prevent null to be passed into the closure of callForAllUsers | Thomas Müller | 2016-04-05 | 2 | -10/+14 |
* | | | | | | | Merge pull request #23040 from owncloud/mobile-css-loading | Thomas Müller | 2016-04-05 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | load mobile styles last, fix #19596 | Jan-Christoph Borchardt | 2016-04-05 | 1 | -6/+6 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #23791 from owncloud/fix-swift-test-mkfifo | Thomas Müller | 2016-04-05 | 2 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Remove any stray socket files before creating new ones | Robin McCorkell | 2016-04-05 | 2 | -0/+2 |
* | | | | | | Merge pull request #23677 from owncloud/db-schema-migration-feedback | Thomas Müller | 2016-04-05 | 8 | -39/+198 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix verbose output of upgrade command - not progressbar in this case and the ... | Thomas Müller | 2016-04-04 | 3 | -19/+45 |
| * | | | | | Add detailed logs hidden and show them on request | Morris Jobke | 2016-04-04 | 4 | -10/+42 |
| * | | | | | Limit the message to the console to the first 30 characters in order to not b... | Thomas Müller | 2016-04-04 | 1 | -1/+5 |
| * | | | | | Show individual sql schema migration steps during upgrade - on web as well as... | Thomas Müller | 2016-04-04 | 8 | -31/+128 |
* | | | | | | Merge pull request #23767 from owncloud/remove-unrequired-randomlib | Thomas Müller | 2016-04-05 | 1 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unrequired randomlib | Lukas Reschke | 2016-04-04 | 1 | -0/+0 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-05 | 84 | -160/+10 |
* | | | | | | | Merge pull request #23682 from owncloud/group_sharing_disabled_capability | Morris Jobke | 2016-04-04 | 4 | -0/+51 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Add intergration tests | Roeland Jago Douma | 2016-04-04 | 2 | -0/+31 |
| * | | | | | | Add capability to show if group sharing is enabled | Roeland Jago Douma | 2016-04-04 | 2 | -0/+20 |
|/ / / / / / | |||||
* / / / / / | Fix PHP memory leak in file_get_contents() | Morris Jobke | 2016-04-04 | 2 | -2/+9 |
|/ / / / / | |||||
* | | | | | Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page | Thomas Müller | 2016-04-04 | 8 | -3/+229 |
|\ \ \ \ \ | |/ / / / |/| | | | |