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

16307 commits

Author SHA1 Message Date
Christoph Wurst
258c8720dd
Fix backup codes activity type 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-18 22:10:57 +02:00
Christoph Wurst
58683f11ac
Publish 2fa backup codes activities to the right stream 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-18 22:10:57 +02:00
Christoph Wurst
1632bb4557
Move activities test code 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-18 22:10:57 +02:00
Christoph Wurst
0928b5f621
Change 2FA activities to more generic security activities 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-18 22:10:57 +02:00
Lukas Reschke
f4189699e7
Function accepts only integers 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 21:59:22 +02:00
Lukas Reschke
639ba526d0
Adjust realm from SabreDAV to Nextcloud 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 21:38:55 +02:00
Lukas Reschke
f93db724d7
Make legacy DAV backend use the BearerAuth backend as well 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 21:19:39 +02:00
Lukas Reschke
ba7b6bd973
Delete token after usage in test 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:58:05 +02:00
Lukas Reschke
fa6ec47a5c
Add indexes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:58:04 +02:00
Lukas Reschke
df3909a7c3
Use Bearer backend for SabreDAV 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:10 +02:00
Lukas Reschke
691646bdae
Add tests for OAuth2 app 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:10 +02:00
Lukas Reschke
d90eba3f85
Fix style issues pointed out in review 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:09 +02:00
Lukas Reschke
b07a0f51ba
Add OAuth state to session 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:08 +02:00
Lukas Reschke
88afd8b224
Cleanup code 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:08 +02:00
Lukas Reschke
9d91ebf8e0
Add XSD definitions 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:07 +02:00
Bjoern Schiessle
1eb7f4956b
delete auth token when client gets deleted 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-18 20:49:07 +02:00
Bjoern Schiessle
bb19b37097
hide client secret by default 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-18 20:49:07 +02:00
Bjoern Schiessle
1a8965b488
handle case if no valid client identifier is given 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-18 20:49:06 +02:00
Lukas Reschke
4b4d3bb1c2
It's a bearer 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:05 +02:00
Lukas Reschke
1470ec95ca
Fetch signle row 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:05 +02:00
Lukas Reschke
4d96cd3df7
Change to POST 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:04 +02:00
Lukas Reschke
c5ad3c9213
Increase length of encrypted token in database 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:04 +02:00
Lukas Reschke
0a2b57c93f
Get a single row 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:04 +02:00
Lukas Reschke
a5ddd65c10
Use query builder 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:03 +02:00
Lukas Reschke
5f71805c35
Add basic implementation for OAuth 2.0 Authorization Code Flow 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-18 20:49:03 +02:00
Björn Schießle
879e11e7d1 Merge pull request #4812 from nextcloud/move-sharing-to-migration 
Move the file sharing app to migration
 2017-05-18 18:24:43 +02:00
Joas Schilling
fad02fe00c
Add the column so we keep the value from before the update 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-18 14:45:26 +02:00
Julius Härtl
489131333a
Inject FileAccessHelper for proper testing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-18 10:45:42 +02:00
Nextcloud bot
d41fd7471c
[tx-robot] updated from transifex 2017-05-18 00:07:48 +00:00
Lukas Reschke
aa9b465af7 Merge pull request #4921 from nextcloud/filerow-clickability 
Increase width of clickable area in file row to open file/folder
 2017-05-17 22:15:46 +02:00
Nextcloud bot
11e04e394d
[tx-robot] updated from transifex 2017-05-17 15:56:32 +00:00
Morris Jobke
c2d8fe6336 Merge pull request #4922 from nextcloud/verbose-uploadmenu-text 
Use more verbose text for upload menu
 2017-05-17 10:48:52 -05:00
Morris Jobke
2ec616323b Merge pull request #4918 from nextcloud/theming-capabilities-plain-background 
OCS Return color when theming uses no background image
 2017-05-17 10:42:41 -05:00
Julius Härtl
81847c01b0
Return color when theming uses no background image 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 13:16:44 +02:00
Julius Härtl
639168ede4
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:16:59 +02:00
Julius Härtl
d3865b6096
Use appdata logo when generating icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:14:37 +02:00
Julius Härtl
edb5502b9d
Add proper Content-Type to icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:11:29 +02:00
Julius Härtl
1157f413c9
Fallback to default favicon 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:11:29 +02:00
Nextcloud bot
443cbdc739
[tx-robot] updated from transifex 2017-05-17 00:08:09 +00:00
Jan-Christoph Borchardt
b7a9ec0002 Use more verbose text for upload menu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-05-16 21:06:05 +02:00
Jan-Christoph Borchardt
ecf3deb01c Increase width of clickable area in file row to open file/folder 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-05-16 21:04:43 +02:00
Jan-Christoph Borchardt
c180ad1caa Remove primary class from public link download button 2017-05-16 20:47:52 +02:00
Christoph Wurst
1161139ebb Merge pull request #4900 from nextcloud/fix-search-mime-icons 
Use proper mime icons for search results
 2017-05-16 20:04:33 +02:00
Lukas Reschke
15f7fe022b Merge pull request #4554 from nextcloud/pointer-cursor-on-clickable-user 
Make it clear that you can now click on usernames
 2017-05-16 16:29:09 +02:00
Jan-Christoph Borchardt
70c750dacc Fix logo being too big on log in page, fix #4585 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-05-16 15:53:54 +02:00
Julius Härtl
da281822b6
Use proper mime icons for search results 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-16 14:30:49 +02:00
Roeland Jago Douma
fd74428cdb Merge pull request #4865 from nextcloud/improve-two-factor-buttons 
Improve layout of buttons for two factor auth
 2017-05-16 13:11:55 +02:00
Morris Jobke
e920e20284 Merge pull request #4425 from nextcloud/oci 
Primary key is too long for oracle
 2017-05-15 23:55:50 -05:00
Nextcloud bot
7d1f362aa0
[tx-robot] updated from transifex 2017-05-16 00:08:08 +00:00
Joas Schilling
d89d96203a Rename the index so the name is unique until the old table is deleted 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-15 15:41:45 -05:00
Joas Schilling
74a6a6c839 Add a update step that copies all the backup codes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-15 15:41:45 -05:00
Joas Schilling
2dc79efb32 Rename the table to a valid name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-15 15:41:45 -05:00
Morris Jobke
91dfff5db4 Revert "fix permissions of mountpoints - take 2" 2017-05-15 12:43:25 -05:00
Morris Jobke
ad0d0b0916 Merge pull request #4685 from nextcloud/fix_4683 
fix permissions of mountpoints - take 2
 2017-05-15 11:53:59 -05:00
Morris Jobke
30443ac177 Improve layout of buttons for two factor auth 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-15 11:45:15 -05:00
Morris Jobke
3f201ec7f3 Merge pull request #4871 from nextcloud/remove-more-personal-info-on-user-deletion 
Remove more personal info on user deletion
 2017-05-15 11:03:33 -05:00
Robin Appelman
9b750c08ac
update comment to code 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-15 15:54:37 +02:00
Roeland Jago Douma
cef2110263
Revert "fix objectstore rename" 
This reverts commit 5334a3dc33.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-15 13:59:18 +02:00
Joas Schilling
cd79eb1b2c
Remove 2FA backup codes on user deletion 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-15 13:31:30 +02:00
Nextcloud bot
9ad57cabc8
[tx-robot] updated from transifex 2017-05-15 00:08:14 +00:00
Nextcloud bot
b1bd9ff0b9
[tx-robot] updated from transifex 2017-05-14 00:07:54 +00:00
Nextcloud bot
6e3a914f4a
[tx-robot] updated from transifex 2017-05-13 00:08:00 +00:00
Morris Jobke
2289ccd0ec Merge pull request #4829 from nextcloud/theming-preview-click 
Clicking on theming preview triggers fileupload dialog
 2017-05-12 10:22:20 -05:00
Joas Schilling
37d333c3b5
Don't open the dialog for logo and background 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-12 09:48:51 +02:00
Joas Schilling
51757716ec
Fix the share type of guest shares when migrating from ownCloud 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-12 09:38:48 +02:00
Joas Schilling
643b4a4ec4
Move the file sharing app to migration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-12 09:38:48 +02:00
Morris Jobke
c2350f237e Clicking on theming preview triggers fileupload dialog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-11 19:49:36 -05:00
Nextcloud bot
645f0aa96f
[tx-robot] updated from transifex 2017-05-12 00:07:46 +00:00
Nextcloud bot
241226c23c
[tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Morris Jobke
167013dbf9 Merge pull request #4783 from nextcloud/lite-application-classes 
Use automatic injection for appdata folders
 2017-05-10 17:31:05 -05:00
Morris Jobke
affa8d07ca Merge pull request #4762 from nextcloud/add-unsafe-global-eval-fn 
Add fallback to jQuery.fn.globalEval
 2017-05-10 11:37:06 -05:00
Lukas Reschke
93994b1320
Eval script elemtents in HTML body response 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-10 13:03:15 +02:00
Joas Schilling
5c20d2ca8c
Use the configured lookup server 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 12:06:09 +02:00
Joas Schilling
266a1e88fa
Define method shouldRun 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 12:06:09 +02:00
Joas Schilling
a8bb4a1898
Use automatic DI injection for UpdateLookupServer 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:44:02 +02:00
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
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
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
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
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
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
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
Nextcloud bot
9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +00: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
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
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
099234cf12
Add function to request SVG or regular fallback image 
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 14:51:55 +02:00
Robin Appelman
9d8936c5bf
fix error when browsing the dav root 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-08 14:34:36 +02:00
Roeland Jago Douma
dea6edb066
Fix init 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 12:40:00 +02:00
Lukas Reschke
278637feb5 Merge pull request #4556 from nextcloud/downstream-ldap-78 
LDAP: only use proxy classes as backend
 2017-05-08 12:29:38 +02:00
Georg Ehrke
255442f281
fix PROPPATCH requests to read-only shared calendars 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-05-08 12:09:15 +02:00
Roeland Jago Douma
92408390b0
Fix ImageExportPluginTest 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
747990b03a
No more XSS 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
3ab53d000f
Clear cache on vcard change/delete 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
34d97aa51c
Request proper size for contacts menu 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
dd430c2fd7
Cache the carddav photo endpoint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:49 +02:00
Roeland Jago Douma
303c0dd6a8
Always dispatch Carddav events 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-08 11:20:47 +02:00
Julius Härtl
2801f5139b
Adjust login button color and remove border 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-08 10:16:30 +02:00
Julius Härtl
510f7cf1b6
Fix tests for theming backgroundColor 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-08 10:16:30 +02:00
Julius Haertl
4199a56912
Theming app: Add plain background color option 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-05-08 10:16:29 +02:00
Jan-Christoph Borchardt
010b9c4609 Fix name of external storages 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-05-08 00:33:45 -05:00
Nextcloud bot
6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot
56bb8745df
[tx-robot] updated from transifex 2017-05-07 00:07:31 +00:00
Nextcloud bot
59ee22101f
[tx-robot] updated from transifex 2017-05-06 00:07:33 +00:00
Roeland Jago Douma
57275e9944 Merge pull request #4701 from nextcloud/enforce-type 
Enforce type hints in dav app
 2017-05-05 15:33:35 +02:00
Morris Jobke
ac04fb8277 Fix invalid theming URLs 
* logo and background image had the cache buster applied twice:
  background-image: url(http://192.168.99.100/server/core/img/logo.svg?v=0?v=0);

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-05 00:37:32 -03:00
Nextcloud bot
619d09529c
[tx-robot] updated from transifex 2017-05-05 00:07:28 +00:00
Morris Jobke
49e958fa12 Enforce type hints in dav app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-04 19:32:22 -03:00
Roeland Jago Douma
b66dfa909b Merge pull request #4693 from nextcloud/fix_4644 
Do not reload the filelist on first open
 2017-05-04 14:37:45 +02:00
Roeland Jago Douma
8d66e325a9
Do not reload the filelist on first open 
Fixes: #4644

Without this patch the filelist would always reload. However since not
all the correct data was set yet it would often:

1. fireoff a propfind to ../webdav/
2. fireoff a propfind to ../webdav/<PATH>

When just opening the file list those are the same so the result is just
fine. However if opening a direct link it means that there is a race
condition on which finishes first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 13:29:49 +02:00
Bjoern Schiessle
c053a275d7
check password for mail shares as well 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-05-04 11:20:20 +02:00
Roeland Jago Douma
412d3e2e80
Fix SharedStorage Test 
A moveable mount point (What a SharedStorage is) always has DELETE +
UPDATE permissions. Since you can either delete (unshare) or update
(rename) it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-04 08:43:05 +02:00
Nextcloud bot
806aeae71d
[tx-robot] updated from transifex 2017-05-04 00:07:29 +00:00
Nextcloud bot
3dbf30c220
[tx-robot] updated from transifex 2017-05-03 00:07:31 +00:00
blizzz
4e4bc17ff5 Merge pull request #4545 from individual-it/access-control-3726 
show error message when "files-drop" upload fails
 2017-05-03 00:21:40 +02:00
Roeland Jago Douma
24ff230f93 Merge pull request #4620 from nextcloud/preview-error-handling 
better handling of preview generation errors
 2017-05-02 21:49:14 +02:00
Lukas Reschke
68a1902586 Merge pull request #4636 from nextcloud/jquery-migrate-browser 
Remove dependency on jquery-migrate.js for browser detection
 2017-05-02 17:01:27 +02:00
Lukas Reschke
db337b4285 Merge pull request #4660 from nextcloud/fix/hide-2fa-backup-codes 
Hide 2FA backup codes if no other 2FA providers are enabled
 2017-05-02 16:08:11 +02:00
Christoph Wurst
d8b3fe460e
Hide 2FA backup codes if no other 2FA providers are enabled 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-02 14:40:44 +02:00
Morris Jobke
23cc309606
Handle more error cases 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-02 13:43:48 +02:00
Roeland Jago Douma
d25e13ea27
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 12:39:37 +02:00
Roeland Jago Douma
59e27f03b6
Add caching to the imageexport plugin 
Since we now heavily use this endpoint for the contacts menu we better
set proper caching on the images. Else this gets reload over and over
again leading to slow loading menu and unneded bytes transfered.

* cache for 1 hour by default
* added ETag for validation

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 12:30:34 +02:00
Nextcloud bot
f27d382c47
[tx-robot] updated from transifex 2017-05-02 00:07:20 +00:00
Morris Jobke
242934c016
Remove dependency on jquery-migrate.js for browser detection 
* ref #4628

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 17:53:48 -03:00
Morris Jobke
dba55f950a Merge pull request #4594 from nextcloud/theming-image-default 
Delete theming images when logo/background is reset to default
 2017-05-01 12:55:00 -03:00
Morris Jobke
3eba37ac14 Merge pull request #4527 from nextcloud/downstream-27504 
Adjust SMB permissions on the root
 2017-05-01 12:53:49 -03:00
Nextcloud bot
2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Julius Härtl
7c69c117e2
Delete theming images when logo/background is reset to default 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-30 11:04:55 -03:00
Nextcloud bot
4518f6dc64
[tx-robot] updated from transifex 2017-04-30 00:07:21 +00:00
Julius Härtl
6e215a0874
Code cleanup and preview for undo actions 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -03:00
Julius Härtl
b436e43d68
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -03:00
Julius Härtl
6b8341ce4b
Use generated SCSS for theming preview 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -03:00
Bjoern Schiessle
f488258d64
send signature to lookup server 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:38 -03:00
Bjoern Schiessle
7340d6a56c
don't add multiple retry jobs 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:38 -03:00
Jan-Christoph Borchardt
981c110f7e
Use JS for verification icon tooltip 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-28 23:41:37 -03:00
Bjoern Schiessle
9a366dbe2e
add missing translation and other small fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
7c309c253b
ask lookup server if email address was verified by the user 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
94df091ee4
send local verification status to lookup server 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
866e5d6d05
use configured lookup server 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
1fc05ea53a
allow admin to configure lookup server 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:35 -03:00
Morris Jobke
2a773310dc Merge pull request #4098 from nextcloud/feature/caldav_search 
add Nextcloud Search extension to CalDAV
 2017-04-28 23:38:04 -03:00
Nextcloud bot
c4673224d1
[tx-robot] updated from transifex 2017-04-29 00:07:17 +00:00
Morris Jobke
ed21ab56c7 Merge pull request #4584 from nextcloud/hint-theming 
Hint: Theming customizes the look and feel of supported clients too
 2017-04-28 19:11:34 -03:00
Julius Härtl
d13e311aaf
Invert new header icons on bright theming colors 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-28 15:53:33 -03:00
Marius Blüm
2eeed15f19
Hint: Theming customizes the look and feel of supported clients too 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-04-28 20:34:58 +02:00
Georg Ehrke
0f8a9514de
rename calendarobjects_properties -> calendarobjects_props 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-28 20:21:46 +02:00
Georg Ehrke
8d00458b56
unit test custom calendar search 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-28 20:21:36 +02:00
Nextcloud bot
3c4dab1bbe
[tx-robot] updated from transifex 2017-04-28 14:05:56 +00:00
Roeland Jago Douma
c42278b651
Make sure mountType is actually defined 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-28 10:03:31 +02:00
Robin Appelman
ab9a36e872
allow apps to set custom mount types 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-28 09:38:21 +02:00
Roeland Jago Douma
9da697b11a Merge pull request #4524 from nextcloud/downstream-27508 
Keep file id on move
 2017-04-28 09:37:40 +02:00
Roeland Jago Douma
3fd75e288c Merge pull request #4569 from nextcloud/fix-icons 
Fix icons in sidebar on personal page
 2017-04-28 08:33:45 +02:00
Nextcloud bot
6908818999
[tx-robot] updated from transifex 2017-04-28 00:07:41 +00:00
Morris Jobke
d6e7cee607
Fix icons in sidebar on personal page 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-27 17:58:41 -03:00
Morris Jobke
31c762aebf Merge pull request #4540 from nextcloud/settings-help 
Add more hints to settings
 2017-04-27 12:09:01 -03:00
Juan Pablo Villafáñez
a9a80f95e3
Use proxy classes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-27 15:57:25 +02:00
Joas Schilling
5f6153168f
Fix class names 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-27 15:45:41 +02:00
Joas Schilling
5bc593a92c
Make it clear that you can now click on usernames 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-27 15:33:16 +02:00
Artur Neumann
f2f2e7b6fb some small refactoring and reformating 
Signed-off-by: Artur Neumann <info@individual-it.net>
 2017-04-27 14:16:55 +05:45
Artur Neumann
79c760a10c use jqXHR.fail() to check for failures 
Signed-off-by: Artur Neumann <info@individual-it.net>
 2017-04-27 14:16:36 +05:45
Joas Schilling
a9d06c07d8
Fix last unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-27 10:18:31 +02:00
Joas Schilling
6fb7d9a865
Don't end the abstract class name with Test.php 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-27 09:49:37 +02:00
Vincent Petry
211a76eff3
Add comment 2017-04-27 09:29:20 +02:00
Vincent Petry
614bd5c294
Properly handle missing READ permission 2017-04-27 09:29:02 +02:00
Joas Schilling
53deb26778
Fix duplicate name of class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-27 09:15:50 +02:00
Morris Jobke
3e37a5f1c7 Merge pull request #3770 from nextcloud/faster-search-in-contacts 
Factorize query for searching contacts
 2017-04-27 00:25:30 -03:00
Morris Jobke
10ec3fda83 Merge pull request #4519 from nextcloud/downstream-27703 
Reload file list when leaving hidden state
 2017-04-26 23:05:08 -03:00
Morris Jobke
0ac806a9dd Merge pull request #4517 from nextcloud/downstream-27637 
Fix recovery checkbox label to properly point
 2017-04-26 22:54:20 -03:00
Nextcloud bot
c1c5f51fd8
[tx-robot] updated from transifex 2017-04-27 00:07:40 +00:00
Jan-Christoph Borchardt
cb16892443 Add more hints to settings 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-26 22:43:58 +02:00
Morris Jobke
58fe27f092 Merge pull request #4461 from danxuliu/fix-closing-details-view-when-viewing-file-in-folder 
Fix details view not closed when viewing a file in its folder
 2017-04-26 17:42:55 -03:00
Roeland Jago Douma
646db7f88d Merge pull request #4518 from nextcloud/downstream-25838 
Fix share indicator handling
 2017-04-26 19:23:27 +02:00
Lukas Reschke
d89c76049f Merge pull request #4374 from nextcloud/contactsmenu_popover 
add contacts popover
 2017-04-26 18:31:17 +02:00
Roeland Jago Douma
edd9444209 Merge pull request #4503 from nextcloud/downstream-27281 
fix objectstore rename
 2017-04-26 17:17:24 +02:00
Robin Appelman
acb0903514
remove duplicate method 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-26 16:45:04 +02:00
Robin Appelman
43970b93d1
remove excessive logging 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-26 16:41:48 +02:00
Juan Pablo Villafáñez
f2bd5f7496
Add new specific tests for SMB 2017-04-26 16:23:52 +02:00
Juan Pablo Villafáñez
71012b3432
Adjust SMB permissions on the root 2017-04-26 16:23:52 +02:00
Vincent Petry
7b6e4d0dd2
Fix FutureFile MOVE to keep destination node 
Sabre usually deletes the target node on MOVE before proceeding with the
actual move operation. This fix prevents this to happen in case the
source node is a FutureFile.
 2017-04-26 15:46:38 +02:00
Vincent Petry
ec8d7010e5
Accept moving FutureFile into a Directory 2017-04-26 15:43:01 +02:00
Vincent Petry
642b4331a6
Moved unit tests from ObjectTree::move to Directory 2017-04-26 15:42:29 +02:00
Vincent Petry
82b967d3f9
Remove ObjectTree::move and let is use the IMoveTarget approach instead 
This removes the duplicated code
 2017-04-26 15:35:08 +02:00
Vincent Petry
0a9f7730d0
Ported ObjectTree::move to IMoveTarget in new DAV endpoint 2017-04-26 15:33:20 +02:00
Morris Jobke
ba43a09380 Merge pull request #4512 from nextcloud/fix-translations-2 
Fix translations
 2017-04-26 08:57:08 -03:00
Vincent Petry
3f36548a6d
Reload file list when leaving hidden state 
Whenever a file list is already initialized and was hidden when
switching to another file list in the navigation bar, if the user comes
back to this list it gets redisplayed. At this point the list needs to
be refreshed to be able to reflect any potential file changes done from
the other lists.
 2017-04-26 13:51:44 +02:00
Vincent Petry
17a31a51c6
Fix share indicator handling 
Properly update the fileInfoModel with the updated share types, which
also updates the file list row indicator properly
 2017-04-26 13:38:12 +02:00
Vincent Petry
b92085f2c7
Fix recovery checkbox label to properly point 2017-04-26 13:29:42 +02:00
Joas Schilling
bec9f18a0f Merge pull request #4478 from nextcloud/improve_settings_help 
adding some documentation hints and some smaller cleanup
 2017-04-26 09:45:01 +02:00
Joas Schilling
6c28c4ac8b
Use correct plural form and add special strings for tomorrow and today 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-26 09:34:59 +02:00
Georg Ehrke
6d7714f182
fix CommentsTabsView js test 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:28:15 +02:00
Georg Ehrke
897bd5cfef
add contactsmenu popover to comments 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:28:14 +02:00
Joas Schilling
f43e7a9405
Fix past tense 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-26 09:27:41 +02:00
Morris Jobke
527369be9c Merge pull request #4500 from nextcloud/downstream-27118 
Restrict proppatch to the proper nodes
 2017-04-26 01:28:16 -03:00
Morris Jobke
4c2c08f376 Merge pull request #4416 from gvmura/avoid-duplicate-files-google 
Avoid duplicate files in google with the same name
 2017-04-26 01:26:04 -03:00
Morris Jobke
8a004ac41f Merge pull request #4489 from nextcloud/ldap-gidnumber-sprt-xuanwo 
user_ldap: Add support for gidNumber
 2017-04-25 22:34:30 -03:00
Nextcloud bot
e5fe41e16b
[tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Georg Ehrke
c76633bb8a
require at least one param or prop filter element 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-25 18:20:32 +02:00
Joas Schilling
5334a3dc33
fix objectstore rename 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 17:52:05 +02:00
Daniel Calviño Sánchez
18f46bd47f Fix closing details view when viewing file in folder 
The Files app active view is set to "files" in silent mode to avoid an
unneeded load of the "/" directory. However, this also prevents the
details view from being automatically closed, so it has to be explicitly
closed by the Goto plugin; the approach used is the same that would have
been used by OCA.Files.App._onNavigationChanged if not silenced.

Fixes #1448

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-25 17:45:42 +02:00
Jan-Christoph Borchardt
bbb58625fe Wording fixes 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 17:45:35 +02:00
Jan-Christoph Borchardt
4e537b5d6b Small layout fixes to settings hints 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-25 17:45:35 +02:00
Frank Karlitschek
f62b75b2b8 change the headline as suggested 2017-04-25 17:45:35 +02:00
Frank Karlitschek
c300d9b225 one more hint 2017-04-25 17:45:35 +02:00
Frank Karlitschek
5e1ce69b05 adding some documentation hints and some smaller cleanup 2017-04-25 17:45:35 +02:00
Vincent Petry
1c40a05204
Restrict proppatch to the proper nodes 
Need to fetch the node earlier because cancelling from within the
handler is not possible. Well, it is but it prevents other node types
using the same property names to run because the failure marks the
property with status 403.
 2017-04-25 17:25:03 +02:00
Joas Schilling
5ee445c54b
Audit log for enabling/disabling a user 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 17:20:35 +02:00
Georg Ehrke
ac3cc5211b
updateProperties: catch exception when reading calendar data 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-25 16:42:41 +02:00
Georg Ehrke
dd424fcb7b
unit test CalDAV Search Plugin 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-25 16:39:17 +02:00
Joas Schilling
8ef25a7628 Merge pull request #4490 from GitHubUser4234/audit_log_group_creation_deletion 
Audit group creation/deletion
 2017-04-25 16:14:52 +02:00
Morris Jobke
5a9224fb4c Merge pull request #3531 from nextcloud/theming-scss 
Theming using SCSS variables
 2017-04-25 10:56:13 -03:00
Arthur Schiwon
43f451e9e0
Fix usersInGroup retrieval 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-25 15:07:05 +02:00
Roger Szabo
f1522a8dca 4190 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-04-25 19:06:49 +08:00
Arthur Schiwon
685faad5ca
fix method name due to changes in master 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-25 13:03:08 +02:00
Arthur Schiwon
b1d646640a
Merge branch 'master' of https://github.com/Xuanwo/server into Xuanwo-master2 2017-04-25 12:42:17 +02:00
Joas Schilling
6448cf5748
Mock it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 12:16:07 +02:00
Georg Ehrke
40eec1e63c
add repairstep with backgroundjob to index calendar data 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-25 11:55:31 +02:00
Joas Schilling
bedd500884
Logo and background URLs must be relative 
They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 11:43:06 +02:00
Julius Härtl
bc1efdf2e1
Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-25 11:39:49 +02:00
Julius Haertl
68a63ad3f3
Implement scss variable injection by OC_Defaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 11:39:45 +02:00
Joas Schilling
5be1010d45
Fix invalid character 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 11:06:27 +02:00
Xuanwo
8db21ad8c8 user_ldap: Add support for gidNumber 
This patch is based on the work of @dleeuw (https://github.com/dleeuw)
(See https://github.com/nextcloud/server/issues/2640#issuecomment-269615883 for more details).
The difference is user & group data will be written into cache to have
better performance, and functions splited from primaryGroupID series to
make them more readable.

Fixed https://github.com/nextcloud/server/issues/2640

Signed-off-by: Xuanwo <xuanwo@yunify.com>
 2017-04-25 10:06:47 +08:00
Nextcloud bot
133f3fdc9a
[tx-robot] updated from transifex 2017-04-25 00:07:30 +00:00
Georg Ehrke
e760cda96f
remove unused CalendarSearchValidator 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-24 22:38:21 +02:00
Georg Ehrke
57b543a918
add Nextcloud Search extension to CalDAV 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-24 22:38:20 +02:00
Morris Jobke
b156117cbd Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casing 
Fix storage info with wrong casing
 2017-04-24 10:41:16 -03:00
Roeland Jago Douma
c5617f4e8a Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save 
Fix working icon placement on password save
 2017-04-24 14:34:56 +02:00
Roeland Jago Douma
97c27395aa Merge pull request #4458 from nextcloud/fix/sinon-stub-deprecation-warnings 
Fix sinon.stub deprecation warnings
 2017-04-24 13:47:46 +02:00
blizzz
42e805f057 Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr 
Handle password expiry in user_ldap
 2017-04-24 12:17:04 +02:00
Daniel Calviño Sánchez
36f55b5867 Fix working icon placement on password save 
Before, the icon appeared below the text input for the password. Now, it
appears inside the text input, to the right end.

The CSS was adjusted based on other icons shown in that position for
other text inputs in the Share tab view, like the information icon or
the clipboard icon.

Fixes #4135

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:50:06 +02:00
Joas Schilling
3d671cc536 Merge pull request #4443 from nextcloud/cleanup-unused-imports 
Remove unused use statements
 2017-04-24 11:47:37 +02:00
Christoph Wurst
2317d7bb49
Fix sinon.stub deprecation warnings 
Calls to `sinon.stub(obj, 'meth', fn)` are deprecated and therefore
replaced by `sinon.stub(obj, 'meth).callsFake(fn)` as instructed by
the deprecation warning.

This makes the js unit testing output readable again.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-24 10:39:37 +02:00
Joas Schilling
7a87fedac3
Remove dead arguments 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 10:18:14 +02:00
Joas Schilling
e19126425b
Fix similar issues with the group id 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 10:15:03 +02:00
Joas Schilling
992c48c89b
Fix the storage info and other checks when the user has wrong casing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 10:10:50 +02:00
Roeland Jago Douma
d842b29c5b Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displayname 
add owner-displayname property to calendars and addressbooks
 2017-04-24 09:17:55 +02:00
Roeland Jago Douma
1c2cdc9d3a Merge pull request #4444 from nextcloud/remove-unused-variables 
Remove unused variables
 2017-04-24 08:09:01 +02:00
Nextcloud bot
a01f946c56
[tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Georg Ehrke
c89e057d27
add owner-displayname property to calendars and addressbooks 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-23 11:26:49 +02:00
Morris Jobke
c54a59d51e
Remove unused use statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 19:23:31 -05:00
Nextcloud bot
11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Morris Jobke
2b6f6dac00
Remove unused variables 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 18:20:51 -05:00
Lukas Reschke
7acdc2a096 Merge pull request #4432 from nextcloud/fix-grammar 
Fix grammar
 2017-04-22 08:15:46 +02:00