Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | filepicker: improve layout and style | Jan-Christoph Borchardt | 2016-10-19 | 3 | -22/+26 |
* | Use a table for the filepicker list and add size column | Robin Appelman | 2016-10-19 | 4 | -41/+57 |
* | use fileclient to get the filelist for the filepicker | Robin Appelman | 2016-10-19 | 1 | -12/+17 |
* | Allow selecting a folder after using the breadcrumb | Robin Appelman | 2016-10-19 | 1 | -1/+1 |
* | Allow selecting the root folder | Robin Appelman | 2016-10-19 | 1 | -1/+5 |
* | Merge pull request #1795 from nextcloud/systemtags-activity-wording | Roeland Jago Douma | 2016-10-19 | 1 | -8/+8 |
|\ | |||||
| * | change wording of system tags from un/assigned to more human added/removed | Jan-Christoph Borchardt | 2016-10-19 | 1 | -8/+8 |
* | | Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bits | Morris Jobke | 2016-10-19 | 2 | -2/+9 |
|\ \ | |/ |/| | |||||
| * | Make sure we only use numbers as length | Joas Schilling | 2016-10-19 | 2 | -2/+9 |
* | | Merge pull request #1784 from nextcloud/fix-activity-filter-names | Joas Schilling | 2016-10-19 | 2 | -2/+2 |
|\ \ | |/ |/| | |||||
| * | Adjust wording to make the separation between sharing and files clearer | Joas Schilling | 2016-10-18 | 2 | -2/+2 |
* | | Merge pull request #1790 from nextcloud/3rdparty-master | Roeland Jago Douma | 2016-10-19 | 1 | -0/+0 |
|\ \ | |||||
| * | | [3rdparty] Point to master again | Roeland Jago Douma | 2016-10-18 | 1 | -0/+0 |
* | | | Merge pull request #1789 from nextcloud/select2-fixes | Morris Jobke | 2016-10-18 | 3 | -78/+113 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix select2 sizing issue | Jan-Christoph Borchardt | 2016-10-18 | 1 | -1/+4 |
| * | | move select2 styles to core so it's universal, not only for tags | Jan-Christoph Borchardt | 2016-10-18 | 3 | -78/+110 |
* | | | Merge pull request #1164 from nextcloud/avatar-files-accesscontrol-fixes | Morris Jobke | 2016-10-18 | 3 | -7/+66 |
|\ \ \ | |||||
| * | | | The red box already makes clear it's an error | Joas Schilling | 2016-10-18 | 1 | -4/+4 |
| * | | | Check the mimetype before reading the content and catch exception | Joas Schilling | 2016-10-18 | 2 | -3/+62 |
| | |/ | |/| | |||||
* | | | Merge pull request #1788 from nextcloud/share-link-whitespace | Morris Jobke | 2016-10-18 | 1 | -0/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | add whitespace above share link so it's visually distinguished more | Jan-Christoph Borchardt | 2016-10-18 | 1 | -0/+4 |
* | | | Merge pull request #1729 from nextcloud/downstream-ldap-3 | Lukas Reschke | 2016-10-18 | 12 | -91/+109 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into downstream-ldap-3 | Arthur Schiwon | 2016-10-16 | 61 | -262/+837 |
| |\ \ \ | |||||
| * | | | | fix and tidy up tests after merge conflicts | Arthur Schiwon | 2016-10-13 | 1 | -16/+8 |
| * | | | | Update tests for phunit 5.5 | Victor Dubiniuk | 2016-10-13 | 5 | -30/+47 |
| * | | | | Harden empty | Victor Dubiniuk | 2016-10-13 | 7 | -50/+59 |
* | | | | | Merge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cache | Lukas Reschke | 2016-10-18 | 2 | -1/+94 |
|\ \ \ \ \ | |||||
| * | | | | | Do not reset the list after adding cached entries | Joas Schilling | 2016-10-17 | 2 | -1/+94 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1734 from nextcloud/setvalue_opt | Lukas Reschke | 2016-10-18 | 2 | -0/+23 |
|\ \ \ \ \ | |||||
| * | | | | | Fix migration tests | Roeland Jago Douma | 2016-10-13 | 1 | -0/+4 |
| * | | | | | Use cache to determine if value need to be updated | Roeland Jago Douma | 2016-10-13 | 1 | -0/+19 |
* | | | | | | Merge pull request #1742 from nextcloud/us_sync-date-of-death | Lukas Reschke | 2016-10-18 | 2 | -43/+77 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [9.2] Sync deathdate and anniversary to birthday calendar (#25655) | Thomas Müller | 2016-10-14 | 2 | -43/+77 |
* | | | | | | | Merge pull request #1739 from nextcloud/bump_symfony_process | Lukas Reschke | 2016-10-18 | 1 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | [3rdparty] Bump synfony/process | Roeland Jago Douma | 2016-10-14 | 1 | -0/+0 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #1774 from nextcloud/ellipsize-sharee | Morris Jobke | 2016-10-18 | 1 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ellipsize sharee name to not overlap with | Jan-Christoph Borchardt | 2016-10-18 | 1 | -1/+6 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge pull request #1780 from nextcloud/jquery-ui-fixes | Jan-Christoph Borchardt | 2016-10-18 | 1 | -1/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | jquery UI fixes | Jan-Christoph Borchardt | 2016-10-18 | 1 | -1/+27 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #1722 from nextcloud/hide-storage-warnings | Morris Jobke | 2016-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | hide storage wrapper warning for the readonly storage | Morris Jobke | 2016-10-13 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #1777 from nextcloud/user-mgmt-layout | Morris Jobke | 2016-10-18 | 2 | -11/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | improve look of Add group flow | Jan-Christoph Borchardt | 2016-10-18 | 2 | -8/+14 |
| * | | | | | | | | fix list height and border to be as in Files | Jan-Christoph Borchardt | 2016-10-18 | 1 | -3/+17 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1606 from nextcloud/search-detail | Morris Jobke | 2016-10-18 | 4 | -5/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix bold no results search text | skjnldsv | 2016-10-11 | 2 | -2/+4 |
| * | | | | | | | Use the correct query variable | Joas Schilling | 2016-10-05 | 1 | -1/+1 |
| * | | | | | | | search design details | Jan-Christoph Borchardt | 2016-09-09 | 4 | -5/+4 |
* | | | | | | | | Merge pull request #1754 from nextcloud/files-move | Jan-Christoph Borchardt | 2016-10-18 | 1 | -3/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | use more fitting icon for files move action | Jan-Christoph Borchardt | 2016-10-17 | 1 | -4/+3 |