Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
d5462fdb
Commit
d5462fdb
authored
10 years ago
by
Morris Jobke
Browse files
Options
Downloads
Plain Diff
Merge pull request #9265 from owncloud/fix-whitespace
fix trailing whitespace noted by Scrutinizer
parents
cec20d50
b7cb4f5a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/files_encryption/js/settings-personal.js
+4
-4
4 additions, 4 deletions
apps/files_encryption/js/settings-personal.js
apps/files_sharing/tests/js/appSpec.js
+1
-1
1 addition, 1 deletion
apps/files_sharing/tests/js/appSpec.js
with
5 additions
and
5 deletions
apps/files_encryption/js/settings-personal.js
+
4
−
4
View file @
d5462fdb
...
...
@@ -24,7 +24,7 @@ function updatePrivateKeyPasswd() {
$
(
document
).
ready
(
function
(){
// Trigger ajax on recoveryAdmin status change
$
(
'
input:radio[name="userEnableRecovery"]
'
).
change
(
$
(
'
input:radio[name="userEnableRecovery"]
'
).
change
(
function
()
{
// Hide feedback messages in case they're already visible
...
...
@@ -33,7 +33,7 @@ $(document).ready(function(){
var
recoveryStatus
=
$
(
this
).
val
();
$
.
post
(
$
.
post
(
OC
.
filePath
(
'
files_encryption
'
,
'
ajax
'
,
'
userrecovery.php
'
)
,
{
userEnableRecovery
:
recoveryStatus
}
,
function
(
data
)
{
...
...
@@ -49,7 +49,7 @@ $(document).ready(function(){
}
);
$
(
"
#encryptAll
"
).
click
(
$
(
"
#encryptAll
"
).
click
(
function
(){
// Hide feedback messages in case they're already visible
...
...
@@ -59,7 +59,7 @@ $(document).ready(function(){
var
userPassword
=
$
(
'
#userPassword
'
).
val
();
var
encryptAll
=
$
(
'
#encryptAll
'
).
val
();
$
.
post
(
$
.
post
(
OC
.
filePath
(
'
files_encryption
'
,
'
ajax
'
,
'
encryptall.php
'
)
,
{
encryptAll
:
encryptAll
,
userPassword
:
userPassword
}
,
function
(
data
)
{
...
...
This diff is collapsed.
Click to expand it.
apps/files_sharing/tests/js/appSpec.js
+
1
−
1
View file @
d5462fdb
...
...
@@ -55,7 +55,7 @@ describe('OCA.Sharing.App tests', function() {
describe
(
'
initialization
'
,
function
()
{
it
(
'
inits sharing-in list on show
'
,
function
()
{
expect
(
fileListIn
.
_sharedWithUser
).
toEqual
(
true
);
expect
(
fileListIn
.
_sharedWithUser
).
toEqual
(
true
);
});
it
(
'
inits sharing-out list on show
'
,
function
()
{
expect
(
fileListOut
.
_sharedWithUser
).
toBeFalsy
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment