e26a16afea
Merge pull request #11549 from owncloud/add-more-localizations-master
...
implement localizations based on punic
2014-10-23 16:09:47 +02:00
770f643e5c
Merge pull request #11259 from owncloud/fix-windows-max-depth-test
...
fixing windows max depth test
2014-10-23 14:34:39 +02:00
fa9a744200
Update 3rdparty submodule
2014-10-23 14:04:38 +02:00
6c1871da06
Merge pull request #10985 from owncloud/db-cleanup
...
Cleanup database handling
2014-10-23 13:48:33 +02:00
7c14a17361
Merge pull request #11721 from owncloud/fix-s3-regression
...
[master] Fix S3 connection regression
2014-10-23 12:42:42 +02:00
ca01530f57
Merge pull request #11726 from owncloud/s3-fixunittests
...
Fix S3 folder creation for new AWS API
2014-10-23 12:35:44 +02:00
7e266e8a79
Merge pull request #11720 from sebomoto/groupadmin-header
...
"Group admin" default label (issue #7706 )
2014-10-23 12:04:33 +02:00
b82e44b448
Merge pull request #10689 from owncloud/load_classfile_once
...
make sure class file is loaded once
2014-10-23 11:41:00 +02:00
2584ba29ea
Merge pull request #11710 from owncloud/closeSessionForAvatars
...
Close session for avatar get
2014-10-23 11:36:47 +02:00
e75c2edba6
[tx-robot] updated from transifex
2014-10-23 01:55:51 -04:00
188effa433
Fix S3 folder creation for new AWS API
...
This also fixes the unit tests
2014-10-22 23:00:30 +02:00
71dce48bd3
Fix S3 connection
2014-10-22 22:17:07 +02:00
52684c86e5
"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.
2014-10-22 22:08:55 +02:00
e9ec45ddd1
Merge pull request #11704 from owncloud/fix-type-for-query
...
Use mixed as type
2014-10-22 18:13:31 +02:00
3b42d3cfed
Close session for avatar get
...
This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here.
2014-10-22 18:12:21 +02:00
44a7a3690a
Merge pull request #11702 from owncloud/fix-11637
...
setup filesystem by username, not login name, fixes #11637
2014-10-22 17:56:30 +02:00
37043508a4
Merge pull request #11620 from owncloud/settings-sidebar
...
Settings sidebar
2014-10-22 17:49:51 +02:00
be06937e65
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.
2014-10-22 15:09:33 +02:00
b7fa644a54
Merge pull request #9586 from owncloud/enhanced-sql-script-generation-oracle-master
...
Special treatment for Oracle
2014-10-22 14:54:42 +02:00
31e489b44d
Merge pull request #11687 from owncloud/appframework-session-annotation
...
introduce SessionMiddleWare to control session handling via an annotatio...
2014-10-22 14:45:28 +02:00
fe912ca9b8
Merge pull request #11694 from owncloud/extstorage-lazyinit
...
Lazy initialize external storages
2014-10-22 14:12:05 +02:00
993376fb6f
better variable name
2014-10-22 13:36:57 +02:00
e0342db47c
set up FS by username, not login name\!
2014-10-22 13:28:08 +02:00
02c5933af8
introduce SessionMiddleWare to control session handling via an annotation
2014-10-22 12:44:19 +02:00
075e8d8e86
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
2014-10-22 12:42:36 +02:00
a9aa7841c9
Merge pull request #11684 from owncloud/guess_mimetype_on_touch
...
guess mimetype on touch
2014-10-22 12:32:09 +02:00
0dcb832039
Fix tags unit test
2014-10-22 12:29:53 +02:00
d83b11d34a
Use statements wrapper in \OCP\IDB
2014-10-22 12:29:53 +02:00
e6f6cdd19f
Bit more cleanup
2014-10-22 12:29:53 +02:00
2ae6a0d96d
Move creating the database connection to the server container
2014-10-22 12:29:53 +02:00
d4e929c37a
Remove implicit prepared statement cache and get the connection from the server container in \OC_DB
2014-10-22 12:26:43 +02:00
97a6f5c46b
Extend \OCP\IDBConnection to cover more use cases
2014-10-22 12:26:43 +02:00
72f99f5041
Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBConnection directly instead
2014-10-22 12:26:43 +02:00
b7718bc212
always use the correct share type
2014-10-22 11:48:29 +02:00
e2ff180521
Merge pull request #11416 from owncloud/eventlogger
...
Allow apps to gather performance diagnistics
2014-10-22 11:18:26 +02:00
916e710ece
[tx-robot] updated from transifex
2014-10-22 01:55:22 -04:00
69db442c49
fixing expected values for formatDate() unit tests
2014-10-21 16:05:35 +02:00
2814a294c8
call initPaths() right before the server is instantiated
2014-10-21 14:10:57 +02:00
cb36666600
Merge pull request #11630 from owncloud/kill-some-legacy
...
remove legacy class OC_Updater
2014-10-21 14:01:49 +02:00
1c9004409b
guess mimetype on touch
2014-10-21 12:58:26 +02:00
3e499d1ac4
Merge pull request #11675 from owncloud/urlencode-for-special-characters
...
URLEncode filenames to be compatible with special characters
2014-10-21 10:05:00 +02:00
8485743e33
[tx-robot] updated from transifex
2014-10-21 01:55:45 -04:00
f451ecb8d8
URLEncode filenames to be compatible with special characters
2014-10-20 20:00:34 +02:00
c0ddf06dfe
Merge pull request #11666 from owncloud/setup-hidesqlitemessageforautoconfig
...
Hide SQLite information on setup when autoconfig is used
2014-10-20 19:50:20 +02:00
32aa1b1b65
Merge pull request #11593 from owncloud/useRelativePathToOwnCloudInstallation
...
Refer to relative path instead of absolute path
2014-10-20 19:05:17 +02:00
51976b2729
Add proper setup and teardown
...
Properly restore REQUEST_URI and SCRIPT_NAME after test runs
2014-10-20 17:11:08 +02:00
f52ed231b3
Hide SQLite information on setup when autoconfig is used
2014-10-20 16:20:24 +02:00
4ce3c25c5c
Add "$_SERVER['REQUEST_URI']" to fix the unit tests
...
Let's hope that works
2014-10-20 15:09:44 +02:00
8f8abdbaee
Add unit tests for convertToRelativePath
2014-10-20 15:09:43 +02:00
7b94c7f9c1
Refer to relative path instead of absolute path
...
There is no need to refer to the absolute path here if we can use the relative one.
Conflicts:
lib/private/templatelayout.php
2014-10-20 15:09:43 +02:00
Thomas Müller
Morris Jobke
Jan-Christoph Borchardt
Jenkins for ownCloud
Vincent Petry
Sebastian Bolt
Lukas Reschke
blizzz
Jörn Friedrich Dreyer
Robin Appelman
Bjoern Schiessle