Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #23510 from owncloud/birthdays-on-shared-addressbooks | Thomas Müller | 2016-04-08 | 5 | -33/+148 |
|\ | |||||
| * | Propagate birthday to group shares as well | Thomas Müller | 2016-03-23 | 4 | -31/+121 |
| * | Propagate birthdays of shared addressbooks to the sharee's birthday calendar ... | Thomas Müller | 2016-03-23 | 3 | -19/+44 |
* | | Merge pull request #23839 from owncloud/sabre-dav-3.0.9 | Thomas Müller | 2016-04-08 | 1 | -0/+0 |
|\ \ | |||||
| * | | Update 3rdparty with sabre/dav 3.0.9 | Joas Schilling | 2016-04-07 | 1 | -0/+0 |
* | | | Merge pull request #23553 from owncloud/lock-ttl-execution-time | Thomas Müller | 2016-04-08 | 6 | -10/+26 |
|\ \ \ | |||||
| * | | | Make lock ttl configurable | Robin Appelman | 2016-04-07 | 6 | -10/+26 |
* | | | | Merge pull request #23736 from owncloud/move_public_webdav_auth_to_share_manager | Thomas Müller | 2016-04-08 | 5 | -51/+252 |
|\ \ \ \ | |||||
| * | | | | Add unit tests for public auth webdav | Roeland Jago Douma | 2016-04-08 | 1 | -0/+170 |
| * | | | | Move public webdav auth over to share manager | Roeland Jago Douma | 2016-04-08 | 2 | -50/+44 |
| * | | | | Set proper permissions on link share | Roeland Jago Douma | 2016-04-08 | 2 | -1/+38 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #23848 from stweil/master | Thomas Müller | 2016-04-08 | 29 | -36/+36 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | lib: Fix typos (found by codespell) | Stefan Weil | 2016-04-07 | 29 | -36/+36 |
|/ / / | |||||
* | | | Merge pull request #23806 from owncloud/multiline-javascript-strings-for-tran... | Thomas Müller | 2016-04-07 | 3 | -12/+27 |
|\ \ \ | |||||
| * | | | Move some translation stings around to enable xgettext to detect them | Thomas Müller | 2016-04-07 | 2 | -11/+9 |
| * | | | Also use Javascript as language in l10n.pl - fixes #13924 | Thomas Müller | 2016-04-07 | 1 | -1/+18 |
* | | | | Merge pull request #23444 from owncloud/add-loading-spinner | Jan-Christoph Borchardt | 2016-04-07 | 1 | -0/+19 |
|\ \ \ \ | |||||
| * | | | | add loading spinner to add to owncloud input field | Erik Pellikka | 2016-04-07 | 1 | -0/+19 |
* | | | | | Merge pull request #23773 from owncloud/share_move_delete_user_hook | Joas Schilling | 2016-04-07 | 10 | -20/+317 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Migrate post_userDelete hook to share manager | Roeland Jago Douma | 2016-04-04 | 10 | -20/+317 |
* | | | | | Merge pull request #23833 from owncloud/remove-xxx | Thomas Müller | 2016-04-07 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Remove xxx from ownCloud we dont want to see that 🙈 | Joas Schilling | 2016-04-07 | 1 | -1/+0 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-07 | 218 | -2206/+2702 |
* | | | | | 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 |
|\ \ \ \ \ \ \ \ \ |