summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* improved error messageBjörn Schießle2013-07-021-1/+1
* cast result to boolBjörn Schießle2013-07-011-1/+1
* fix error stringBjörn Schießle2013-07-011-1/+1
* add correct php versionBjörn Schießle2013-07-011-1/+1
* check php version, the encryption app needs php >= 5.3.3Björn Schießle2013-07-013-7/+22
* backport from pull request #3863Björn Schießle2013-07-011-1/+1
* Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2013-07-011-3/+3
|\
| * Merge pull request #3857 from owncloud/enable_single_autotestMorris Jobke2013-07-011-3/+3
| |\
| | * enable testing individual testsJörn Friedrich Dreyer2013-06-261-3/+3
* | | set default logo claim to ''Björn Schießle2013-07-011-1/+1
* | | add logo claim to defaults.phpBjörn Schießle2013-07-014-9/+12
* | | logo claim addedBjörn Schießle2013-07-011-0/+3
* | | make mail footer aware of different themesBjörn Schießle2013-07-011-3/+4
* | | remove unneeded if conditionBjörn Schießle2013-07-011-5/+1
* | | lib/defaults.php should only contain the default strings and read the other s...Björn Schießle2013-07-011-38/+44
* | | check for updates only in the community editionBjörn Schießle2013-07-011-1/+1
* | | construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-07-015-20/+44
|/ /
* | Merge pull request #3223 from owncloud/fix-2820Morris Jobke2013-07-014-9/+40
|\ \
| * | if rename of file fails, the rename is undone in the view - #fix 2820Morris Jobke2013-06-154-9/+40
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-01535-1125/+1133
* | | 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