summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1788 from nextcloud/share-link-whitespaceMorris Jobke2016-10-181-0/+4
|\
| * add whitespace above share link so it's visually distinguished moreJan-Christoph Borchardt2016-10-181-0/+4
* | Merge pull request #1729 from nextcloud/downstream-ldap-3Lukas Reschke2016-10-1812-91/+109
|\ \
| * \ Merge branch 'master' into downstream-ldap-3Arthur Schiwon2016-10-1619-50/+118
| |\ \
| * | | fix and tidy up tests after merge conflictsArthur Schiwon2016-10-131-16/+8
| * | | Update tests for phunit 5.5Victor Dubiniuk2016-10-135-30/+47
| * | | Harden emptyVictor Dubiniuk2016-10-137-50/+59
* | | | Merge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cacheLukas Reschke2016-10-182-1/+94
|\ \ \ \
| * | | | Do not reset the list after adding cached entriesJoas Schilling2016-10-172-1/+94
* | | | | Merge pull request #1734 from nextcloud/setvalue_optLukas Reschke2016-10-181-0/+4
|\ \ \ \ \
| * | | | | Fix migration testsRoeland Jago Douma2016-10-131-0/+4
* | | | | | Merge pull request #1742 from nextcloud/us_sync-date-of-deathLukas Reschke2016-10-182-43/+77
|\ \ \ \ \ \
| * | | | | | [9.2] Sync deathdate and anniversary to birthday calendar (#25655)Thomas Müller2016-10-142-43/+77
* | | | | | | Merge pull request #1774 from nextcloud/ellipsize-shareeMorris Jobke2016-10-181-1/+6
|\ \ \ \ \ \ \
| * | | | | | | ellipsize sharee name to not overlap withJan-Christoph Borchardt2016-10-181-1/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #1606 from nextcloud/search-detailMorris Jobke2016-10-183-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix bold no results search textskjnldsv2016-10-111-1/+2
| * | | | | | search design detailsJan-Christoph Borchardt2016-09-093-4/+3
* | | | | | | Merge pull request #1754 from nextcloud/files-moveJan-Christoph Borchardt2016-10-181-3/+16
|\ \ \ \ \ \ \
| * | | | | | | use more fitting icon for files move actionJan-Christoph Borchardt2016-10-171-4/+3
| * | | | | | | Add file action to move files and foldersRobin Appelman2016-10-141-0/+14
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2016-10-1866-110/+328
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Make sure the UID is correctly casedJoas Schilling2016-10-171-3/+11
* | | | | | | Merge pull request #1449 from nextcloud/comments-user-mentionMorris Jobke2016-10-1713-11/+1727
|\ \ \ \ \ \ \
| * | | | | | | apply some polishArthur Schiwon2016-10-144-86/+28
| * | | | | | | emit pre-update event for commentsArthur Schiwon2016-10-125-44/+28
| * | | | | | | adjust wording of the notificationArthur Schiwon2016-10-082-8/+7
| * | | | | | | remove notifications of deleted comments from the DBArthur Schiwon2016-10-082-7/+36
| * | | | | | | use different files route/controllerArthur Schiwon2016-10-072-13/+2
| * | | | | | | Notificacations for simple @-mentioning in commentsArthur Schiwon2016-10-0712-10/+1783
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2016-10-176-0/+6
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2016-10-162-0/+32
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2016-10-1510-4/+12
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #1441 from nextcloud/getby-id-less-queriesLukas Reschke2016-10-145-40/+55
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | remove unneeded unlockRobin Appelman2016-10-121-2/+0
| * | | | | | remove duplicate traitRobin Appelman2016-10-121-1/+0
| * | | | | | get node by path as fallbackRobin Appelman2016-10-121-6/+8
| * | | | | | fix getting recipient share in ocs apiRobin Appelman2016-10-121-14/+18
| * | | | | | fix share tests not passing pathRobin Appelman2016-10-121-4/+7
| * | | | | | re-use the share node while formating if we already have itRobin Appelman2016-10-121-7/+13
| * | | | | | more robust test setupRobin Appelman2016-10-123-11/+11
| * | | | | | phpunit is weirdRobin Appelman2016-10-121-3/+4
| * | | | | | Always unlock node after trying to create a shareRobin Appelman2016-10-121-1/+3
| | |_|_|_|/ | |/| | | |
* | | | | | fix typoThomas Citharel2016-10-141-1/+1
| |_|_|/ / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2016-10-148-4/+42
| |_|_|/ |/| | |
* | | | Merge pull request #1726 from nextcloud/fix-symfony-tableMorris Jobke2016-10-133-3/+4
|\ \ \ \
| * | | | symfony replaced table helper by class, fixes two broken LDAP occ commandsArthur Schiwon2016-10-123-3/+4
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2016-10-134-2/+16
|/ / /
* | | Merge pull request #1713 from nextcloud/rebase_1493Roeland Jago Douma2016-10-121-0/+2
|\ \ \
| * | | fix issue #1482 - mail invites through v1 webdavClaudemir Todo Bom2016-10-121-0/+2