summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4338 from nextcloud/handlebars-minLukas Reschke2017-04-125-9192/+34
|\
| * Move to handlebars.min.jsRoeland Jago Douma2017-04-125-9192/+34
|/
* Merge pull request #4307 from nextcloud/sharing-emailsRoeland Jago Douma2017-04-1216-279/+388
|\
| * Fix unit testsMorris Jobke2017-04-125-13/+19
| * Dont add click-button text for plaintext mailsJoas Schilling2017-04-121-3/+4
| * No newlines when heading is emptyJoas Schilling2017-04-122-3/+7
| * make the plain text footer standard compliant and add a space after '--'. It ...Bjoern Schiessle2017-04-121-1/+1
| * Use instance name as alt-textJoas Schilling2017-04-125-5/+9
| * Don't duplicate the sentence with the headerJoas Schilling2017-04-123-4/+8
| * Use new email design for sharebymail emailsMorris Jobke2017-04-125-250/+39
| * Properly escape heading, body and button textMorris Jobke2017-04-122-6/+12
| * Add addBodyButton to add a single button to email templatesMorris Jobke2017-04-125-0/+295
* | Merge pull request #4335 from nextcloud/jquery-ui-minLukas Reschke2017-04-125-29698/+9
|\ \
| * | Moved to jquery-ui.custom.min.jsRoeland Jago Douma2017-04-125-29698/+9
* | | Merge pull request #4282 from nextcloud/oci-connect-stringMorris Jobke2017-04-122-24/+36
|\ \ \
| * | | use the same oci connectstring in all code pathsRobin Appelman2017-04-102-24/+36
* | | | Merge pull request #4306 from nextcloud/followup-3905Roeland Jago Douma2017-04-121-0/+13
|\ \ \ \
| * | | | Favorites integration tests for shared filesMorris Jobke2017-04-121-0/+13
* | | | | Merge pull request #4331 from nextcloud/query-builder-sumMorris Jobke2017-04-122-0/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add sub() to the query function builderRobin Appelman2017-04-122-0/+14
| |/ / /
* | | | Merge pull request #4329 from nextcloud/move-out-shared-folderMorris Jobke2017-04-125-49/+56
|\ \ \ \
| * | | | use unjailed path when moving files out of a shared storageRobin Appelman2017-04-121-2/+9
| * | | | rename Jail::getSourcePath to getUnjailedPath to fix conflict with Local::get...Robin Appelman2017-04-124-47/+47
| |/ / /
* | | | Merge pull request #4325 from nextcloud/downstream-27522Roeland Jago Douma2017-04-122-6/+13
|\ \ \ \ | |_|_|/ |/| | |
| * | | Simplify the testJoas Schilling2017-04-121-1/+1
| * | | Optimize put - Dont try to fetch filecache for not existing filecache in encr...Piotr M2017-04-122-6/+13
* | | | Merge pull request #3614 from nextcloud/discover-federatedsharing-endpointsBjörn Schießle2017-04-1234-509/+502
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update autoloaderRoeland Jago Douma2017-04-112-0/+4
| * | | Do proper DIRoeland Jago Douma2017-04-1117-39/+16
| * | | give old end-points a seperate nameBjoern Schiessle2017-04-112-2/+33
| * | | fix constructorBjoern Schiessle2017-04-112-2/+2
| * | | remove discovery manager in favour of the OCSDiscoveryServiceBjoern Schiessle2017-04-1118-468/+81
| * | | add tests for discovery serviceBjoern Schiessle2017-04-112-3/+102
| * | | adjust existing testsBjoern Schiessle2017-04-114-12/+42
| * | | get addressbook url and carddav user from remote serverBjoern Schiessle2017-04-113-21/+35
| * | | use discovered end-point for trusted serversBjoern Schiessle2017-04-112-6/+36
| * | | provide public discovery service to discover OCS end-points on another serverBjoern Schiessle2017-04-114-0/+195
* | | | Merge pull request #4323 from nextcloud/downstream-27613Roeland Jago Douma2017-04-122-6/+12
|\ \ \ \
| * | | | Allow file upload when storage is unlimitedJoas Schilling2017-04-122-6/+12
| | |/ / | |/| |
* | | | Merge pull request #4324 from nextcloud/downstream-27581-27602Roeland Jago Douma2017-04-124-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix casing of same origin frame optionJoas Schilling2017-04-124-5/+5
|/ / /
* | | Merge pull request #3905 from nextcloud/downstream-27069Joas Schilling2017-04-125-10/+174
|\ \ \
| * | | Add drone.yml configMorris Jobke2017-04-111-0/+10
| * | | Add integration test for trashbinVincent Petry2017-04-114-10/+164
* | | | Merge pull request #4317 from nextcloud/cleanup-files_trashbin-updateBjörn Schießle2017-04-121-42/+0
|\ \ \ \
| * | | | [files_trashbin] Remove unneeded update stepsMorris Jobke2017-04-121-42/+0
* | | | | Merge pull request #4316 from nextcloud/cleanup-files_sharing-updateBjörn Schießle2017-04-122-263/+0
|\ \ \ \ \
| * | | | | [files_sharing] Remove unneeded update stepsMorris Jobke2017-04-122-263/+0
| |/ / / /
* | | | | Merge pull request #4312 from nextcloud/cleanup-nameBjörn Schießle2017-04-1254-113/+113
|\ \ \ \ \
| * | | | | Update comments to NextcloudMorris Jobke2017-04-1154-113/+113
| |/ / / /