wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22685 commits 157 branches 562 tags 714 MiB
Commit graph

22685 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bernhard Posselt
fdc64e370c add a controller and reponse for ocs 2015-02-05 14:02:17 +01:00
Jenkins for ownCloud
9adff77040 [tx-robot] updated from transifex 2015-02-05 01:54:49 -05:00
Frank Karlitschek
defe41ee4e 8.0.0 RC2 2015-02-04 23:27:52 +01:00
blizzz
4a1c0b1d21 Merge pull request #13897 from owncloud/fix-13644 
fix user loading
 2015-02-04 18:36:40 +01:00
Arthur Schiwon
30b24696c8 fix user loading 2015-02-04 17:19:11 +01:00
Lukas Reschke
7b0d9f5035 Merge pull request #13894 from owncloud/revert-13892-disable-autocomplete 
Revert "Disable autocomplete for SMTP Password"
 2015-02-04 16:57:17 +01:00
Clark Tomlinson
0ae4db2431 Revert "Disable autocomplete for SMTP Password" 2015-02-04 10:54:22 -05:00
Clark Tomlinson
e8c11620bc Merge pull request #13892 from owncloud/disable-autocomplete 
Disable autocomplete for SMTP Password
 2015-02-04 10:46:33 -05:00
Lukas Reschke
74bae87803 Disable autocomplete for SMTP Password 
While really nearly no modern browser cares about it anymore too much it's still not wrong to have it here (and also stops some automated scanners reporting this...)
 2015-02-04 16:33:40 +01:00
Björn Schießle
486f49ed72 Merge pull request #13881 from owncloud/upload_to_root_of_mountpoint 
detect root of mountpoint also if the trailing slash is missed
 2015-02-04 14:44:02 +01:00
blizzz
09216ef49b Merge pull request #13849 from owncloud/ldap-oc8-update 
no update routine needed from OC 7 to 8
 2015-02-04 14:19:58 +01:00
Bjoern Schiessle
21c45925fe detect root of mountpoint also if the trailing slash is missed 2015-02-04 12:47:04 +01:00
Jenkins for ownCloud
77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Thomas Müller
23c6a0cf99 Merge pull request #13843 from owncloud/fix-files-disabled 
Fix disabled files app
 2015-02-03 16:13:15 +01:00
Morris Jobke
d70160c607 enabled disabled files app in repair step 2015-02-03 14:03:43 +01:00
Thomas Müller
9e222ec841 Merge pull request #13791 from owncloud/extstorage-fixdavexceptions 
Fix DAV exceptions, some will still return false now
 2015-02-03 13:31:32 +01:00
Arthur Schiwon
02a1cc01b6 no update routine needed from OC 7 to 8 2015-02-03 11:43:47 +01:00
Thomas Müller
a24d73aa0c Merge pull request #13837 from owncloud/endless-redirect 
Add callCheck to testremote.php
 2015-02-03 11:28:15 +01:00
Jenkins for ownCloud
6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Morris Jobke
a7eedf0149 Disallow disabling of files app 2015-02-03 00:39:01 +01:00
Lukas Reschke
4270188252 Add callCheck to testremote.php 
Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service.
 2015-02-02 19:39:41 +01:00
Thomas Müller
92bc1b44d5 Merge pull request #13822 from owncloud/include-core-version-in-js-version-tag 
include core version into js/css version tag
 2015-02-02 15:02:11 +01:00
Thomas Müller
24daee836a include core version into js/css version tag - fixes #13702 2015-02-02 13:02:11 +01:00
Morris Jobke
1bb8d5978c Merge pull request #13817 from owncloud/core-apps-dependencies 
encryption requires openssl and user_ldap requires ldap 🙊
 2015-02-02 12:49:45 +01:00
Lukas Reschke
2426bd1b9d Merge pull request #13811 from owncloud/default-to-null 
Default to `null` for lostpassword
 2015-02-02 11:41:14 +01:00
Thomas Müller
82b271855c add libs which have no version number 2015-02-02 10:49:46 +01:00
Thomas Müller
359abca50c Merge pull request #13790 from owncloud/fix-subadmin-group 
Fix subadmin listing of group
 2015-02-02 09:45:28 +01:00
Thomas Müller
c9543c9e8e encryption requires openssl and user_ldap requires ldap 🙊 2015-02-02 09:20:05 +01:00
Jenkins for ownCloud
800829d93d [tx-robot] updated from transifex 2015-02-02 01:54:32 -05:00
Lukas Reschke
944dc127b8 Mock l10n in the setup 2015-02-01 17:46:48 +01:00
Lukas Reschke
ba29ea178f Add unit tests for empty token 2015-02-01 17:34:03 +01:00
Thomas Müller
4ecf1f85be Merge pull request #13810 from owncloud/tdomain 
fix trusted domain localization
 2015-02-01 17:26:55 +01:00
Lukas Reschke
35afb0d22e Default to null for lostpassword 
We oC 8 we use the `StringUtils::equals` method which will also verify the type, since we don't anylonger hash the token twice this is required in case somebody is able to invoke this route with an empty `$token`.
 2015-02-01 17:07:10 +01:00
Volkan Gezer
9beb033a9f fix trusted domain localization 2015-02-01 16:06:12 +01:00
Jenkins for ownCloud
a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Lukas Reschke
012d06e8a2 Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares 
make sure that we get the correct user from the path
 2015-01-31 08:52:07 +01:00
Jenkins for ownCloud
c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Lukas Reschke
fcd5056376 Consistent variable naming 2015-01-30 18:31:04 +01:00
Joas Schilling
b58f2faf21 Merge pull request #13804 from owncloud/check-return-before-assuming-array 
Check whether return is an error case before using it
 2015-01-30 17:39:28 +01:00
Lukas Reschke
0f7634eadc Switch to a factory and add unit tests 2015-01-30 17:24:42 +01:00
Joas Schilling
7bd7c20295 Check whether return is an error case before using it 2015-01-30 16:39:57 +01:00
Bjoern Schiessle
9ef96e4dd5 no need to initialize the same view twice 2015-01-30 14:39:31 +01:00
Bjoern Schiessle
ed29c6ce86 get correct user for paths to the trash bin, needed for remote shares if the size of of trash gets calculated 2015-01-30 14:39:09 +01:00
Lukas Reschke
7e7dd92f6b Add unit tests 2015-01-30 14:29:46 +01:00
Lukas Reschke
734dcc82dd Fix subadmin listing of group 
Without this patch filtering for the "_everyone" (empty) group did not work for subadmins.

Fixes itself.
 2015-01-30 14:29:46 +01:00
Morris Jobke
e7900ba255 Merge pull request #13508 from owncloud/failed-delete-cache 
Dont remove a file from cache if the delete operation failed
 2015-01-30 14:08:44 +01:00
Vincent Petry
5ade2854ee Fix DAV exceptions, some will still return false now 
Since the Storage interface isn't ready to work directly with exceptions
like Forbidden and NotFound, the DAV storage has been adapted to still
return false when expected.
 2015-01-30 12:02:23 +01:00
Jenkins for ownCloud
f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Robin McCorkell
24fc1c751a Merge pull request #13774 from owncloud/fix-exception-css 
add CSS to exception page - fixes #13747
 2015-01-29 22:00:03 +00:00
Morris Jobke
5b4fd12b5b add CSS to exception page - fixes #13747 2015-01-29 20:18:08 +01:00