summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-15766-6766/+6851
|
* Merge pull request #3733 from owncloud/email_templateJan-Christoph Borchardt2013-06-144-9/+56
|\ | | | | E-mail templates (#3683)
| * remove » and « from the text mail because they will be escapedThomas Mueller2013-06-141-1/+1
| |
| * Do no translate "ownCloud - "Stephan Arts2013-06-142-4/+4
| |
| * Use templates to theme share e-mails (#3683)Stephan Arts2013-06-144-9/+56
| |
* | Merge pull request #3473 from opensaucesystems/masterThomas Müller2013-06-142-3/+9
|\ \ | | | | | | Small update to user_webdavauth
| * | Update settings.phpopensaucesystems2013-05-231-1/+1
| | |
| * | Remove http:// from label and add placeholderopensaucesystems2013-05-231-1/+1
| | |
| * | Enable https authenticationopensaucesystems2013-05-231-1/+1
| | | | | | | | | Allow authentication using https:// as well as http://
| * | Enable https authenticationopensaucesystems2013-05-231-2/+8
| | |
* | | Merge pull request #3721 from owncloud/oracle_setup_fixesThomas Müller2013-06-145-26/+47
|\ \ \ | |_|/ |/| | Oracle setup fixes
| * | remove default tablespace in parameterJörn Friedrich Dreyer2013-06-141-3/+3
| | |
| * | adding default to $hint within ctor of DatabaseSetupExceptionThomas Mueller2013-06-141-1/+1
| | |
| * | coding styleThomas Mueller2013-06-141-1/+4
| | |
| * | use executeAudited in sabredav lockJörn Friedrich Dreyer2013-06-141-13/+12
| | |
| * | add missing backticks, use executeAudited in post_deleteGroup and ↵Jörn Friedrich Dreyer2013-06-141-6/+6
| | | | | | | | | | | | post_removeFromGroup
| * | fix oci dbschema testJörn Friedrich Dreyer2013-06-141-1/+6
| | |
| * | use USERS tablespace whn none is given, only needed when we need to create a ↵Jörn Friedrich Dreyer2013-06-141-5/+8
| | | | | | | | | | | | user, does not need to be stored in config
| * | oracle does not need sequence suffix, manually set database name to allow ↵Jörn Friedrich Dreyer2013-06-141-1/+12
| | | | | | | | | | | | fetching db schema, don't shutdown db - we are using utf8 to connect
* | | Merge pull request #3726 from owncloud/remove-outlinesJan-Christoph Borchardt2013-06-141-0/+7
|\ \ \ | | | | | | | | remove dotted outlines in Firefox, fix #3712
| * | | remove dotted outlines in Firefox, fix #3712Jan-Christoph Borchardt2013-06-141-0/+7
| | | |
* | | | No coverage for testsThomas Müller2013-06-141-0/+1
| | | |
* | | | No coverage for settings/l10nThomas Müller2013-06-141-0/+1
| | | |
* | | | No coverage for lib/l10n and core/l10nThomas Müller2013-06-141-0/+2
| | | |
* | | | Merge pull request #3684 from owncloud/pg_install_db_masterMorris Jobke2013-06-141-1/+7
|\ \ \ \ | | | | | | | | | | Try connection with specified db when postgres does not work
| * | | | improve commentMorris Jobke2013-06-141-1/+1
| | | | |
| * | | | Correct escapingeMerzh2013-06-121-1/+1
| | | | |
| * | | | Try connection with specified db when postgres does not workBrice Maron2013-06-121-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/setup.php
* | | | | Merge pull request #2835 from owncloud/move-maint-startThomas Müller2013-06-145-7/+32
|\ \ \ \ \ | | | | | | | | | | | | Move maintenance start to ajax call
| * \ \ \ \ Merge branch 'master' into move-maint-startThomas Mueller2013-06-141477-46609/+40487
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php
| * | | | | | Clear opcode caches after writing to the config file, fixes #3372Michael Gapczynski2013-05-252-1/+20
| | | | | | |
| * | | | | | Merge branch 'master' into move-maint-startMichael Gapczynski2013-05-21630-10618/+18821
| |\ \ \ \ \ \
| * | | | | | | Add undefined verision variablesMichael Gapczynski2013-05-171-1/+3
| | | | | | | |
| * | | | | | | Turn off theme before updateMichael Gapczynski2013-05-141-0/+1
| | | | | | | |
| * | | | | | | Also check for needed upgrade in the Sabre Maintenance connectorBart Visscher2013-05-041-0/+3
| | | | | | | |
| * | | | | | | Connect watcher failure function to the failure signalBart Visscher2013-05-041-1/+1
| | | | | | | |
| * | | | | | | Move start of the maintenance mode to the ajax callBart Visscher2013-05-042-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the update page is shown in a browser. And not an ajax request
* | | | | | | | Merge pull request #3715 from owncloud/fixes_for_3641_3620Björn Schießle2013-06-142-9/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | files_encryption: bug fixes for reported problems.
| * | | | | | | Merge branch 'master' into fixes_for_3641_3620Florin Peter2013-06-1410-137/+114
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | fix for path_hash not unique as reported at #3641Florin Peter2013-06-131-2/+2
| | | | | | | |
| * | | | | | | fix memory problems as reported at #3620Florin Peter2013-06-132-7/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-14402-3023/+7526
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #3690 from owncloud/use_execute_audited_in_filecacheThomas Müller2013-06-137-122/+99
|\ \ \ \ \ \ | | | | | | | | | | | | | | use executeAudited in files cache
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | minor cleanup for exception handling
| * | | | | | 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Revise Contributing document