summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23510 from owncloud/birthdays-on-shared-addressbooksThomas Müller2016-04-085-33/+148
|\
| * Propagate birthday to group shares as wellThomas Müller2016-03-234-31/+121
| * Propagate birthdays of shared addressbooks to the sharee's birthday calendar ...Thomas Müller2016-03-233-19/+44
* | Merge pull request #23839 from owncloud/sabre-dav-3.0.9Thomas Müller2016-04-081-0/+0
|\ \
| * | Update 3rdparty with sabre/dav 3.0.9Joas Schilling2016-04-071-0/+0
* | | Merge pull request #23553 from owncloud/lock-ttl-execution-timeThomas Müller2016-04-086-10/+26
|\ \ \
| * | | Make lock ttl configurableRobin Appelman2016-04-076-10/+26
* | | | Merge pull request #23736 from owncloud/move_public_webdav_auth_to_share_managerThomas Müller2016-04-085-51/+252
|\ \ \ \
| * | | | Add unit tests for public auth webdavRoeland Jago Douma2016-04-081-0/+170
| * | | | Move public webdav auth over to share managerRoeland Jago Douma2016-04-082-50/+44
| * | | | Set proper permissions on link shareRoeland Jago Douma2016-04-082-1/+38
| | |/ / | |/| |
* | | | Merge pull request #23848 from stweil/masterThomas Müller2016-04-0829-36/+36
|\ \ \ \ | |/ / / |/| | |
| * | | lib: Fix typos (found by codespell)Stefan Weil2016-04-0729-36/+36
|/ / /
* | | Merge pull request #23806 from owncloud/multiline-javascript-strings-for-tran...Thomas Müller2016-04-073-12/+27
|\ \ \
| * | | Move some translation stings around to enable xgettext to detect themThomas Müller2016-04-072-11/+9
| * | | Also use Javascript as language in l10n.pl - fixes #13924Thomas Müller2016-04-071-1/+18
* | | | Merge pull request #23444 from owncloud/add-loading-spinnerJan-Christoph Borchardt2016-04-071-0/+19
|\ \ \ \
| * | | | add loading spinner to add to owncloud input fieldErik Pellikka2016-04-071-0/+19
* | | | | Merge pull request #23773 from owncloud/share_move_delete_user_hookJoas Schilling2016-04-0710-20/+317
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Migrate post_userDelete hook to share managerRoeland Jago Douma2016-04-0410-20/+317
* | | | | Merge pull request #23833 from owncloud/remove-xxxThomas Müller2016-04-071-1/+0
|\ \ \ \ \
| * | | | | Remove xxx from ownCloud we dont want to see that 🙈Joas Schilling2016-04-071-1/+0
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-07218-2206/+2702
* | | | | Merge pull request #23768 from owncloud/skjnldsv-color-generator-editJohn Molakvoæ2016-04-071-5/+23
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Updated color generatorJohn Molakvoæ2016-04-061-5/+23
|/ / / /
* | | | Merge pull request #23766 from owncloud/replace-getid-3Lukas Reschke2016-04-062-6/+10
|\ \ \ \
| * | | | Replace getid3 with ID3ParserLukas Reschke2016-04-062-6/+10
* | | | | Merge pull request #23822 from stweil/masterThomas Müller2016-04-068-11/+11
|\ \ \ \ \
| * | | | | tests: Fix typos (found by codespell)Stefan Weil2016-04-068-11/+11
|/ / / / /
* | | | | Merge pull request #23501 from owncloud/alarms_for_birthdayeventsThomas Müller2016-04-061-0/+5
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into alarms_for_birthdayeventsAchim Königs2016-03-26416-1162/+1320
| |\ \ \ \ \
| * | | | | | add VALARM for birthday eventsAchim Königs2016-03-231-0/+5
* | | | | | | Merge pull request #23823 from owncloud/drop-js-based-acceptance-testsThomas Müller2016-04-0630-2344/+0
|\ \ \ \ \ \ \
| * | | | | | | Drop JS based acceptance tests - we have our behat based integration tests wh...Thomas Müller2016-04-0630-2344/+0
* | | | | | | | Merge pull request #23819 from owncloud/move-core-completely-to-psr4Roeland Douma2016-04-0660-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove OC/Core autoloading from old autoloaderLukas Reschke2016-04-062-4/+2
| * | | | | | | | Rename files to be PSR-4 compliantLukas Reschke2016-04-0658-0/+0
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #23820 from owncloud/move-settings-completely-to-psr4Roeland Douma2016-04-0613-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove OC/Settings from old autoloaderLukas Reschke2016-04-062-4/+2
| * | | | | | | | Rename files to be PSR-4 compliantLukas Reschke2016-04-0611-0/+0
| |/ / / / / / /
* | | | | | | | Merge pull request #23777 from owncloud/ldap-null-userLukas Reschke2016-04-061-5/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle case where the user is not known - fixes #23759Thomas Müller2016-04-041-5/+7
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-066-0/+12
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #23818 from owncloud/use-proper-methodsJoas Schilling2016-04-067-11/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Use proper shortcut methods in templatesMorris Jobke2016-04-067-11/+11
|/ / / / / / /
* | | | | | | Merge pull request #23763 from owncloud/do_not_export_share_type_2Morris Jobke2016-04-061-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Share type 2 is privateRoeland Jago Douma2016-04-041-2/+0
* | | | | | | | Merge pull request #23793 from owncloud/hard-code-dav-endpointsThomas Müller2016-04-062-12/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | All webdav endpoints within remote.php are now hardcoded - helps to prevent m...Thomas Müller2016-04-052-12/+22
* | | | | | | | | Merge pull request #23808 from owncloud/test-lock-with-strange-filenameRoeland Douma2016-04-061-0/+2
|\ \ \ \ \ \ \ \ \