wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
40438 commits 157 branches 562 tags 714 MiB
Commit graph

16613 commits

Author SHA1 Message Date
Morris Jobke
8e6d86a862 Merge pull request #5304 from nextcloud/bugfix/2855/dont_send_invitations_for_past_events 
don't send invitation emails for past events
 2017-09-06 22:48:46 +02:00
Robin Appelman
ccc41aeddd
adjust tests to new failed storage handling 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-06 17:12:19 +02:00
Morris Jobke
6f7d200838 Merge pull request #6370 from nextcloud/fix-alternative-logins 
Fix layout of alternative login buttons
 2017-09-06 10:22:04 +02:00
Morris Jobke
f5aea79bd7
Fix layout of alternative login buttons 
* fixes #6367

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-06 10:21:11 +02:00
Morris Jobke
1724fed8c5 Merge pull request #5415 from nextcloud/search-cache-node 
cache nodes from search results
 2017-09-06 10:16:01 +02:00
Nextcloud bot
9d930210ee
[tx-robot] updated from transifex 2017-09-06 00:08:21 +00:00
Morris Jobke
15cd21d252 Merge pull request #6358 from nextcloud/fix-mixup-of-id-and-name 
Set the meta data before everything
 2017-09-05 16:08:57 +02:00
Morris Jobke
cebbb1633a Merge pull request #5642 from tobru/fix/groupOfUniqueNames_in_Wizard 
recognize groupOfUniqueNames as valid LDAP group object
 2017-09-05 13:33:15 +02:00
Georg Ehrke
a1df91da9d
Sabre/VObject returns DateTimeImmutable, not a simple DateTime 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-09-05 13:13:37 +02:00
Georg Ehrke
86f28669fc
don't send invitation emails for past events 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-09-05 13:13:37 +02:00
Morris Jobke
ff93dd7eb1 Merge pull request #5466 from jlehtoranta/ldap-connectivity-fixes 
LDAP Connectivity Fixes
 2017-09-04 18:31:32 +02:00
Joas Schilling
6dbb64c4a2
Merge setMetaData into constructor 
This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-04 15:07:41 +02:00
Julius Härtl
63d1da50b4
Cleanup theming styles to fit the new login page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:31:57 +02:00
Julius Härtl
8f10cee3ff
Fix tests for primary element color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Julius Härtl
da5662c454
Use separate element color in theming 
This way we can use a grey color when the primary color is to bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Morris Jobke
30ca3b70ed Merge pull request #6196 from nextcloud/downstream-26539-2 
Handle invalid ext storage backend to keep mount point visible
 2017-09-04 14:17:28 +02:00
blizzz
2060ff591b Merge pull request #6120 from nextcloud/public_upload_share_api_fix 
Public upload share permission handling
 2017-09-04 12:43:02 +02:00
Roeland Jago Douma
f0158e42e9 Merge pull request #6309 from nextcloud/new-dav-event 
add a new dav event to allow apps to register their own sabredav plugins
 2017-09-04 12:12:46 +02:00
Morris Jobke
5927a63680 Merge pull request #6351 from nhirokinet/master 
not to backquote LIMIT on CalDavBackend.php
 2017-09-04 12:10:57 +02:00
Robin Appelman
e9a58f8579
show storage as unavailable in the file list 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-04 11:54:13 +02:00
Robin Appelman
68ee79b595
set the exception for failedstorage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-04 11:54:13 +02:00
Morris Jobke
442d4ed24a
Use the FailedStorage instead 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 11:54:13 +02:00
Vincent Petry
5df5b9c8b1
Handle invalid ext storage backend to keep mount point visible 
Keep mount point visible and also ext storage config visible when
dealing with configs relating to storage backends or auth mechanisms
that were provided by an app that is currently disabled.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-04 11:54:08 +02:00
Morris Jobke
d5cba5eeaa Merge pull request #6221 from nextcloud/fav_share_api_fix 
Correctly format OCS response with favorites
 2017-09-04 08:46:09 +02:00
nhirokinet
baba99a7e6 not to backquote LIMIT on CalDavBackend.php 2017-09-03 23:51:49 +09:00
Julius Härtl
0a49757535
Change invertion threshold to 55% 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-02 21:48:14 +02:00
Nextcloud bot
27c6dc9657
[tx-robot] updated from transifex 2017-09-02 00:08:29 +00:00
Nextcloud bot
45f687a279
[tx-robot] updated from transifex 2017-09-01 00:08:27 +00:00
Morris Jobke
77354cb7a2 Merge pull request #6315 from nextcloud/metadata-for-all-emails 
Implement metadata for email templates of remaining emails
 2017-08-31 09:54:31 +02:00
Nextcloud bot
99dcf5036d
[tx-robot] updated from transifex 2017-08-31 00:08:31 +00:00
Morris Jobke
404bd1be60
Implement metadata for email templates of remaining emails 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-30 22:56:14 +02:00
Roeland Jago Douma
969eea2c0d Merge pull request #6273 from nextcloud/move-multiple-files 
Move multiple files
 2017-08-30 14:23:05 +02:00
Bjoern Schiessle
454d136a06
also allow to register additional plugins if the old endpoint is used 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-30 14:05:18 +02:00
Bjoern Schiessle
f8cc8e1c9e
add a new dav event to allow apps to register their own sabredav plugins 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-30 14:05:18 +02:00
Nextcloud bot
1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Morris Jobke
4edb261805 Merge pull request #6303 from nextcloud/background-image 
Adjust background image to the one used on the website
 2017-08-29 19:09:54 +02:00
Morris Jobke
3cfe91bf0f
Add shareWith to email template metadata 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-29 16:09:25 +02:00
Jan-Christoph Borchardt
2e6d1a3453 Set primary action button color to same as theming color 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-29 16:05:18 +02:00
Jan-Christoph Borchardt
badbab81ea Update background image to the one used on the website 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-29 16:04:11 +02:00
Morris Jobke
7d8b7d4e4e Merge pull request #4925 from nextcloud/error-styling 
Improve design and wording of various error messages
 2017-08-29 12:03:16 +02:00
Roeland Jago Douma
eea7de4c9f
Correctly format OCS response with favorites 
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.

This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-29 12:03:13 +02:00
Morris Jobke
8c917cbfe0 Merge pull request #6288 from nextcloud/master-6287 
Allow the expiration date to be set to null
 2017-08-29 11:32:11 +02:00
Björn Schießle
5adc1efe9f Merge pull request #6283 from nextcloud/add-new-propfind 
add propfind to detect encryption status
 2017-08-29 10:47:33 +02:00
Nextcloud bot
daf2d6cb96
[tx-robot] updated from transifex 2017-08-29 00:08:27 +00:00
Morris Jobke
be23f7e1de
Allow the expiration date to be set to null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-28 17:49:16 +02:00
Bjoern Schiessle
e83e1c7c23
add propfind to detect encryption status 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-28 14:02:25 +02:00
Nextcloud bot
8e4085526d
[tx-robot] updated from transifex 2017-08-28 00:08:24 +00:00
Thomas Citharel
2af0c3d928 Move multiple files 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-08-27 15:20:18 +02:00
Morris Jobke
2bf15eda26 Merge pull request #6255 from nextcloud/email-meta-data 
Add meta information to emails for better customisation
 2017-08-26 18:53:52 +02:00
Roeland Jago Douma
85d5a71258 Merge pull request #6182 from nextcloud/fixes-in-files-drop-js 
Fixes in files_drop.js
 2017-08-26 17:58:30 +02:00