aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* filepicker: improve layout and styleJan-Christoph Borchardt2016-10-193-22/+26
* Use a table for the filepicker list and add size columnRobin Appelman2016-10-194-41/+57
* use fileclient to get the filelist for the filepickerRobin Appelman2016-10-191-12/+17
* Allow selecting a folder after using the breadcrumbRobin Appelman2016-10-191-1/+1
* Allow selecting the root folderRobin Appelman2016-10-191-1/+5
* Merge pull request #1795 from nextcloud/systemtags-activity-wordingRoeland Jago Douma2016-10-191-8/+8
|\
| * change wording of system tags from un/assigned to more human added/removedJan-Christoph Borchardt2016-10-191-8/+8
* | Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bitsMorris Jobke2016-10-192-2/+9
|\ \ | |/ |/|
| * Make sure we only use numbers as lengthJoas Schilling2016-10-192-2/+9
* | Merge pull request #1784 from nextcloud/fix-activity-filter-namesJoas Schilling2016-10-192-2/+2
|\ \ | |/ |/|
| * Adjust wording to make the separation between sharing and files clearerJoas Schilling2016-10-182-2/+2
* | Merge pull request #1790 from nextcloud/3rdparty-masterRoeland Jago Douma2016-10-191-0/+0
|\ \
| * | [3rdparty] Point to master againRoeland Jago Douma2016-10-181-0/+0
* | | Merge pull request #1789 from nextcloud/select2-fixesMorris Jobke2016-10-183-78/+113
|\ \ \ | |/ / |/| |
| * | fix select2 sizing issueJan-Christoph Borchardt2016-10-181-1/+4
| * | move select2 styles to core so it's universal, not only for tagsJan-Christoph Borchardt2016-10-183-78/+110
* | | Merge pull request #1164 from nextcloud/avatar-files-accesscontrol-fixesMorris Jobke2016-10-183-7/+66
|\ \ \
| * | | The red box already makes clear it's an errorJoas Schilling2016-10-181-4/+4
| * | | Check the mimetype before reading the content and catch exceptionJoas Schilling2016-10-182-3/+62
| | |/ | |/|
* | | 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-1661-262/+837
| |\ \ \
| * | | | 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-182-0/+23
|\ \ \ \ \
| * | | | | Fix migration testsRoeland Jago Douma2016-10-131-0/+4
| * | | | | Use cache to determine if value need to be updatedRoeland Jago Douma2016-10-131-0/+19
* | | | | | 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 #1739 from nextcloud/bump_symfony_processLukas Reschke2016-10-181-0/+0
|\ \ \ \ \ \ \
| * | | | | | | [3rdparty] Bump synfony/processRoeland Jago Douma2016-10-141-0/+0
| |/ / / / / /
* | | | | | | 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 #1780 from nextcloud/jquery-ui-fixesJan-Christoph Borchardt2016-10-181-1/+27
|\ \ \ \ \ \ \
| * | | | | | | jquery UI fixesJan-Christoph Borchardt2016-10-181-1/+27
| |/ / / / / /
* | | | | | | Merge pull request #1722 from nextcloud/hide-storage-warningsMorris Jobke2016-10-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | hide storage wrapper warning for the readonly storageMorris Jobke2016-10-131-1/+1
* | | | | | | | Merge pull request #1777 from nextcloud/user-mgmt-layoutMorris Jobke2016-10-182-11/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | improve look of Add group flowJan-Christoph Borchardt2016-10-182-8/+14
| * | | | | | | | fix list height and border to be as in FilesJan-Christoph Borchardt2016-10-181-3/+17
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1606 from nextcloud/search-detailMorris Jobke2016-10-184-5/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix bold no results search textskjnldsv2016-10-112-2/+4
| * | | | | | | Use the correct query variableJoas Schilling2016-10-051-1/+1
| * | | | | | | search design detailsJan-Christoph Borchardt2016-09-094-5/+4
* | | | | | | | 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