summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3852 from owncloud/fixing-3830-masterThomas Müller2013-06-302-5/+17
|\
| * session_life_time -> session_lifetimeThomas Mueller2013-06-282-3/+3
| * session life time is now configurable and set to the same valueThomas Mueller2013-06-262-5/+17
* | Merge pull request #3763 from owncloud/recursive-rmdirThomas Müller2013-06-303-5/+57
|\ \
| * | make rmdir recursive for mappellocal storage backendRobin Appelman2013-06-301-3/+23
| * | Make rmdir recursive for local storageRobin Appelman2013-06-172-2/+34
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-30639-4723/+4658
* | | Merge pull request #3897 from bantu/gitignoreThomas Müller2013-06-291-17/+17
|\ \ \
| * | | gitignore: Make paths relative to repository root.Andreas Fischer2013-06-291-17/+17
* | | | Merge pull request #2703 from owncloud/cleanup-setupThomas Müller2013-06-297-739/+770
|\ \ \ \ | |/ / / |/| | |
| * | | Fix review itemsBart Visscher2013-06-297-13/+15
| * | | Fix found errorsBart Visscher2013-06-296-10/+10
| * | | Fix OCI setupDatabase parameterBart Visscher2013-06-291-2/+2
| * | | Remove unsued parameterBart Visscher2013-06-291-1/+1
| * | | Use db setup class for option validationBart Visscher2013-06-297-35/+43
| * | | Change database creation to use array to select db setup classBart Visscher2013-06-292-25/+31
| * | | Convert database setup code to objectsBart Visscher2013-06-296-179/+210
| * | | Split database specific install/setup code to their own classBart Visscher2013-06-295-703/+687
|/ / /
* | | Merge pull request #3896 from owncloud/fix-dropdown-because-no-one-fixes-3241Bart Visscher2013-06-291-2/+2
|\ \ \
| * | | Escape dropdownLukas Reschke2013-06-291-2/+2
|/ / /
* | | Merge pull request #2914 from Kondou-ger/label_overlapping_valueBart Visscher2013-06-292-2/+2
|\ \ \
| * | | Default to localhost, if nothing is entered.kondou2013-05-281-1/+1
| * | | Fix textfield label overlapping value.kondou2013-04-131-1/+1
* | | | Merge pull request #3688 from roha4000/fix_upload_max_filesizeBart Visscher2013-06-291-2/+2
|\ \ \ \
| * | | | Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one...Roland Hager2013-06-211-2/+2
* | | | | Merge pull request #3635 from owncloud/storage-wrapperBart Visscher2013-06-296-9/+571
|\ \ \ \ \
| * | | | | fix storage wrapper namespacesRobin Appelman2013-06-283-4/+4
| * | | | | move storage wrappers to their own namespaceRobin Appelman2013-06-281-1/+1
| * | | | | use a getter for the storage loader to ensure the instance is createdRobin Appelman2013-06-071-3/+10
| * | | | | add test cases for MountRobin Appelman2013-06-071-0/+46
| * | | | | storage loader needs to be accessible by appsRobin Appelman2013-06-071-1/+1
| * | | | | Storage wrapper: provide access to the wrapped storageRobin Appelman2013-06-071-1/+8
| * | | | | merge master into storage-wrapperRobin Appelman2013-06-071479-53746/+46937
| |\ \ \ \ \
| * | | | | | manage creating and wrapping storages in it's own classRobin Appelman2013-06-073-34/+49
| * | | | | | Add mechanism to allow apps to wraper storage classesRobin Appelman2013-05-082-1/+42
| * | | | | | Add wrapper storage backendRobin Appelman2013-05-082-0/+446
* | | | | | | Merge pull request #3268 from owncloud/convert-oc_logBart Visscher2013-06-292-43/+187
|\ \ \ \ \ \ \
| * | | | | | | Fix usage of non existent constsBart Visscher2013-06-281-3/+3
| * | | | | | | missing $Thomas Mueller2013-06-271-1/+1
| * | | | | | | Fix review pointsBart Visscher2013-06-271-5/+7
| * | | | | | | Make the object drive the logging backendBart Visscher2013-06-272-11/+18
| * | | | | | | Remove default return hintBart Visscher2013-05-131-9/+0
| * | | | | | | Use the constants from OC_LogBart Visscher2013-05-131-11/+5
| * | | | | | | Code styleBart Visscher2013-05-131-18/+9
| * | | | | | | Remove include for loading legacy classBart Visscher2013-05-131-2/+0
| * | | | | | | Fix OC\Log with OC_Log in wrong namespaceBart Visscher2013-05-131-6/+6
| * | | | | | | Implement OC\Log as proxy to OC_LogBart Visscher2013-05-132-38/+199
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-29629-8572/+10231
* | | | | | | | Merge pull request #3886 from owncloud/disable-public-upload-if-encryption-en...Thomas Müller2013-06-281-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | for now we disable public upload in case encryption is enabledThomas Mueller2013-06-281-1/+5