summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-1770-84/+194
* [tx-robot] updated from transifexNextcloud bot2017-06-1676-52/+176
* Merge pull request #5428 from nextcloud/5384-stable12Morris Jobke2017-06-152-7/+72
|\
| * Backport of #5384 to stable12Joas Schilling2017-06-152-7/+72
|/
* Merge pull request #5422 from nextcloud/5190-stable12Morris Jobke2017-06-151-9/+32
|\
| * Forward port of #5190 to stable12Arthur Schiwon2017-06-151-9/+32
* | Merge pull request #5210 from nextcloud/ldap-attempt-reconnect-stable12Lukas Reschke2017-06-151-16/+68
|\ \ | |/ |/|
| * fix pagingArthur Schiwon2017-05-301-3/+4
| * make sure used ldap connection resource is always up to dateArthur Schiwon2017-05-301-6/+8
| * moved to something a little less invasive. back to passing CR around.bline2017-05-301-36/+40
| * special case for controlPagedResultResponse. It would be nice if there was a ...bline2017-05-301-33/+78
* | Merge pull request #5301 from nextcloud/bugfix-stable12/noid/fix_proppatch_re...Morris Jobke2017-06-142-0/+12
|\ \
| * | allow users to send PropPatch request when calendar is group-shared with themGeorg Ehrke2017-06-082-0/+12
* | | Merge pull request #5299 from nextcloud/bugfix-stable12/4885/calendar_shares_...Morris Jobke2017-06-145-0/+20
|\ \ \
| * | | urldecode group principals in Cal- and CardDAV backendGeorg Ehrke2017-06-125-0/+20
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-06-15214-430/+1234
* | | Merge pull request #5416 from nextcloud/stable12-5392Morris Jobke2017-06-142-10/+1
|\ \ \
| * | | Use the guest.css for the maintenance page as wellMorris Jobke2017-06-142-10/+1
* | | | Merge pull request #5397 from nextcloud/stable12-5072Morris Jobke2017-06-141-1/+1
|\ \ \ \
| * | | | Fixed a crash caused by Local::copyFromStorage() not conforming to Common::co...Michael Munger2017-06-131-1/+1
* | | | | Merge pull request #5026 from nextcloud/filename-input-tooltip-stable12Morris Jobke2017-06-142-0/+3
|\ \ \ \ \
| * | | | | Make new file file tooltip error text changePhil Davis2017-05-221-0/+1
| * | | | | Make rename file tooltip error text changePhil Davis2017-05-221-0/+2
* | | | | | Merge pull request #5401 from nextcloud/translate-oauth2Morris Jobke2017-06-142-0/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Translate OAuth2 in stable12Joas Schilling2017-06-142-0/+6
* | | | | | Merge pull request #5402 from nextcloud/stable12-fix/contactsmenu-l10n-search...Joas Schilling2017-06-141-1/+1
|\ \ \ \ \ \
| * | | | | | Localize contacts menu search input placeholderChristoph Wurst2017-06-141-1/+1
| |/ / / / /
* | | | | | Merge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-user...Joas Schilling2017-06-143-5/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Prevent sending second WWW-Authenticate headerLukas Reschke2017-06-133-5/+25
* | | | | | Merge pull request #5362 from nextcloud/exclude-files-external-dir-from-encry...Lukas Reschke2017-06-141-0/+1
|\ \ \ \ \ \
| * | | | | | don't try to encrypt/decrypt the certificate bundleBjoern Schiessle2017-06-131-0/+1
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-14118-228/+256
* | | | | | | Merge pull request #5296 from nextcloud/bugfix-stable12/5077/allow_proppatche...Morris Jobke2017-06-132-0/+11
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | allow PropPatch requests to contact_birthdaysGeorg Ehrke2017-06-082-0/+11
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #5063 from nextcloud/backport-4969-activity-external-user-...Morris Jobke2017-06-131-0/+26
|\ \ \ \ \ \
| * | | | | | Fix username and avatar for external usersJoas Schilling2017-05-231-0/+26
* | | | | | | Merge pull request #5379 from nextcloud/stable12-5310-fix-tag-label-removed-w...Morris Jobke2017-06-1314-33/+487
|\ \ \ \ \ \ \
| * | | | | | | Extract toggle visibility of a SystemTagsInfoView to its own viewDaniel Calviño Sánchez2017-06-136-26/+214
| * | | | | | | Add visibility related methodsDaniel Calviño Sánchez2017-06-132-6/+70
| * | | | | | | Fix toggle element being removed when MainFileInfoView is rendered againDaniel Calviño Sánchez2017-06-132-10/+26
| * | | | | | | Trigger pre and post render events in MainFileInfoDetailsViewDaniel Calviño Sánchez2017-06-131-0/+4
| * | | | | | | Make possible to know the registered detail views in a details viewDaniel Calviño Sánchez2017-06-134-0/+72
| * | | | | | | Extract duplicated code to a methodDaniel Calviño Sánchez2017-06-131-28/+15
| * | | | | | | Add acceptance tests for showing the input field for tagsDaniel Calviño Sánchez2017-06-132-0/+123
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #5387 from nextcloud/backport-5367Morris Jobke2017-06-132-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix unknown share tokenJoas Schilling2017-06-132-2/+7
| |/ / / / / /
* | | | | | | Merge pull request #5388 from nextcloud/stable12-5378Morris Jobke2017-06-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix #5349, no themed icon when dragging folderPatrik Kernstock2017-06-131-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #5389 from nextcloud/stable12-5305Morris Jobke2017-06-138-8/+93
|\ \ \ \ \ \ \
| * | | | | | | Do not show icon for quota barMorris Jobke2017-06-132-5/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 10:22:22 +0000