Bjoern Schiessle
11ab457b72
add password as parameter to the signal so that the encryption can create a new key-pair
2014-11-17 17:50:19 +01:00
Lukas Reschke
357465eac9
Add "postPasswordReset" hook
2014-11-17 17:50:19 +01:00
Lukas Reschke
767b08c669
Use correct route instead
...
THX @schiesbn
(I should setup a mail server on my local system...)
2014-11-17 17:50:19 +01:00
Lukas Reschke
57b5c82eb7
Remove uneeded import
2014-11-17 17:50:19 +01:00
Lukas Reschke
60ae2894aa
Fix scrutinizer issues
2014-11-17 17:50:19 +01:00
Lukas Reschke
1b50d4f7ce
Warn for password reset when files_encryption is enabled
...
This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password.
Furthermore I updated the code to use our new classes and added some unit tests for it 👯
Fixes https://github.com/owncloud/core/issues/11438
2014-11-17 17:50:19 +01:00
Vincent Petry
af7688ec17
Merge pull request #11741 from owncloud/delete_all_children_preview_2
...
delete all children's previews when deleting a folder
2014-11-17 16:45:54 +01:00
Morris Jobke
146cb920c9
Merge pull request #12218 from owncloud/issue/10991-fixes
...
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
Robin Appelman
36528c6ef6
Merge pull request #12031 from owncloud/app-manager
...
Add \OC\App\Manager to handle enabling/disabling apps
2014-11-17 15:49:15 +01:00
Joas Schilling
6625d5c88f
Correctly restore previous root mount point after testing
2014-11-17 10:48:19 +01:00
Joas Schilling
289a27778e
Correctly refresh the apps list after removing the mock
2014-11-17 10:48:17 +01:00
Joas Schilling
53318c4bb5
Fix Files\Storage\Home::testRoot()
2014-11-17 10:48:16 +01:00
Joas Schilling
0ab973a3a6
Make it possible to cleanPath() absolute Windows paths
2014-11-17 10:48:15 +01:00
Joas Schilling
39ae569c5c
Correctly close handle of directory when listing certificates
2014-11-17 10:48:14 +01:00
Joas Schilling
b228226700
Fix single run of encryption tests and usages of uniqid() and fopen()
2014-11-17 10:48:13 +01:00
Joas Schilling
a3a064fe96
Skip some more tests on Windows which just can not work at all
2014-11-17 10:48:06 +01:00
Jenkins for ownCloud
9df50c7be6
[tx-robot] updated from transifex
2014-11-17 01:54:33 -05:00
Jenkins for ownCloud
55889d7eb4
[tx-robot] updated from transifex
2014-11-16 01:55:00 -05:00
Morris Jobke
b9e86b0951
Merge pull request #12186 from owncloud/fix-12182
...
eliminate OC_Template::printErrorPage in database classes, fixes #12182
2014-11-15 16:50:15 +01:00
Morris Jobke
c44e3b056b
Merge pull request #12189 from owncloud/checkIfAppIsEnabled
...
Check if app is enabled for user
2014-11-15 13:38:18 +01:00
Lukas Reschke
cd5925036a
Check if app is enabled for user
...
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
2014-11-15 11:13:55 +01:00
Jenkins for ownCloud
580d27eed2
[tx-robot] updated from transifex
2014-11-15 01:54:28 -05:00
Clark Tomlinson
f6d9310d91
Merge pull request #11029 from owncloud/fix-share-download
...
Fix share download
2014-11-14 14:44:34 -05:00
Arthur Schiwon
74ffda8261
do not output DB information, and do not set header
2014-11-14 17:43:22 +01:00
Arthur Schiwon
08205c63f9
errors are already logged
2014-11-14 16:59:54 +01:00
Vincent Cloutier
fad621140b
Added download size on public sharing
2014-11-14 16:26:59 +01:00
Lukas Reschke
988c85d292
Refactor file sharing public link handling
...
fixes download issue introduced by #10755
Conflicts:
apps/files_sharing/public.php
2014-11-14 16:26:59 +01:00
Arthur Schiwon
7ed678b04d
eliminate OC_Template::printErrorPage in database classes, fixes #12182
2014-11-14 15:48:55 +01:00
Thomas Müller
0f3c5d8541
Merge pull request #12181 from owncloud/resubmit-second-fail
...
Fail...
2014-11-14 14:38:13 +01:00
Lukas Reschke
3fa892aecc
Fail...
2014-11-14 13:42:13 +01:00
Thomas Müller
9fa25d5542
Merge pull request #12177 from owncloud/skip-mail-test-for
...
Mark skipped until #12085 is merged
2014-11-14 13:24:15 +01:00
Lukas Reschke
1358f3f17b
Mark skipped until #12085 is merged
...
See https://github.com/owncloud/core/pull/12175#issuecomment-63054620
2014-11-14 13:19:02 +01:00
Jörn Friedrich Dreyer
df18bd3e0d
Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename
...
Do not remove dir entry if it has the same name as the parent
2014-11-14 10:37:10 +01:00
Jenkins for ownCloud
0811b39e5f
[tx-robot] updated from transifex
2014-11-14 01:54:47 -05:00
Morris Jobke
c0d63680ed
Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup
...
cleanup group admin(s) on deleteGroup
2014-11-13 22:39:40 +01:00
Vincent Petry
914f4cb6f2
Do not remove dir entry if it has the same name as the parent
...
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
2014-11-13 17:37:56 +01:00
Vincent Petry
dfcf2059e1
Merge pull request #12157 from owncloud/fix-autotest-condition
...
this allows a non-existant config/config.php for starting the autotest.s...
2014-11-13 16:35:01 +01:00
Morris Jobke
b564192ba2
Merge pull request #12158 from owncloud/drop-snapjs
...
remove unneeded snap.js - followup to #11985 - ref #12156
2014-11-13 16:03:11 +01:00
Morris Jobke
e5d46d0d94
Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change_display_name
...
removal of wrong/double implemented check
2014-11-13 15:39:07 +01:00
blizzz
559b34e53d
Merge pull request #12005 from owncloud/bower-multiselect
...
Move multiselect to user_ldap
2014-11-13 14:43:06 +01:00
Morris Jobke
42793534d4
remove unneeded snap.js - followup to #11985 - ref #12156
2014-11-13 13:20:37 +01:00
michag86
7e70c4ee95
removal of wrong/double implemented check
...
Check already implemented in core/settings/ajax/changedisplayname.php
2014-11-13 13:02:02 +01:00
Lukas Reschke
5f8fb8d1ee
Run preupdate before an update
...
The update routine tries to test the database migration before actually performing the update.
However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.
This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
2014-11-13 12:07:49 +01:00
Morris Jobke
19346f4a27
this allows a non-existant config/config.php for starting the autotest.sh
2014-11-13 11:58:09 +01:00
Vincent Petry
5ca869c324
Merge pull request #9177 from owncloud/jsdocexperiment
...
Improved JS Docs + added build script for JS Docs
2014-11-13 11:16:08 +01:00
Jenkins for ownCloud
a069171cda
[tx-robot] updated from transifex
2014-11-13 01:54:36 -05:00
Morris Jobke
f39cb3fbc9
Migrate multiselect to user_ldap
2014-11-13 00:47:14 +01:00
Morris Jobke
97a8fa418d
Merge pull request #12141 from owncloud/kill-dav-client
...
OC_DAVClient is not longer used - no need to carry it around anymore
2014-11-12 21:20:52 +01:00
Vincent Petry
e0b797c43c
Merge pull request #12087 from AdamWill/google-touch
...
google: fix touch() when $mtime is set (Google wants RFC3339) #11267
2014-11-12 18:24:57 +01:00
Thomas Müller
6e3a841652
Merge pull request #12139 from owncloud/DoNotTouchMe
...
Try to read the file only instead of trying to touch
2014-11-12 17:29:56 +01:00