summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5739 from nextcloud/comradekingu-patch-4Roeland Jago Douma2017-07-181-2/+2
|\
| * : 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 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 bindingAllan Nordhøy2017-07-141-4/+4
| |/
* | Merge pull request #5737 from nextcloud/comradekingu-patch-2Morris Jobke2017-07-181-3/+3
|\ \
| * | command-line, Consider narrowingAllan Nordhøy2017-07-141-3/+3
| |/
* | Merge pull request #5741 from nextcloud/comradekingu-patch-6Morris Jobke2017-07-181-2/+2
|\ \
| * | sent, an invitation, - successfulAllan Nordhøy2017-07-141-2/+2
| |/
* | Merge pull request #5740 from nextcloud/comradekingu-patch-5Morris Jobke2017-07-181-2/+2
|\ \
| * | 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
|\ \
| * | - yourAllan Nordhøy2017-07-151-1/+1
* | | [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 theming appJulius Härtl2017-07-123-28/+67
* | [tx-robot] updated from transifexNextcloud bot2017-07-1342-182/+190
* | Merge pull request #5567 from nextcloud/public-capabilitiesRoeland Jago Douma2017-07-121-2/+2
|\ \
| * | Expose theming capabilities to publicJulius Härtl2017-06-301-2/+2
* | | Merge pull request #5685 from nextcloud/jail-propagatorRoeland Jago Douma2017-07-122-56/+0
|\ \ \
| * | | Fix propagating changes within jail wrapperRobin Appelman2017-07-112-56/+0
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-1250-298/+304
* | | | Merge pull request #5681 from nextcloud/upstream-fix-circlesMorris Jobke2017-07-112-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | upstreamMaxence Lange2017-07-112-3/+3
* | | | Merge pull request #5672 from nextcloud/upload-hidden-filelistMorris Jobke2017-07-112-9/+13
|\ \ \ \ | |/ / / |/| | |
| * | | fix testRobin Appelman2017-07-111-9/+11
| * | | properly block file upload to non-active filelistRobin Appelman2017-07-101-0/+2
* | | | Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select...Morris Jobke2017-07-102-0/+2
|\ \ \ \
| * | | | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-102-0/+2
* | | | | Merge pull request #5669 from nextcloud/fix-remote-share-activity-emailsMorris Jobke2017-07-102-8/+14
|\ \ \ \ \
| * | | | | Fix owner cloud id in unshare activityJoas Schilling2017-07-101-1/+1
| * | | | | Fix activity emails for accept/decline of remote sharesJoas Schilling2017-07-102-7/+13
| | |/ / / | |/| | |
* / | | | Rectify variable $uid->$userRoger Szabo2017-07-101-1/+1
|/ / / /
* | | | Merge pull request #5649 from nextcloud/fix-5611Morris Jobke2017-07-101-8/+10
|\ \ \ \
| * | | | fix alignment of radio button and its label in encryption settingsArthur Schiwon2017-07-071-8/+10
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-1014-16/+18
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-0912-6/+20
* | | | | [tx-robot] updated from transifexNextcloud bot2017-07-0828-74/+98
|/ / / /
* | | | Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emailsMorris Jobke2017-07-0719-67/+251
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix testsJoas Schilling2017-06-201-6/+6
| * | | Use PNG version of the icons for shipped activitiesJoas Schilling2017-06-2018-61/+245
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-0712-78/+90
* | | | adjust encryption tests to the new master key defaultBjoern Schiessle2017-07-061-1/+1
* | | | update sharing test to new master key defaultBjoern Schiessle2017-07-061-0/+2
* | | | fix and extend dav test to also test the master-key setupBjoern Schiessle2017-07-062-0/+52
* | | | since the default for the master key changed we need to write the setting exp...Bjoern Schiessle2017-07-062-1/+84