Jenkins for ownCloud
1e1903e4fe
[tx-robot] updated from transifex
2016-06-23 02:09:38 -04:00
Morris Jobke
77c1175894
Merge pull request #204 from JSoko/master
...
de language files changed to Nextcloud
2016-06-22 22:14:40 +02:00
Morris Jobke
d47262ea46
Merge pull request #25233 from owncloud/iedavclient-nullheaders
...
Init the headers in iedavclient.js
2016-06-22 22:13:12 +02:00
Joachim Sokolowski
d7d7b49647
to Nextcloud
2016-06-22 17:41:01 +02:00
Vincent Petry
4a2fb1b4cb
Init the headers in iedavclient.js
2016-06-22 16:58:06 +02:00
Vincent Petry
ae50e7236f
Merge pull request #25225 from owncloud/enc-revertversionsize
...
Rollback version must also adjust cached size
2016-06-22 16:39:49 +02:00
Vincent Petry
d5f4328842
Merge pull request #25223 from owncloud/external-list-default-options
...
Hide more default options in occ files_external:list
2016-06-22 15:53:20 +02:00
Vincent Petry
963d8a8565
Merge pull request #25123 from owncloud/issue-23005-broken-remote-shares
...
Add timeouts to make the UI usable again when a remote share is unrea…
2016-06-22 15:52:44 +02:00
Vincent Petry
fa3dc909a4
Rollback version must also adjust cached size
2016-06-22 14:16:16 +02:00
Vincent Petry
3db5de95bd
Merge pull request #25172 from owncloud/token-login-validation
...
Token login validation
2016-06-22 13:58:56 +02:00
Vincent Petry
293ae8a8cf
Merge pull request #25134 from owncloud/app-passwords
...
app passwords/device tokens wording
2016-06-22 13:50:11 +02:00
Robin Appelman
eed1c52aec
Hide more default options in occ files_external:list
2016-06-22 13:34:55 +02:00
VicDeo
854352d9a0
occ web executor ( #24957 )
...
* Initial web executor
* Fix PHPDoc
Fix broken integration test
OccControllerTests do not require database access - moch them all!
Kill unused sprintf
2016-06-22 13:12:36 +02:00
Joachim Sokolowski
553a151fc6
Merge remote-tracking branch 'refs/remotes/origin/master' into nextcloud/master
2016-06-22 13:10:40 +02:00
Joachim Sokolowski
690062a634
Merge remote-tracking branch 'refs/remotes/nextcloud/master'
2016-06-22 11:13:01 +02:00
Lukas Reschke
c347a35ab6
Merge pull request #201 from nextcloud/followup-to-196
...
Fix translation strings
2016-06-22 11:02:57 +02:00
Vincent Petry
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests
2016-06-22 10:29:40 +02:00
Joas Schilling
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable
2016-06-22 10:29:40 +02:00
Morris Jobke
7e186194c4
Fix translation strings
2016-06-22 10:27:24 +02:00
Morris Jobke
7ba89b1175
Merge pull request #196 from JSoko/patch-2
...
singleuser.user.php -> nextcloud
2016-06-22 10:25:03 +02:00
Vincent Petry
c49ff83f18
Merge pull request #25208 from owncloud/uploadfolder-firemkdirhooksforparents
...
Fire hooks for mkdir for folder upload
2016-06-22 10:21:00 +02:00
Morris Jobke
4d4e579dbc
Merge pull request #197 from JSoko/master
...
changed to nextcloud
2016-06-22 10:13:12 +02:00
Joachim Sokolowski
fa19e4c2eb
some text-changes to nextcloud
2016-06-22 08:41:10 +02:00
Joachim Sokolowski
a83cbee717
changed to nextcloud
2016-06-22 08:20:23 +02:00
Joachim Sokolowski
1ffd8d0d96
nextcloud server
...
nextcloud server
2016-06-22 08:07:45 +02:00
Joachim Sokolowski
2d76fbf3ca
Merge remote-tracking branch 'refs/remotes/nextcloud/master'
2016-06-22 07:59:18 +02:00
Jenkins for ownCloud
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
Joachim Sokolowski
64a9f9d77b
singleuser.user.php -> nextcloud
...
Changed to nextcloud
2016-06-22 07:48:36 +02:00
Marius Blüm
ce923d7b83
Merge pull request #194 from JSoko/patch-1
...
default.php for nextcloud themes example
2016-06-22 06:41:54 +02:00
Joachim Sokolowski
235e2fc68e
default.php for nextcloud
...
changing it to nextcloud
2016-06-21 17:27:02 +02:00
karakayasemi
c8b7a059b4
Fire hooks for mkdir for folder upload
...
fromTmpFile function, usual mkdir call is only working for file's parent
directory. Does not care upper parent folders. I added a recursive
function that creates parent non-existing folders with usual mkdir.
2016-06-21 17:10:52 +02:00
Lukas Reschke
638a713008
Merge pull request #191 from nextcloud/ci-postgres
...
Add postgres to CI
2016-06-21 16:46:30 +02:00
Christoph Wurst
178fa11ec1
use theme name instead of hard-coded 'ownCloud'
2016-06-21 16:39:51 +02:00
Christoph Wurst
2c1db51e7c
fix tranlations
2016-06-21 16:39:51 +02:00
Christoph Wurst
31f3aaa36b
app passwords/device tokens wording
2016-06-21 16:39:51 +02:00
Jörn Friedrich Dreyer
704a993e37
Fix null pointer exception in user_ldap ( #25062 )
2016-06-21 16:30:48 +02:00
Vincent Petry
755c86e3a2
Merge pull request #24505 from owncloud/ceph-wait-for-http
...
Don't rely on the notify socket but on the service responding
2016-06-21 16:21:11 +02:00
Christoph Wurst
7f22aeb5d6
redirect to new login route ( #25099 )
...
* redirect to new login route
* encode anchor in url and restore it client-side
2016-06-21 16:14:51 +02:00
Morris Jobke
6583a2fef0
Add postgres to CI
2016-06-21 16:05:48 +02:00
Christoph Wurst
195fc5b048
Merge pull request #25196 from owncloud/update-session-token-password
...
update session token password on user password change
2016-06-21 15:39:01 +02:00
Georg Ehrke
1452b74de7
Contacts API: replace raw image data with url ( #25081 )
...
* add uri to AddressBookImpl array
* Introduce ImageExportPlugin for CardDav
* add plugin to v1 routes
* replace binary contact photo with link
* update tests
* Adding unit tests
2016-06-21 15:25:44 +02:00
Lukas Reschke
d5dd30c3a0
Add "Login credentials" and "User Provided"
...
This adds the "Login Credentials" and "User Provided" option to the external storage implementation, it is basically done by reverting 176fb191b7
from https://github.com/owncloud/core/pull/22432 .
This was taken from owncloud/core which is AGPL licensed.
2016-06-21 14:58:35 +02:00
Lukas Reschke
3985055cda
Merge pull request #188 from nextcloud/add-wnd
...
Add "Global Auth" option to external storage
2016-06-21 14:53:44 +02:00
Robin Appelman
6affbdc6e7
Add "Global Auth" option to external storage
...
This adds the "Global Auth" option to the external storage implementation, it is basically done by reverting c2c6caee93
from https://github.com/owncloud/core/pull/22468 .
This was taken from owncloud/core which is AGPL licensed. Commited with "icewind@owncloud.com" to keep the license header signature in sync.
![2016-06-21_14-01-06](https://cloud.githubusercontent.com/assets/878997/16228662/9c243136-37b8-11e6-9700-c1076ddb3d17.png )
2016-06-21 14:16:45 +02:00
Thomas Müller
f2f1eab7f4
fix broken unit test ( #25198 )
2016-06-21 13:55:11 +02:00
Vincent Petry
af98e3e641
Merge pull request #25042 from owncloud/session-settings-ellipsis
...
add overflow ellipsis to session and device tokens list
2016-06-21 12:15:38 +02:00
Lukas Reschke
097cba8b38
Merge pull request #185 from nextcloud/fix-permission-issue
...
Show error message if config file is not readable
2016-06-21 12:14:24 +02:00
Christoph Wurst
db11c20dcb
pass new password instead of username
2016-06-21 11:54:54 +02:00
Lukas Reschke
e6895cb3b5
Merge pull request #186 from nextcloud/master-sync-upstream
...
[master] sync upstream - 21.06.2016
2016-06-21 11:43:15 +02:00
Vincent Petry
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00