Commit graph

21040 commits

Author SHA1 Message Date
Thomas Müller
d9db791c67 introduce sidebar for admin page 2014-10-30 13:44:40 +01:00
Jenkins for ownCloud
ea55848fa1 [tx-robot] updated from transifex 2014-10-30 01:55:14 -04:00
Morris Jobke
e8703f648d fix style of generated documentation 2014-10-29 20:38:59 +01:00
Vincent Petry
106b9eb55c Merge pull request #11409 from owncloud/watcher-reuse
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
Morris Jobke
7d10ec41e6 Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
Fix moving share keys as non-owner to subdir
2014-10-29 15:59:42 +01:00
Lukas Reschke
32071e8c06 Merge pull request #11831 from owncloud/make-search-non-blocking
Close session for search
2014-10-29 15:29:28 +01:00
Morris Jobke
6c4b7db09b just add merge commit of 3rdparty repo 2014-10-29 14:10:38 +01:00
Thomas Müller
105940b9dc Merge pull request #11638 from owncloud/oc8-translations
[OC8] Load javascript translations using standard web technologies
2014-10-29 13:09:02 +01:00
Vincent Petry
e8f9b929bd Added encryption test when moving file as non-owner 2014-10-29 12:57:12 +01:00
Vincent Petry
f44e617dfd Fix warning with unset extension check 2014-10-29 12:56:49 +01:00
Vincent Petry
b920f888ae Fix moving share keys as non-owner to subdir
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.

After the move/copy operation the keys are moved/copied to the target
dir.

Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
2014-10-29 12:22:50 +01:00
Thomas Müller
c353cbe633 Merge pull request #11689 from owncloud/doctrine-2.5
Update doctrine/dbal to 2.5
2014-10-29 11:34:23 +01:00
Thomas Müller
fb4f993336 Fix implementation of translation short cut 2014-10-29 10:58:10 +01:00
Thomas Müller
ff84384513 Adding translations for settings 2014-10-29 10:57:46 +01:00
Lukas Reschke
1052243285 Close session for search
Make search non-blocking.
2014-10-29 10:28:09 +01:00
Vincent Petry
c682b1f0c1 Fix language file detection 2014-10-29 10:13:51 +01:00
Thomas Müller
9f7c571e40 update all translation files to js and json 2014-10-29 10:13:50 +01:00
Thomas Müller
2f19de11e4 adding console command to generate javascript translation files based on existing php translation files
read server side translations from json files
2014-10-29 10:09:12 +01:00
Vincent Petry
d71cd680dd Include core translations
Moved search result type translations to search.js

Load JS translations earlier

Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.

This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
2014-10-29 10:09:12 +01:00
Thomas Müller
a589d61b78 in case a translation javascript is not found we no longer bail out
remove translation.php
2014-10-29 10:09:12 +01:00
Vincent Petry
ec1a73fab9 Added OC.L10N namespace with translation functions
Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
Thomas Müller
f67123c5a4 l10n.pl now generates js files as well 2014-10-29 10:09:12 +01:00
Jenkins for ownCloud
cb944814d9 [tx-robot] updated from transifex 2014-10-29 01:54:45 -04:00
Thomas Müller
46c2909c78 Update doctrine/dbal to 2.5 2014-10-28 15:39:37 +01:00
Morris Jobke
dd9cd7c946 Merge pull request #11738 from owncloud/update-patchwork-utf8
Use composer autoloader to load Patchwork
2014-10-28 14:40:16 +01:00
Thomas Müller
c93ddf77b9 Use composer autoloader to load Patchwork 2014-10-28 13:42:28 +01:00
Lukas Reschke
c864f5e20c Merge pull request #11805 from owncloud/AdamWill-issue9643
use Composer autoloader not OC for non-Composer 3rdparty (#9643)
2014-10-28 13:09:07 +01:00
Adam Williamson
0e3f2055d2 use Composer autoloader not OC for non-Composer 3rdparty (#9643)
Composer's autoloader is rather better than the OwnCloud autoloader's
handling of non-OC classes. Plus we can rely on upstream Composer to
maintain it and not worry about it ourselves.

With this change, we drop the bits of OwnCloud's autoloader that
handled non-OC classes, and register the classes that were being
handled by that code with Composer's autoloader instead. As these
dependencies are converted to actually being managed by Composer,
the explicit registrations can be dropped as they won't be needed
any more.

Since OwnCloud's autoloader isn't going to handle non-OC classes any
more, we no longer need to test to make sure it does it right.

drop unneeded registerPrefix() and registerClass() from autoloader

Now we're not handling anything but OC's own classes, these are
unnecessary.

error out if composer autoloader is not found (thanks bantu)

We're never going to be able to work without the autoloader, if it's not
there we should just throw our hands up and surrender.
2014-10-28 11:32:20 +01:00
Lukas Reschke
437a660680 Merge pull request #11600 from owncloud/refactor-appsettings-to-app-framework
Migrate new app settings to AppFramework
2014-10-28 11:13:20 +01:00
Morris Jobke
4461e69873 Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handling
Properly catch 503 storage not available in getQuotaInfo
2014-10-28 09:33:54 +01:00
Jenkins for ownCloud
23873d80fe [tx-robot] updated from transifex 2014-10-28 01:55:38 -04:00
Lukas Reschke
7466ff09bb Merge pull request #11799 from owncloud/no-stable-etags-on-windows
On Windows platform we have no stable etag generation - yet
2014-10-27 22:33:14 +01:00
Lukas Reschke
d6380a5395 Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable
Make supported DBs configurable within config.php
2014-10-27 22:24:16 +01:00
Thomas Müller
79778d6a51 code cleanup during review 👍 2014-10-27 21:39:35 +01:00
Lukas Reschke
233c49f4b9 Make supported DBs configurable within config.php
This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.

To test this play around with the new configuration parameter "supportedDatabases".
2014-10-27 21:39:34 +01:00
Thomas Müller
d0ce600eec On Windows platform we have no stable etag generation - yet 2014-10-27 20:48:47 +01:00
Vincent Petry
21d825ed6c Properly catch 503 storage not available in getQuotaInfo
When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.

This fix prevents the expected exception to make the whole call fail.
2014-10-27 16:27:12 +01:00
Morris Jobke
a00712aa65 Merge pull request #11783 from owncloud/allow_passing_driver_options
allow passing db driver options
2014-10-27 16:00:13 +01:00
Robin Appelman
8de287f2ef Merge pull request #11763 from owncloud/stable-etags
Generate stable etags for local files
2014-10-27 15:30:30 +01:00
Morris Jobke
290e9cd5b2 Merge pull request #11787 from owncloud/fix-php-docs
Fix PHPDoc
2014-10-27 14:46:41 +01:00
Jörn Friedrich Dreyer
de72aff2c1 add driver options to config samples 2014-10-27 14:43:31 +01:00
Lukas Reschke
f7c393fa9f Fix PHPDoc
Stop my IDE and Scrutinizer from complaining.
2014-10-27 13:38:40 +01:00
Jörn Friedrich Dreyer
e16a58220d allow passing driver options, fixes #11718 2014-10-27 12:30:29 +01:00
Vincent Petry
aee1edf6b5 Merge pull request #11708 from owncloud/fix-momentjs
Setting moment locale based on user selection
2014-10-27 10:30:47 +01:00
Jenkins for ownCloud
5d391910c5 [tx-robot] updated from transifex 2014-10-27 01:54:28 -04:00
Jenkins for ownCloud
214af9523a [tx-robot] updated from transifex 2014-10-26 01:54:32 -04:00
Lukas Reschke
acec1afe17 Merge pull request #11760 from owncloud/add-type-hints-where-sensible
Add type hinting to functions
2014-10-25 14:09:48 +02:00
Morris Jobke
be32e562e3 drop unneeded hint 2014-10-25 12:00:56 +02:00
Jenkins for ownCloud
3652f02e48 [tx-robot] updated from transifex 2014-10-25 01:54:35 -04:00
Morris Jobke
63f2b1f460 Merge pull request #11767 from danbartram/add_db_rollback
Add missing DB rollback functionality
2014-10-24 19:52:56 +02:00