summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-081-0/+18
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-0662-3/+69
|
* Merge pull request #3951 from owncloud/fixing-3936-masterThomas Müller2013-07-051-1/+12
|\ | | | | get the real physical folder name for anonymous upload
| * proper fix for getting the shared item if no user is logged inThomas Müller2013-07-051-1/+12
| |
* | Merge pull request #3957 from owncloud/config-glob-failThomas Müller2013-07-051-0/+3
|\ \ | |/ |/| OC_Config: handle failure of glob('*.config.php')
| * OC_Config: handle failure of glob('*.config.php')Robin Appelman2013-07-051-0/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-051-1/+5
|/
* eddition string should be empty by defaultBjörn Schießle2013-07-041-1/+1
|
* add public apiBjörn Schießle2013-07-041-0/+108
|
* move to non-static OC_DefaultsBjörn Schießle2013-07-043-58/+61
| | | | | | Conflicts: lib/mail.php
* Add init funtion to OC_Defaults to be able to wrap translatable stringsBjörn Schießle2013-07-042-9/+26
|
* Merge pull request #3888 from owncloud/ocs_api_fixesBart Visscher2013-07-031-0/+2
|\ | | | | Ocs api fixes
| * Allow setting defaults and requirements for the api routeBart Visscher2013-06-281-0/+2
| |
* | Suppress warning in setup if config doesn't existkondou2013-07-031-1/+1
| |
* | don't run hooks for .part filesBjörn Schießle2013-07-031-1/+1
| |
* | if a part file gets renamed to a real file, that this was the second step of ↵Björn Schießle2013-07-031-2/+20
| | | | | | | | a write operation, hence emit a write signal
* | Merge pull request #3870 from owncloud/reset_migration_statusBjörn Schießle2013-07-021-0/+1
|\ \ | | | | | | introduce pre-disable-app hook and first usage in files_encryption
| * | introduce pre-disable-app hook and use it for the encryption app to reset ↵Björn Schießle2013-06-271-0/+1
| |/ | | | | | | migration status if the app was disabled
* | Merge pull request #3748 from owncloud/fixing-3740-masterThomas Müller2013-07-011-8/+14
|\ \ | | | | | | in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
| * | use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not setThomas Müller2013-07-011-2/+8
| | |
| * | in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better ↵Thomas Mueller2013-06-171-7/+7
| | | | | | | | | | | | than nothing
* | | Merge pull request #3775 from owncloud/test_fixes_for_dbschemaThomas Müller2013-07-011-17/+24
|\ \ \ | | | | | | | | use executeAudited, add table name to assert message, skip schema changi...
| * | | isError should detect a PEAR_Error even if the backend is PDO.Thomas Mueller2013-06-281-19/+23
| | | | | | | | | | | | | | | | This can happen on errors during schema migration - which is always done with MDB2
| * | | correctly handle error results of PDO and MDB2 backendsJörn Friedrich Dreyer2013-06-281-3/+6
| | | |
* | | | Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_blockThomas Müller2013-07-011-85/+64
|\ \ \ \ | | | | | | | | | | remove unnecessary try catch blocks
| * | | | remove unnecessary exception handlingJörn Friedrich Dreyer2013-06-201-85/+64
| | | | |
* | | | | backport from pull request #3863Björn Schießle2013-07-011-1/+1
| | | | |
* | | | | set default logo claim to ''Björn Schießle2013-07-011-1/+1
| | | | |
* | | | | add logo claim to defaults.phpBjörn Schießle2013-07-011-0/+9
| | | | |
* | | | | make mail footer aware of different themesBjörn Schießle2013-07-011-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/mail.php
* | | | | remove unneeded if conditionBjörn Schießle2013-07-011-5/+1
| | | | |
* | | | | lib/defaults.php should only contain the default strings and read the other ↵Björn Schießle2013-07-011-38/+44
| | | | | | | | | | | | | | | | | | | | strings directly from the theme
* | | | | construct the foother in defaults.php so that we use always the same footerBjörn Schießle2013-07-011-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: settings/templates/admin.php
* | | | | Merge pull request #3852 from owncloud/fixing-3830-masterThomas Müller2013-06-301-5/+14
|\ \ \ \ \ | | | | | | | | | | | | session life time is now configurable and set to the same value
| * | | | | session_life_time -> session_lifetimeThomas Mueller2013-06-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default session_lifetime is 24hrs recreation of session is triggered at 50% of the session life time
| * | | | | session life time is now configurable and set to the same valueThomas Mueller2013-06-261-5/+14
| | | | | |
* | | | | | Merge pull request #3763 from owncloud/recursive-rmdirThomas Müller2013-06-302-4/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make rmdir recursive for local storage
| * | | | | | make rmdir recursive for mappellocal storage backendRobin Appelman2013-06-301-3/+23
| | | | | | |
| * | | | | | Make rmdir recursive for local storageRobin Appelman2013-06-171-1/+21
| | |_|_|/ / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-3036-207/+172
| | | | | |
* | | | | | 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 #2914 from Kondou-ger/label_overlapping_valueBart Visscher2013-06-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix textfield label overlapping value.
| * | | | | | Default to localhost, if nothing is entered.kondou2013-05-281-1/+1
| | | | | | |