Commit Graph

21769 Commits

Author SHA1 Message Date
Volkan Gezer 388ef07c20 update grammar
Suggested by mnestis on Transifex.
2014-11-21 02:17:02 +01:00
Morris Jobke 75d37b69f6 fix unit tests of mdb2scheamreader 2014-11-20 22:35:37 +01:00
Morris Jobke 593ef76e36 Revert "drop OC_Preferences::getUsers and getApps"
This reverts commit 09fd34eed9.
2014-11-20 22:02:26 +01:00
Morris Jobke 78d9d49112 Merge pull request #12336 from owncloud/drop-getApps-getUsers
drop OC_Preferences::getUsers and getApps
2014-11-20 21:59:15 +01:00
Arthur Schiwon b5e707b1bf trigger count on the correct filter 2014-11-20 18:31:40 +01:00
Arthur Schiwon 6b6147dafd phpdoc and mixed up letters 2014-11-20 18:31:40 +01:00
Arthur Schiwon 031d6c179f better readbility, no effective changes 2014-11-20 18:31:40 +01:00
Arthur Schiwon 0e6d47123a use underscore.js for undefined checks 2014-11-20 18:31:40 +01:00
Arthur Schiwon d8bb8afee3 this happens already before counting, no need anymore 2014-11-20 18:31:40 +01:00
Arthur Schiwon c9e865629e JS doc 2014-11-20 18:31:40 +01:00
Arthur Schiwon 4a3fe42b16 a corrected email attribute needs to be saved, not only returned 2014-11-20 18:31:39 +01:00
Arthur Schiwon f9b4f5f4e5 to reassure that selected attributes still work, do not count all matching entries but limit it to 1 in order to make it faster 2014-11-20 18:31:39 +01:00
Arthur Schiwon 71944a59a5 detectors (email, displayname..) are now started in one place, triggered from only 2 places. more reliable structure and flow, saves requests 2014-11-20 18:31:39 +01:00
Arthur Schiwon f725cc66a3 consolidate user count filter in wizard and user back end 2014-11-20 18:31:39 +01:00
Arthur Schiwon cb3af1dce2 detect user display name attribute and return user count depending on its presence 2014-11-20 18:31:39 +01:00
Morris Jobke 09fd34eed9 drop OC_Preferences::getUsers and getApps 2014-11-20 17:56:05 +01:00
Morris Jobke 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
Thomas Müller 7fa4c6d0bc Merge pull request #12321 from owncloud/checkForXMLWriter
Check for XMLWriter class
2014-11-20 17:04:27 +01:00
Vincent Petry 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
Morris Jobke 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
Lukas Reschke 713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
Joas Schilling b842059285 Remove testcleanuplistener.php 2014-11-20 15:26:27 +01:00
Joas Schilling 84d358a761 Clean up the test data in tearDownAfterClass()
The result of the listener should then be empty and can be removed
2014-11-20 15:26:26 +01:00
Morris Jobke 8ae8eb4734 drop dependency of some commands on old config object 2014-11-20 15:03:16 +01:00
Thomas Müller 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
Morris Jobke 46e6104795 Merge pull request #12297 from owncloud/issue/10991-all-testcase
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
Volkan Gezer 995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Morris Jobke 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
Lukas Reschke 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
Vincent Petry 6a08fca363 Merge pull request #12253 from owncloud/port-12154
Port 12154
2014-11-20 12:47:27 +01:00
Joas Schilling d15f1882f9 Simplify the binary finding code in the movie preview class 2014-11-20 12:41:55 +01:00
Joas Schilling 64421d76fd Deduplicate function by moving it to the OC_Helper 2014-11-20 12:37:59 +01:00
Vincent Petry 10d0883da9 Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs
Added function to load translations from JS
2014-11-20 10:53:46 +01:00
Jenkins for ownCloud fffc5bc002 [tx-robot] updated from transifex 2014-11-20 01:55:06 -05:00
Vincent Petry 63fa8ec69a JSHint fixes in sharedfilelistSpec unit test file 2014-11-19 17:44:05 +01:00
Vincent Petry 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
Olivier Paroz 68a9376858 Use a more universal shebang
On FreeBSD, php is usually in /usr/local and I'm sure there are many more exceptions.
2014-11-19 17:34:03 +01:00
Joas Schilling e32968cfce Remove exec() call with invalid name on windows
Currently running unit tests prints the following message 3 times:
The command "command" is misspelt or could not be found.
Instead of trying this, we just skip this now.
2014-11-19 17:04:55 +01:00
Vincent Petry ffe57d89e4 Fix l10n promises 2014-11-19 17:02:17 +01:00
Joas Schilling 6202ca33ba Make remaining files extend the test base 2014-11-19 14:53:59 +01:00
Joas Schilling cb3a598cdb Make root tests extend the \Test\TestCase 2014-11-19 14:53:51 +01:00
Joas Schilling 76ebd3a050 Make apps/ extend the \Test\TestCase and fix overwritten methods 2014-11-19 14:52:09 +01:00
Joas Schilling bb540722cd Use base class to reset the file mapper 2014-11-19 14:52:07 +01:00
Vincent Petry 1c5933c96c Better use of promise in OC.L10N.load() 2014-11-19 14:49:15 +01:00
Lukas Reschke 284ba5b688 Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2
Show warning when invalid user was passed
2014-11-19 14:27:32 +01:00
Morris Jobke 980dd4d22a replace double quotes with single quotes 2014-11-19 13:15:04 +01:00
Morris Jobke fef9d4218c replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig 2014-11-19 13:06:22 +01:00
Lukas Reschke 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
Bernhard Posselt 4e90c44301 add postfix
add postfix
2014-11-19 12:01:42 +01:00
Morris Jobke 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