summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* external storage: change confusing 'applicable' to 'available for'Jan-Christoph Borchardt2014-04-011-1/+1
* Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hookBjörn Schießle2014-04-013-87/+66
|\
| * don't call getFileInfo() to avoid to open the same file twiceBjoern Schiessle2014-03-311-12/+16
| * move check if a file should be encrypted to the pre hookBjoern Schiessle2014-03-312-75/+50
* | Merge pull request #7943 from hjort/masterVincent Petry2014-04-011-3/+3
|\ \
| * | Correction: failure on sharing when user ID was prefixed by zeroRodrigo Hjort2014-03-281-3/+3
* | | Merge pull request #7975 from owncloud/fix-7973-master-2Vincent Petry2014-04-0115-2569/+0
|\ \ \
| * | | remove pl_PL - fixes #7973Thomas Müller2014-03-3115-2569/+0
* | | | Merge pull request #7915 from owncloud/replace-personalblockVincent Petry2014-04-0111-430/+407
|\ \ \ \
| * \ \ \ external storage: fix merge conflict, indentationJan-Christoph Borchardt2014-03-31119-2126/+3046
| |\ \ \ \
| * | | | | replace last personalblock fieldset within files_externalJan-Christoph Borchardt2014-03-311-3/+1
| * | | | | remove CSS rules for personalblock, remove it from coreJan-Christoph Borchardt2014-03-272-17/+4
| * | | | | replace personalblock fieldset with section class in core user_ appsJan-Christoph Borchardt2014-03-272-9/+7
| * | | | | replace personalblock fieldset with section class in files appsJan-Christoph Borchardt2014-03-274-271/+261
| * | | | | replace personalblock fieldset with section div in admin and personal settingsJan-Christoph Borchardt2014-03-272-124/+112
| * | | | | general styles for the content areaJan-Christoph Borchardt2014-03-271-3/+19
| | |_|_|/ | |/| | |
* | | | | Merge pull request #7966 from owncloud/url_generation_hackMorris Jobke2014-04-011-1/+6
|\ \ \ \ \
| * | | | | Check if web root has already been appendedThomas Tanghus2014-03-311-1/+6
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-0135-200/+242
* | | | | Merge pull request #7967 from owncloud/sharing_fix_select_statementBjörn Schießle2014-03-311-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | select statement always need to contain file_source respectively item_sourceBjoern Schiessle2014-03-311-2/+2
| |/ / /
* | | | Merge pull request #7916 from owncloud/fix-input-sizesMorris Jobke2014-03-312-7/+11
|\ \ \ \ | |/ / / |/| | |
| * | | fix duplicate rules for button/input styles, em to pxJan-Christoph Borchardt2014-03-311-3/+3
| * | | convert input metrics to pxJan-Christoph Borchardt2014-03-271-3/+8
| * | | remove additional radio button width declarationJan-Christoph Borchardt2014-03-271-1/+0
| |/ /
* | | Merge pull request #7939 from owncloud/wring_redirect_on_loginVincent Petry2014-03-312-6/+6
|\ \ \
| * | | Sub-dir was prepended twiceThomas Tanghus2014-03-291-1/+1
| * | | Sub-dir was prepended twiceThomas Tanghus2014-03-291-2/+1
| * | | Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936Thomas Tanghus2014-03-281-4/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-3112-12/+12
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-3018-53/+57
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-2917-110/+113
* | | | Merge pull request #7845 from duritong/fix_submodule_urlThomas Müller2014-03-281-1/+1
|\ \ \ \
| * | | | use https as submodule urlmh2014-03-211-1/+1
* | | | | Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-masterMorris Jobke2014-03-281-3/+11
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | adding @method annotation to declare methods which can be called on the wrapp...Thomas Müller2014-03-281-3/+11
* | | | | Merge pull request #7934 from owncloud/addEventToExpirationDateVincent Petry2014-03-281-1/+8
|\ \ \ \ \
| * | | | | Emit event after setting a new expiration for a shareMorris Jobke2014-03-281-1/+8
* | | | | | Merge pull request #7770 from jamesryanbell/masterMorris Jobke2014-03-281-2/+2
|\ \ \ \ \ \
| * | | | | | SVG support detectionjamesryanbell2014-03-171-2/+2
* | | | | | | Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_failsBjörn Schießle2014-03-281-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
* | | | | | | Merge pull request #7824 from owncloud/hash-parameter-orderThomas Müller2014-03-284-19/+35
|\ \ \ \ \ \ \
| * | | | | | | fix temporary file based common hashRobin Appelman2014-03-211-2/+1
| * | | | | | | Fix parameter order for Storage\Local::hashRobin Appelman2014-03-203-17/+34
* | | | | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_apiVincent Petry2014-03-288-1706/+2026
|\ \ \ \ \ \ \ \
| * | | | | | | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-252-3/+88
| * | | | | | | | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-252-85/+7
| * | | | | | | | don't assign variables in if conditionBjoern Schiessle2014-03-251-18/+17
| * | | | | | | | add todoBjoern Schiessle2014-03-251-1/+1