]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Wed, 29 Oct 2014 14:59:42 +0000 (15:59 +0100)]
Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
Fix moving share keys as non-owner to subdir
Lukas Reschke [Wed, 29 Oct 2014 14:29:28 +0000 (15:29 +0100)]
Merge pull request #11831 from owncloud/make-search-non-blocking
Close session for search
Morris Jobke [Wed, 29 Oct 2014 13:10:38 +0000 (14:10 +0100)]
just add merge commit of 3rdparty repo
Thomas Müller [Wed, 29 Oct 2014 12:09:02 +0000 (13:09 +0100)]
Merge pull request #11638 from owncloud/oc8-translations
[OC8] Load javascript translations using standard web technologies
Vincent Petry [Wed, 29 Oct 2014 11:57:12 +0000 (12:57 +0100)]
Added encryption test when moving file as non-owner
Vincent Petry [Wed, 29 Oct 2014 11:56:49 +0000 (12:56 +0100)]
Fix warning with unset extension check
Vincent Petry [Wed, 29 Oct 2014 11:22:50 +0000 (12:22 +0100)]
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.
Thomas Müller [Wed, 29 Oct 2014 10:34:23 +0000 (11:34 +0100)]
Merge pull request #11689 from owncloud/doctrine-2.5
Update doctrine/dbal to 2.5
Thomas Müller [Wed, 29 Oct 2014 09:58:10 +0000 (10:58 +0100)]
Fix implementation of translation short cut
Thomas Müller [Wed, 29 Oct 2014 09:57:46 +0000 (10:57 +0100)]
Adding translations for settings
Lukas Reschke [Wed, 29 Oct 2014 09:28:09 +0000 (10:28 +0100)]
Close session for search
Make search non-blocking.
Vincent Petry [Tue, 28 Oct 2014 12:19:51 +0000 (13:19 +0100)]
Fix language file detection
Thomas Müller [Fri, 17 Oct 2014 12:20:02 +0000 (14:20 +0200)]
update all translation files to js and json
Thomas Müller [Fri, 24 Oct 2014 11:53:01 +0000 (13:53 +0200)]
adding console command to generate javascript translation files based on existing php translation files
read server side translations from json files
Vincent Petry [Fri, 24 Oct 2014 10:50:54 +0000 (12:50 +0200)]
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.
Thomas Müller [Mon, 20 Oct 2014 11:43:29 +0000 (13:43 +0200)]
in case a translation javascript is not found we no longer bail out
remove translation.php
Vincent Petry [Fri, 17 Oct 2014 17:47:37 +0000 (19:47 +0200)]
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
Thomas Müller [Fri, 17 Oct 2014 12:17:39 +0000 (14:17 +0200)]
l10n.pl now generates js files as well
Jenkins for ownCloud [Wed, 29 Oct 2014 05:54:45 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 21 Oct 2014 13:30:23 +0000 (15:30 +0200)]
Update doctrine/dbal to 2.5
Morris Jobke [Tue, 28 Oct 2014 13:40:16 +0000 (14:40 +0100)]
Merge pull request #11738 from owncloud/update-patchwork-utf8
Use composer autoloader to load Patchwork
Thomas Müller [Thu, 23 Oct 2014 13:28:26 +0000 (15:28 +0200)]
Use composer autoloader to load Patchwork
Lukas Reschke [Tue, 28 Oct 2014 12:09:07 +0000 (13:09 +0100)]
Merge pull request #11805 from owncloud/AdamWill-issue9643
use Composer autoloader not OC for non-Composer 3rdparty (#9643)
Adam Williamson [Tue, 29 Jul 2014 01:48:17 +0000 (18:48 -0700)]
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.
Lukas Reschke [Tue, 28 Oct 2014 10:13:20 +0000 (11:13 +0100)]
Merge pull request #11600 from owncloud/refactor-appsettings-to-app-framework
Migrate new app settings to AppFramework
Morris Jobke [Tue, 28 Oct 2014 08:33:54 +0000 (09:33 +0100)]
Merge pull request #11791 from owncloud/webdav-getquotainfo-503-handling
Properly catch 503 storage not available in getQuotaInfo
Jenkins for ownCloud [Tue, 28 Oct 2014 05:55:38 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Mon, 27 Oct 2014 21:33:14 +0000 (22:33 +0100)]
Merge pull request #11799 from owncloud/no-stable-etags-on-windows
On Windows platform we have no stable etag generation - yet
Lukas Reschke [Mon, 27 Oct 2014 21:24:16 +0000 (22:24 +0100)]
Merge pull request #11786 from owncloud/MakeSupportedDBsConfigurable
Make supported DBs configurable within config.php
Thomas Müller [Mon, 27 Oct 2014 18:53:12 +0000 (19:53 +0100)]
code cleanup during review :+1:
Lukas Reschke [Mon, 27 Oct 2014 11:51:26 +0000 (12:51 +0100)]
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".
Thomas Müller [Mon, 27 Oct 2014 19:48:47 +0000 (20:48 +0100)]
On Windows platform we have no stable etag generation - yet
Vincent Petry [Mon, 27 Oct 2014 15:27:12 +0000 (16:27 +0100)]
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.
Morris Jobke [Mon, 27 Oct 2014 15:00:13 +0000 (16:00 +0100)]
Merge pull request #11783 from owncloud/allow_passing_driver_options
allow passing db driver options
Robin Appelman [Mon, 27 Oct 2014 14:30:30 +0000 (15:30 +0100)]
Merge pull request #11763 from owncloud/stable-etags
Generate stable etags for local files
Morris Jobke [Mon, 27 Oct 2014 13:46:41 +0000 (14:46 +0100)]
Merge pull request #11787 from owncloud/fix-php-docs
Fix PHPDoc
Jörn Friedrich Dreyer [Mon, 27 Oct 2014 13:43:31 +0000 (14:43 +0100)]
add driver options to config samples
Lukas Reschke [Mon, 27 Oct 2014 12:38:40 +0000 (13:38 +0100)]
Fix PHPDoc
Stop my IDE and Scrutinizer from complaining.
Jörn Friedrich Dreyer [Mon, 27 Oct 2014 11:30:29 +0000 (12:30 +0100)]
allow passing driver options, fixes #11718
Vincent Petry [Mon, 27 Oct 2014 09:30:47 +0000 (10:30 +0100)]
Merge pull request #11708 from owncloud/fix-momentjs
Setting moment locale based on user selection
Jenkins for ownCloud [Mon, 27 Oct 2014 05:54:28 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 26 Oct 2014 05:54:32 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Sat, 25 Oct 2014 12:09:48 +0000 (14:09 +0200)]
Merge pull request #11760 from owncloud/add-type-hints-where-sensible
Add type hinting to functions
Morris Jobke [Sat, 25 Oct 2014 10:00:56 +0000 (12:00 +0200)]
drop unneeded hint
Jenkins for ownCloud [Sat, 25 Oct 2014 05:54:35 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 24 Oct 2014 17:52:56 +0000 (19:52 +0200)]
Merge pull request #11767 from danbartram/add_db_rollback
Add missing DB rollback functionality
Thomas Müller [Fri, 24 Oct 2014 17:29:05 +0000 (19:29 +0200)]
Merge pull request #11709 from owncloud/temp-handling
Cleanup handling of temporary files
Dan Bartram [Fri, 24 Oct 2014 16:44:06 +0000 (17:44 +0100)]
Add missing DB rollback functionality
Robin Appelman [Fri, 24 Oct 2014 14:07:45 +0000 (16:07 +0200)]
Generate stable etags for local files
Lukas Reschke [Fri, 24 Oct 2014 13:49:55 +0000 (15:49 +0200)]
Fix PHPDoc and remove explicit type hint
Clark Tomlinson [Fri, 24 Oct 2014 13:16:43 +0000 (09:16 -0400)]
Merge pull request #11735 from owncloud/mssql-migrations-master
disable database migration unit tests for MSSQL
Lukas Reschke [Fri, 24 Oct 2014 12:13:40 +0000 (14:13 +0200)]
Add type hinting to functions
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
Lukas Reschke [Fri, 24 Oct 2014 11:54:09 +0000 (13:54 +0200)]
Merge pull request #11752 from owncloud/use-function-outside-of-loop
Use function outside of loop
Lukas Reschke [Thu, 23 Oct 2014 21:27:15 +0000 (23:27 +0200)]
Use function outside of loop
Otherwise the function is executed n times which is a lot of overhead
Robin Appelman [Wed, 22 Oct 2014 15:36:52 +0000 (17:36 +0200)]
Use the TempManager to handle temporary files
Robin Appelman [Wed, 22 Oct 2014 15:33:36 +0000 (17:33 +0200)]
Add \OC\TempManager to handle creating and cleaning temporary files
Lukas Reschke [Fri, 24 Oct 2014 10:15:19 +0000 (12:15 +0200)]
Merge pull request #11758 from owncloud/fix-permissions
Make files non executable
Lukas Reschke [Fri, 24 Oct 2014 09:59:29 +0000 (11:59 +0200)]
Merge pull request #11754 from owncloud/fix-division-null
Prevent division by zero
Lukas Reschke [Fri, 24 Oct 2014 09:14:51 +0000 (11:14 +0200)]
Make files non executable
There is not much sense in having these files marked executable, we should avoid that.
Jenkins for ownCloud [Fri, 24 Oct 2014 05:55:11 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 23 Oct 2014 23:27:25 +0000 (01:27 +0200)]
Merge pull request #7749 from owncloud/load_avatar_header_via_php
Load avatar in header via PHP
Lukas Reschke [Thu, 23 Oct 2014 22:18:45 +0000 (00:18 +0200)]
Merge pull request #11751 from owncloud/fix-unreachable-statement
Remove unreachable statement
Lukas Reschke [Thu, 23 Oct 2014 22:10:22 +0000 (00:10 +0200)]
Prevent division by zero
Potentially fixes https://github.com/owncloud/core/issues/11742
Morris Jobke [Thu, 23 Oct 2014 21:51:05 +0000 (23:51 +0200)]
add avatardiv-shown class to bring back mobile style
kondou [Sat, 15 Mar 2014 14:27:48 +0000 (15:27 +0100)]
Load avatar in header via PHP
* fix #7484
* use UID, css, and div instead of span
Lukas Reschke [Thu, 23 Oct 2014 21:03:14 +0000 (23:03 +0200)]
Remove unreachable statement
Clark Tomlinson [Wed, 22 Oct 2014 14:38:17 +0000 (10:38 -0400)]
Setting moment locale based on user selection
Thomas Müller [Thu, 23 Oct 2014 14:09:47 +0000 (16:09 +0200)]
Merge pull request #11549 from owncloud/add-more-localizations-master
implement localizations based on punic
Thomas Müller [Thu, 23 Oct 2014 12:32:37 +0000 (14:32 +0200)]
disable database migration unit tests for MSSQL
Thomas Müller [Thu, 23 Oct 2014 12:34:39 +0000 (14:34 +0200)]
Merge pull request #11259 from owncloud/fix-windows-max-depth-test
fixing windows max depth test
Thomas Müller [Thu, 23 Oct 2014 12:04:38 +0000 (14:04 +0200)]
Update 3rdparty submodule
Thomas Müller [Thu, 23 Oct 2014 11:48:33 +0000 (13:48 +0200)]
Merge pull request #10985 from owncloud/db-cleanup
Cleanup database handling
Morris Jobke [Thu, 23 Oct 2014 10:42:42 +0000 (12:42 +0200)]
Merge pull request #11721 from owncloud/fix-s3-regression
[master] Fix S3 connection regression
Morris Jobke [Thu, 23 Oct 2014 10:35:44 +0000 (12:35 +0200)]
Merge pull request #11726 from owncloud/s3-fixunittests
Fix S3 folder creation for new AWS API
Jan-Christoph Borchardt [Thu, 23 Oct 2014 10:04:33 +0000 (12:04 +0200)]
Merge pull request #11720 from sebomoto/groupadmin-header
"Group admin" default label (issue #7706)
Morris Jobke [Thu, 23 Oct 2014 09:41:00 +0000 (11:41 +0200)]
Merge pull request #10689 from owncloud/load_classfile_once
make sure class file is loaded once
Thomas Müller [Thu, 23 Oct 2014 09:36:47 +0000 (11:36 +0200)]
Merge pull request #11710 from owncloud/closeSessionForAvatars
Close session for avatar get
Jenkins for ownCloud [Thu, 23 Oct 2014 05:55:51 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Vincent Petry [Wed, 22 Oct 2014 21:00:30 +0000 (23:00 +0200)]
Fix S3 folder creation for new AWS API
This also fixes the unit tests
Vincent Petry [Wed, 22 Oct 2014 19:48:22 +0000 (21:48 +0200)]
Fix S3 connection
Sebastian Bolt [Wed, 22 Oct 2014 20:08:55 +0000 (22:08 +0200)]
"Group admin" default label (issue #7706)
Changed the column header to "Group Admin for" and the default value of
the multiselect box to "no group" if user is not a groupadmin for any
group.
Lukas Reschke [Wed, 22 Oct 2014 16:13:31 +0000 (18:13 +0200)]
Merge pull request #11704 from owncloud/fix-type-for-query
Use mixed as type
Lukas Reschke [Wed, 22 Oct 2014 16:12:21 +0000 (18:12 +0200)]
Close session for avatar get
This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here.
blizzz [Wed, 22 Oct 2014 15:56:30 +0000 (17:56 +0200)]
Merge pull request #11702 from owncloud/fix-11637
setup filesystem by username, not login name, fixes #11637
Lukas Reschke [Wed, 22 Oct 2014 15:49:51 +0000 (17:49 +0200)]
Merge pull request #11620 from owncloud/settings-sidebar
Settings sidebar
Lukas Reschke [Wed, 22 Oct 2014 13:07:16 +0000 (15:07 +0200)]
Use mixed as type
Actually query() returns value of the type "mixed" (as is also stated in the interface) - this is purely there to make our IDEs and Scrutinizer happier.
Jörn Friedrich Dreyer [Wed, 22 Oct 2014 12:54:42 +0000 (14:54 +0200)]
Merge pull request #9586 from owncloud/enhanced-sql-script-generation-oracle-master
Special treatment for Oracle
Lukas Reschke [Wed, 22 Oct 2014 12:45:28 +0000 (14:45 +0200)]
Merge pull request #11687 from owncloud/appframework-session-annotation
introduce SessionMiddleWare to control session handling via an annotatio...
Lukas Reschke [Wed, 22 Oct 2014 12:12:05 +0000 (14:12 +0200)]
Merge pull request #11694 from owncloud/extstorage-lazyinit
Lazy initialize external storages
Arthur Schiwon [Wed, 22 Oct 2014 11:36:57 +0000 (13:36 +0200)]
better variable name
Arthur Schiwon [Wed, 22 Oct 2014 11:28:08 +0000 (13:28 +0200)]
set up FS by username, not login name\!
Thomas Müller [Tue, 21 Oct 2014 12:53:10 +0000 (14:53 +0200)]
introduce SessionMiddleWare to control session handling via an annotation
Vincent Petry [Tue, 21 Oct 2014 14:18:44 +0000 (16:18 +0200)]
Lazy initialize external storages
Fixed the following external storages to not connect in the constructor,
but do it on-demand when getConnection() is called.
- S3
- SWIFT
- SFTP
Jörn Friedrich Dreyer [Wed, 22 Oct 2014 10:32:09 +0000 (12:32 +0200)]
Merge pull request #11684 from owncloud/guess_mimetype_on_touch
guess mimetype on touch
Robin Appelman [Mon, 20 Oct 2014 13:09:19 +0000 (15:09 +0200)]
Fix tags unit test
Robin Appelman [Mon, 20 Oct 2014 13:09:00 +0000 (15:09 +0200)]
Use statements wrapper in \OCP\IDB
Robin Appelman [Wed, 10 Sep 2014 11:33:59 +0000 (13:33 +0200)]
Bit more cleanup
Robin Appelman [Wed, 10 Sep 2014 11:24:49 +0000 (13:24 +0200)]
Move creating the database connection to the server container
Robin Appelman [Wed, 10 Sep 2014 11:11:04 +0000 (13:11 +0200)]
Remove implicit prepared statement cache and get the connection from the server container in \OC_DB
Robin Appelman [Wed, 10 Sep 2014 11:07:51 +0000 (13:07 +0200)]
Extend \OCP\IDBConnection to cover more use cases