Commit Graph

16352 Commits (e9532cfbbb5261b4c3e15920c04f6e86e9c8d319)

Author SHA1 Message Date
Roeland Jago Douma 1ac6eae7d5 Merge pull request #5739 from nextcloud/comradekingu-patch-4
Spelling: Bigversal and LDAP
7 years ago
Morris Jobke 58f72309cc Merge pull request #5736 from smueller18/patch-2
do not show hyphen in og:title if slogan does not exist
7 years ago
Roeland Jago Douma 4b1f258198 Merge pull request #5735 from nextcloud/comradekingu-patch-1
Spelling: Shortening and binding
7 years ago
Morris Jobke 99555faffd Merge pull request #5737 from nextcloud/comradekingu-patch-2
Spelling: command-line, Consider narrowing
7 years ago
Morris Jobke 7642492cfe Merge pull request #5741 from nextcloud/comradekingu-patch-6
Spelling: sent, an invitation, - successful
7 years ago
Morris Jobke 79cf7d610f Merge pull request #5740 from nextcloud/comradekingu-patch-5
Spelling: log out, : Bigversal
7 years ago
Nextcloud bot b1b843e572
[tx-robot] updated from transifex 7 years ago
Roeland Jago Douma 1956ea0e13 Merge pull request #5743 from nextcloud/comradekingu-patch-7
Spelling: - your
7 years ago
Nextcloud bot 125767265d
[tx-robot] updated from transifex 7 years ago
Allan Nordhøy 1d24c82e38 - your
This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
7 years ago
Nextcloud bot a23cdd04bb
[tx-robot] updated from transifex 7 years ago
Allan Nordhøy de6b7668c1 sent, an invitation, - successful 7 years ago
Allan Nordhøy 6ab8b90e94 log out, : Bigversal 7 years ago
Allan Nordhøy ddc804aa32 : Bigversal and LDAP 7 years ago
Allan Nordhøy 4b8c1eaa91 command-line, Consider narrowing 7 years ago
Stephan Müller 7cf3dc4e29 do not show hyphen in og:title if slogan does not exist 7 years ago
Allan Nordhøy 66cbf90853 Spelling: Shortening and binding 7 years ago
Nextcloud bot 3865c77279
[tx-robot] updated from transifex 7 years ago
Joas Schilling e335121d5e Merge pull request #5070 from nextcloud/theming-vs-themes
Prefer custom theme over the theming app
7 years ago
Nextcloud bot 261513b04a
[tx-robot] updated from transifex 7 years ago
Roeland Jago Douma 86a496d94a Merge pull request #5567 from nextcloud/public-capabilities
Public capabilities API
7 years ago
Roeland Jago Douma 08d3cb9107 Merge pull request #5685 from nextcloud/jail-propagator
Fix propagating changes within jail wrapper
7 years ago
Julius Härtl ce5ad7e7f4
Prefer custom theme over theming app
Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years ago
Nextcloud bot 13295c2d1d
[tx-robot] updated from transifex 7 years ago
Morris Jobke 9e2d1caba2 Merge pull request #5681 from nextcloud/upstream-fix-circles
upstream fix circles
7 years ago
Robin Appelman dfe662ad42
Fix propagating changes within jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years ago
Morris Jobke 4153e1de79 Merge pull request #5672 from nextcloud/upload-hidden-filelist
properly block file upload to non-active filelist
7 years ago
Robin Appelman e1d6ca3c53
fix test
Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years ago
Maxence Lange 6e7be6acfd upstream
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
7 years ago
Morris Jobke 7df7d0ff3b Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select-dropdowns
Fix unselecting items on multi select dropdowns
7 years ago
Morris Jobke 22693aec47 Merge pull request #5669 from nextcloud/fix-remote-share-activity-emails
Fix remote share activity emails
7 years ago
Robin Appelman 12c9b1efb0
properly block file upload to non-active filelist
Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years ago
Roger Szabo 0ebec6f9a4 Rectify variable $uid->$user
Signed-off-by: Roger Szabo <roger.szabo@web.de>
7 years ago
Joas Schilling 33cb45d4a3
Fix owner cloud id in unshare activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago
Joas Schilling b69ddfba8b
Fix activity emails for accept/decline of remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago
Morris Jobke c7b28064e3 Merge pull request #5649 from nextcloud/fix-5611
fix alignment of radio button and its label in encryption settings
7 years ago
Daniel Calviño Sánchez 46e813e749 Enable the toggleSelect extension in multi-select dropdowns
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>
7 years ago
Nextcloud bot 4f7fafb5c5
[tx-robot] updated from transifex 7 years ago
Nextcloud bot cf8db31bce
[tx-robot] updated from transifex 7 years ago
Nextcloud bot f59062ce83
[tx-robot] updated from transifex 7 years ago
Arthur Schiwon c46006934c
fix alignment of radio button and its label in encryption settings
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years ago
Morris Jobke b4deba2078 Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
Use PNGs for icons in activity emails
7 years ago
Nextcloud bot d23bc9a99a
[tx-robot] updated from transifex 7 years ago
Bjoern Schiessle 001a9c02dd
adjust encryption tests to the new master key default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago
Bjoern Schiessle c46b158e10
update sharing test to new master key default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago
Bjoern Schiessle f186a5cfb1
fix and extend dav test to also test the master-key setup
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago
Bjoern Schiessle d668e17769
since the default for the master key changed we need to write the setting explicitely to the database if we migrate from a older version
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago
Bjoern Schiessle 66debbe18e
add occ command to disable the master key again
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago
Bjoern Schiessle 5f75468aa4
improve status messages
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago
Bjoern Schiessle 28a7e72868
after the master key was loaded we are ready to go, no re-login needed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago