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

39027 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
fb78774eb8
[tx-robot] updated from transifex 2017-05-10 00:08:31 +00:00
Lukas Reschke
ec69980154 Merge pull request #4772 from nextcloud/fix-theming-background-preview 
Fix theming preview for background image
 2017-05-10 00:31:55 +02:00
Roeland Jago Douma
6a4734d78e Merge pull request #4702 from nextcloud/handle-user-folder-not-available 
Stop if user folder is not available
 2017-05-09 22:50:52 +02:00
Morris Jobke
b2c96d0c23 Stop if user folder is not available 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-09 11:26:08 -05:00
Julius Härtl
fb204de7f6
Fix theming preview for background image 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-09 18:21:41 +02:00
Robin Appelman
6a0f2fe52d Merge pull request #4737 from nextcloud/logo-icon-container 
fix sizing of logo in header
 2017-05-09 18:21:01 +02:00
Roeland Jago Douma
b9bcc819bd Merge pull request #4758 from nextcloud/fix_3470 
Do not write and read rootcerts.crt at the same time
 2017-05-09 15:00:35 +02:00
Roeland Jago Douma
04a5c34cac Merge pull request #4746 from nextcloud/fix-mentioned-user-not-clickable-after-posting-or-editing-a-comment 
Fix mentioned user not clickable after posting or editing a comment
 2017-05-09 14:23:29 +02:00
Roeland Jago Douma
5a61a794d4
Do not write and read rootcerts.crt at the same time 
(Possibly) fixes #3470

When updating the main file /files_external/rootcerts.crt we should not
read from /files_external/rootcerts.crt at the same time.

For 2 reasons: writing to a file and reading from it at the same time
can have non deterministic results

And we don't want all the certificates to appear 2 times in there.

This isn't caught by our standard file locking (that does not allow this
actually) because it is in a non locked path....

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-09 13:00:07 +02:00
Roeland Jago Douma
46f7e8202f Merge pull request #4752 from nextcloud/fix-personal-settings-popover 
Fix privacy settings drop downs on personal settings page
 2017-05-09 12:15:20 +02:00
Lukas Reschke
62f2610129 Merge pull request #4736 from nextcloud/richdef-opengraph 
open-graph
 2017-05-09 11:15:55 +02:00
Joas Schilling
a089e08411
Add circle as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-09 10:45:10 +02:00
Roeland Jago Douma
07fe15eea5 Merge pull request #4705 from nextcloud/htaccess-upload 
Proper exception for upload of .htaccess file via WebDAV
 2017-05-09 10:35:38 +02:00
Roeland Jago Douma
a06ef70c8f Merge pull request #4757 from nextcloud/fix/system-users-enumeration-contacts-menu 
Do not list system users in contacts menu if sharing autocompletion i…
 2017-05-09 10:34:37 +02:00
Morris Jobke
defb153ce3
Fix privacy settings drop downs on personal settings page 
* fixes #4672

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-09 10:16:23 +02:00
Maxence Lange
90b1c73e81 my name as author 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-05-09 07:14:52 -01:00
Maxence Lange
93e4bd3495 using title as name 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-05-09 07:10:16 -01:00
Christoph Wurst
56a9084dd2
Do not list system users in contacts menu if sharing autocompletion is disabled 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-09 08:45:36 +02:00
Roeland Jago Douma
dfa3aaa0c6 Merge pull request #4753 from nextcloud/fix-links-on-error-page 
Fix escaped HTML on error pages
 2017-05-09 08:45:11 +02:00
Roeland Jago Douma
684997f79c Merge pull request #4751 from nextcloud/wait-for-postgres 
Wait for Postgres to be available
 2017-05-09 08:44:28 +02:00
Roeland Jago Douma
888e719671 Merge pull request #4750 from nextcloud/allow-requests-to-manifest-json 
Don't redirect requests to /core/img/manifest.json
 2017-05-09 08:43:35 +02:00
Nextcloud bot
37b847ec48
[tx-robot] updated from transifex 2017-05-09 05:08:07 +00:00
Nextcloud bot
43275b1000
[tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Morris Jobke
d6c25748be Merge pull request #4755 from nextcloud/l10n-extraction 
Extract app name and navigation entries for l10n
 2017-05-08 23:25:20 -05:00
Morris Jobke
692e056df9 Extract app name and navigation entries for l10n 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 23:24:28 -05:00
Morris Jobke
9309217ecb Fix escaped HTML on error pages 
* fixes #4655

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 21:16:08 -05:00
Morris Jobke
f8044cbbce Proper exception for upload of .htaccess file via WebDAV 
* fixes #2860

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 20:03:41 -05:00
Nextcloud bot
f6a4028fad
[tx-robot] updated from transifex 2017-05-09 00:07:51 +00:00
Morris Jobke
e696b92297 Wait for Postgres to be available 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 17:57:49 -05:00
Lukas Reschke
ccd0ded812
Don't redirect requests to /core/img/manifest.json 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-09 00:02:37 +02:00
Nextcloud bot
9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +00:00
Lukas Reschke
3a22f9dfe5 Merge pull request #4745 from nextcloud/improve-text 
Improve readability of verify text
 2017-05-08 22:29:04 +02:00
Daniel Calviño Sánchez
0db3a413b3 Fix mentioned user not clickable after posting or editing a comment 
The contactsMenu plugin was called on avatar elements from
_postRenderItem, which is called when a new comment is added to the
collection. Due to this contactsMenu was not called when messages were
edited; when a new comment is posted _postRenderItem is called, but at
that time the "mentions" attribute is not filled yet, so "@username" is
not replaced by avatars in the message and thus contactsMenu has no
avatars to be called on.

Calling contactsMenu was moved to a new method, _postRenderMessage,
which is called from _postRenderItem and from the success callback when
fetching the model in _onSubmitSuccess (which replaces "@username" by
avatars in the message after posting or editing a comment).

Fixes #4555

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-08 22:24:33 +02:00
Morris Jobke
e77ea713b2 Improve readability of verify text 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 15:03:25 -05:00
Daniel Calviño Sánchez
002018d8ad Add missing unit tests for comments with mentions 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-05-08 21:55:22 +02:00
Morris Jobke
fe13f214fd Merge pull request #4692 from nextcloud/unify-sharing-messages 
don't mention the owner of a file in case of a re-share by mail.
 2017-05-08 13:32:04 -05:00
Morris Jobke
1a83f11925 Merge pull request #4718 from nextcloud/handle-stalled-or-invisible-elements-automatically-in-acceptance-tests 
Handle stale or invisible elements automatically in acceptance tests
 2017-05-08 12:52:30 -05:00
Morris Jobke
2d707fdfb5 Merge pull request #4621 from nextcloud/fix_readonly_shared_calendar_proppatch 
fix PROPPATCH requests to read-only shared calendars
 2017-05-08 12:42:30 -05:00
Bjoern Schiessle
adb60ae965
don't mention the owner of a file in case of a re-share by mail. The recipient doesn't care about the owner and probably don't even know it 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-08 19:20:31 +02:00
Morris Jobke
df6ce6b385 Merge pull request #4675 from nextcloud/fix_4651 
Create a photo cache to speedup the contactsmenu
 2017-05-08 12:20:27 -05:00
Robin Appelman
36d0c3da69 Merge pull request #4733 from nextcloud/fix-browser-dav-root 
fix error when browsing the dav root
 2017-05-08 18:04:13 +02:00
Lukas Reschke
9bc77f2914 Merge pull request #4695 from nextcloud/reset-verify-state 
reset verification state if max tries are reached
 2017-05-08 17:51:07 +02:00
Lukas Reschke
ecba440574 Merge pull request #4741 from nextcloud/bump-to-beta2 
Increase version to beta2
 2017-05-08 17:50:06 +02:00
Lukas Reschke
c28fe270b6 Merge pull request #4727 from stffabi/IncreaseDeviceEntropy 
Increase device password entropy.
 2017-05-08 17:49:52 +02:00
Lukas Reschke
5213c56197 Merge pull request #4734 from nextcloud/allow-specifying-logo-mimetype 
Add function to request SVG or regular fallback image
 2017-05-08 17:48:50 +02:00
Lukas Reschke
157be421a9 Merge pull request #4740 from nextcloud/external-moved-to-appstore 
External has been moved to appstore
 2017-05-08 17:48:25 +02:00
Lukas Reschke
f859a3a5e8 Merge pull request #4738 from nextcloud/check-if-nextcloud-is-installed 
Check if Nextcloud is installed
 2017-05-08 17:48:11 +02:00
Lukas Reschke
9904d1ab43
Increase version to beta2 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 16:04:57 +02:00
Lukas Reschke
dcfd1f5b48
External has been moved to appstore 
As discussed with Joas.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 15:46:09 +02:00
Lukas Reschke
26f7a3b462
Check if Nextcloud is installed 
Fixes https://github.com/nextcloud/server/issues/4735

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 15:10:53 +02:00