13b06aa6df
Merge pull request #12342 from owncloud/fix-master-unit-tests
...
fix unit tests of mdb2scheamreader
2014-11-21 13:07:51 +01:00
f8421958b3
[tx-robot] updated from transifex
2014-11-21 02:54:26 -05:00
61d5a522a4
Merge pull request #12344 from owncloud/fixstypo
...
update grammar
2014-11-21 08:40:07 +01:00
388ef07c20
update grammar
...
Suggested by mnestis on Transifex.
2014-11-21 02:17:02 +01:00
75d37b69f6
fix unit tests of mdb2scheamreader
2014-11-20 22:35:37 +01:00
593ef76e36
Revert "drop OC_Preferences::getUsers and getApps"
...
This reverts commit 09fd34eed9
2014-11-20 22:02:26 +01:00
78d9d49112
Merge pull request #12336 from owncloud/drop-getApps-getUsers
...
drop OC_Preferences::getUsers and getApps
2014-11-20 21:59:15 +01:00
09fd34eed9
drop OC_Preferences::getUsers and getApps
2014-11-20 17:56:05 +01:00
985f8c3f69
Merge pull request #12330 from owncloud/jenkins-eat-that
...
drop dependency of some commands on old config object
2014-11-20 17:11:08 +01:00
7fa4c6d0bc
Merge pull request #12321 from owncloud/checkForXMLWriter
...
Check for XMLWriter class
2014-11-20 17:04:27 +01:00
391ece46e3
Fix file upload to ext storage when recovery key is enabled
...
Fixes an issue when uploading files to external storage when recovery
keys are enabled
The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-20 16:43:44 +01:00
604bf61e10
Merge pull request #12299 from owncloud/clean-lib-base-config
...
replace all static calls to OC_Config and OC_Preferences to calls to OCP...
2014-11-20 16:24:37 +01:00
713c8e0dac
Merge pull request #12325 from owncloud/removeunneccessarylang
...
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
8ae8eb4734
drop dependency of some commands on old config object
2014-11-20 15:03:16 +01:00
cbb9caf030
Merge pull request #12226 from owncloud/remove-phpass
...
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
46e6104795
Merge pull request #12297 from owncloud/issue/10991-all-testcase
...
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
995fe4a176
cleanup languages. closes #11274
2014-11-20 14:46:17 +01:00
288acb55a0
Merge pull request #12305 from owncloud/sharelist-nodelete
...
Remove delete button in shared with others list
2014-11-20 13:32:07 +01:00
9a1673c79d
Check for XMLWriter class
...
This is not installed by default in all cases and will break the DAV features of ownCloud. Lot's of reports such as https://github.com/owncloud/ios-issues/issues/167#issuecomment-63798507
2014-11-20 13:13:14 +01:00
6a08fca363
Merge pull request #12253 from owncloud/port-12154
...
Port 12154
2014-11-20 12:47:27 +01:00
10d0883da9
Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs
...
Added function to load translations from JS
2014-11-20 10:53:46 +01:00
fffc5bc002
[tx-robot] updated from transifex
2014-11-20 01:55:06 -05:00
63fa8ec69a
JSHint fixes in sharedfilelistSpec unit test file
2014-11-19 17:44:05 +01:00
98ec0451be
Remove delete button in shared with others list
...
Whenever a file is shared with others or with link, a delete button used
to be visible that triggered a direct deletion.
This button has been removed to avoid accidental deletion from people
who might believe it was an unshare button. Unsharing is still possible
inside the share dropdown.
2014-11-19 17:42:57 +01:00
ffe57d89e4
Fix l10n promises
2014-11-19 17:02:17 +01:00
6202ca33ba
Make remaining files extend the test base
2014-11-19 14:53:59 +01:00
cb3a598cdb
Make root tests extend the \Test\TestCase
2014-11-19 14:53:51 +01:00
76ebd3a050
Make apps/ extend the \Test\TestCase and fix overwritten methods
2014-11-19 14:52:09 +01:00
bb540722cd
Use base class to reset the file mapper
2014-11-19 14:52:07 +01:00
1c5933c96c
Better use of promise in OC.L10N.load()
2014-11-19 14:49:15 +01:00
284ba5b688
Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2
...
Show warning when invalid user was passed
2014-11-19 14:27:32 +01:00
980dd4d22a
replace double quotes with single quotes
2014-11-19 13:15:04 +01:00
fef9d4218c
replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig
2014-11-19 13:06:22 +01:00
1c8f9564a4
Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
...
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
dc9eaf59dc
Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-enabled
...
Only show undelete capability if files_trashbin is enabled
2014-11-19 11:42:19 +01:00
cd60a27ad6
Remove stray generateUrl
2014-11-19 10:59:38 +01:00
705976ba0a
[tx-robot] updated from transifex
2014-11-19 01:54:59 -05:00
61641293f4
Only show undelete capability if files_trashbin is enabled
...
Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
2014-11-18 23:06:39 +01:00
24d4d5e2a1
Merge pull request #12270 from owncloud/fix-search-label
...
User management search just searches users - adjust label of input field...
2014-11-18 22:50:05 +01:00
45e770733e
Merge pull request #12272 from owncloud/drop-var_dump
...
drop unneeded var_dump - fixes #9997
2014-11-18 22:39:48 +01:00
d40bdfb35e
drop unneeded var_dump - fixes #9997
2014-11-18 22:36:42 +01:00
256eff6eac
User management search just searches users - adjust label of input field - fixes #10229
2014-11-18 22:12:14 +01:00
81d112fb42
Merge pull request #12261 from oparoz/patch-1
...
Replace deprecated switches
2014-11-18 18:59:34 +01:00
3b0a7574d6
Merge pull request #12264 from owncloud/use-full-path-for-filesize-calculation
...
Use full path instead of only the filename
2014-11-18 18:11:31 +01:00
106d0f9c75
Merge pull request #12224 from owncloud/fix_12211
...
make sure that we don't find the wrong shares if a user and a group have the same ID
2014-11-18 17:26:02 +01:00
1b85f40cbe
$file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned.
...
This feature only exists on master.
2014-11-18 17:14:26 +01:00
cb118ce371
Replace deprecated switches
...
Warning: -convert-to is deprecated. Use --convert-to instead.
Warning: -outdir is deprecated. Use --outdir instead.
2014-11-18 15:04:01 +01:00
309788003d
Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager
...
Fix type hinting for app manager
2014-11-18 13:56:40 +01:00
8d4e63dd7c
Merge pull request #12242 from owncloud/fix-undefined-size
...
Check if the size field is available
2014-11-18 12:37:16 +01:00
260a084d27
Add repair steps for legacy config files
...
Remove all ports from the trusted domains
Conflicts:
lib/private/repair.php
lib/repair/repairconfig.php
2014-11-18 12:36:03 +01:00
Thomas Müller
Jenkins for ownCloud
Volkan Gezer
Morris Jobke
Vincent Petry
Lukas Reschke
Volkan Gezer
Joas Schilling
Björn Schießle
Olivier Paroz