summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3690 from owncloud/use_execute_audited_in_filecacheThomas Müller2013-06-137-122/+99
|\
| * fix another double wrapped arrayJörn Friedrich Dreyer2013-06-121-1/+1
| * remove additional array wrappingJörn Friedrich Dreyer2013-06-121-3/+3
| * use executeAudited in files cacheJörn Friedrich Dreyer2013-06-127-122/+99
* | Merge pull request #3686 from owncloud/minor_exception_cleanupThomas Müller2013-06-132-7/+3
|\ \
| * | PDOException has no previous(), oh the consistency ...Jörn Friedrich Dreyer2013-06-131-1/+1
| * | minor cleanup for exception handlingJörn Friedrich Dreyer2013-06-121-6/+2
| |/
* | Merge pull request #3586 from owncloud/contributingMorris Jobke2013-06-131-8/+12
|\ \
| * | Fix typoMorris Jobke2013-06-131-1/+1
| * | TL;DR and remove link from "Report issue here"Morris Jobke2013-06-121-1/+5
| * | trashbin -> deleted filesMorris Jobke2013-06-051-1/+1
| * | Revise Contributing documentMichael Gapczynski2013-06-031-8/+8
* | | Merge pull request #3687 from owncloud/template_updatesBjörn Schießle2013-06-139-18/+119
|\ \ \
| * | | improved footerBjörn Schießle2013-06-132-3/+8
| * | | Merge branch 'template_updates' of github.com:owncloud/core into template_upd...Björn Schießle2013-06-122-9/+4
| |\ \ \
| | * | | move common settings footer fieldset out of conditionalJan-Christoph Borchardt2013-06-122-9/+4
| * | | | add logo-claimBjörn Schießle2013-06-122-1/+6
| * | | | don't show translation hints in enterprise editionBjörn Schießle2013-06-121-0/+2
| |/ / /
| * | | short explanation about OC_DefaultsBjörn Schießle2013-06-121-0/+5
| * | | make pub link share footer aware of different owncloud editionsBjörn Schießle2013-06-121-2/+2
| * | | make main menu aware of the different owncloud editionsBjörn Schießle2013-06-121-1/+2
| * | | add default doc urlBjörn Schießle2013-06-121-0/+10
| * | | make footer and urls aware of ownCloud editionsBjörn Schießle2013-06-124-5/+23
| * | | keep all strings in one place to make it easier to change themBjörn Schießle2013-06-124-7/+55
| * | | make footer aware of ownCloud editionsBjörn Schießle2013-06-121-2/+7
| * | | mage page title aware of ownCloud editionBjörn Schießle2013-06-123-4/+11
| | |/ | |/|
* | | Merge pull request #3558 from owncloud/files_encryption_check_private_keyBjörn Schießle2013-06-1320-158/+460
|\ \ \
| * \ \ Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-13583-3299/+6073
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3552 from owncloud/files_encryption_upgrade_fixBjörn Schießle2013-06-138-99/+52
|\ \ \ \
| * \ \ \ Merge branch 'master' into files_encryption_upgrade_fixBjörn Schießle2013-06-13163-1726/+4352
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #3640 from infoneo/masterThomas Müller2013-06-132-19/+31
|\ \ \ \ \
| * | | | | Update mapper.phpinfoneo2013-06-081-3/+15
| * | | | | Update mapper.phpinfoneo2013-06-081-25/+8
| * | | | | Fixed problems with a dots in a filenamesinfoneo2013-05-121-6/+12
| * | | | | Dots in a filenames fixinfoneo2013-05-121-8/+19
* | | | | | Merge pull request #3668 from owncloud/encryption_migrate_only_onceBjörn Schießle2013-06-133-28/+74
|\ \ \ \ \ \
| * | | | | | add comment to explain the helper functionBjörn Schießle2013-06-131-0/+8
| * | | | | | fix typo in var nameBjörn Schießle2013-06-131-1/+1
| * | | | | | adapt test to the code changesBjörn Schießle2013-06-121-3/+18
| * | | | | | use number of manipulated rows as idicator if it was possible to enter the mi...Björn Schießle2013-06-122-69/+24
| * | | | | | use constants for different migration statusBjörn Schießle2013-06-111-8/+11
| * | | | | | make sure that only one process can enter the migration modeBjörn Schießle2013-06-112-12/+77
* | | | | | | Merge pull request #3677 from owncloud/apps-buttonsJan-Christoph Borchardt2013-06-132-6/+17
|\ \ \ \ \ \ \
| * | | | | | | apps management: change misleading + to ...Jan-Christoph Borchardt2013-06-121-1/+1
| * | | | | | | remove App management top bar and move buttons more contextually in the inter...Jan-Christoph Borchardt2013-06-122-6/+17
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-13156-1673/+4230
| | | | * | | Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into ...Björn Schießle2013-06-131-0/+0
| | | | |\ \ \
| | | | | * | | update submoduleFlorin Peter2013-06-121-0/+0
| | | | * | | | LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removedBjörn Schießle2013-06-131-18/+0
| | | | |/ / /
| | | | * | | Merge branch 'master' into files_encryption_upgrade_fixBjörn Schießle2013-06-12753-4945/+8757
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |