f274833403
remove unused variable
2014-11-25 10:12:10 +01:00
6fb2477fb7
Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate
...
Don't disclose relative directory path for single shared files of user
2014-11-25 10:09:16 +01:00
bc3c835f6a
Merge pull request #12390 from owncloud/use-session-in-case
...
Close session only if encryption app is not enabled
2014-11-25 09:32:16 +01:00
53b2d85709
Merge pull request #12402 from owncloud/fix-phpdoc
...
Fix PHPDoc and deprecated code
2014-11-25 09:20:36 +01:00
eb1dcb87c1
Merge pull request #12380 from owncloud/remove-oc-migrate
...
Remove OC_Migrate
2014-11-25 00:25:37 +01:00
b947b65e5b
Fix PHPDoc and deprecated code
...
Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.
2014-11-24 23:09:49 +01:00
02095d4f20
Merge pull request #11837 from owncloud/fix-11328
...
unify count filters and introduce display name attribute detection
2014-11-24 18:13:01 +01:00
e2a9bd7838
You can only change the oritentation of a JPEG
...
TIFFs also have EXIF headers, but they're not supported by the Image class
PHP doc
http://php.net/manual/en/function.exif-read-data.php
2014-11-24 17:32:53 +01:00
949d7b3312
Merge pull request #12391 from owncloud/fix_12361
...
use login name to verify password
2014-11-24 17:06:48 +01:00
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
1645c8f819
use login name to verify password
2014-11-24 15:44:43 +01:00
8589079590
Close session only if encryption app is not enabled
...
Fixes https://github.com/owncloud/core/issues/12389
2014-11-24 15:02:49 +01:00
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
1b17429c1d
Merge pull request #12142 from owncloud/DeprecateOldIAPICalls
...
Deprecate older API wrappers and calls
2014-11-24 14:01:49 +01:00
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
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
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
216d617938
Remove OC_Migrate
...
This is unused legacy code. Let it die with ~~~honor~~ fire.
Fixes https://github.com/owncloud/core/issues/12346
2014-11-24 10:53:45 +01:00
c556382160
Merge pull request #12374 from owncloud/vagrant_puphpet_gitignore
...
add puphpet and vagrant to gitignore
2014-11-24 09:01:23 +01:00
0edcfc1dc1
[tx-robot] updated from transifex
2014-11-24 01:54:35 -05:00
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
03a975a080
add puphpet and vagrant to gitignore
2014-11-23 23:01:50 +01:00
45d985f2d8
remove ugly hack and don't use OC\Preview\Image for tiffs and svgs
2014-11-23 19:11:03 +01:00
a3496cf7fa
[tx-robot] updated from transifex
2014-11-23 01:54:39 -05:00
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
2cc3edb10d
Merge pull request #12328 from owncloud/remove-testcleanuplistener
...
Remove testcleanuplistener
2014-11-22 10:05:47 +01:00
fa3f7ad9e9
[tx-robot] updated from transifex
2014-11-22 01:55:21 -05:00
9aef83b579
make scrutinizer happier and always count users on assisted mode, even with xp'ed mode (would be a regression otherwise)
2014-11-22 00:51:41 +01:00
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
503de94392
make updateCount work properly with new xp'd mode as well as without
2014-11-21 16:23:56 +01:00
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
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
c07c338c90
fix counting when ldapPagingSize is 0
2014-11-21 14:51:20 +01:00
397f14ed86
Consolidate if statement, and update unit test
2014-11-21 13:31:56 +01:00
13b06aa6df
Merge pull request #12342 from owncloud/fix-master-unit-tests
...
fix unit tests of mdb2scheamreader
2014-11-21 13:07:51 +01:00
1d4d308a6c
fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire.
2014-11-21 11:01:39 +01:00
5f6f54e785
Rename providers to not begin with test
...
Fixes https://github.com/owncloud/core/issues/12347
2014-11-21 10:54:41 +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
b5e707b1bf
trigger count on the correct filter
2014-11-20 18:31:40 +01:00
6b6147dafd
phpdoc and mixed up letters
2014-11-20 18:31:40 +01:00
031d6c179f
better readbility, no effective changes
2014-11-20 18:31:40 +01:00
0e6d47123a
use underscore.js for undefined checks
2014-11-20 18:31:40 +01:00
d8bb8afee3
this happens already before counting, no need anymore
2014-11-20 18:31:40 +01:00
c9e865629e
JS doc
2014-11-20 18:31:40 +01:00
4a3fe42b16
a corrected email attribute needs to be saved, not only returned
2014-11-20 18:31:39 +01:00
Bjoern Schiessle
Morris Jobke
Lukas Reschke
Olivier Paroz
Björn Schießle
Thomas Müller
Vincent Petry
Jenkins for ownCloud
Georg Ehrke
Arthur Schiwon
Miguel Prokop
Volkan Gezer