wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20973 commits 157 branches 562 tags 714 MiB
Commit graph

7545 commits

Author SHA1 Message Date
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
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
6c1871da06 Merge pull request #10985 from owncloud/db-cleanup 
Cleanup database handling
 2014-10-23 13:48: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
Jenkins for ownCloud
e75c2edba6 [tx-robot] updated from transifex 2014-10-23 01:55:51 -04: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
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
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
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
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
Robin Appelman
97a6f5c46b Extend \OCP\IDBConnection to cover more use cases 2014-10-22 12:26:43 +02:00
Robin Appelman
72f99f5041 Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBConnection directly instead 2014-10-22 12:26:43 +02:00
Bjoern Schiessle
b7718bc212 always use the correct share type 2014-10-22 11:48:29 +02:00
Morris Jobke
e2ff180521 Merge pull request #11416 from owncloud/eventlogger 
Allow apps to gather performance diagnistics
 2014-10-22 11:18:26 +02:00
Jenkins for ownCloud
916e710ece [tx-robot] updated from transifex 2014-10-22 01:55:22 -04:00
Thomas Müller
2814a294c8 call initPaths() right before the server is instantiated 2014-10-21 14:10:57 +02:00
Lukas Reschke
cb36666600 Merge pull request #11630 from owncloud/kill-some-legacy 
remove legacy class OC_Updater
 2014-10-21 14:01:49 +02:00
Jenkins for ownCloud
8485743e33 [tx-robot] updated from transifex 2014-10-21 01:55:45 -04:00
Lukas Reschke
8f8abdbaee Add unit tests for convertToRelativePath 2014-10-20 15:09:43 +02:00
Lukas Reschke
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
c8e8945efb implement localizations based on punic 2014-10-20 15:04:42 +02:00
Thomas Müller
d9907b6fa3 move some deprecated usage of OC_Config and OC_AppConfig to \OC::server 2014-10-20 14:44:44 +02:00
Thomas Müller
6af0e76a03 remove legacy class OC_Updater 2014-10-20 14:44:42 +02:00
Robin Appelman
9fd234f63f Log some additional events 2014-10-20 13:38:38 +02:00
Robin Appelman
beb1c6ad74 Allow adding events that hapend before the event logger was loaded 2014-10-20 13:38:38 +02:00
Robin Appelman
4a8358bc50 Rename to NullQueryLogger 2014-10-20 13:38:38 +02:00
Robin Appelman
1e69f5e7ac Log some basic events 2014-10-20 13:38:38 +02:00
Robin Appelman
6e08014781 Rename namespace to Diagnostics 2014-10-20 13:38:38 +02:00
Robin Appelman
2790bda4f8 Activate the query logger on connect 2014-10-20 13:38:37 +02:00
Robin Appelman
b71d1d3616 Add QueryLogger interface to allow apps to get a list of used queries 2014-10-20 13:38:37 +02:00
Robin Appelman
d38050cf52 Add an EventLogger interface to allow apps to get a log of the request timeline 2014-10-20 13:38:37 +02:00
Jörn Friedrich Dreyer
ca0e3fdfea throw exception in writeBack, the returned boolean is checked nowhere 2014-10-20 11:29:05 +02:00
Jörn Friedrich Dreyer
9b0f0df7f5 make skeleton compatible with objectstore 
suspend encryption proxy when copying skeleton
 2014-10-20 11:28:36 +02:00
Jenkins for ownCloud
87da62072b [tx-robot] updated from transifex 2014-10-20 01:54:34 -04:00
Jenkins for ownCloud
68dd1edbfe [tx-robot] updated from transifex 2014-10-18 01:55:30 -04:00
Arthur Schiwon
4e8c7570d4 make performance less bad. Still far from good, but at least it works 2014-10-17 20:16:04 +02:00
Arthur Schiwon
a7a532f58a with several backends, more than limit can be returned 2014-10-17 20:16:04 +02:00
Morris Jobke
7bf401e48a Merge pull request #11430 from owncloud/minify-js-css-master 
adding cssmin and jssmin(minify)
 2014-10-17 15:05:59 +02:00
Lukas Reschke
439b33ec38 Merge pull request #11634 from owncloud/loadapps-encapsulaterequire 
Encapsulate require_once to avoid name space bleedind
 2014-10-17 14:32:10 +02:00