summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-114-0/+14
* | | | | Merge pull request #23863 from owncloud/fix_unit_testsThomas Müller2016-04-109-32/+15
|\ \ \ \ \
| * | | | | Fix dav commentsRoeland Jago Douma2016-04-081-10/+0
| * | | | | Fix encryption testsRoeland Jago Douma2016-04-082-7/+0
| * | | | | Fix filespluginRoeland Jago Douma2016-04-081-6/+4
| * | | | | Fix mappertestRoeland Jago Douma2016-04-081-3/+4
| * | | | | Fix notification testsRoeland Jago Douma2016-04-081-0/+2
| * | | | | Fix avatar controller testsRoeland Jago Douma2016-04-081-1/+1
| * | | | | Fix ShareManager testsRoeland Jago Douma2016-04-081-1/+1
| * | | | | Fix Share20OCSTestRoeland Jago Douma2016-04-081-4/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #23891 from owncloud/add-download-icon-whiteThomas Müller2016-04-103-0/+9
|\ \ \ \ \
| * | | | | Added white download iconsskjnldsv2016-04-103-0/+9
* | | | | | Merge pull request #23893 from owncloud/add-VCFExportPluginThomas Müller2016-04-101-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adding VCFExportPluginThomas Müller2016-04-101-0/+2
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-108-2/+14
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-09352-2416/+2472
|/ / / /
* | | | 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