aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-16365-2177/+2831
|
* Merge pull request #8603 from owncloud/trashbinfixVincent Petry2014-05-151-1/+1
|\ | | | | [regression] Fixed trashbin to use correct class
| * Fixed trashbin to use correct classVincent Petry2014-05-151-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-valignJan-Christoph Borchardt2014-05-152-6/+28
|\ | | | | Vertically align public layout to better fit small mobile screens
| * Move vertical alignment of public layout to mobile. Refs #8140jbtbnl2014-05-042-16/+22
| |
| * Vertically align public layout to better fit small mobile screensjbtbnl2014-04-102-7/+23
| |
* | Merge pull request #8589 from fibsifan/files_external_sftp_portRobin McCorkell2014-05-151-4/+4
|\ \ | | | | | | rename URL-fields to Host for SFTP/FTP and SMB external Storage backends
| * | changing label "URL" to "Host"fibsifan2014-05-151-4/+4
| | |
* | | Merge pull request #8587 from Raydiation/masterThomas Müller2014-05-155-7/+38
|\ \ \ | | | | | | | | Small cleanup and language detection for apps
| * | | use registerService method instead of array accessBernhard Posselt2014-05-141-1/+1
| | | |
| * | | use fetch method instead of fetchRow because fetchRow is only an owncloud ↵Bernhard Posselt2014-05-142-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 Posselt2014-05-142-0/+31
| | | | | | | | | | | | | | | | javascript language selection
* | | | Merge pull request #8597 from owncloud/l10n-fix-typoVincent Petry2014-05-151-2/+2
|\ \ \ \ | | | | | | | | | | fix typo encryption
| * | | | fix typo encryptionVolkan Gezer2014-05-151-2/+2
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-15344-12260/+12326
| | | | |
* | | | | Merge pull request #8567 from owncloud/test-ocshareunittestsThomas Müller2014-05-143-0/+101
|\ \ \ \ \ | |/ / / / |/| | | | Added ground work for OC.Share unit tests
| * | | | Added ground work for OC.Share unit testsVincent Petry2014-05-133-0/+101
| | | | |
* | | | | Merge pull request #8522 from owncloud/sharing_ux_improvementsBjörn Schießle2014-05-146-25/+69
|\ \ \ \ \ | | | | | | | | | | | | Sharing ux improvements
| * | | | | move expire message to the bottomBjoern Schiessle2014-05-131-1/+2
| | | | | |
| * | | | | hide default expire message if user sets expire dateBjoern Schiessle2014-05-131-0/+7
| | | | | |
| * | | | | increase width of share dialogBjoern Schiessle2014-05-131-1/+1
| | | | | |
| * | | | | add information about default expire date to the share dialogBjoern Schiessle2014-05-133-2/+29
| | | | | |
| * | | | | hide input field if default expire date isn't activatedBjoern Schiessle2014-05-133-23/+32
| | | | | |
* | | | | | Merge pull request #8403 from owncloud/fix-oc-dialogicewind19912014-05-141-6/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | fix oc dialog because the body isn't 100% x 100% in dimensions anymore
| * | | | | Use jquery to get the window widthRobin Appelman2014-05-131-2/+2
| | | | | |
| * | | | | Don't set the dialog content height to a zero or negative valueRobin Appelman2014-05-131-4/+10
| | | | | |
| * | | | | Dont use absolute positioning for buttonrowRobin Appelman2014-05-131-3/+4
| | | | | |
| * | | | | fix oc dialog because the body isn't 100% x 100% in dimensions anymoreMorris Jobke2014-04-292-6/+5
| | | | | |
* | | | | | Merge pull request #8584 from Bagera/masterjbtbnl2014-05-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | avoid row resize on filename edit
| * | | | | | Set row height in files tableBagera2014-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets row height to avoid resize when name is edited
| * | | | | | fixes #7949Bagera2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets height to form to avoid resizing when filename link is not shown
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-14131-2033/+6816
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #8582 from owncloud/remove-outdated-update-scLukas Reschke2014-05-141-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.0Lukas Reschke2014-05-131-46/+0
| |/ / / / /
* | | | | | Merge pull request #8542 from owncloud/phpdoc-improvementsThomas Müller2014-05-13121-487/+543
|\ \ \ \ \ \ | | | | | | | | | | | | | | PHPDoc Improvements
| * | | | | | fixing variable namingThomas Müller2014-05-131-24/+24
| | | | | | |
| * | | | | | @returns -> @returnThomas Müller2014-05-133-12/+12
| | | | | | |
| * | | | | | @breif -> @briefThomas Müller2014-05-132-3/+3
| | | | | | |
| * | | | | | fix PHPDocThomas Müller2014-05-131-3/+5
| | | | | | |
| * | | | | | object -> \OC\PreviewThomas Müller2014-05-131-1/+1
| | | | | | |
| * | | | | | adding PHPDocThomas Müller2014-05-131-2/+21
| | | | | | |
| * | | | | | fixing typo and missing @throwsThomas Müller2014-05-131-1/+2
| | | | | | |
| * | | | | | More PHPDoc for file functionsRobin McCorkell2014-05-132-0/+12
| | | | | | |
| * | | | | | Fix various code errors detected by ScrutinizerRobin McCorkell2014-05-132-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 errorsRobin McCorkell2014-05-134-7/+12
| | | | | | |
| * | | | | | Change parameter order of implodeRobin McCorkell2014-05-131-1/+1
| | | | | | |
| * | | | | | Fix Scrutinizer errors about missing user backendRobin McCorkell2014-05-132-21/+34
| | | | | | |
| * | | | | | Use OC_User_Interface instead of OC_User_BackendRobin McCorkell2014-05-132-6/+6
| | | | | | |
| * | | | | | Fix PHPDoc and typosLukas Reschke2014-05-134-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 useBackendRobin McCorkell2014-05-131-1/+1
| | | | | | |