summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move CONTRIBUTUNG and issue template into .github subfolderMarius Blüm2016-10-162-0/+0
* [tx-robot] updated from transifexNextcloud bot2016-10-166-0/+40
* [tx-robot] updated from transifexNextcloud bot2016-10-1516-8/+20
* Merge pull request #1756 from nextcloud/filepickerMorris Jobke2016-10-144-16/+35
|\
| * filepicker stylingRobin Appelman2016-10-144-14/+26
| * use mimetype icons in filepicker if there is no previewRobin Appelman2016-10-141-2/+9
* | Merge pull request #1441 from nextcloud/getby-id-less-queriesLukas Reschke2016-10-1421-198/+390
|\ \ | |/ |/|
| * remove unneeded unlockRobin Appelman2016-10-121-2/+0
| * explicitly cast to intRobin Appelman2016-10-121-2/+5
| * 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
| * reuse share node when creating a shareRobin Appelman2016-10-121-0/+3
| * 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-122-2/+4
| * optimize Folder::getById to use less queriesRobin Appelman2016-10-1214-157/+328
* | Merge pull request #1037 from nextcloud/no-double-token-updateChristoph Wurst2016-10-142-29/+128
|\ \
| * | Add test to ensure token times are updatedRobin Appelman2016-10-111-24/+128
| * | dont update the auth token twiceRobin Appelman2016-10-112-5/+0
* | | Merge pull request #1745 from nextcloud/fix-dav-typoMorris Jobke2016-10-141-1/+1
|\ \ \
| * | | fix typoThomas Citharel2016-10-141-1/+1
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2016-10-1412-4/+74
* | | Merge pull request #1721 from nextcloud/fix_bowerRoeland Jago Douma2016-10-136-0/+170
|\ \ \
| * | | add proper .gitignore rulesMorris Jobke2016-10-121-0/+5
| * | | Add .bower.json to version controlRoeland Jago Douma2016-10-125-0/+165
| | |/ | |/|
* | | Merge pull request #1720 from nextcloud/3rdparty_masterRoeland Jago Douma2016-10-131-0/+0
|\ \ \
| * | | [3rdparty] Update to master againRoeland Jago Douma2016-10-121-0/+0
| |/ /
* | | Merge pull request #1701 from nextcloud/impr-user-listLukas Reschke2016-10-131-17/+4
|\ \ \
| * | | tidy up adding user to list a little bitArthur Schiwon2016-10-111-17/+4
* | | | 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-1316-10/+66
|/ / / /
* | | | Merge pull request #1704 from nextcloud/avatar_dropdownblizzz2016-10-122-9/+27
|\ \ \ \ | |_|/ / |/| | |
| * | | [9.2] Show avatar in share drop down (#25976)Thomas Müller2016-10-112-9/+27
* | | | 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
* | | | | Merge pull request #1711 from nextcloud/us_move-more-commands-to-info.xmlMorris Jobke2016-10-125-107/+26
|\ \ \ \ \
| * | | | | Readd Notify commandRoeland Jago Douma2016-10-121-0/+1
| * | | | | Move console command registration to info.xml for encryption as well as files...Thomas Müller2016-10-125-107/+25
| |/ / / /
* | | | | Merge pull request #1712 from nextcloud/us_tear_down_fs_between_cronMorris Jobke2016-10-121-0/+2
|\ \ \ \ \
| * | | | | [master] Tear down FS between cron jobs (#26223)Vincent Petry2016-10-121-0/+2
| |/ / / /
* | | | | Merge pull request #1693 from nextcloud/fix-authors-with-mail-and-homepageRoeland Jago Douma2016-10-121-6/+46
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Better search functionalityJoas Schilling2016-10-111-5/+23
| * | | | Fix authors that have a mail or homepageJoas Schilling2016-10-111-2/+24
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2016-10-1264-66/+82
* | | | Merge pull request #1705 from nextcloud/us_register-commands-in-info.xmlJoas Schilling2016-10-1115-175/+68
|\ \ \ \
| * | | | Add tests for commands in info.xmlRoeland Jago Douma2016-10-111-0/+7