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

17732 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin McCorkell
87b548ed91 Fix all PHPDoc types and variable names, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell
a7ae2e874a Squash 'a | b' into 'a|b', in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell
b5bc37d2e4 Fix @return array PHPDocs, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell
b653ad164b Replace @returns with @return, in /lib 2014-05-13 19:08:14 +01:00
Thomas Müller
f5bc680f9c Merge pull request #8572 from owncloud/core-getabsolutepathwithzero 
Fixed getAbsolutePath case when path is "0"
 2014-05-13 17:41:18 +02:00
Vincent Petry
bab8c1f8e5 Fixed getAbsolutePath case when path is "0" 
Make sure to correctly check for string emptiness when the passed path
is "0".
 2014-05-13 17:38:46 +02:00
Thomas Müller
7babd44dd0 Merge pull request #8524 from owncloud/prompt-dialog 
Add prompt dialog to OC.dialogs
 2014-05-13 17:32:06 +02:00
Björn Schießle
b8de1e5d71 Merge pull request #8398 from owncloud/enc_backup_keys 
backup the encryption key after the encryption was disabled
 2014-05-13 09:25:16 -04:00
Morris Jobke
e934129bf6 Merge pull request #8566 from owncloud/controller-defaults 
Allow setting of controller default method values through normal PHP default values
 2014-05-13 14:32:07 +02:00
Bjoern Schiessle
a9ac11718e backup the encryption key after the encryption was disabled so that the user 
can restore them if needed
 2014-05-13 12:35:25 +02:00
Vincent Petry
6d00675d69 Merge pull request #8562 from owncloud/better-addmountpoint 
Extract mount point merging logic into separate function
 2014-05-13 12:19:41 +02:00
Morris Jobke
22e57d7e5a Merge pull request #8550 from owncloud/fix-sticky-footer 
fix sticky footer on log in page
 2014-05-13 11:02:14 +02:00
Bernhard Posselt
a152e320f6 make it possible to omit parameters and use the default parameters from the controller method 2014-05-13 10:40:49 +02:00
Vincent Petry
c06063255f Merge pull request #8526 from owncloud/escape-share-emails-master 
escape display name and email
 2014-05-13 10:29:54 +02:00
Vincent Petry
e3f6abf1f0 Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master 
Rotate thumbnail when encryption is enabled
 2014-05-13 10:27:41 +02:00
Jenkins for ownCloud
a60db322c2 [tx-robot] updated from transifex 2014-05-13 01:55:41 -04:00
Robin McCorkell
08a8a409d6 Extract mount point merging logic into separate function 2014-05-13 00:14:30 +01:00
Thomas Müller
408189b7e4 Merge pull request #8556 from owncloud/kill-legacy-code-master 
Kill legacy code master
 2014-05-12 20:55:24 +02:00
Lukas Reschke
aea44ee0d5 Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap 
Use proper PHPDoc and variable names in the LDAP lib
 2014-05-12 19:31:43 +02:00
Lukas Reschke
cd7fc5cb80 Use array as type 2014-05-12 19:31:21 +02:00
Thomas Müller
ee8a7b53da Merge pull request #8553 from owncloud/fix-8549-master 
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade...
 2014-05-12 17:45:08 +02:00
Thomas Müller
1d18fd4e6d Merge pull request #8482 from owncloud/public-logger 
Make logger available in the container
 2014-05-12 16:40:58 +02:00
Thomas Müller
f5ed92bf31 remove legacy aka deprecated code: OC_Cache_FileGlobalGC 2014-05-12 16:34:47 +02:00
Thomas Müller
e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Thomas Müller
33987eea83 remove legacy aka deprecated code: OC_Cache 2014-05-12 16:23:33 +02:00
Thomas Müller
4dd1a49a68 remove legacy aka deprecated code: OC_Filesystem 2014-05-12 16:20:07 +02:00
Thomas Müller
3cd32dcb7c adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() to OC_Response, which seems to be a more reasonable place 2014-05-12 15:14:01 +02:00
Thomas Müller
93dbb39e77 adding unit test for message interpolation 2014-05-12 14:17:36 +02:00
Jan-Christoph Borchardt
b92c4cb84d fix sticky footer on log in page 2014-05-12 13:40:04 +02:00
Morris Jobke
9d95fff427 fix missing spaces 2014-05-12 13:32:03 +02:00
Vincent Petry
9a9665f361 Merge pull request #8041 from owncloud/files-sortcolumns 
File list sorting by clicking on column headers
 2014-05-12 12:50:27 +02:00
Thomas Müller
1c731aacaf fix style 2014-05-12 11:30:47 +02:00
Thomas Müller
da0e37ef03 Rotate thumbnail when encryption is enabled 
When a picture is encrypted, save it to a temporary file first so that
the PHP function for rotation can access it as file.
 2014-05-12 11:27:39 +02:00
Thomas Müller
d853c60d7e adding interpolation as requested by PSR-3 2014-05-12 10:54:09 +02:00
Jenkins for ownCloud
f4e8de3cbb [tx-robot] updated from transifex 2014-05-12 01:55:44 -04:00
Morris Jobke
2054837d01 Merge pull request #8541 from owncloud/hardenIsSubDirectory 
Harden issubdirectory()
 2014-05-12 01:42:25 +02:00
Morris Jobke
984b509c0b Merge pull request #8540 from owncloud/fix-undefined 
$owner is not defined here
 2014-05-12 01:32:05 +02:00
Morris Jobke
6499995474 Merge pull request #8477 from owncloud/better-controllers 
Better appframework controllers
 2014-05-12 01:07:49 +02:00
Morris Jobke
7a6ff56b13 Merge pull request #8274 from owncloud/appframework-db 
Port database layer from appframework to core
 2014-05-12 00:12:19 +02:00
Morris Jobke
58dc10349a Merge pull request #8518 from owncloud/multiselect-width-fix 
reduce multiselect max-width from 400 to 200px to not take too much space
 2014-05-11 23:41:35 +02:00
Bernhard Posselt
63f2f16b85 use new controllermethodreflector for corsmiddleware 2014-05-11 17:55:59 +02:00
Bernhard Posselt
474b8f071d Fix typo 2014-05-11 17:54:09 +02:00
Bernhard Posselt
3e58a767ad Fix method signature 2014-05-11 17:54:09 +02:00
Bernhard Posselt
fcb1aa36f0 default to null to not fail if type is not annotated via phpdoc 2014-05-11 17:54:09 +02:00
Bernhard Posselt
1d45239c65 adjust license headers to new mail address 2014-05-11 17:54:08 +02:00
Bernhard Posselt
cb666c18d6 rename formatter to responder, formatResponse to buildResponse 2014-05-11 17:54:08 +02:00
Bernhard Posselt
c590244fa1 add private property for reflector in security middleware 2014-05-11 17:54:08 +02:00
Bernhard Posselt
ede7325772 fix broken if 2014-05-11 17:54:08 +02:00
Bernhard Posselt
d8da79cab0 add test for not failing when adding more comments after type parameters, do not limit x-www-form-urlencoded to POST 2014-05-11 17:54:08 +02:00
Bernhard Posselt
4dca2038bf add request to dispatcher class 2014-05-11 17:54:08 +02:00