summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23945 from owncloud/fix_oc_share_permissionsJoas Schilling2016-04-132-26/+18
|\
| * always return the complete permissions the file was shared withBjörn Schießle2016-04-122-26/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1316-2/+38
|/
* apps: Fix typos (found by codespell) (#23862)Stefan Weil2016-04-127-11/+11
* Migrate post_groupDelete hook to share manager (#23841)Roeland Douma2016-04-121-0/+10
* Merge pull request #23798 from owncloud/federated-unshare-background-jobMorris Jobke2016-04-113-4/+335
|\
| * re-try to send unshare notification if remote server is not availableBjoern Schiessle2016-04-083-4/+335
* | Merge pull request #23868 from owncloud/scrutinizer-patch-2Thomas Müller2016-04-111-1/+1
|\ \
| * | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-04-081-1/+1
* | | Merge pull request #22615 from owncloud/add-blacklisted-files-to-capabilitiesThomas Müller2016-04-111-0/+13
|\ \ \
| * | | Add blacklisted_files to capabilitiesJoas Schilling2016-04-041-0/+13
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-112-0/+2
* | | | Merge pull request #23863 from owncloud/fix_unit_testsThomas Müller2016-04-105-27/+7
|\ \ \ \
| * | | | 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 Share20OCSTestRoeland Jago Douma2016-04-081-4/+3
| | |/ / | |/| |
* | | | Adding VCFExportPluginThomas Müller2016-04-101-0/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-104-0/+8
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-0990-428/+434
|/ / /
* | | 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
* | | | 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
* | | | Merge pull request #23806 from owncloud/multiline-javascript-strings-for-tran...Thomas Müller2016-04-072-11/+9
|\ \ \ \
| * | | | Move some translation stings around to enable xgettext to detect themThomas Müller2016-04-072-11/+9
* | | | | 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-072-0/+65
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Migrate post_userDelete hook to share managerRoeland Jago Douma2016-04-042-0/+65
* | | | | | Remove xxx from ownCloud we dont want to see that 🙈Joas Schilling2016-04-071-1/+0
| |_|_|_|/ |/| | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-0792-0/+452
* | | | | 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-26156-236/+656
| |\ \ \ \ \
| * | | | | | add VALARM for birthday eventsAchim Königs2016-03-231-0/+5
* | | | | | | 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
| | |_|/ / / / | |/| | | | |
* | | | | | | Use proper shortcut methods in templatesMorris Jobke2016-04-064-6/+6
* | | | | | | Merge pull request #23793 from owncloud/hard-code-dav-endpointsThomas Müller2016-04-061-11/+0
|\ \ \ \ \ \ \
| * | | | | | | All webdav endpoints within remote.php are now hardcoded - helps to prevent m...Thomas Müller2016-04-051-11/+0
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-0690-434/+6
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Remove any stray socket files before creating new onesRobin McCorkell2016-04-052-0/+2
|/ / / / / /
* / / / / / Add capability to show if group sharing is enabledRoeland Jago Douma2016-04-042-0/+20
|/ / / / /
* | | | | Merge pull request #23557 from owncloud/sabre-plugin-browser-error-pageThomas Müller2016-04-046-2/+217
|\ \ \ \ \
| * | | | | Add magical regex to catch browsersLukas Reschke2016-03-241-1/+7
| * | | | | In case of exception we return an html page in case the client is a browserThomas Müller2016-03-246-2/+211
* | | | | | Merge pull request #23743 from owncloud/issue-23686-files-transferownership-s...Björn Schießle2016-04-042-3/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Inject the Mount ManagerJoas Schilling2016-04-042-6/+10
| * | | | | Unmount the share before deleting it, so we don't try to use it later onJoas Schilling2016-04-011-0/+6