summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-07-21276-940/+316
|
* Merge pull request #5629 from nextcloud/add-recovery-key-on-public-uploadBjörn Schießle2017-07-201-2/+21
|\ | | | | Add recovery key on public upload
| * make sure that we always have a ownerBjoern Schiessle2017-07-201-4/+17
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * Add recovery key on public uploadBjoern Schiessle2017-07-201-2/+8
| | | | | | | | | | | | | | | | In order to decide if a recovery key needs to be added we always need to check the files owner settings and not the settings of the currently logged in user. Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Fix copy and paste error on activity descriptionsJoas Schilling2017-07-202-2/+2
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-07-2030-0/+120
|
* Merge pull request #5734 from nextcloud/only-readable-chars-in-share-tokensJoas Schilling2017-07-192-3/+2
|\ | | | | Only use readable chars in Share Tokens
| * Only use readable chars in Share TokensJoas Schilling2017-07-182-3/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5776 from nextcloud/install-phanRoeland Jago Douma2017-07-194-5/+9
|\ \ | | | | | | Run phan over code base
| * | Run phan over code baseLukas Reschke2017-07-194-5/+9
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Add Android and iOS URLs to theming appMorris Jobke2017-07-192-0/+71
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Allow overwriting of IOS theming valuesRoeland Jago Douma2017-07-191-1/+20
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-07-19182-654/+670
| |
* | Merge pull request #5739 from nextcloud/comradekingu-patch-4Roeland Jago Douma2017-07-181-2/+2
|\ \ | | | | | | Spelling: Bigversal and LDAP
| * | : Bigversal and LDAPAllan Nordhøy2017-07-141-2/+2
| | |
* | | Merge pull request #5736 from smueller18/patch-2Morris Jobke2017-07-181-1/+1
|\ \ \ | | | | | | | | do not show hyphen in og:title if slogan does not exist
| * | | do not show hyphen in og:title if slogan does not existStephan Müller2017-07-141-1/+1
| |/ /
* | | Merge pull request #5735 from nextcloud/comradekingu-patch-1Roeland Jago Douma2017-07-181-4/+4
|\ \ \ | | | | | | | | Spelling: Shortening and binding
| * | | Spelling: Shortening and bindingAllan Nordhøy2017-07-141-4/+4
| |/ /
* | | Merge pull request #5737 from nextcloud/comradekingu-patch-2Morris Jobke2017-07-181-3/+3
|\ \ \ | | | | | | | | Spelling: command-line, Consider narrowing
| * | | command-line, Consider narrowingAllan Nordhøy2017-07-141-3/+3
| |/ /
* | | Merge pull request #5741 from nextcloud/comradekingu-patch-6Morris Jobke2017-07-181-2/+2
|\ \ \ | | | | | | | | Spelling: sent, an invitation, - successful
| * | | sent, an invitation, - successfulAllan Nordhøy2017-07-141-2/+2
| |/ /
* | | Merge pull request #5740 from nextcloud/comradekingu-patch-5Morris Jobke2017-07-181-2/+2
|\ \ \ | | | | | | | | Spelling: log out, : Bigversal
| * | | log out, : BigversalAllan Nordhøy2017-07-141-2/+2
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-07-1850-116/+116
| | |
* | | Merge pull request #5743 from nextcloud/comradekingu-patch-7Roeland Jago Douma2017-07-171-1/+1
|\ \ \ | | | | | | | | Spelling: - your
| * | | - yourAllan Nordhøy2017-07-151-1/+1
| | | | | | | | | | | | This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-1712-132/+506
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2017-07-1522-38/+46
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-07-1416-74/+82
| |
* | Merge pull request #5070 from nextcloud/theming-vs-themesJoas Schilling2017-07-133-28/+67
|\ \ | | | | | | Prefer custom theme over the theming app
| * | Prefer custom theme over theming appJulius Härtl2017-07-123-28/+67
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-1342-182/+190
| | |
* | | Merge pull request #5567 from nextcloud/public-capabilitiesRoeland Jago Douma2017-07-121-2/+2
|\ \ \ | | | | | | | | Public capabilities API
| * | | Expose theming capabilities to publicJulius Härtl2017-06-301-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #5685 from nextcloud/jail-propagatorRoeland Jago Douma2017-07-122-56/+0
|\ \ \ \ | | | | | | | | | | Fix propagating changes within jail wrapper
| * | | | Fix propagating changes within jail wrapperRobin Appelman2017-07-112-56/+0
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-1250-298/+304
| | | |
* | | | Merge pull request #5681 from nextcloud/upstream-fix-circlesMorris Jobke2017-07-112-3/+3
|\ \ \ \ | |/ / / |/| | | upstream fix circles
| * | | upstreamMaxence Lange2017-07-112-3/+3
| | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* | | | Merge pull request #5672 from nextcloud/upload-hidden-filelistMorris Jobke2017-07-112-9/+13
|\ \ \ \ | |/ / / |/| | | properly block file upload to non-active filelist
| * | | fix testRobin Appelman2017-07-111-9/+11
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | properly block file upload to non-active filelistRobin Appelman2017-07-101-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #5656 from ↵Morris Jobke2017-07-102-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix-unselecting-items-on-multi-select-dropdowns Fix unselecting items on multi select dropdowns
| * | | | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-102-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toggleSelect extension for Select2 makes possible to unselect items in a multi-select dropdown by clicking on them; this behaviour should be enabled in all the multi-select dropdowns used in the server. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | Merge pull request #5669 from nextcloud/fix-remote-share-activity-emailsMorris Jobke2017-07-102-8/+14
|\ \ \ \ \ | | | | | | | | | | | | Fix remote share activity emails
| * | | | | Fix owner cloud id in unshare activityJoas Schilling2017-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix activity emails for accept/decline of remote sharesJoas Schilling2017-07-102-7/+13
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / | | | Rectify variable $uid->$userRoger Szabo2017-07-101-1/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>