Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1768 from nextcloud/more-filepicker | Jan-Christoph Borchardt | 2016-10-20 | 1 | -0/+1 |
|\ | |||||
| * | fix file exist dialog styling | Robin Appelman | 2016-10-19 | 1 | -0/+1 |
* | | Merge pull request #1797 from nextcloud/issue-1791-show-path-on-filename-conf... | Morris Jobke | 2016-10-20 | 2 | -2/+26 |
|\ \ | |/ |/| | |||||
| * | Show the path, when the filename conflicts | Joas Schilling | 2016-10-19 | 2 | -2/+26 |
* | | 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 #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 | 19 | -50/+118 |
| |\ \ \ | |||||
| * | | | | 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 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Fix migration tests | Roeland Jago Douma | 2016-10-13 | 1 | -0/+4 |
* | | | | | | 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 #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 #1606 from nextcloud/search-detail | Morris Jobke | 2016-10-18 | 3 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix bold no results search text | skjnldsv | 2016-10-11 | 1 | -1/+2 |
| * | | | | | | search design details | Jan-Christoph Borchardt | 2016-09-09 | 3 | -4/+3 |
* | | | | | | | 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 |
| * | | | | | | | Add file action to move files and folders | Robin Appelman | 2016-10-14 | 1 | -0/+14 |
* | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-18 | 66 | -110/+328 |
| |_|_|_|/ / / |/| | | | | | | |||||
* | | | | | | | Make sure the UID is correctly cased | Joas Schilling | 2016-10-17 | 1 | -3/+11 |
* | | | | | | | Merge pull request #1449 from nextcloud/comments-user-mention | Morris Jobke | 2016-10-17 | 13 | -11/+1727 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apply some polish | Arthur Schiwon | 2016-10-14 | 4 | -86/+28 |
| * | | | | | | | emit pre-update event for comments | Arthur Schiwon | 2016-10-12 | 5 | -44/+28 |
| * | | | | | | | adjust wording of the notification | Arthur Schiwon | 2016-10-08 | 2 | -8/+7 |
| * | | | | | | | remove notifications of deleted comments from the DB | Arthur Schiwon | 2016-10-08 | 2 | -7/+36 |
| * | | | | | | | use different files route/controller | Arthur Schiwon | 2016-10-07 | 2 | -13/+2 |
| * | | | | | | | Notificacations for simple @-mentioning in comments | Arthur Schiwon | 2016-10-07 | 12 | -10/+1783 |
* | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-17 | 6 | -0/+6 |
* | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-16 | 2 | -0/+32 |
* | | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-15 | 10 | -4/+12 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #1441 from nextcloud/getby-id-less-queries | Lukas Reschke | 2016-10-14 | 5 | -40/+55 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | remove unneeded unlock | Robin Appelman | 2016-10-12 | 1 | -2/+0 |
| * | | | | | | remove duplicate trait | Robin Appelman | 2016-10-12 | 1 | -1/+0 |
| * | | | | | | get node by path as fallback | Robin Appelman | 2016-10-12 | 1 | -6/+8 |
| * | | | | | | fix getting recipient share in ocs api | Robin Appelman | 2016-10-12 | 1 | -14/+18 |
| * | | | | | | fix share tests not passing path | Robin Appelman | 2016-10-12 | 1 | -4/+7 |
| * | | | | | | re-use the share node while formating if we already have it | Robin Appelman | 2016-10-12 | 1 | -7/+13 |