summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Replace close_connection() for newer django versionsAlexander Sulfrian2015-09-232-4/+13
* Server: Use close_db_connection decorator everywhereAlexander Sulfrian2015-09-231-4/+1
* Server/Admin: Remove load_models() callAlexander Sulfrian2015-09-231-1/+0
* Server/Admin: Remove call of django.setupAlexander Sulfrian2015-09-231-3/+0
* DBSettings: syncdb is replaced by migrateAlexander Sulfrian2015-09-231-2/+4
* DBSettings: Automatically upgrade migrations from south to djangoAlexander Sulfrian2015-09-231-0/+43
* Add matching django migrations for southAlexander Sulfrian2015-09-237-272/+411
* Reporting: Clear error message if django is missingAlexander Sulfrian2015-09-231-8/+7
* fix check for reporting in src/lib/Bcfg2/Server/Plugins/Reporting.pyJonas Jochmaring2015-09-231-7/+11
* added django.setup() calls to src/lib/Bcfg2/DBSettings.pyJonas Jochmaring2015-09-232-2/+6
* some more django 1.7 compatibility fixesJonas Jochmaring2015-09-232-2/+6
* make Bcfg2-web compatible with django 1.7Jonas Jochmaring2015-09-2312-479/+1046
* Logging: Fix message buildingAlexander Sulfrian2015-09-211-0/+2
* Compatibility with Jinja < 2.7.Gordon Messmer2015-09-091-3/+9
* Keep trailing newlines in Jinja2 templates.Gordon Messmer2015-09-091-1/+3
* Merge branch 'no-django' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-09-011-2/+4
|\
| * DBSettings: Don't use django, if it's not availableAlexander Sulfrian2015-07-201-2/+4
* | Merge branch 'rules-replace_name' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-09-013-2/+51
|\ \
| * | Rules: New options replace_name to replace %{name} in attributesAlexander Sulfrian2015-08-263-2/+51
* | | Merge branch 'no-jinja2' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-281-14/+15
|\ \ \
| * | | Plugins/Cfg: Don't depend on jinja2Alexander Sulfrian2015-07-201-14/+15
| | |/ | |/|
* | | Merge pull request #292 from AlexanderS/fix-options-defaultChris St. Pierre2015-07-281-0/+3
|\ \ \
| * | | Options: Set default values from config, right after adding a new optionAlexander Sulfrian2015-07-221-0/+3
| |/ /
* | | BuiltinCore: Fix logging with daemonizationAlexander Sulfrian2015-07-281-1/+20
* | | Merge branch 'fix/systemd-ignore' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-281-1/+1
|\ \ \
| * | | Client/Tools/Systemd: Do not stop services if status is set to ignoreAlexander Sulfrian2015-07-271-1/+1
* | | | Ldap: Complete renew of the Ldap pluginAlexander Sulfrian2015-07-241-165/+159
* | | | Utils: Generalize safe_module_nameAlexander Sulfrian2015-07-243-13/+17
|/ / /
* | | Merge branch 'fix-date-format' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-238-31/+27
|\ \ \
| * | | DBSettings: Add possibility to specify arbitrary django options.Alexander Sulfrian2015-07-231-1/+8
| * | | Reporting/templates: Use configurable date formats.Alexander Sulfrian2015-07-236-6/+12
| * | | Options/Types: Fix database OPTIONS parsingAlexander Sulfrian2015-07-232-24/+7
| | |/ | |/|
* | | Merge branch 'merge-files-ignore-binary' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-223-17/+22
|\ \ \ | |/ / |/| |
| * | Utils: Generalize is_string from POSIX/FileAlexander Sulfrian2015-07-223-24/+22
| * | Lint/MergeFiles: Ignore binary filesAlexander Sulfrian2015-07-211-0/+7
| |/
* / PrioDir: Only set text content, if something is availableAlexander Sulfrian2015-07-211-1/+2
|/
* Merge branch 'maint'Alexander Sulfrian2015-06-1216-89/+307
|\
| * Version bump to 1.3.6Sol Jerome2015-06-112-2/+2
| * Reporting: Fix plus/minusSol Jerome2015-06-111-2/+2
| * Merge branch 'fix-yum-packages-traceback' into maintSol Jerome2015-04-281-4/+9
| |\
| | * Yum.py: Add debug log messageSol Jerome2015-04-281-0/+2
| | * Yum.py: Fix traceback when arch missingSol Jerome2014-11-041-4/+7
| * | Merge pull request #276 from gaurdro/fix-secontext-not-supportedChris St. Pierre2015-04-212-20/+37
| |\ \
| | * | handle filesystem secontexts properly for contextless filesystemsRoss Smith2015-04-162-20/+37
| * | | Reporting: Fix typoSol Jerome2015-04-171-1/+1
| |/ /
| * | FreeBSDInit: Fix __init__ callSol Jerome2015-04-091-1/+1
| * | Yum.py: Compare epoch/version/release separatelySol Jerome2015-03-311-6/+15
| * | Packages/Yum.py: Fix dependency resolution logicSol Jerome2015-03-301-2/+101
| * | Server/Plugins/Packages: Fix _init_attributes position.Alexander Sulfrian2015-03-251-2/+2
| * | compat: use eval instead of ast.literal_eval on python 2.4Michael Fenn2015-03-192-2/+8