7e448a376f
Fix PHPDoc and typos
...
Some things my IDE complained about while creating a custom backend.
Fix PHPDoc and typos
Some things my IDE complained about while creating a custom backend.
Conflicts:
lib/private/group/database.php
lib/private/group/dummy.php
lib/private/group/example.php
2014-05-13 19:08:14 +01:00
3bed3d2a23
Change parameter type for useBackend
2014-05-13 19:08:14 +01:00
87b548ed91
Fix all PHPDoc types and variable names, in /lib
2014-05-13 19:08:14 +01:00
a7ae2e874a
Squash 'a | b' into 'a|b', in /lib
2014-05-13 19:08:14 +01:00
b5bc37d2e4
Fix @return array PHPDocs, in /lib
2014-05-13 19:08:14 +01:00
b653ad164b
Replace @returns with @return, in /lib
2014-05-13 19:08:14 +01:00
5757d02b76
fixes #7949
...
Sets height to form to avoid resizing when filename link is not shown
2014-05-13 20:02:22 +02:00
2d1296bb03
We do not support updates from 4.5 > 7.0
2014-05-13 18:54:43 +02:00
f5bc680f9c
Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
...
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
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
7babd44dd0
Merge pull request #8524 from owncloud/prompt-dialog
...
Add prompt dialog to OC.dialogs
2014-05-13 17:32:06 +02:00
737be1a10f
move expire message to the bottom
2014-05-13 15:27:56 +02:00
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
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
c85e6d919e
Use jquery to get the window width
2014-05-13 13:00:46 +02:00
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
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
b985021082
hide default expire message if user sets expire date
2014-05-13 11:56:04 +02:00
b8dc85b2f6
increase width of share dialog
2014-05-13 11:49:16 +02:00
46d6cb739d
Don't set the dialog content height to a zero or negative value
2014-05-13 11:37:29 +02:00
541495b1b5
Dont use absolute positioning for buttonrow
2014-05-13 11:36:31 +02:00
d56d03e230
add information about default expire date to the share dialog
2014-05-13 11:28:25 +02:00
ec045b251c
hide input field if default expire date isn't activated
2014-05-13 11:28:25 +02:00
627eba5348
Added ground work for OC.Share unit tests
2014-05-13 11:15:06 +02:00
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
a152e320f6
make it possible to omit parameters and use the default parameters from the controller method
2014-05-13 10:40:49 +02:00
c06063255f
Merge pull request #8526 from owncloud/escape-share-emails-master
...
escape display name and email
2014-05-13 10:29:54 +02:00
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
a60db322c2
[tx-robot] updated from transifex
2014-05-13 01:55:41 -04:00
08a8a409d6
Extract mount point merging logic into separate function
2014-05-13 00:14:30 +01:00
408189b7e4
Merge pull request #8556 from owncloud/kill-legacy-code-master
...
Kill legacy code master
2014-05-12 20:55:24 +02:00
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
cd7fc5cb80
Use array as type
2014-05-12 19:31:21 +02:00
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
1d18fd4e6d
Merge pull request #8482 from owncloud/public-logger
...
Make logger available in the container
2014-05-12 16:40:58 +02:00
f5ed92bf31
remove legacy aka deprecated code: OC_Cache_FileGlobalGC
2014-05-12 16:34:47 +02:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
33987eea83
remove legacy aka deprecated code: OC_Cache
2014-05-12 16:23:33 +02:00
4dd1a49a68
remove legacy aka deprecated code: OC_Filesystem
2014-05-12 16:20:07 +02:00
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
93dbb39e77
adding unit test for message interpolation
2014-05-12 14:17:36 +02:00
b92c4cb84d
fix sticky footer on log in page
2014-05-12 13:40:04 +02:00
9d95fff427
fix missing spaces
2014-05-12 13:32:03 +02:00
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
1c731aacaf
fix style
2014-05-12 11:30:47 +02:00
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
d853c60d7e
adding interpolation as requested by PSR-3
2014-05-12 10:54:09 +02:00
f4e8de3cbb
[tx-robot] updated from transifex
2014-05-12 01:55:44 -04:00
2054837d01
Merge pull request #8541 from owncloud/hardenIsSubDirectory
...
Harden issubdirectory()
2014-05-12 01:42:25 +02:00
984b509c0b
Merge pull request #8540 from owncloud/fix-undefined
...
$owner is not defined here
2014-05-12 01:32:05 +02:00
Lukas Reschke
Robin McCorkell
Bagera
Thomas Müller
Vincent Petry
Bjoern Schiessle
Morris Jobke
Robin Appelman
Bernhard Posselt
Jenkins for ownCloud
Jan-Christoph Borchardt