Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5739 from nextcloud/comradekingu-patch-4 | Roeland Jago Douma | 2017-07-18 | 1 | -2/+2 |
|\ | | | | | Spelling: Bigversal and LDAP | ||||
| * | : Bigversal and LDAP | Allan Nordhøy | 2017-07-14 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #5736 from smueller18/patch-2 | Morris Jobke | 2017-07-18 | 1 | -1/+1 |
|\ \ | | | | | | | do not show hyphen in og:title if slogan does not exist | ||||
| * | | do not show hyphen in og:title if slogan does not exist | Stephan Müller | 2017-07-14 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #5735 from nextcloud/comradekingu-patch-1 | Roeland Jago Douma | 2017-07-18 | 1 | -4/+4 |
|\ \ | | | | | | | Spelling: Shortening and binding | ||||
| * | | Spelling: Shortening and binding | Allan Nordhøy | 2017-07-14 | 1 | -4/+4 |
| |/ | |||||
* | | Merge pull request #5737 from nextcloud/comradekingu-patch-2 | Morris Jobke | 2017-07-18 | 1 | -3/+3 |
|\ \ | | | | | | | Spelling: command-line, Consider narrowing | ||||
| * | | command-line, Consider narrowing | Allan Nordhøy | 2017-07-14 | 1 | -3/+3 |
| |/ | |||||
* | | Merge pull request #5741 from nextcloud/comradekingu-patch-6 | Morris Jobke | 2017-07-18 | 1 | -2/+2 |
|\ \ | | | | | | | Spelling: sent, an invitation, - successful | ||||
| * | | sent, an invitation, - successful | Allan Nordhøy | 2017-07-14 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #5740 from nextcloud/comradekingu-patch-5 | Morris Jobke | 2017-07-18 | 1 | -2/+2 |
|\ \ | | | | | | | Spelling: log out, : Bigversal | ||||
| * | | log out, : Bigversal | Allan Nordhøy | 2017-07-14 | 1 | -2/+2 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-18 | 50 | -116/+116 |
| | | |||||
* | | Merge pull request #5743 from nextcloud/comradekingu-patch-7 | Roeland Jago Douma | 2017-07-17 | 1 | -1/+1 |
|\ \ | | | | | | | Spelling: - your | ||||
| * | | - your | Allan Nordhøy | 2017-07-15 | 1 | -1/+1 |
| | | | | | | | | | This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here. | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-17 | 12 | -132/+506 |
|/ / | |||||
* / | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-15 | 22 | -38/+46 |
|/ | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-14 | 16 | -74/+82 |
| | |||||
* | Merge pull request #5070 from nextcloud/theming-vs-themes | Joas Schilling | 2017-07-13 | 3 | -28/+67 |
|\ | | | | | Prefer custom theme over the theming app | ||||
| * | Prefer custom theme over theming app | Julius Härtl | 2017-07-12 | 3 | -28/+67 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-13 | 42 | -182/+190 |
| | | |||||
* | | Merge pull request #5567 from nextcloud/public-capabilities | Roeland Jago Douma | 2017-07-12 | 1 | -2/+2 |
|\ \ | | | | | | | Public capabilities API | ||||
| * | | Expose theming capabilities to public | Julius Härtl | 2017-06-30 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | | Merge pull request #5685 from nextcloud/jail-propagator | Roeland Jago Douma | 2017-07-12 | 2 | -56/+0 |
|\ \ \ | | | | | | | | | Fix propagating changes within jail wrapper | ||||
| * | | | Fix propagating changes within jail wrapper | Robin Appelman | 2017-07-11 | 2 | -56/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-12 | 50 | -298/+304 |
| | | | | |||||
* | | | | Merge pull request #5681 from nextcloud/upstream-fix-circles | Morris Jobke | 2017-07-11 | 2 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | upstream fix circles | ||||
| * | | | upstream | Maxence Lange | 2017-07-11 | 2 | -3/+3 |
| | | | | | | | | | | | | Signed-off-by: Maxence Lange <maxence@nextcloud.com> | ||||
* | | | | Merge pull request #5672 from nextcloud/upload-hidden-filelist | Morris Jobke | 2017-07-11 | 2 | -9/+13 |
|\ \ \ \ | |/ / / |/| | | | properly block file upload to non-active filelist | ||||
| * | | | fix test | Robin Appelman | 2017-07-11 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | properly block file upload to non-active filelist | Robin Appelman | 2017-07-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | Merge pull request #5656 from ↵ | Morris Jobke | 2017-07-10 | 2 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-unselecting-items-on-multi-select-dropdowns Fix unselecting items on multi select dropdowns | ||||
| * | | | | Enable the toggleSelect extension in multi-select dropdowns | Daniel Calviño Sánchez | 2017-07-10 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toggleSelect extension for Select2 makes possible to unselect items in a multi-select dropdown by clicking on them; this behaviour should be enabled in all the multi-select dropdowns used in the server. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
* | | | | | Merge pull request #5669 from nextcloud/fix-remote-share-activity-emails | Morris Jobke | 2017-07-10 | 2 | -8/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix remote share activity emails | ||||
| * | | | | | Fix owner cloud id in unshare activity | Joas Schilling | 2017-07-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | | | Fix activity emails for accept/decline of remote shares | Joas Schilling | 2017-07-10 | 2 | -7/+13 |
| | |/ / / | |/| | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* / | | | | Rectify variable $uid->$user | Roger Szabo | 2017-07-10 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de> | ||||
* | | | | Merge pull request #5649 from nextcloud/fix-5611 | Morris Jobke | 2017-07-10 | 1 | -8/+10 |
|\ \ \ \ | | | | | | | | | | | fix alignment of radio button and its label in encryption settings | ||||
| * | | | | fix alignment of radio button and its label in encryption settings | Arthur Schiwon | 2017-07-07 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-10 | 14 | -16/+18 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-09 | 12 | -6/+20 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-08 | 28 | -74/+98 |
|/ / / / | |||||
* | | | | Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails | Morris Jobke | 2017-07-07 | 19 | -67/+251 |
|\ \ \ \ | |_|_|/ |/| | | | Use PNGs for icons in activity emails | ||||
| * | | | Fix tests | Joas Schilling | 2017-06-20 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Use PNG version of the icons for shipped activities | Joas Schilling | 2017-06-20 | 18 | -61/+245 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-07-07 | 12 | -78/+90 |
| | | | | |||||
* | | | | adjust encryption tests to the new master key default | Bjoern Schiessle | 2017-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | update sharing test to new master key default | Bjoern Schiessle | 2017-07-06 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | fix and extend dav test to also test the master-key setup | Bjoern Schiessle | 2017-07-06 | 2 | -0/+52 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | since the default for the master key changed we need to write the setting ↵ | Bjoern Schiessle | 2017-07-06 | 2 | -1/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | explicitely to the database if we migrate from a older version Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> |