Björn Schießle
949d7b3312
Merge pull request #12391 from owncloud/fix_12361
...
use login name to verify password
2014-11-24 17:06:48 +01:00
Thomas Müller
ddacd7f900
Merge pull request #12294 from owncloud/route-postfix
...
Add route postfix to allow url versioning when only the http method changed
2014-11-24 16:32:54 +01:00
Bjoern Schiessle
1645c8f819
use login name to verify password
2014-11-24 15:44:43 +01:00
Morris Jobke
168fce0b18
Merge pull request #12303 from owncloud/windows-unknown-command-command
...
Deduplicate findBinaryPath() and do not try "command -v" on windows
2014-11-24 14:03:07 +01:00
Morris Jobke
1b17429c1d
Merge pull request #12142 from owncloud/DeprecateOldIAPICalls
...
Deprecate older API wrappers and calls
2014-11-24 14:01:49 +01:00
Morris Jobke
8782b2237c
Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
...
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
Thomas Müller
e956bd1094
Merge pull request #12359 from owncloud/fix-redirect-url-for-password-change
...
Use `/` as redirect location if webroot is set to an empty value
2014-11-24 11:09:17 +01:00
Vincent Petry
49ad10cfd0
Merge pull request #12362 from owncloud/add-ocs-header-per-default
...
Add OCS API header per default
2014-11-24 11:09:00 +01:00
Lukas Reschke
c556382160
Merge pull request #12374 from owncloud/vagrant_puphpet_gitignore
...
add puphpet and vagrant to gitignore
2014-11-24 09:01:23 +01:00
Jenkins for ownCloud
0edcfc1dc1
[tx-robot] updated from transifex
2014-11-24 01:54:35 -05:00
Lukas Reschke
cebfdd877d
Merge pull request #12372 from owncloud/preview_tiff_fix
...
remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
2014-11-24 01:12:43 +01:00
Georg Ehrke
03a975a080
add puphpet and vagrant to gitignore
2014-11-23 23:01:50 +01:00
Georg Ehrke
45d985f2d8
remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
2014-11-23 19:11:03 +01:00
Jenkins for ownCloud
a3496cf7fa
[tx-robot] updated from transifex
2014-11-23 01:54:39 -05:00
Morris Jobke
fe46393115
Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ci
...
Rename providers to not begin with test
2014-11-22 16:41:29 +01:00
Morris Jobke
2cc3edb10d
Merge pull request #12328 from owncloud/remove-testcleanuplistener
...
Remove testcleanuplistener
2014-11-22 10:05:47 +01:00
Jenkins for ownCloud
fa3f7ad9e9
[tx-robot] updated from transifex
2014-11-22 01:55:21 -05:00
Lukas Reschke
8c2aeb9b21
Add OCS API header per default
...
Relieve @PVince from having to write it all the time ;-)
2014-11-21 19:54:19 +01:00
Bjoern Schiessle
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
Lukas Reschke
0fa8b449b2
Use / as redirect location if webroot is set to an empty value
...
If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.
This means that while the password is getting resetted the user is not redirected to the login page.
I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.
Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)
Reported by @cdamken
2014-11-21 15:38:36 +01:00
Thomas Müller
13b06aa6df
Merge pull request #12342 from owncloud/fix-master-unit-tests
...
fix unit tests of mdb2scheamreader
2014-11-21 13:07:51 +01:00
Lukas Reschke
5f6f54e785
Rename providers to not begin with test
...
Fixes https://github.com/owncloud/core/issues/12347
2014-11-21 10:54:41 +01:00
Jenkins for ownCloud
f8421958b3
[tx-robot] updated from transifex
2014-11-21 02:54:26 -05:00
Thomas Müller
61d5a522a4
Merge pull request #12344 from owncloud/fixstypo
...
update grammar
2014-11-21 08:40:07 +01:00
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
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
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
