summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-12-0532-209/+301
|
* Enabling unit testing for apptemplate_advancedThomas Müller2012-12-041-0/+1
|
* Merge pull request #707 from owncloud/fix_infield_autofillJan-Christoph Borchardt2012-12-043-13/+165
|\ | | | | Fix infield autofill
| * minified version no longer availableThomas Mueller2012-12-041-1/+1
| |
| * merge changes discussed in dcneiner pull number 4 'fix for autocomplete ↵Jörn Friedrich Dreyer2012-12-041-5/+16
| | | | | | | | issue' including firefox password overlay
| * replace minified infieldlabel with dcneiners versionJörn Friedrich Dreyer2012-12-042-12/+153
|/
* [tx-robot] updated from transifexJenkins for ownCloud2012-12-0432-55/+70
|
* LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes ↵Arthur Schiwon2012-12-031-4/+11
| | | | different problems, esp. with non-ascii characters in the dn (#631)
* Merge pull request #650 from schiesbn/fix_fileVersioningForSharedFiles_masterBjörn Schießle2012-12-031-6/+6
|\ | | | | fix regression in file versioning for shared files
| * rebase on latest masterBjörn Schießle2012-12-020-0/+0
| |\
| | * fix regression in file versioning for shared filesBjörn Schießle2012-11-301-6/+6
| | |
| * | fix typo in variable nameBjörn Schießle2012-12-021-1/+1
| | |
| * | fix regression in file versioning for shared filesBjörn Schießle2012-12-021-6/+6
| | |
* | | Merge pull request #682 from VicDeo/masterThomas Müller2012-12-032-33/+28
|\ \ \ | | | | | | | | Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
| * | | Check if we have an array with data. Fix #487Victor Dubiniuk2012-12-021-1/+1
| | | |
| * | | Clean KB entries processing codeVictor Dubiniuk2012-12-021-32/+27
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2012-12-0392-215/+254
|/ /
* | Merge pull request #654 from butonic/checkstyle_fixesThomas Müller2012-12-0230-370/+603
|\ \ | | | | | | fix checkstyle for files_encryption & files_encryption app, add whitespace for readability
| * | fix checkstyle for files_external app, add whitespace for readabilityJörn Friedrich Dreyer2012-11-3022-306/+527
| | |
| * | fix checkstyle for files_encryption app, add whitespace for readabilityJörn Friedrich Dreyer2012-11-308-64/+76
| | |
* | | Merge pull request #672 from irosenb/patch-1icewind19912012-12-011-1/+1
|\ \ \ | | | | | | | | Update lib/image.php
| * | | Update lib/image.phpIsaac Rosenberg2012-12-011-1/+1
|/ / / | | | | | | Corrected simple typo
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-0256-483/+653
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2012-12-01144-2399/+2119
| | |
* | | Merge pull request #603 from owncloud/store_plain_groupnameBart Visscher2012-11-302-2/+2
|\ \ \ | | | | | | | | Group name doesn't need to be sanitized before storing it in the database
| * | | Group name does't need to be sanitized before storing it in the databaseBart Visscher2012-11-272-2/+2
| | | | | | | | | | | | | | | | It should only be sanitized before display
* | | | Merge pull request #644 from butonic/checkstyle_fixesBart Visscher2012-11-3010-73/+152
|\ \ \ \ | | |/ / | |/| | fix checkstyle for files app
| * | | fix checkstyle for files appJörn Friedrich Dreyer2012-11-2911-74/+153
| | | |
* | | | Merge pull request #605 from owncloud/fix_false_positive_share_2Bart Visscher2012-11-301-1/+1
|\ \ \ \ | |_|_|/ |/| | | Sharing: Fix false positived v. 2
| * | | Sharing: Fix false positived v. 2Thomas Tanghus2012-11-271-1/+1
| | | |
* | | | Merge pull request #619 from samtuke/versions_cacheBart Visscher2012-11-302-5/+31
|\ \ \ \ | | | | | | | | | | OC_FSV->copy now only caches files which are copied from data/user/files
| * | | | OC_FSV->copy now only caches files which are copied from data/user/filesSam Tuke2012-11-282-5/+31
| | | | | | | | | | | | | | | | | | | | Added contextual comments
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-3081-394/+651
| | | | |
* | | | | Merge pull request #635 from owncloud/ob_endThomas Müller2012-11-296-8/+17
|\ \ \ \ \ | |_|_|/ / |/| | | | provide a safe way to end output buffering
| * | | | use new obEnd function instead of ob_end_cleanRobin Appelman2012-11-295-5/+5
| | | | |
| * | | | add function to safely end output bufferingRobin Appelman2012-11-291-3/+12
|/ / / /
* | | | Merge pull request #620 from owncloud/fix_600Georg Ehrke2012-11-292-7/+8
|\ \ \ \ | | | | | | | | | | Fix #600
| * | | | use attr instead of dataGeorg Ehrke2012-11-291-7/+2
| | | | |
| * | | | Revert "fix group and subadmin managing for 'ajax-loaded' users"Georg Ehrke2012-11-291-2/+7
| | | | | | | | | | | | | | | | | | | | This reverts commit a5774229a13ef307dabe3142d1a85f12bf41b391.
| * | | | add a client side checkGeorg Ehrke2012-11-281-0/+3
| | | | |
| * | | | fix group and subadmin managing for 'ajax-loaded' usersGeorg Ehrke2012-11-281-7/+2
| | | | |
| * | | | make some checks server-sideGeorg Ehrke2012-11-282-3/+6
| |/ / /
* | | | Merge pull request #617 from samtuke/fix_docblocksblizzz2012-11-291-21/+15
|\ \ \ \ | | | | | | | | | | Cleaned up docblock comments
| * | | | Cleaned up docblock commentsSam Tuke2012-11-281-21/+15
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2916-28/+36
| | | |
* | | | Merge pull request #540 from Raydiation/masterThomas Müller2012-11-281-0/+68
|\ \ \ \ | | | | | | | | | | More tests for lib/group.php
| * | | | added more unittests for the group fileBernhard Posselt2012-11-281-0/+68
| |/ / /
* | | | Merge pull request #601 from butonic/add_drag_shadow_in_firefoxBart Visscher2012-11-281-1/+1
|\ \ \ \ | |/ / / |/| | | show drag shadow in firefox by using helper:'clone'
| * | | show drag shadow in firefox by using helper:'clone'Jörn Friedrich Dreyer2012-11-271-1/+1
| |/ /
* | | Merge pull request #401 from owncloud/share_hooksJörn Friedrich Dreyer2012-11-284-14/+34
|\ \ \ | | | | | | | | Create functions to install standard hooks