]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoAdd some generic default headers as well via PHP
Lukas Reschke [Thu, 26 Mar 2015 14:30:00 +0000 (15:30 +0100)]
Add some generic default headers as well via PHP

9 years agoMerge pull request #14399 from owncloud/ignore-empty-plurals
Lukas Reschke [Thu, 26 Mar 2015 19:15:33 +0000 (20:15 +0100)]
Merge pull request #14399 from owncloud/ignore-empty-plurals

Ignore empty plurals just like with singulars

9 years agoMerge pull request #15129 from owncloud/version-command-bus
Lukas Reschke [Thu, 26 Mar 2015 18:55:13 +0000 (19:55 +0100)]
Merge pull request #15129 from owncloud/version-command-bus

expire versions in a background command

9 years agoMerge pull request #15232 from owncloud/remove-arg-separator-magic
Lukas Reschke [Thu, 26 Mar 2015 18:41:22 +0000 (19:41 +0100)]
Merge pull request #15232 from owncloud/remove-arg-separator-magic

Remove custom `arg_separator.output`

9 years agoMerge pull request #14665 from owncloud/fileid-increment
Morris Jobke [Thu, 26 Mar 2015 18:36:18 +0000 (19:36 +0100)]
Merge pull request #14665 from owncloud/fileid-increment

SQLite autoincrement test

9 years agoMerge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricks
Thomas Müller [Thu, 26 Mar 2015 17:21:44 +0000 (18:21 +0100)]
Merge pull request #15228 from owncloud/add-missing-navigation-for-tips-n-tricks

Add navigation entry for tips and tricks setion

9 years agoMerge pull request #15230 from owncloud/sqlite-notice
Jan-Christoph Borchardt [Thu, 26 Mar 2015 17:15:22 +0000 (18:15 +0100)]
Merge pull request #15230 from owncloud/sqlite-notice

move SQLite notice from warnings to tips & tricks

9 years agoMerge pull request #14958 from owncloud/dropdown-style
Jan-Christoph Borchardt [Thu, 26 Mar 2015 17:07:35 +0000 (18:07 +0100)]
Merge pull request #14958 from owncloud/dropdown-style

popover style for apps and user dropdown menus

9 years agoteardown after we're done
Robin Appelman [Thu, 26 Mar 2015 16:30:43 +0000 (17:30 +0100)]
teardown after we're done

9 years agoMerge pull request #14495 from owncloud/update-mailmap-01
Thomas Müller [Thu, 26 Mar 2015 16:17:18 +0000 (17:17 +0100)]
Merge pull request #14495 from owncloud/update-mailmap-01

Updating .mailmap

9 years agomock up missing elements in the tests
Jan-Christoph Borchardt [Thu, 26 Mar 2015 16:10:59 +0000 (17:10 +0100)]
mock up missing elements in the tests

9 years agosave uid instead of user object in command
Robin Appelman [Thu, 26 Mar 2015 16:11:34 +0000 (17:11 +0100)]
save uid instead of user object in command

9 years agoRemove custom `arg_separator.output`
Lukas Reschke [Thu, 26 Mar 2015 16:07:26 +0000 (17:07 +0100)]
Remove custom `arg_separator.output`

This seems unrequired nowadays and like a legacy fragment. It should be safe to remove.

Fixes https://github.com/owncloud/core/issues/14782

9 years agocheck limit of serialized command in unit tests
Robin Appelman [Tue, 24 Mar 2015 09:48:21 +0000 (10:48 +0100)]
check limit of serialized command in unit tests

9 years agoensure commands can be serialized in unit tests
Robin Appelman [Tue, 24 Mar 2015 09:46:29 +0000 (10:46 +0100)]
ensure commands can be serialized in unit tests

9 years agoSetup the filesystem in the expire command
Robin Appelman [Tue, 24 Mar 2015 09:19:54 +0000 (10:19 +0100)]
Setup the filesystem in the expire command

9 years agoHandle exceptions thrown during hooks when running unit tests
Robin Appelman [Tue, 24 Mar 2015 09:19:30 +0000 (10:19 +0100)]
Handle exceptions thrown during hooks when running unit tests

9 years agoForce test cases using background commands to handle setting up the filesystem
Robin Appelman [Tue, 24 Mar 2015 09:02:48 +0000 (10:02 +0100)]
Force test cases using background commands to handle setting up the filesystem

9 years agoexpire versions in a background command
Robin Appelman [Mon, 23 Mar 2015 12:07:40 +0000 (13:07 +0100)]
expire versions in a background command

9 years agoonly move dropdown triangle when navigation is opened, fix timing bug
Jan-Christoph Borchardt [Thu, 26 Mar 2015 15:25:29 +0000 (16:25 +0100)]
only move dropdown triangle when navigation is opened, fix timing bug

9 years agomove SQLite notice from warnings to tips & tricks
Jan-Christoph Borchardt [Thu, 26 Mar 2015 15:53:27 +0000 (16:53 +0100)]
move SQLite notice from warnings to tips & tricks

9 years agoMerge pull request #15226 from owncloud/fix-upload-placeholder
Joas Schilling [Thu, 26 Mar 2015 15:50:43 +0000 (16:50 +0100)]
Merge pull request #15226 from owncloud/fix-upload-placeholder

Fix placeholder in files upload

9 years agoMerge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list
Joas Schilling [Thu, 26 Mar 2015 15:35:46 +0000 (16:35 +0100)]
Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list

Correctly only send the errors of the current file to the event

9 years agoAdd navigation entry for tips and tricks setion
Joas Schilling [Thu, 26 Mar 2015 15:23:21 +0000 (16:23 +0100)]
Add navigation entry for tips and tricks setion

9 years agoRevert "add https:// placeholder for From Link feature. closes #13255"
Robin McCorkell [Thu, 26 Mar 2015 14:47:21 +0000 (14:47 +0000)]
Revert "add https:// placeholder for From Link feature. closes #13255"

This reverts commit 18b5966f3a7639c6190f58b0d94e05e67200d57a.

9 years agoMerge pull request #15218 from owncloud/revert-oc-etag-master
Thomas Müller [Thu, 26 Mar 2015 14:34:24 +0000 (15:34 +0100)]
Merge pull request #15218 from owncloud/revert-oc-etag-master

Revert oc etag master

9 years agoCorrectly only send the errors of the current file to the event
Joas Schilling [Thu, 26 Mar 2015 14:33:31 +0000 (15:33 +0100)]
Correctly only send the errors of the current file to the event

9 years agodetail corrections for search box layout
Jan-Christoph Borchardt [Thu, 26 Mar 2015 14:06:11 +0000 (15:06 +0100)]
detail corrections for search box layout

9 years agoRevert "adding OC-ETag header"
Vincent Petry [Thu, 26 Mar 2015 14:04:41 +0000 (15:04 +0100)]
Revert "adding OC-ETag header"

This reverts commit 30ee8b6f998b4b2e27da92b3adcdbc4683d3bcde.

9 years agoRevert "adding unit tests"
Vincent Petry [Thu, 26 Mar 2015 14:04:36 +0000 (15:04 +0100)]
Revert "adding unit tests"

This reverts commit 8d327c94a844804d0e7af057866e552bd5aafd17.

9 years agofix user dropdown for IE8
Jan-Christoph Borchardt [Thu, 26 Mar 2015 14:02:31 +0000 (15:02 +0100)]
fix user dropdown for IE8

9 years agoMerge pull request #15212 from owncloud/log-width
Morris Jobke [Thu, 26 Mar 2015 13:41:54 +0000 (14:41 +0100)]
Merge pull request #15212 from owncloud/log-width

force log messages to break to alleviate horizontal scroll on Admin page

9 years agoMerge pull request #15168 from owncloud/oc-etag-master
Vincent Petry [Thu, 26 Mar 2015 12:52:43 +0000 (13:52 +0100)]
Merge pull request #15168 from owncloud/oc-etag-master

adding OC-ETag header

9 years agoMerge pull request #14125 from dratini0/master
Lukas Reschke [Thu, 26 Mar 2015 12:35:00 +0000 (13:35 +0100)]
Merge pull request #14125 from dratini0/master

[nginx] Extending X-Accel-Redirect support

9 years agoMerge pull request #15206 from owncloud/mark-dot-files-gray
Thomas Müller [Thu, 26 Mar 2015 11:40:47 +0000 (12:40 +0100)]
Merge pull request #15206 from owncloud/mark-dot-files-gray

Show hidden files (dot files) in gray

9 years agoforce log messages to break to alleviate horizontal scroll on Admin page
Jan-Christoph Borchardt [Thu, 26 Mar 2015 10:42:04 +0000 (11:42 +0100)]
force log messages to break to alleviate horizontal scroll on Admin page

9 years agoadjust animations of Share, Versions and others to OC.menuSpeed
Jan-Christoph Borchardt [Thu, 26 Mar 2015 11:21:40 +0000 (12:21 +0100)]
adjust animations of Share, Versions and others to OC.menuSpeed

9 years agoreintroduce quick animation for menus
Jan-Christoph Borchardt [Thu, 26 Mar 2015 10:59:30 +0000 (11:59 +0100)]
reintroduce quick animation for menus

9 years agoUpdate license headers
Jenkins for ownCloud [Thu, 26 Mar 2015 10:44:34 +0000 (11:44 +0100)]
Update license headers

9 years agodetect MIT licensed files and ignore them for now
Thomas Müller [Tue, 17 Mar 2015 10:58:46 +0000 (11:58 +0100)]
detect MIT licensed files and ignore them for now

9 years agoproperly break after the first comment ends + allow to pass in one file/folder via...
Thomas Müller [Wed, 4 Mar 2015 13:33:40 +0000 (14:33 +0100)]
properly break after the first comment ends + allow to pass in one file/folder via commandline argument

9 years agoUpdating email of nickvergessen and georg
Thomas Müller [Wed, 4 Mar 2015 13:32:54 +0000 (14:32 +0100)]
Updating email of nickvergessen and georg

9 years agofixing ignorance of 'Not Committed Yet'
Thomas Müller [Wed, 25 Feb 2015 13:00:30 +0000 (14:00 +0100)]
fixing ignorance of 'Not Committed Yet'

9 years agoUpdating .mailmap
Thomas Müller [Wed, 25 Feb 2015 12:50:46 +0000 (13:50 +0100)]
Updating .mailmap

9 years agofix log in issue, fix arrow position, make dropdown work in Firefox
Jan-Christoph Borchardt [Thu, 26 Mar 2015 09:55:04 +0000 (10:55 +0100)]
fix log in issue, fix arrow position, make dropdown work in Firefox

9 years agoupdate 3rdparty submodule
Morris Jobke [Thu, 26 Mar 2015 10:09:05 +0000 (11:09 +0100)]
update 3rdparty submodule

9 years agoMerge pull request #15195 from owncloud/reanimate-add-guzzle
Morris Jobke [Thu, 26 Mar 2015 10:06:48 +0000 (11:06 +0100)]
Merge pull request #15195 from owncloud/reanimate-add-guzzle

Add wrapper for Guzzle

9 years agoMerge pull request #15194 from owncloud/fix-15146
Thomas Müller [Thu, 26 Mar 2015 10:03:36 +0000 (11:03 +0100)]
Merge pull request #15194 from owncloud/fix-15146

Do not use APCu when apc.enabled is Off.

9 years agoAdd repair step to fix SQLite autoincrement
Vincent Petry [Wed, 25 Mar 2015 17:31:49 +0000 (18:31 +0100)]
Add repair step to fix SQLite autoincrement

Force Doctrine to generate alter table SQL statements for SQLite to make
sure the code from OCSqlitePlatform is triggered.

9 years agoadding unit tests
Thomas Müller [Thu, 26 Mar 2015 09:49:26 +0000 (10:49 +0100)]
adding unit tests

9 years agoShow hidden files (dot files) in gray
Morris Jobke [Thu, 26 Mar 2015 09:29:01 +0000 (10:29 +0100)]
Show hidden files (dot files) in gray

9 years agofix accessibility of ownCloud logo and navigation entries, fix #15013g
Jan-Christoph Borchardt [Thu, 26 Mar 2015 09:28:49 +0000 (10:28 +0100)]
fix accessibility of ownCloud logo and navigation entries, fix #15013g

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 26 Mar 2015 05:55:29 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

9 years agoMerge pull request #15203 from owncloud/revert-15201-webdav-ng-bugfix
Morris Jobke [Wed, 25 Mar 2015 23:56:12 +0000 (00:56 +0100)]
Merge pull request #15203 from owncloud/revert-15201-webdav-ng-bugfix

Revert "FIX for webdav.mediencenter.t-online.de"

9 years agoRevert "FIX for webdav.mediencenter.t-online.de"
Morris Jobke [Wed, 25 Mar 2015 23:56:06 +0000 (00:56 +0100)]
Revert "FIX for webdav.mediencenter.t-online.de"

9 years agomove triangle of apps dropdown to align with app name triangle
Jan-Christoph Borchardt [Wed, 25 Mar 2015 23:36:02 +0000 (00:36 +0100)]
move triangle of apps dropdown to align with app name triangle

9 years agoreduce logo size a bit for a better look
Jan-Christoph Borchardt [Wed, 25 Mar 2015 23:35:47 +0000 (00:35 +0100)]
reduce logo size a bit for a better look

9 years agoadjust share dropdown border radius to 3px
Jan-Christoph Borchardt [Wed, 25 Mar 2015 17:04:31 +0000 (18:04 +0100)]
adjust share dropdown border radius to 3px

9 years agomore small fixes in header
Jan-Christoph Borchardt [Wed, 25 Mar 2015 17:01:14 +0000 (18:01 +0100)]
more small fixes in header

9 years agofurther adjustments of header and dropdown styles
Jan-Christoph Borchardt [Wed, 25 Mar 2015 16:39:50 +0000 (17:39 +0100)]
further adjustments of header and dropdown styles

9 years agopopover style for apps and user dropdown menus
Jan-Christoph Borchardt [Tue, 17 Mar 2015 12:47:54 +0000 (13:47 +0100)]
popover style for apps and user dropdown menus

9 years agoMerge pull request #15170 from owncloud/middleclickbreadcrumb
Morris Jobke [Wed, 25 Mar 2015 23:19:52 +0000 (00:19 +0100)]
Merge pull request #15170 from owncloud/middleclickbreadcrumb

Fix middle click on breadcrumb

9 years agoMerge pull request #15201 from owncloud/webdav-ng-bugfix
Oliver Kohl D.Sc. [Wed, 25 Mar 2015 20:30:18 +0000 (21:30 +0100)]
Merge pull request #15201 from owncloud/webdav-ng-bugfix

FIX for webdav.mediencenter.t-online.de

https://webdav.mediencenter.t-online.de returns invalid response code.

e.g.
{"reqId":"f9a1c394b98108e4e5ca62bf47829c64","remoteAddr":"81.189.45.224","app":"PHP","message":"Undefined offset: 2 at \/var\/www\/owncloud\/3rdparty\/sabre\/dav\/lib\/Sabre\/DAV\/Client.php#569","level":3,"time":"2015-03-25T18:25:48+00:00","method":"GET","url":"\/index.php\/apps\/files\/ajax\/getstoragestats.php?dir=External%2FT-Cloud%2FTests"}

e.g.
{"reqId":"3407d66672b3cef206b0af883e49bff4","remoteAddr":"46.74.125.245","app":"PHP","message":"Undefined index: {DAV:}getlastmodified at \/var\/www\/owncloud\/lib\/private\/files\/storage\/dav.php#563","level":3,"time":"2015-03-25T16:33:21+00:00"}

9 years agoFIX for webdav.mediencenter.t-online.de
Oliver Kohl D.Sc. [Wed, 25 Mar 2015 20:29:29 +0000 (21:29 +0100)]
FIX for webdav.mediencenter.t-online.de

https://webdav.mediencenter.t-online.de returns invalid response code.

e.g.
{"reqId":"f9a1c394b98108e4e5ca62bf47829c64","remoteAddr":"81.189.45.224","app":"PHP","message":"Undefined offset: 2 at \/var\/www\/owncloud\/3rdparty\/sabre\/dav\/lib\/Sabre\/DAV\/Client.php#569","level":3,"time":"2015-03-25T18:25:48+00:00","method":"GET","url":"\/index.php\/apps\/files\/ajax\/getstoragestats.php?dir=External%2FT-Cloud%2FTests"}

e.g.
{"reqId":"3407d66672b3cef206b0af883e49bff4","remoteAddr":"46.74.125.245","app":"PHP","message":"Undefined index: {DAV:}getlastmodified at \/var\/www\/owncloud\/lib\/private\/files\/storage\/dav.php#563","level":3,"time":"2015-03-25T16:33:21+00:00"}

9 years agoRename platform
Robin Appelman [Wed, 4 Mar 2015 14:05:30 +0000 (15:05 +0100)]
Rename platform

9 years agotriger db upgrade to set autoincrement for sqlite
Robin Appelman [Wed, 4 Mar 2015 13:30:33 +0000 (14:30 +0100)]
triger db upgrade to set autoincrement for sqlite

9 years agoAdd custom sqlite platform to set auto increment
Robin Appelman [Wed, 4 Mar 2015 13:30:07 +0000 (14:30 +0100)]
Add custom sqlite platform to set auto increment

9 years agoSQLite autoincrement test
Vincent Petry [Tue, 3 Mar 2015 10:14:45 +0000 (11:14 +0100)]
SQLite autoincrement test

9 years agoMerge pull request #15187 from owncloud/connectioncheck-feedback
Vincent Petry [Wed, 25 Mar 2015 15:28:25 +0000 (16:28 +0100)]
Merge pull request #15187 from owncloud/connectioncheck-feedback

only show connection checks results if there are errors, fix #11476

9 years agoMerge pull request #15185 from owncloud/fix-14775-master
Vincent Petry [Wed, 25 Mar 2015 15:26:58 +0000 (16:26 +0100)]
Merge pull request #15185 from owncloud/fix-14775-master

tearDown the file system before reinitializing

9 years agoAdd wrapper for Guzzle
Lukas Reschke [Mon, 16 Mar 2015 10:28:23 +0000 (11:28 +0100)]
Add wrapper for Guzzle

9 years agoMerge pull request #15190 from owncloud/hide-update-notification-on-mobile
Morris Jobke [Wed, 25 Mar 2015 14:48:34 +0000 (15:48 +0100)]
Merge pull request #15190 from owncloud/hide-update-notification-on-mobile

do not show update notification on mobile, fix overlapping of header menus

9 years agoMerge pull request #15183 from owncloud/active-usermenu-entry
Vincent Petry [Wed, 25 Mar 2015 14:47:56 +0000 (15:47 +0100)]
Merge pull request #15183 from owncloud/active-usermenu-entry

highlight active user menu entry

9 years agoMerge pull request #15180 from owncloud/ext-tabbing
Morris Jobke [Wed, 25 Mar 2015 14:46:59 +0000 (15:46 +0100)]
Merge pull request #15180 from owncloud/ext-tabbing

Use individual timers for separate config rows

9 years agoMerge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldelete
Vincent Petry [Wed, 25 Mar 2015 13:58:06 +0000 (14:58 +0100)]
Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldelete

Recreate trashbin folder after full deletion

9 years agoDo not use APCu when apc.enabled is Off.
Andreas Fischer [Wed, 25 Mar 2015 13:52:01 +0000 (14:52 +0100)]
Do not use APCu when apc.enabled is Off.

9 years agodo not show update notification on mobile, fix overlapping of header menus, fix ...
Jan-Christoph Borchardt [Wed, 25 Mar 2015 11:43:05 +0000 (12:43 +0100)]
do not show update notification on mobile, fix overlapping of header menus, fix #10544

9 years agotearDown the file system before reinitializing - fixes #14775
Thomas Müller [Wed, 25 Mar 2015 09:55:54 +0000 (10:55 +0100)]
tearDown the file system before reinitializing - fixes #14775

9 years agoonly show connection checks results if there are errors, fix #11476
Jan-Christoph Borchardt [Wed, 25 Mar 2015 08:34:13 +0000 (09:34 +0100)]
only show connection checks results if there are errors, fix #11476

9 years agoFix breadcrumb click JS unit test
Vincent Petry [Wed, 25 Mar 2015 08:27:55 +0000 (09:27 +0100)]
Fix breadcrumb click JS unit test

9 years agohighlight active user menu entry
Jan-Christoph Borchardt [Wed, 25 Mar 2015 08:27:43 +0000 (09:27 +0100)]
highlight active user menu entry

9 years agoMerge pull request #14970 from owncloud/sidebar-enhancements
Jan-Christoph Borchardt [Wed, 25 Mar 2015 08:16:49 +0000 (09:16 +0100)]
Merge pull request #14970 from owncloud/sidebar-enhancements

sidebar fixes

9 years agoMerge pull request #15181 from owncloud/simple-fix
Thomas Müller [Wed, 25 Mar 2015 07:46:52 +0000 (08:46 +0100)]
Merge pull request #15181 from owncloud/simple-fix

Make the link to issue template bold

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 25 Mar 2015 05:55:46 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

9 years agoMake the link to issue template bold
Daniel Hansson [Wed, 25 Mar 2015 04:21:43 +0000 (05:21 +0100)]
Make the link to issue template bold

Makes it easier to see the issue template link. And hopefully more we don't have to tell everybody that much that they should use it.

9 years agoMerge pull request #15171 from owncloud/sabre-logforbiddenasdebug
Thomas Müller [Tue, 24 Mar 2015 22:31:35 +0000 (23:31 +0100)]
Merge pull request #15171 from owncloud/sabre-logforbiddenasdebug

Log forbidden in debug level

9 years agoUse individual timers for separate config rows
Robin McCorkell [Sun, 15 Mar 2015 19:47:22 +0000 (19:47 +0000)]
Use individual timers for separate config rows

9 years agoMerge pull request #14949 from owncloud/sabre-2.1.3
Lukas Reschke [Tue, 24 Mar 2015 22:16:57 +0000 (23:16 +0100)]
Merge pull request #14949 from owncloud/sabre-2.1.3

Update sabre-2.1.3 thirdparty submodule

9 years agoRecreate trashbin folder after full deletion
Vincent Petry [Tue, 24 Mar 2015 22:02:14 +0000 (23:02 +0100)]
Recreate trashbin folder after full deletion

9 years agoLog forbidden in debug level
Vincent Petry [Tue, 24 Mar 2015 21:08:11 +0000 (22:08 +0100)]
Log forbidden in debug level

9 years agoFix middle click on breadcrumb
Vincent Petry [Tue, 24 Mar 2015 21:05:02 +0000 (22:05 +0100)]
Fix middle click on breadcrumb

9 years agoadding OC-ETag header
Thomas Müller [Fri, 29 Aug 2014 10:09:33 +0000 (12:09 +0200)]
adding OC-ETag header

9 years agoMerge pull request #15055 from owncloud/share-activity-grouping
Morris Jobke [Tue, 24 Mar 2015 19:23:36 +0000 (20:23 +0100)]
Merge pull request #15055 from owncloud/share-activity-grouping

Group sharing activities by user/group and file respectively

9 years agoMerge pull request #15160 from owncloud/deduplicate-external-manager-tests
Morris Jobke [Tue, 24 Mar 2015 19:15:56 +0000 (20:15 +0100)]
Merge pull request #15160 from owncloud/deduplicate-external-manager-tests

Deduplicate external manager tests

9 years agoMerge pull request #14919 from rullzer/files_thumbnail_fix
Morris Jobke [Tue, 24 Mar 2015 19:12:19 +0000 (20:12 +0100)]
Merge pull request #14919 from rullzer/files_thumbnail_fix

Files thumbnail fix

9 years agoNo longer directly output OC_Image for thumbnails
Roeland Jago Douma [Mon, 16 Mar 2015 11:42:40 +0000 (12:42 +0100)]
No longer directly output OC_Image for thumbnails

* Only use public interfaces
  - Injected IPreview
* Added unit tests

9 years agoMerge pull request #15158 from owncloud/fix-failing-master
Robin Appelman [Tue, 24 Mar 2015 16:54:11 +0000 (17:54 +0100)]
Merge pull request #15158 from owncloud/fix-failing-master

Fix failing master unit tests

9 years agoMerge the two tests into one
Joas Schilling [Tue, 24 Mar 2015 16:26:38 +0000 (17:26 +0100)]
Merge the two tests into one

9 years ago*cough*
Joas Schilling [Tue, 24 Mar 2015 15:25:54 +0000 (16:25 +0100)]
*cough*

9 years agoMerge pull request #14998 from rullzer/ocs_api_new_url
Morris Jobke [Tue, 24 Mar 2015 16:04:31 +0000 (17:04 +0100)]
Merge pull request #14998 from rullzer/ocs_api_new_url

OCS API should return fancy OC url