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

394 commits

Author SHA1 Message Date
Nextcloud bot
f3a7b7eaa3
[tx-robot] updated from transifex 2017-02-27 01:19:49 +00:00
Nextcloud bot
556b958af2
[tx-robot] updated from transifex 2017-02-25 01:25:07 +00:00
Nextcloud bot
54317e80c0
[tx-robot] updated from transifex 2017-02-23 01:18:48 +00:00
Nextcloud bot
47c6a8019f
[tx-robot] updated from transifex 2017-02-16 01:07:44 +00:00
Joas Schilling
0be2921966
Fix DI of the cloud id manager into apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-14 12:47:46 +01:00
Nextcloud bot
7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Nextcloud bot
01b3da612b
[tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
Nextcloud bot
c2e61362cc
[tx-robot] updated from transifex 2017-02-10 01:07:02 +00:00
Robin Appelman
bf88060a98 Merge pull request #3297 from nextcloud/cloud-id-resolve 
Add a single public api for resolving a cloud id to a user and remote and back
 2017-02-09 14:54:32 +01:00
Robin Appelman
f6cd5200a2
clean cloud ids 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-09 13:31:06 +01:00
Nextcloud bot
3c4b539fdf
[tx-robot] updated from transifex 2017-02-09 01:07:10 +00:00
Robin Appelman
a359d0d7c7
remove test for removed code 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:02 +01:00
Robin Appelman
fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:02 +01:00
Nextcloud bot
fa96b9e356
[tx-robot] updated from transifex 2017-02-06 01:07:04 +00:00
Nextcloud bot
e4a74568e6
[tx-robot] updated from transifex 2017-02-05 01:07:05 +00:00
Nextcloud bot
49bce91404
[tx-robot] updated from transifex 2017-02-03 01:07:21 +00:00
Nextcloud bot
b946ec9d6c
[tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
Nextcloud bot
bbcb1dd2e0
[tx-robot] updated from transifex 2017-01-30 01:07:14 +00:00
Nextcloud bot
012e521239
[tx-robot] updated from transifex 2017-01-22 01:07:52 +00:00
Nextcloud bot
48a3f2a8a2
[tx-robot] updated from transifex 2017-01-20 01:07:41 +00:00
Bjoern Schiessle
3882a8d648
some code cleanup while working on the file 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-19 10:12:46 +01:00
Bjoern Schiessle
cd8104dfb0
add brute force protection to 'mount public link' operation 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-19 10:12:46 +01:00
Nextcloud bot
203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Nextcloud bot
c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Nextcloud bot
4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Nextcloud bot
d9035e2805
[tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Nextcloud bot
0d24e5d5f9
[tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot
fc02564ea6
[tx-robot] updated from transifex 2016-12-30 01:07:28 +00:00
Nextcloud bot
3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Nextcloud bot
0b64e96c9b
[tx-robot] updated from transifex 2016-12-22 01:07:28 +00:00
Nextcloud bot
fe9a38d5b5
[tx-robot] updated from transifex 2016-12-21 01:07:18 +00:00
Nextcloud bot
f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Joas Schilling
edec1fafe7
Update app versions and requirements 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-13 20:41:55 +01:00
Bjoern Schiessle
91303469e0
improve wording of admin settings to enable search on the public address book 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-12-12 13:55:12 +01:00
Nextcloud bot
74d1b0bada
[tx-robot] updated from transifex 2016-12-08 01:07:26 +00:00
Nextcloud bot
dda39728e3
[tx-robot] updated from transifex 2016-12-05 01:07:41 +00:00
Nextcloud bot
41dcceeb35
[tx-robot] updated from transifex 2016-11-30 01:07:16 +00:00
Nextcloud bot
e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Joas Schilling
b31d621840
Add an icon to the federated sharing notification 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-28 17:23:42 +01:00
Nextcloud bot
4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Nextcloud bot
8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Roeland Jago Douma
08ef7356f6 Merge pull request #2165 from nextcloud/sharing-activities-update 
Move file sharing activities to the new API
 2016-11-22 10:19:15 +01:00
Lukas Reschke
7b3855a375
Add config switch 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-21 11:30:02 +01:00
Nextcloud bot
ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Nextcloud bot
97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
Nextcloud bot
b1ee9862f8
[tx-robot] updated from transifex 2016-11-19 01:06:44 +00:00
Nextcloud bot
00fffae47f
[tx-robot] updated from transifex 2016-11-18 01:07:04 +00:00
Nextcloud bot
ab18d2f55e
[tx-robot] updated from transifex 2016-11-17 01:07:02 +00:00
Roeland Jago Douma
7100a1b347 Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboard 
Adds copy tooltip to clipboards
 2016-11-16 17:57:35 +01:00
Joas Schilling
bdaf334c53
Move file sharing activities to the new API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-16 16:45:08 +01:00
Morris Jobke
b7e6e9f83c
Fix tooltips - they now properly change on click 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-16 15:43:26 +01:00
Roeland Jago Douma
f7c637071a
Adds copy tooltip to clipboards 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-15 19:30:59 +01:00
Lukas Reschke
bc1008ac38
Use 11.0 instead 9.2 
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 14:45:58 +01:00
Nextcloud bot
571c5aac5e
[tx-robot] updated from transifex 2016-11-15 01:07:05 +00:00
Nextcloud bot
8c1cd07de3
[tx-robot] updated from transifex 2016-11-14 01:07:06 +00:00
Nextcloud bot
150b86a7db
[tx-robot] updated from transifex 2016-11-13 01:07:09 +00:00
Nextcloud bot
cfda17d8f3
[tx-robot] updated from transifex 2016-11-10 01:07:14 +00:00
Nextcloud bot
8d954c0ece
[tx-robot] updated from transifex 2016-11-07 01:07:03 +00:00
Nextcloud bot
ca3616cb58
[tx-robot] updated from transifex 2016-11-05 01:07:14 +00:00
Nextcloud bot
479d76d426
[tx-robot] updated from transifex 2016-11-04 01:07:04 +00:00
Nextcloud bot
8471219b7c
[tx-robot] updated from transifex 2016-11-03 01:07:06 +00:00
Bjoern Schiessle
4623b70cc9
catch all exception and return a user friendly exception message 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 18:05:14 +01:00
Bjoern Schiessle
76b1dee499
use https by default if no protocol is given. Only use unsecure connection if it is explicitely given 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-11-02 10:44:55 +01:00
Nextcloud bot
122fbf0092
[tx-robot] updated from transifex 2016-11-02 01:07:09 +00:00
Lukas Reschke
ef467c3195 Merge pull request #339 from nextcloud/share-types-by-folder 
Add getShareTypesInFolder to optimize folder listening
 2016-11-01 18:44:00 +01:00
Roeland Jago Douma
7e2159e9bb
Add defaultShareProvider & federatedshareprovider tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 13:52:37 +01:00
Roeland Jago Douma
fc4d0a86ef
Fix merging backend results 
* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-01 12:16:05 +01:00
Nextcloud bot
20f45e6fe4
[tx-robot] updated from transifex 2016-11-01 01:06:57 +00:00
Roeland Jago Douma
ce7eb02685
Add remoteprovider getsharesinfolder function 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-31 20:26:11 +01:00
Robin Appelman
3692769b0a
Add getShareTypesInFolder to optimize folder listening 
Signed-off-by: Robin Appelman <icewind@owncloud.com>
 2016-10-31 15:55:40 +01:00
Nextcloud bot
6d2d069c17
[tx-robot] updated from transifex 2016-10-31 01:06:55 +00:00
Nextcloud bot
1187a8c183
[tx-robot] updated from transifex 2016-10-30 00:06:56 +00:00
Lukas Reschke
e48fa1c337 Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n 
Move away from legacy OC_L10N
 2016-10-29 09:39:22 +02:00
Nextcloud bot
035890aeb1
[tx-robot] updated from transifex 2016-10-29 00:07:14 +00:00
Roeland Jago Douma
740659a04c
Move away from OC_L10N 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-28 21:46:28 +02:00
Nextcloud bot
ad597d498d
[tx-robot] updated from transifex 2016-10-28 00:07:11 +00:00
Morris Jobke
d4969abc9d Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings 
Nextcloud rich object strings
 2016-10-27 15:30:58 +02:00
Nextcloud bot
9984eba727
[tx-robot] updated from transifex 2016-10-27 00:07:01 +00:00
Joas Schilling
103bf6dd28
Switch to public API 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-21 09:09:26 +02:00
Joas Schilling
246bb9f33d
Move OC\Files\Storage\Shared to the right namespace 2016-10-20 20:27:44 +02:00
Joas Schilling
cf2d1b2427
Move federated share notifications to ROS 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-20 12:14:59 +02:00
Nextcloud bot
943d9737e4
[tx-robot] updated from transifex 2016-10-18 00:06:51 +00:00
Nextcloud bot
07a1be2e06
[tx-robot] updated from transifex 2016-10-03 00:12:47 +00:00
Nextcloud bot
da03018add
[tx-robot] updated from transifex 2016-10-01 00:08:23 +00:00
Lukas Reschke
bd70221d61
Mock HTTPClientService 
These tests were not using any kind of mocks at all! This made the test execution time took 2 minutes instead of now less than 1 second… (because multiple HTTP requests were queued and timed-out then…)

See https://blackfire.io/profiles/compare/6d2611f2-ad08-47b6-973b-2b5f9c8b96d2/graph for reference

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-09-29 00:06:56 +02:00
skjnldsv
71830b285c Svgo optimization 
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
 2016-09-27 20:56:26 +02:00
Nextcloud bot
b30c79b63c
[tx-robot] updated from transifex 2016-09-23 00:09:45 +00:00
Nextcloud bot
6a873acf46
[tx-robot] updated from transifex 2016-09-22 00:11:32 +00:00
Nextcloud bot
cb6e16ab5c
[tx-robot] updated from transifex 2016-09-17 00:10:14 +00:00
Nextcloud bot
7ffadc7e26
[tx-robot] updated from transifex 2016-09-14 00:10:31 +00:00
Joas Schilling
6f8f78b07a
Fix some more sniffs 2016-09-12 16:48:11 +02:00
Nextcloud bot
b992bf2142
[tx-robot] updated from transifex 2016-09-08 00:10:21 +00:00
Nextcloud bot
1110ef52ed
[tx-robot] updated from transifex 2016-09-07 00:09:25 +00:00
Nextcloud bot
4a5cd74fb2
[tx-robot] updated from transifex 2016-09-01 00:09:24 +00:00
Roeland Jago Douma
ac2be923a6
Fix deprecated usages of getMock in federatedfilesharing 2016-08-31 14:06:51 +02:00
Roeland Jago Douma
2812755359
Move federated sharing routes to the federatedfilesharingapp 
* Move routes to app
* Move routes over to the AppFramework
* Fix tests

There is plenty of stuff to fix properly here. But out of scope for now.
 2016-08-28 21:26:33 +02:00
Roeland Jago Douma
c20aef8795 Merge pull request #1085 from nextcloud/fix-ffs-sharing-syntax 
Fix the syntax of the federation ID share buttons
 2016-08-26 15:10:03 +02:00
Joas Schilling
6b885bbc56
Reorder the buttons by importance 2016-08-26 14:16:27 +02:00
Joas Schilling
ab5a69b94d
FIx the syntax of the buttons 2016-08-26 13:59:50 +02:00
Julius Haertl
a7273f1658
Make federadedfilesharing button match the theming values 2016-08-26 12:52:16 +02:00
Julius Haertl
a7c5f1b3c4
Theming: fix federated sharing button color 2016-08-26 12:07:45 +02:00
Roeland Jago Douma
a1ed8207e9
HTTPHelper is deprecated 
Use the IClientService instead
 2016-08-24 21:30:39 +02:00
Nextcloud bot
39c180117e
[tx-robot] updated from transifex 2016-08-17 13:30:52 +00:00
Lukas Reschke
6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +02:00
Lukas Reschke
7ffb7b0d84
Use MockBuilder instead of createMock 
CI uses an older PHPUnit
 2016-08-15 16:43:22 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Nextcloud bot
f3124b5052
[tx-robot] updated from transifex 2016-08-15 00:12:16 +00:00
Nextcloud bot
241fc286c7
[tx-robot] updated from transifex 2016-08-14 00:10:34 +00:00
Arthur Schiwon
d2fcac8300
change federatedfilesharing css class to followupsection to reduce whitespace 2016-08-13 00:36:32 +02:00
Lukas Reschke
8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Arthur Schiwon
5696c8aa35
adjust federatedfilesharing 2016-08-11 15:13:40 +02:00
Nextcloud bot
f68f1d5f37
[tx-robot] updated from transifex 2016-08-11 12:08:42 +00:00
Nextcloud bot
56bf0a8399
[tx-robot] updated from transifex 2016-08-11 00:14:12 +00:00
Nextcloud bot
d6bee61131
[tx-robot] updated from transifex 2016-08-10 00:09:59 +00:00
Roeland Jago Douma
edeb41ccaf Merge pull request #780 from nextcloud/copy_fed_cloud_id 
Add clipboard action to Personal Settings Fed Cloud Id
 2016-08-09 16:18:15 +02:00
Roeland Jago Douma
6f37a65b77
Add clipboard action to Personal Settings Fed Cloud Id 2016-08-09 14:22:00 +02:00
Roeland Jago Douma
d8e8096eba
Make 'Add to your website' toggleable 2016-08-09 12:21:10 +02:00
Nextcloud bot
3a26def7cf
[tx-robot] updated from transifex 2016-08-09 00:10:11 +00:00
Joas Schilling
dae6432ae7
Increment the versions and adjust the capitilization 2016-08-08 16:45:40 +02:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
Nextcloud bot
50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Nextcloud bot
95a0714973
[tx-robot] updated from transifex 2016-07-27 00:09:48 +00:00
Nextcloud bot
7d969962db
[tx-robot] updated from transifex 2016-07-25 00:09:09 +00:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +00:00
Joas Schilling
7400ff05ac
Also increase the min version 2016-07-22 14:46:52 +02:00
Robin Appelman
6062b6365b bumb compatible app versions for core apps 2016-07-22 13:04:23 +02:00
Joas Schilling
03cb588ea9 Merge pull request #500 from nextcloud/bump_version 
Bump version
 2016-07-22 10:03:42 +02:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Joas Schilling
86129a8b88
Increase app versions 2016-07-21 15:50:30 +02:00
Nextcloud bot
b7c5a59adf
[tx-robot] updated from transifex 2016-07-21 00:09:07 +00:00
Nextcloud bot
4a963c21ff
[tx-robot] updated from transifex 2016-07-19 00:09:00 +00:00
Morris Jobke
40328114f9 Merge pull request #379 from nextcloud/create_federated_share_on_mount 
Create federated share on mount
 2016-07-18 09:22:48 +02:00
Bjoern Schiessle
f8a531c06c
don't convert link share to federated share if outgoing federated shares are forbidden 2016-07-14 20:48:45 +02:00
Bjoern Schiessle
c7f6461c53
rename SaveToNextcloudController to MountPublicLinkController 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
56d3100f44
adjust copyright notices 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
dc53788711
remove unused parameter 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
55b990b544
allow to mount public link from Nextclouds <= 9 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
5bbba490c4
move some stuff over to the federatedfilesharing app 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
2f23054b01
s/ownCloud/Nextcloud 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
33a685bc41
continue to accept the URL of the remote server instead of the federated cloud id 2016-07-14 16:39:48 +02:00
Björn Schießle
a0ae16aa1a
add unit tests 2016-07-14 11:22:35 +02:00
Björn Schießle
f5d0b464a7
create a real federated share if a user add a public link to his ownCloud 
this way the owner sees all mounted public links and control them individually
 2016-07-14 11:22:35 +02:00
Morris Jobke
2b86f1e677
Remove unneeded usage of tipsy 
* tooltip is already initialized
 2016-07-13 09:57:49 +02:00
Nextcloud bot
c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Nextcloud bot
a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Lukas Reschke
2a1a3957b6 Merge pull request #333 from nextcloud/sync-master 
Sync master
 2016-07-07 19:29:43 +02:00
Morris Jobke
ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Morris Jobke
5ace43f438 Revert "[tx-robot] updated from transifex" 
This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234.
 2016-07-07 11:04:08 +02:00
Nextcloud bot
4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Jenkins for ownCloud
34eec57262 [tx-robot] updated from transifex 2016-07-05 02:31:32 -04:00
Jenkins for ownCloud
9e0d8fcf41 [tx-robot] updated from transifex 2016-07-04 01:56:34 -04:00
Jenkins for ownCloud
cea84cf7a8 [tx-robot] updated from transifex 2016-07-03 01:54:52 -04:00
Jenkins for ownCloud
dea7b5be35 [tx-robot] updated from transifex 2016-07-02 01:54:53 -04:00
Vincent Petry
ba95297c5c Merge pull request #25262 from owncloud/fed-sharing-error 
Only save federated share after remote server is notified
 2016-07-01 16:20:39 +02:00
Lukas Reschke
179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Morris Jobke
b6397ef73a Merge pull request #236 from nextcloud/master-sync-upstream 
[Master] sync upstream
 2016-06-28 09:02:03 +02:00
Jenkins for ownCloud
894b7d93f6 [tx-robot] updated from transifex 2016-06-28 01:57:10 -04:00
Lukas Reschke
6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Morris Jobke
5961d5aae4 Add app:check-code for already compatible apps 
* admin_audit, comments, federation
* removed not needed call to OC_Util::checkAdminUser() (is already
  done by the request handler before)
 2016-06-27 16:50:10 +02:00
Robin Appelman
646c90cc4a Log reason why we removed the fed share 2016-06-27 16:38:47 +02:00
Robin Appelman
8d32e1d35b Handle exceptions thrown while trying to notify remote server of a fed share 2016-06-27 14:28:12 +02:00
Vincent Petry
f65787ffdc Merge pull request #25247 from owncloud/fed-unshare-fail 
Remove a fed share from the local table before trying to notify the remote server
 2016-06-27 09:58:13 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Jenkins for ownCloud
29068d3845 [tx-robot] updated from transifex 2016-06-24 01:56:13 -04:00
Robin Appelman
040c541138 Remove a fed share from the local table before trying to notify the remote server 2016-06-23 14:19:55 +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
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Bjoern Schiessle
9eaccaf2b1
s/ownCloud/Nextcloud 2016-06-20 14:20:48 +02:00
Jenkins for ownCloud
bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Jenkins for ownCloud
cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Jenkins for ownCloud
be4a29d75f [tx-robot] updated from transifex 2016-06-15 05:54:49 +00:00
Arthur Schiwon
ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 2016-06-14 01:06:25 +02:00
Jenkins for ownCloud
3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Jenkins for ownCloud
e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Arthur Schiwon
a636e4ff28
Downstream 2016-06-09 
Merge branch 'master' of https://github.com/owncloud/core into downstream-160609
 2016-06-09 18:45:12 +02:00
blizzz
51fd2602a7 Revert "Downstream 2016-06-08" 2016-06-09 17:41:57 +02:00
Jenkins for ownCloud
6aab7d7232
[tx-robot] updated from transifex 2016-06-09 14:00:02 +02:00
Jenkins for ownCloud
355f50bd6c [tx-robot] updated from transifex 2016-06-09 06:16:41 +00:00
Jan-Christoph Borchardt
81145ee57c THIS IS NEXTCLOUD! adjusting the design 2016-06-08 17:02:18 +02:00
Jenkins for ownCloud
bbd61cd98a [tx-robot] updated from transifex 2016-06-08 01:54:57 -04:00
Jenkins for ownCloud
4234892a60 [tx-robot] updated from transifex 2016-06-04 02:01:18 -04:00
Jenkins for ownCloud
63132483ca [tx-robot] updated from transifex 2016-06-03 02:19:30 -04:00
Jenkins for ownCloud
f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Jenkins for ownCloud
a9f666f36e [tx-robot] updated from transifex 2016-06-01 01:56:03 -04:00
Jenkins for ownCloud
b2e524b936 [tx-robot] updated from transifex 2016-05-31 01:54:58 -04:00
Jenkins for ownCloud
985063a7e2 [tx-robot] updated from transifex 2016-05-30 01:57:01 -04:00
Jenkins for ownCloud
c870e77546 [tx-robot] updated from transifex 2016-05-29 01:55:25 -04:00
Jenkins for ownCloud
c778fa062c [tx-robot] updated from transifex 2016-05-28 01:55:21 -04:00
Jenkins for ownCloud
a95275d27b [tx-robot] updated from transifex 2016-05-27 01:55:35 -04:00
Lukas Reschke
aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Jenkins for ownCloud
567381e361 [tx-robot] updated from transifex 2016-05-26 01:56:23 -04:00
Joas Schilling
3a716ae91c
Move lib/ to PSR-4 2016-05-25 14:59:59 +02:00
Jenkins for ownCloud
6972f4dc50 [tx-robot] updated from transifex 2016-05-25 02:03:38 -04:00
Jenkins for ownCloud
f1f7511c61 [tx-robot] updated from transifex 2016-05-24 15:24:38 -04:00
Vincent Petry
5ba1add03c Merge pull request #24603 from owncloud/federated_reshare 
flat federated re-share
 2016-05-23 09:52:13 +02:00