summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| | | | | |
| * | | | | Fix all PHPDoc types and variable names, in /libRobin McCorkell2014-05-1375-263/+255
| | | | | |
| * | | | | Squash 'a | b' into 'a|b', in /libRobin McCorkell2014-05-1323-26/+26
| | | | | |
| * | | | | Fix @return array PHPDocs, in /libRobin McCorkell2014-05-1338-75/+75
| | | | | |
| * | | | | Replace @returns with @return, in /libRobin McCorkell2014-05-1318-72/+72
| |/ / / /
* | | | | Merge pull request #8586 from owncloud/more-unit-testsThomas Müller2014-05-131-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | Add tests for other types that PHP might cast
| * | | | Add tests for other types that PHP might castLukas Reschke2014-05-131-0/+2
|/ / / / | | | | | | | | Addition to https://github.com/owncloud/core/pull/8572
* | | | Merge pull request #8572 from owncloud/core-getabsolutepathwithzeroThomas Müller2014-05-132-1/+19
|\ \ \ \ | | | | | | | | | | Fixed getAbsolutePath case when path is "0"
| * | | | Fixed getAbsolutePath case when path is "0"Vincent Petry2014-05-132-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Make sure to correctly check for string emptiness when the passed path is "0".
* | | | | Merge pull request #8524 from owncloud/prompt-dialogThomas Müller2014-05-131-1/+60
|\ \ \ \ \ | | | | | | | | | | | | Add prompt dialog to OC.dialogs
| * | | | | Fix Typo, define $ as globalLukas Reschke2014-05-111-2/+2
| | | | | |
| * | | | | Add prompt dialog to OC.dialogsRobin Appelman2014-05-091-0/+59
| | | | | |
* | | | | | Merge pull request #8398 from owncloud/enc_backup_keysBjörn Schießle2014-05-139-22/+176
|\ \ \ \ \ \ | | | | | | | | | | | | | | backup the encryption key after the encryption was disabled
| * | | | | | backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-139-22/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | can restore them if needed
* | | | | | | Merge pull request #8566 from owncloud/controller-defaultsMorris Jobke2014-05-134-13/+46
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Allow setting of controller default method values through normal PHP default values
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 21:27:39 +0000