Commit Graph

17781 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 60efa0f1c8 Merge pull request #8140 from owncloud/login-valign
Vertically align public layout to better fit small mobile screens
2014-05-15 15:06:52 +02:00
Robin McCorkell a0f309bbd8 Merge pull request #8589 from fibsifan/files_external_sftp_port
rename URL-fields to Host for SFTP/FTP and SMB external Storage backends
2014-05-15 13:22:22 +01:00
fibsifan 06c084cc3c changing label "URL" to "Host" 2014-05-15 14:09:10 +02:00
Thomas Müller 7abe3b1989 Merge pull request #8587 from Raydiation/master
Small cleanup and language detection for apps
2014-05-15 12:22:47 +02:00
Vincent Petry 3daaf6ba4f Merge pull request #8597 from owncloud/l10n-fix-typo
fix typo encryption
2014-05-15 10:05:37 +02:00
Jenkins for ownCloud d9d684197a [tx-robot] updated from transifex 2014-05-15 01:55:53 -04:00
Volkan Gezer 5291f47c66 fix typo encryption 2014-05-15 01:29:14 +02:00
Thomas Müller 48ee72732e Merge pull request #8567 from owncloud/test-ocshareunittests
Added ground work for OC.Share unit tests
2014-05-14 23:35:58 +02:00
Björn Schießle dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements
Sharing ux improvements
2014-05-14 12:54:27 -04:00
icewind1991 4c19acf09b Merge pull request #8403 from owncloud/fix-oc-dialog
fix oc dialog because the body isn't 100% x 100% in dimensions anymore
2014-05-14 13:34:55 +02:00
jbtbnl c98edf18cc Merge pull request #8584 from Bagera/master
avoid row resize on filename edit
2014-05-14 10:05:59 +02:00
Bagera 7b39704c61 Set row height in files table
Sets row height to avoid resize when name is edited
2014-05-14 08:32:48 +02:00
Jenkins for ownCloud c9df98abae [tx-robot] updated from transifex 2014-05-14 01:55:31 -04:00
Bernhard Posselt d8020c3506 use registerService method instead of array access 2014-05-14 01:09:48 +02:00
Bernhard Posselt 9e36c33104 use fetch method instead of fetchRow because fetchRow is only an owncloud internal alias that exists purely for compability 2014-05-14 01:09:48 +02:00
Bernhard Posselt 512373fadf provide a way to detect the language that is being used (e.g. for clientside javascript language selection 2014-05-14 01:09:48 +02:00
Lukas Reschke 166f2af5d8 Merge pull request #8582 from owncloud/remove-outdated-update-sc
We do not support updates from 4.5 > 7.0 or even 3.0 > 7.0
2014-05-14 00:28:05 +02:00
Thomas Müller 5fb94bf76f Merge pull request #8542 from owncloud/phpdoc-improvements
PHPDoc Improvements
2014-05-13 23:23:11 +02:00
Thomas Müller 401bc60981 Merge pull request #8586 from owncloud/more-unit-tests
Add tests for other types that PHP might cast
2014-05-13 23:06:15 +02:00
Lukas Reschke b0381cfe12 Add tests for other types that PHP might cast
Addition to https://github.com/owncloud/core/pull/8572
2014-05-13 22:01:11 +02:00
Thomas Müller 37ba6f503a fixing variable naming 2014-05-13 19:09:15 +01:00
Thomas Müller 58857b8df5 @returns -> @return 2014-05-13 19:09:15 +01:00
Thomas Müller 55fc693750 @breif -> @brief 2014-05-13 19:09:15 +01:00
Thomas Müller fa503a4772 fix PHPDoc 2014-05-13 19:09:15 +01:00
Thomas Müller 650a55e2ba object -> \OC\Preview 2014-05-13 19:09:14 +01:00
Thomas Müller 7853bc4cac adding PHPDoc 2014-05-13 19:09:14 +01:00
Thomas Müller 147007bdd8 fixing typo and missing @throws 2014-05-13 19:09:14 +01:00
Robin McCorkell 4755392c65 More PHPDoc for file functions 2014-05-13 19:09:14 +01:00
Robin McCorkell f7e777f7d2 Fix various code errors detected by Scrutinizer
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
2014-05-13 19:09:14 +01:00
Robin McCorkell bac8962bbc Fix Scrutinizer errors 2014-05-13 19:08:14 +01:00
Robin McCorkell bd3bf4b507 Change parameter order of implode 2014-05-13 19:08:14 +01:00
Robin McCorkell 875a8acedf Fix Scrutinizer errors about missing user backend 2014-05-13 19:08:14 +01:00
Robin McCorkell 8ab01599a9 Use OC_User_Interface instead of OC_User_Backend 2014-05-13 19:08:14 +01:00
Lukas Reschke 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
Robin McCorkell 3bed3d2a23 Change parameter type for useBackend 2014-05-13 19:08:14 +01:00
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
Bagera 5757d02b76 fixes #7949
Sets height to form to avoid resizing when filename link is not shown
2014-05-13 20:02:22 +02:00
Lukas Reschke 2d1296bb03 We do not support updates from 4.5 > 7.0 2014-05-13 18:54:43 +02: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
Bjoern Schiessle 737be1a10f move expire message to the bottom 2014-05-13 15:27:56 +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
Robin Appelman c85e6d919e Use jquery to get the window width 2014-05-13 13:00:46 +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