Commit Graph

20982 Commits

Author SHA1 Message Date
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
Thomas Müller 9fa5483111 Merge pull request #11709 from owncloud/temp-handling
Cleanup handling of temporary files
2014-10-24 19:29:05 +02:00
Dan Bartram 9c1015b790 Add missing DB rollback functionality 2014-10-24 17:44:06 +01:00
Clark Tomlinson 25a4b5a935 Merge pull request #11735 from owncloud/mssql-migrations-master
disable database migration unit tests for MSSQL
2014-10-24 09:16:43 -04:00
Lukas Reschke 77b8e1543a Merge pull request #11752 from owncloud/use-function-outside-of-loop
Use function outside of loop
2014-10-24 13:54:09 +02:00
Lukas Reschke d060180140 Use function outside of loop
Otherwise the function is executed n times which is a lot of overhead
2014-10-24 12:27:53 +02:00
Robin Appelman 0b96297783 Use the TempManager to handle temporary files 2014-10-24 12:18:49 +02:00
Robin Appelman 83c74b80ad Add \OC\TempManager to handle creating and cleaning temporary files 2014-10-24 12:18:46 +02:00
Lukas Reschke 9739a25547 Merge pull request #11758 from owncloud/fix-permissions
Make files non executable
2014-10-24 12:15:19 +02:00
Lukas Reschke 0525341a12 Merge pull request #11754 from owncloud/fix-division-null
Prevent division by zero
2014-10-24 11:59:29 +02:00
Lukas Reschke 2d2a4741ce Make files non executable
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
Jenkins for ownCloud 9babcfb9e2 [tx-robot] updated from transifex 2014-10-24 01:55:11 -04:00
Morris Jobke 4b5a3876ac Merge pull request #7749 from owncloud/load_avatar_header_via_php
Load avatar in header via PHP
2014-10-24 01:27:25 +02:00
Lukas Reschke 46dd59f47b Merge pull request #11751 from owncloud/fix-unreachable-statement
Remove unreachable statement
2014-10-24 00:18:45 +02:00
Lukas Reschke 3efac5a4f2 Prevent division by zero
Potentially fixes https://github.com/owncloud/core/issues/11742
2014-10-24 00:10:22 +02:00
Morris Jobke a10b25587f add avatardiv-shown class to bring back mobile style 2014-10-23 23:51:05 +02:00
kondou 729dffed5e Load avatar in header via PHP
* fix #7484
* use UID, css, and div instead of span
2014-10-23 23:17:18 +02:00
Lukas Reschke c30b7f8197 Remove unreachable statement 2014-10-23 23:03:14 +02:00
Thomas Müller e26a16afea Merge pull request #11549 from owncloud/add-more-localizations-master
implement localizations based on punic
2014-10-23 16:09:47 +02:00
Thomas Müller 5aab98c4bf disable database migration unit tests for MSSQL 2014-10-23 14:35:44 +02:00
Thomas Müller 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
Thomas Müller fa9a744200 Update 3rdparty submodule 2014-10-23 14:04:38 +02:00
Thomas Müller 6c1871da06 Merge pull request #10985 from owncloud/db-cleanup
Cleanup database handling
2014-10-23 13:48:33 +02:00
Morris Jobke 7c14a17361 Merge pull request #11721 from owncloud/fix-s3-regression
[master] Fix S3 connection regression
2014-10-23 12:42:42 +02:00
Morris Jobke 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
Jan-Christoph Borchardt 7e266e8a79 Merge pull request #11720 from sebomoto/groupadmin-header
"Group admin" default label (issue #7706)
2014-10-23 12:04:33 +02:00
Morris Jobke 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
Thomas Müller 2584ba29ea Merge pull request #11710 from owncloud/closeSessionForAvatars
Close session for avatar get
2014-10-23 11:36:47 +02:00
Jenkins for ownCloud e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04:00
Vincent Petry 188effa433 Fix S3 folder creation for new AWS API
This also fixes the unit tests
2014-10-22 23:00:30 +02:00
Vincent Petry 71dce48bd3 Fix S3 connection 2014-10-22 22:17:07 +02:00
Sebastian Bolt 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
Lukas Reschke e9ec45ddd1 Merge pull request #11704 from owncloud/fix-type-for-query
Use mixed as type
2014-10-22 18:13:31 +02:00
Lukas Reschke 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
blizzz 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
Lukas Reschke 37043508a4 Merge pull request #11620 from owncloud/settings-sidebar
Settings sidebar
2014-10-22 17:49:51 +02:00
Lukas Reschke 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
Jörn Friedrich Dreyer 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
Lukas Reschke 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
Lukas Reschke fe912ca9b8 Merge pull request #11694 from owncloud/extstorage-lazyinit
Lazy initialize external storages
2014-10-22 14:12:05 +02:00
Arthur Schiwon 993376fb6f better variable name 2014-10-22 13:36:57 +02:00
Arthur Schiwon e0342db47c set up FS by username, not login name\! 2014-10-22 13:28:08 +02:00
Thomas Müller 02c5933af8 introduce SessionMiddleWare to control session handling via an annotation 2014-10-22 12:44:19 +02:00
Vincent Petry 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
Jörn Friedrich Dreyer a9aa7841c9 Merge pull request #11684 from owncloud/guess_mimetype_on_touch
guess mimetype on touch
2014-10-22 12:32:09 +02:00
Robin Appelman 0dcb832039 Fix tags unit test 2014-10-22 12:29:53 +02:00
Robin Appelman d83b11d34a Use statements wrapper in \OCP\IDB 2014-10-22 12:29:53 +02:00
Robin Appelman e6f6cdd19f Bit more cleanup 2014-10-22 12:29:53 +02:00
Robin Appelman 2ae6a0d96d Move creating the database connection to the server container 2014-10-22 12:29:53 +02:00
Robin Appelman 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