summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23953 from owncloud/small_share_manager_fixLukas Reschke2016-04-132-1/+41
|\
| * Add testLukas Reschke2016-04-121-0/+40
| * set $share to null if getShareByToken() failedBjörn Schießle2016-04-121-1/+1
|/
* Revert "Document an example wait timeout for MySQL in case the web hoster is ...Thomas Müller2016-04-121-2/+1
* Document an example wait timeout for MySQL in case the web hoster is killing ...Thomas Müller2016-04-121-1/+2
* apps: Fix typos (found by codespell) (#23862)Stefan Weil2016-04-127-11/+11
* Add unit testing capabilities for templates (#23708)Thomas Müller2016-04-126-27/+132
* Exclude autoload_static.php (#23935)Lukas Reschke2016-04-121-1/+1
* Checkboxes (#23063)Hendrik Leppelsack2016-04-122-19/+86
* Migrate post_groupDelete hook to share manager (#23841)Roeland Douma2016-04-129-14/+179
* Don't calculate permissions twice (#23917)Roeland Douma2016-04-121-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-126-0/+12
* Merge pull request #23856 from owncloud/share_remove_addtogroup_hooksJoas Schilling2016-04-113-235/+0
|\
| * Remove pre/post_addToGroup hooks for sharesRoeland Jago Douma2016-04-083-235/+0
* | Catch the AutoloadNotAllowedException also for legacy jobs (#23901)Morris Jobke2016-04-111-2/+9
* | To be safe don't unload until end (#23752)Joshua Ruehlig2016-04-111-1/+1
* | Merge pull request #23798 from owncloud/federated-unshare-background-jobMorris Jobke2016-04-114-5/+337
|\ \
| * | re-try to send unshare notification if remote server is not availableBjoern Schiessle2016-04-084-5/+337
* | | 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
* | | | | Merge pull request #23860 from owncloud/followup-23304-opening-empty-fileThomas Müller2016-04-111-3/+9
|\ \ \ \ \
| * | | | | Correctly return an empty string for empty filesJoas Schilling2016-04-081-3/+9
| | |_|_|/ | |/| | |
* | | | | [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