Commit graph

20998 commits

Author SHA1 Message Date
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
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
Robin Appelman
283c10f010 Generate stable etags for local files 2014-10-24 16:47:58 +02:00
Lukas Reschke
f901c5ff08 Fix PHPDoc and remove explicit type hint 2014-10-24 15:49:55 +02: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
b3a04840b5 Add type hinting to functions
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02: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
Clark Tomlinson
ca5abe5744 Setting moment locale based on user selection 2014-10-23 10:32:47 -04: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