]>
source.dussan.org Git - nextcloud-server.git/log
Robin Appelman [Tue, 6 Jan 2015 14:40:40 +0000 (15:40 +0100)]
Fix group select autocomplete
Thomas Müller [Tue, 6 Jan 2015 13:40:51 +0000 (14:40 +0100)]
Merge pull request #13122 from owncloud/fix-licence-apps-management
fixing wrong usage of license vs licence
Thomas Müller [Tue, 6 Jan 2015 13:38:50 +0000 (14:38 +0100)]
Merge pull request #13125 from owncloud/lower-deprecation-warning-level
degraded logging policy for server container in AppFramework
Thomas Müller [Tue, 6 Jan 2015 13:36:51 +0000 (14:36 +0100)]
Merge pull request #13116 from owncloud/fix_assets
Fix JS asset generation
Morris Jobke [Tue, 6 Jan 2015 12:43:40 +0000 (13:43 +0100)]
degraded logging policy for server container in AppFramework
Thomas Müller [Tue, 6 Jan 2015 12:07:17 +0000 (13:07 +0100)]
fixing wrong usage of license vs licence
Jenkins for ownCloud [Tue, 6 Jan 2015 06:54:59 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Mon, 5 Jan 2015 19:09:10 +0000 (20:09 +0100)]
Merge pull request #13101 from owncloud/variable-is-undefined-please-use-a-proper-ide-in-the-future-whoever-did-that
Fix undefined variable and write unit tests for OC_Principal connector
Robin McCorkell [Mon, 5 Jan 2015 15:48:04 +0000 (15:48 +0000)]
Fix JS asset generation
At some point SeparatorFilter should be included upstream
(kriswallsmith/assetic), then lib/private/assetic/separatorfilter.php can be
removed and the `use` in lib/private/templatelayout.php rewritten.
SeparatorFilter inserts a separator between assets, preventing issues when
files are incorrectly terminated. For JS this is a semicolon.
Morris Jobke [Mon, 5 Jan 2015 12:26:56 +0000 (13:26 +0100)]
Merge pull request #13103 from owncloud/fix-htaccess-regex
escape . in htaccess regex for CSS and JS HTTP headers
Morris Jobke [Mon, 5 Jan 2015 12:23:13 +0000 (13:23 +0100)]
Merge pull request #13108 from owncloud/fix-public-link-mount-for-pre-oc7
Check for version before mounting a public link
Bernhard Posselt [Mon, 5 Jan 2015 11:09:59 +0000 (12:09 +0100)]
Merge pull request #13107 from owncloud/change-to-better-error-level
Use info instead of warning log level
Morris Jobke [Mon, 5 Jan 2015 10:50:05 +0000 (11:50 +0100)]
Check for version before mounting a public link
* ownCloud 7.0.0 is needed - version of merge of server <-> server
sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
Lukas Reschke [Mon, 5 Jan 2015 10:18:11 +0000 (11:18 +0100)]
Use info instead of warning log level
Otherwise the log is flooded as can be seen at https://github.com/owncloud/core/issues/13106
Fixes https://github.com/owncloud/core/issues/13106
Lukas Reschke [Mon, 5 Jan 2015 09:35:24 +0000 (10:35 +0100)]
Merge pull request #13099 from owncloud/fix-provisioning-api
Remove unnecessary setUp method from provisioning_api
Morris Jobke [Mon, 5 Jan 2015 09:23:24 +0000 (10:23 +0100)]
escape . in htaccess regex for CSS and JS HTTP headers
Lukas Reschke [Fri, 19 Dec 2014 18:42:39 +0000 (19:42 +0100)]
Use proper test name
Lukas Reschke [Fri, 19 Dec 2014 18:42:02 +0000 (19:42 +0100)]
Use proper namespace
Lukas Reschke [Fri, 19 Dec 2014 15:50:32 +0000 (16:50 +0100)]
Use namespace
Lukas Reschke [Fri, 19 Dec 2014 12:28:11 +0000 (13:28 +0100)]
Write unit-tests and use DI
Lukas Reschke [Fri, 19 Dec 2014 10:48:43 +0000 (11:48 +0100)]
Fix code-style
Morris Jobke [Mon, 5 Jan 2015 08:47:44 +0000 (09:47 +0100)]
Merge pull request #13095 from derkostka/master
fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"
Jenkins for ownCloud [Mon, 5 Jan 2015 06:54:36 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Tom Needham [Sun, 4 Jan 2015 23:10:44 +0000 (23:10 +0000)]
Remove unnecessary setUp method
derkostka [Sun, 4 Jan 2015 16:07:33 +0000 (17:07 +0100)]
fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"
changed variable #user to #name
Morris Jobke [Sun, 4 Jan 2015 09:09:30 +0000 (10:09 +0100)]
Merge pull request #13060 from dratini0/master
Fix: X-Accel-Redirect did not support custom data dir and local mounts
Jenkins for ownCloud [Sun, 4 Jan 2015 06:54:53 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Sat, 3 Jan 2015 21:41:44 +0000 (22:41 +0100)]
Merge pull request #13091 from owncloud/fix-provisioning-api
Fix remaining unit tests for provisioning_api
Tom Needham [Sat, 3 Jan 2015 15:58:36 +0000 (15:58 +0000)]
Add proper group setup and teardown to all provisioning_api tests
Tom Needham [Sat, 3 Jan 2015 15:39:42 +0000 (15:39 +0000)]
Create admin group before running provisioning_api tests
Tom Needham [Sat, 3 Jan 2015 13:25:48 +0000 (13:25 +0000)]
Ensure admin group is present before running tests
Morris Jobke [Sat, 3 Jan 2015 10:59:22 +0000 (11:59 +0100)]
Merge pull request #13082 from mmattel/rename_text_no_external_storages
adopt text "no external storage configured"
Jenkins for ownCloud [Sat, 3 Jan 2015 06:54:29 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Fri, 2 Jan 2015 20:23:05 +0000 (21:23 +0100)]
Merge pull request #13083 from owncloud/fix-provisioning-api
Add provisioning_api app.php so app is detected
root [Fri, 2 Jan 2015 20:00:02 +0000 (21:00 +0100)]
adopt text "no ecternal storage configured"
storage -> storages
Tom Needham [Fri, 2 Jan 2015 19:07:31 +0000 (19:07 +0000)]
Change array element order to fix failing test
Tom Needham [Fri, 2 Jan 2015 18:52:11 +0000 (18:52 +0000)]
Add placeholder app.php for provisioning_api so app is detected
Jenkins for ownCloud [Fri, 2 Jan 2015 06:54:28 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Frank Karlitschek [Thu, 1 Jan 2015 22:07:16 +0000 (23:07 +0100)]
8.0 alpha 1
Jenkins for ownCloud [Thu, 1 Jan 2015 06:54:30 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 31 Dec 2014 06:54:33 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
dratini0 [Tue, 30 Dec 2014 21:36:13 +0000 (22:36 +0100)]
removed a little duplication
dratini0 [Tue, 30 Dec 2014 21:07:04 +0000 (22:07 +0100)]
Fix: X-Accel-Redirect did not support custom data dir and local mounts
Frank Karlitschek [Tue, 30 Dec 2014 21:02:41 +0000 (22:02 +0100)]
jump to 8.0.0.0 The test upgrade and installation of apps realistic.
Don´t open the champaign yet. This is obviously not the final release. ;-)
The final will have the version number 8.0.0.x
Lukas Reschke [Tue, 30 Dec 2014 18:04:50 +0000 (19:04 +0100)]
Merge pull request #13055 from owncloud/dbal25
update dbal to 2.5.0
Robin Appelman [Tue, 30 Dec 2014 15:47:30 +0000 (16:47 +0100)]
update dbal to 2.5.0
Jenkins for ownCloud [Tue, 30 Dec 2014 06:54:26 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Frank Karlitschek [Mon, 29 Dec 2014 17:47:39 +0000 (18:47 +0100)]
Merge pull request #12854 from owncloud/add-direct-download-link
Adding foundation for the direct download url
Jenkins for ownCloud [Mon, 29 Dec 2014 06:54:27 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 16 Dec 2014 12:15:34 +0000 (13:15 +0100)]
adding getDirectDownload() to Wrapper
Thomas Müller [Mon, 15 Dec 2014 14:20:24 +0000 (15:20 +0100)]
Adding basement for the direct download url
Thomas Müller [Sun, 28 Dec 2014 13:29:49 +0000 (14:29 +0100)]
Merge pull request #13023 from owncloud/provisioning_api-2
[jenkins] Add provisioning_api app
Thomas Müller [Sun, 28 Dec 2014 13:12:57 +0000 (14:12 +0100)]
Merge pull request #13043 from owncloud/check-for-hash
Check for hash
Lukas Reschke [Sun, 28 Dec 2014 12:36:59 +0000 (13:36 +0100)]
Merge pull request #13035 from owncloud/new_edition_detection
Automatically detect the edition based on the enterprise_key app.
Lukas Reschke [Sun, 28 Dec 2014 12:23:34 +0000 (13:23 +0100)]
Check for hash
See https://github.com/owncloud/core/pull/13042
Jenkins for ownCloud [Sun, 28 Dec 2014 06:54:26 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Sat, 27 Dec 2014 20:39:23 +0000 (21:39 +0100)]
Merge pull request #13025 from lyonel/master
user_ldap is too verbose by default
Thomas Müller [Sat, 27 Dec 2014 20:38:47 +0000 (21:38 +0100)]
Merge pull request #13012 from owncloud/small_fix
only send activity if we have a valid path and the file is readable
Jenkins for ownCloud [Sat, 27 Dec 2014 06:54:33 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 26 Dec 2014 06:54:28 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Frank Karlitschek [Thu, 25 Dec 2014 10:36:41 +0000 (11:36 +0100)]
remove Edition
Frank Karlitschek [Thu, 25 Dec 2014 08:48:15 +0000 (09:48 +0100)]
Automatically detect the edition based on the enterprise_key app.
Jenkins for ownCloud [Thu, 25 Dec 2014 06:54:29 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Tom Needham [Mon, 22 Dec 2014 13:54:50 +0000 (13:54 +0000)]
Add provisioning_api app
enable unit tests for provisioning api
fix admin docu key
Lyonel Vincent [Wed, 24 Dec 2014 15:35:36 +0000 (16:35 +0100)]
Be less verbose when using a paged search
Lower the priority from INFO to DEBUG
Lyonel Vincent [Wed, 24 Dec 2014 15:32:27 +0000 (16:32 +0100)]
Be less verbose when disabling SSL cert validation
change log level from WARN to DEBUG
Jenkins for ownCloud [Wed, 24 Dec 2014 06:54:33 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 23 Dec 2014 14:36:55 +0000 (15:36 +0100)]
Merge pull request #12830 from owncloud/intelligent-container
Intelligent container
Morris Jobke [Tue, 23 Dec 2014 12:55:51 +0000 (13:55 +0100)]
Merge pull request #13008 from owncloud/db-connection-test-cleanup
Clean up test table in Connection Test to prevent unnecessary failures.
Bjoern Schiessle [Tue, 23 Dec 2014 11:40:52 +0000 (12:40 +0100)]
only send activity if we have a valid path and the file is readable
Morris Jobke [Tue, 23 Dec 2014 10:21:06 +0000 (11:21 +0100)]
Merge pull request #10292 from owncloud/external-share-delete
Fix trashbin when deleting a file over an external share
Bernhard Posselt [Sat, 13 Dec 2014 18:28:20 +0000 (19:28 +0100)]
Intelligent container
* resolves dependencies by type hint or variable name
* simpler route.php
* implementation of https://github.com/owncloud/core/issues/12829
Generates and injects parameters automatically. You can now build full classes like
$c->query('MyClassName')
without having to register it as a service. The resolved object's instance will be saved by using registerService. If a constructor parameter is not type hinted, the parameter name will be taken.
Therefore the following two implementations are identical:
class Class1 { function __construct(MyClassName $class)
class Class1 { function __construct($MyClassName)
This makes it possible to also inject primitive values such as strings, arrays etc.
In addition if the query could not be resolved, a `QueryException` is now thrown
Routes can now be returned as an array from `routes.php` and an `appinfo/application.php` is optional
Old commit messages:
make it possible to return the routes instead of having to intialize the application
try to get the controller by convention
add first implementation of automatic resolve
add another test just to be sure
store the resolved object
more tests
add phpdoc to public app.php method
use the same variable for the public app.php method
deprecate old methods and add services for public interfaces
deprecated getServer method
disallow private api injection for apps other than core or settings (settings should be an app goddamnit :D)
register userid because its such an often used variable
fix indention and leading slash
use test namespace
add deprecation reasons, remove private api usage checks and remove deprecation from getServer()
add additional public interfaces
add public interface for rootfolder
fix syntax error
remove deprecation from methods where no alternative is there yet
remove deprecated from method which has no alternative
add timezone public service for #12881
add another deprecation hint
move deprecation into separate branch
remove dead comment
first try to get the namespace from the info.xml, if it does not exist, just uppercase the first letter
also trim the namespace name
add an interface for timefactory
move timefactory to public and add icontrollermethodreflector
keep core interface
fix copyright date in headers
Jenkins for ownCloud [Tue, 23 Dec 2014 06:55:23 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Andreas Fischer [Tue, 23 Dec 2014 00:01:58 +0000 (01:01 +0100)]
Clean up test table in Connection Test to prevent unnecessary failures.
Björn Schießle [Mon, 22 Dec 2014 22:31:07 +0000 (23:31 +0100)]
Merge pull request #12997 from owncloud/sharing_activities
add activity if public shared file/folder was downloaded
Morris Jobke [Mon, 22 Dec 2014 18:37:52 +0000 (19:37 +0100)]
Merge pull request #13003 from owncloud/remove-skip-to-content
remove skip to content for now, see #12999
Robin Appelman [Mon, 22 Dec 2014 14:04:59 +0000 (15:04 +0100)]
Make sure the path passed to the activity manager is normalized
Bjoern Schiessle [Mon, 22 Dec 2014 11:35:50 +0000 (12:35 +0100)]
add activity if public shared file/folder was downloaded
Jan-Christoph Borchardt [Mon, 22 Dec 2014 15:02:45 +0000 (16:02 +0100)]
remove skip to content for now, see #12999
Thomas Müller [Mon, 22 Dec 2014 13:47:14 +0000 (14:47 +0100)]
Merge pull request #12860 from owncloud/remove-apparently-unused-file
Remove unused file
Thomas Müller [Mon, 22 Dec 2014 13:12:03 +0000 (14:12 +0100)]
Merge pull request #11810 from owncloud/hhvm-autotest
Adding autotest-hhvm.sh [WIP]
Morris Jobke [Mon, 22 Dec 2014 09:01:39 +0000 (10:01 +0100)]
Merge pull request #12969 from owncloud/clarify-docs
Clarify return values
Morris Jobke [Mon, 22 Dec 2014 08:50:29 +0000 (09:50 +0100)]
Merge pull request #12961 from owncloud/try_to_cache_keys
cache keys to read them only once from the hard disc
Morris Jobke [Mon, 22 Dec 2014 08:05:23 +0000 (09:05 +0100)]
Merge pull request #12983 from owncloud/root-iface
Add an interface for the root folder so apps have an interface to deal with storage
Jenkins for ownCloud [Mon, 22 Dec 2014 06:54:49 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Bernhard Posselt [Sat, 20 Dec 2014 14:59:31 +0000 (15:59 +0100)]
add an interface for the root folder so apps have an interface to deal with storage
fix comments and newline
add newline
Thomas Müller [Sun, 21 Dec 2014 19:30:43 +0000 (20:30 +0100)]
Merge pull request #12978 from owncloud/fix-support-claim
Change support message to be more explicit about the enterprise edition
Thomas Müller [Sun, 21 Dec 2014 19:29:03 +0000 (20:29 +0100)]
Merge pull request #12981 from owncloud/MDB2SchemaManager-tearDown-Oracle
Properly call parent::tearDown() in MDB2SchemaManager::tearDown().
Thomas Müller [Sun, 21 Dec 2014 19:27:53 +0000 (20:27 +0100)]
Merge pull request #12982 from owncloud/timefac-iface
Add an interface for the timefactory class
Morris Jobke [Sun, 21 Dec 2014 09:38:34 +0000 (10:38 +0100)]
Merge pull request #12942 from owncloud/favs-missingsharedsubdirs
Fix issues with searchByTag in shared storage
Jenkins for ownCloud [Sun, 21 Dec 2014 06:54:36 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Bernhard Posselt [Sat, 20 Dec 2014 14:52:25 +0000 (15:52 +0100)]
add an interface for the timefactory class
fix indention
Andreas Fischer [Sat, 20 Dec 2014 14:30:02 +0000 (15:30 +0100)]
Properly call parent::tearDown() in MDB2SchemaManager::tearDown().
The early return introduced by
04c982a96e19f2254739c24ee8c6b568edcb4190
prevents parent::tearDown() being called on Oracle.
Morris Jobke [Sat, 20 Dec 2014 11:00:27 +0000 (12:00 +0100)]
Merge pull request #12974 from owncloud/documents-typeface
change Documents default typeface from serif to sans-serif
Morris Jobke [Fri, 19 Dec 2014 20:05:39 +0000 (21:05 +0100)]
Change support message to be more explicit about the enterprise edition
Jenkins for ownCloud [Sat, 20 Dec 2014 06:56:24 +0000 (01:56 -0500)]
[tx-robot] updated from transifex
Tom Needham [Fri, 19 Dec 2014 23:34:18 +0000 (23:34 +0000)]
Merge pull request #12972 from owncloud/use-https-where-possible
Link to HTTPS page
derkostka [Fri, 19 Dec 2014 11:09:46 +0000 (12:09 +0100)]
Fix Undefined variable: result at tags.php#231
Fix app":"PHP","message":"Undefined variable: result at \/var\/www\/owncloud\/lib\/private\/tags.php#231" by moving the function call into the respective loop
Adjust indentation
Do it right - indentation
sorry, this is my first one
Björn Schießle [Fri, 19 Dec 2014 18:04:44 +0000 (19:04 +0100)]
Merge pull request #12749 from owncloud/server2server-sharing-ng
server to server sharing next generation
blizzz [Fri, 19 Dec 2014 17:52:30 +0000 (18:52 +0100)]
Merge pull request #12101 from owncloud/ldap_split_mapping
Ldap split mapping from Access superclass