summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * | | make it possible to omit parameters and use the default parameters from the ↵Bernhard Posselt2014-05-134-13/+46
| | | | | | | | | | | | | | | | controller method
* | | | Merge pull request #8562 from owncloud/better-addmountpointVincent Petry2014-05-131-11/+25
|\ \ \ \ | | | | | | | | | | Extract mount point merging logic into separate function
| * | | | Extract mount point merging logic into separate functionRobin McCorkell2014-05-131-11/+25
| | | | |
* | | | | Merge pull request #8550 from owncloud/fix-sticky-footerMorris Jobke2014-05-131-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | fix sticky footer on log in page
| * | | | fix sticky footer on log in pageJan-Christoph Borchardt2014-05-121-2/+2
| | | | |
* | | | | Merge pull request #8526 from owncloud/escape-share-emails-masterVincent Petry2014-05-131-2/+2
|\ \ \ \ \ | | | | | | | | | | | | escape display name and email
| * | | | | fix styleThomas Müller2014-05-121-2/+2
| | | | | |
| * | | | | escape display name and emailThomas Müller2014-05-091-1/+1
| | | | | |
* | | | | | Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-masterVincent Petry2014-05-131-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rotate thumbnail when encryption is enabled
| * | | | | | Rotate thumbnail when encryption is enabledThomas Müller2014-05-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a picture is encrypted, save it to a temporary file first so that the PHP function for rotation can access it as file.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1317-94/+104
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #8556 from owncloud/kill-legacy-code-masterThomas Müller2014-05-1236-540/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | Kill legacy code master
| * | | | | | remove legacy aka deprecated code: OC_Cache_FileGlobalGCThomas Müller2014-05-121-4/+0
| | | | | | |
| * | | | | | remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-1228-98/+89
| | | | | | |
| * | | | | | remove legacy aka deprecated code: OC_CacheThomas Müller2014-05-125-17/+7
| | | | | | |
| * | | | | | remove legacy aka deprecated code: OC_FilesystemThomas Müller2014-05-125-421/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldapLukas Reschke2014-05-1215-386/+691
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use proper PHPDoc and variable names in the LDAP lib
| * | | | | | Use array as typeLukas Reschke2014-05-121-1/+1
| | | | | | |
| * | | | | | That's bool and not always trueLukas Reschke2014-05-111-1/+1
| | | | | | |
| * | | | | | Use WizardResult|false instead of mixedLukas Reschke2014-05-111-2/+2
| | | | | | |
| * | | | | | Use @return instead of @returnsLukas Reschke2014-05-113-9/+9
| | | | | | |
| * | | | | | Fix TypoLukas Reschke2014-05-113-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I guess that should be `default` and not `defautl`, wondering how this ever worked.
| * | | | | | Use proper PHPDoc and variable names in the LDAP libLukas Reschke2014-05-1112-378/+683
| | | | | | | | | | | | | | | | | | | | | | | | | | | | My IDE was so sad about this that it marked the whole file in red and yellow and forced me to fix this.
* | | | | | | Merge pull request #8553 from owncloud/fix-8549-masterThomas Müller2014-05-122-29/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade...
| * | | | | | | adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() ↵Thomas Müller2014-05-122-29/+33
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | to OC_Response, which seems to be a more reasonable place
* | | | | | | Merge pull request #8482 from owncloud/public-loggerThomas Müller2014-05-124-13/+194
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Make logger available in the container
| * | | | | | adding unit test for message interpolationThomas Müller2014-05-121-0/+40
| | | | | | |
| * | | | | | fix missing spacesMorris Jobke2014-05-122-3/+3
| | | | | | |
| * | | | | | adding interpolation as requested by PSR-3Thomas Müller2014-05-121-0/+9
| | | | | | |
| * | | | | | - make logger available in the containerBernhard Posselt2014-05-093-13/+145
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | - inject logger class into log - adding PHPDoc comments and fixing typos
* | | | | | Merge pull request #8041 from owncloud/files-sortcolumnsVincent Petry2014-05-1212-74/+507
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | File list sorting by clicking on column headers
| * | | | | Clear selection on reload (when changing sort)Vincent Petry2014-04-292-2/+9
| | | | | |
| * | | | | typos, indentation and remove of unused codeThomas Müller2014-04-283-7/+7
| | | | | |
| * | | | | html input tag has no closing tagThomas Müller2014-04-281-2/+3
| | | | | |
| * | | | | $RUNTIME_APPTYPES is no longer used - left over from pre OC4Thomas Müller2014-04-281-5/+0
| | | | | |
| * | | | | Added unit test in files app for sort function in helper classVincent Petry2014-04-282-6/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added unit test for the Helper class in the files app that tests the different sort orders.
| * | | | | Set default sort of trashbin to timestamp descendingVincent Petry2014-04-282-4/+2
| | | | | |
| * | | | | Add sorting to files list, trashbin and public filesVincent Petry2014-04-2810-57/+382
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1240-218/+295
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-01 13:26:36 +0000