Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-16 | 365 | -2177/+2831 |
| | |||||
* | Merge pull request #8603 from owncloud/trashbinfix | Vincent Petry | 2014-05-15 | 1 | -1/+1 |
|\ | | | | | [regression] Fixed trashbin to use correct class | ||||
| * | Fixed trashbin to use correct class | Vincent Petry | 2014-05-15 | 1 | -1/+1 |
|/ | | | | | It seems that \OC_Filesystemview has been removed. Now using the correct class \OC\Files\View() | ||||
* | Merge pull request #8140 from owncloud/login-valign | Jan-Christoph Borchardt | 2014-05-15 | 2 | -6/+28 |
|\ | | | | | Vertically align public layout to better fit small mobile screens | ||||
| * | Move vertical alignment of public layout to mobile. Refs #8140 | jbtbnl | 2014-05-04 | 2 | -16/+22 |
| | | |||||
| * | Vertically align public layout to better fit small mobile screens | jbtbnl | 2014-04-10 | 2 | -7/+23 |
| | | |||||
* | | Merge pull request #8589 from fibsifan/files_external_sftp_port | Robin McCorkell | 2014-05-15 | 1 | -4/+4 |
|\ \ | | | | | | | rename URL-fields to Host for SFTP/FTP and SMB external Storage backends | ||||
| * | | changing label "URL" to "Host" | fibsifan | 2014-05-15 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #8587 from Raydiation/master | Thomas Müller | 2014-05-15 | 5 | -7/+38 |
|\ \ \ | | | | | | | | | Small cleanup and language detection for apps | ||||
| * | | | use registerService method instead of array access | Bernhard Posselt | 2014-05-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | use fetch method instead of fetchRow because fetchRow is only an owncloud ↵ | Bernhard Posselt | 2014-05-14 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | internal alias that exists purely for compability | ||||
| * | | | provide a way to detect the language that is being used (e.g. for clientside ↵ | Bernhard Posselt | 2014-05-14 | 2 | -0/+31 |
| | | | | | | | | | | | | | | | | javascript language selection | ||||
* | | | | Merge pull request #8597 from owncloud/l10n-fix-typo | Vincent Petry | 2014-05-15 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | fix typo encryption | ||||
| * | | | | fix typo encryption | Volkan Gezer | 2014-05-15 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-15 | 344 | -12260/+12326 |
| | | | | | |||||
* | | | | | Merge pull request #8567 from owncloud/test-ocshareunittests | Thomas Müller | 2014-05-14 | 3 | -0/+101 |
|\ \ \ \ \ | |/ / / / |/| | | | | Added ground work for OC.Share unit tests | ||||
| * | | | | Added ground work for OC.Share unit tests | Vincent Petry | 2014-05-13 | 3 | -0/+101 |
| | | | | | |||||
* | | | | | Merge pull request #8522 from owncloud/sharing_ux_improvements | Björn Schießle | 2014-05-14 | 6 | -25/+69 |
|\ \ \ \ \ | | | | | | | | | | | | | Sharing ux improvements | ||||
| * | | | | | move expire message to the bottom | Bjoern Schiessle | 2014-05-13 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | hide default expire message if user sets expire date | Bjoern Schiessle | 2014-05-13 | 1 | -0/+7 |
| | | | | | | |||||
| * | | | | | increase width of share dialog | Bjoern Schiessle | 2014-05-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | add information about default expire date to the share dialog | Bjoern Schiessle | 2014-05-13 | 3 | -2/+29 |
| | | | | | | |||||
| * | | | | | hide input field if default expire date isn't activated | Bjoern Schiessle | 2014-05-13 | 3 | -23/+32 |
| | | | | | | |||||
* | | | | | | Merge pull request #8403 from owncloud/fix-oc-dialog | icewind1991 | 2014-05-14 | 1 | -6/+12 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | fix oc dialog because the body isn't 100% x 100% in dimensions anymore | ||||
| * | | | | | Use jquery to get the window width | Robin Appelman | 2014-05-13 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Don't set the dialog content height to a zero or negative value | Robin Appelman | 2014-05-13 | 1 | -4/+10 |
| | | | | | | |||||
| * | | | | | Dont use absolute positioning for buttonrow | Robin Appelman | 2014-05-13 | 1 | -3/+4 |
| | | | | | | |||||
| * | | | | | fix oc dialog because the body isn't 100% x 100% in dimensions anymore | Morris Jobke | 2014-04-29 | 2 | -6/+5 |
| | | | | | | |||||
* | | | | | | Merge pull request #8584 from Bagera/master | jbtbnl | 2014-05-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | avoid row resize on filename edit | ||||
| * | | | | | | Set row height in files table | Bagera | 2014-05-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets row height to avoid resize when name is edited | ||||
| * | | | | | | fixes #7949 | Bagera | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets height to form to avoid resizing when filename link is not shown | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-14 | 131 | -2033/+6816 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #8582 from owncloud/remove-outdated-update-sc | Lukas Reschke | 2014-05-14 | 1 | -46/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | We do not support updates from 4.5 > 7.0 or even 3.0 > 7.0 | ||||
| * | | | | | | We do not support updates from 4.5 > 7.0 | Lukas Reschke | 2014-05-13 | 1 | -46/+0 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #8542 from owncloud/phpdoc-improvements | Thomas Müller | 2014-05-13 | 121 | -487/+543 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PHPDoc Improvements | ||||
| * | | | | | | fixing variable naming | Thomas Müller | 2014-05-13 | 1 | -24/+24 |
| | | | | | | | |||||
| * | | | | | | @returns -> @return | Thomas Müller | 2014-05-13 | 3 | -12/+12 |
| | | | | | | | |||||
| * | | | | | | @breif -> @brief | Thomas Müller | 2014-05-13 | 2 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | fix PHPDoc | Thomas Müller | 2014-05-13 | 1 | -3/+5 |
| | | | | | | | |||||
| * | | | | | | object -> \OC\Preview | Thomas Müller | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | adding PHPDoc | Thomas Müller | 2014-05-13 | 1 | -2/+21 |
| | | | | | | | |||||
| * | | | | | | fixing typo and missing @throws | Thomas Müller | 2014-05-13 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | More PHPDoc for file functions | Robin McCorkell | 2014-05-13 | 2 | -0/+12 |
| | | | | | | | |||||
| * | | | | | | Fix various code errors detected by Scrutinizer | Robin McCorkell | 2014-05-13 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | Fix Scrutinizer errors | Robin McCorkell | 2014-05-13 | 4 | -7/+12 |
| | | | | | | | |||||
| * | | | | | | Change parameter order of implode | Robin McCorkell | 2014-05-13 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix Scrutinizer errors about missing user backend | Robin McCorkell | 2014-05-13 | 2 | -21/+34 |
| | | | | | | | |||||
| * | | | | | | Use OC_User_Interface instead of OC_User_Backend | Robin McCorkell | 2014-05-13 | 2 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | Fix PHPDoc and typos | Lukas Reschke | 2014-05-13 | 4 | -15/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | Change parameter type for useBackend | Robin McCorkell | 2014-05-13 | 1 | -1/+1 |
| | | | | | | |