github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,659 Commits 2 Branches 0 Tags
2fec26e6b45880aac06bf11fbd6c722ff67c435a
Commit Graph
1659 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antoine Nguyen 2fec26e6b4 Merge branch '1.1.x' 
Conflicts:
	doc/getting_started/plugins.rst
 2014-10-08 10:25:01 +02:00
Antoine Nguyen 243ee9c574 Amavis configuration update. 
see #608
 2014-10-08 10:23:16 +02:00
Antoine Nguyen 917d4a9600 Merge branch '1.1.x' 2014-10-08 10:09:41 +02:00
Antoine Nguyen ce2b04723f Documentation update. 
see #609
 2014-10-08 10:09:14 +02:00
Antoine Nguyen 534b21c896 Last fixes. 
see #609
 2014-10-08 09:57:43 +02:00
Antoine Nguyen 38a3b88224 Merge pull request #609 from carragom/1.1.x 
Improve the postfixadmin migration code
 2014-10-08 09:01:17 +02:00
Carlos Ramos 2eeba77c47 Improve the postfixadmin migration code: 
- Assign right permissions to domain administrators and
      superadministrator.
    - Correctly prepend the password schema to all admins.
    - Update model classes with the correct varchar length and
      other useful relations.
 2014-10-07 15:29:04 -06:00
Antoine Nguyen a965e5635d Merge pull request #604 from aanriot/master 
Restart uwsgi to finish the upgrade.
 2014-09-19 13:48:04 +02:00
Alexandre Anriot d788dd5db6 Clarifiy the restart process at the end of the upgrade. 2014-09-19 11:19:29 +02:00
Alexandre Anriot ed1e2c7739 Merge branch 'master' of https://github.com/tonioo/modoboa 2014-09-19 11:11:08 +02:00
Antoine Nguyen 234dd2f4c7 Merge branch '1.1.x' 2014-09-19 11:05:22 +02:00
Antoine Nguyen d7a44d1f06 Make the body optional. 
fix #605
 2014-09-19 11:03:39 +02:00
Antoine Nguyen 104f739ea2 Merge branch '1.1.x' 2014-09-18 10:14:50 +02:00
Alexandre Anriot f6fdacfaaf Restart uwsgi to finish the upgrade. 2014-09-18 09:19:25 +02:00
Antoine Nguyen 9a19f33efd Version 1.1.6 2014-09-17 15:32:21 +02:00
Antoine Nguyen b680a5a78b Merge branch '1.1.x' 2014-09-17 15:25:17 +02:00
Antoine Nguyen 534d9e0b2d Don't forget the "rename domain" case. 
see #603
 2014-09-17 15:19:26 +02:00
Antoine Nguyen 70e953de75 Few fixes. 
fix #603
 2014-09-17 14:42:02 +02:00
Antoine Nguyen 888632d8f3 I forgot the migration :p 
see #603
 2014-09-17 13:59:29 +02:00
Antoine Nguyen 610289e10f Translations update. 2014-09-17 13:59:09 +02:00
Antoine Nguyen ccd4df566a No more foreign key between admin_mailbox and admin_quota. 
see #603
 2014-09-17 13:53:06 +02:00
Antoine Nguyen 84837d3813 Merge branch '1.1.x' 
Conflicts:
	modoboa/locale/cs_CZ/LC_MESSAGES/django.po
	modoboa/locale/de/LC_MESSAGES/django.po
	modoboa/locale/en/LC_MESSAGES/django.po
	modoboa/locale/es/LC_MESSAGES/django.po
	modoboa/locale/fr/LC_MESSAGES/django.po
	modoboa/locale/it/LC_MESSAGES/django.po
	modoboa/locale/nl_NL/LC_MESSAGES/django.po
	modoboa/locale/pt_PT/LC_MESSAGES/django.po
	modoboa/locale/ru/LC_MESSAGES/django.po
	modoboa/locale/sv/LC_MESSAGES/django.po
 2014-08-24 14:51:30 +02:00
Antoine Nguyen a28833b162 New map file. 
see #599
 2014-08-24 14:30:58 +02:00
Antoine Nguyen 8a43b442ca Domain conflict check fixed. 
see #591
 2014-08-24 14:06:40 +02:00
Antoine Nguyen 2bbc464c36 Do not use translated content. 
fix #598
 2014-08-24 13:48:04 +02:00
Antoine Nguyen c85b6040f2 Avoid backtrace display on domain conflict. 
fix #591
 2014-08-24 13:38:25 +02:00
Antoine Nguyen 97b58f8539 Translation files updated. 2014-08-24 12:36:52 +02:00
Antoine Nguyen d40d162ffa Domain/mailbox creation control when importing from LDAP. 
see #591
 2014-08-24 12:27:19 +02:00
Antoine Nguyen d1b0b6a5b4 Minor fixes in the pfxadmin migration script. 
see #577
 2014-08-24 10:45:04 +02:00
Antoine Nguyen 734ec0327f Migration script is now a regular management command. 
see #577
 2014-08-24 10:25:49 +02:00
Antoine Nguyen 214025b8d8 Merge pull request #577 from carragom/1.1.x 
Update postfixadmin migration code
 2014-08-24 09:17:25 +02:00
Carlos Ramos e678e8d1a3 Update postfixadmin migration code 
Changes:
        - Update the code to actually work with the current version of
          modoboa.
        - Use database transaction to roll back if something goes wrong.
 2014-08-23 13:57:10 -06:00
Antoine Nguyen 2b25600dd2 Use path instead of url. 
see #574
 2014-08-23 19:53:32 +02:00
Antoine Nguyen 9158a87dbf wip: radicale extension. 
Display full calendar urls.
see #574
 2014-08-23 19:32:09 +02:00
Antoine Nguyen 12762ddd21 wip: Radicale extension. 
Initial documentation.
see #574
 2014-08-23 19:03:49 +02:00
Antoine Nguyen 041fa357d3 Split plugins documentation. 2014-08-23 18:45:54 +02:00
Antoine Nguyen 2607afc969 Merge branch 'master' into feature/radicale 
Conflicts:
	modoboa/extensions/amavis/app_settings.py
	tests/install_from_scratch.py
 2014-08-23 18:25:25 +02:00
Antoine Nguyen 6bd5662ff4 Merge branch 'master' of github.com:tonioo/modoboa 2014-08-23 16:17:44 +02:00
Antoine Nguyen 9e5ec0f810 Merge branch 'master' into feature/version_checker 
Conflicts:
	modoboa/extensions/amavis/general_callbacks.py
	modoboa/extensions/amavis/views.py
 2014-08-23 16:16:47 +02:00
Antoine Nguyen 1a309747f8 Adding missing requirement: requests. 2014-08-23 16:00:18 +02:00
Antoine Nguyen f9e3ac81f5 Display test results on stdout. 2014-08-23 15:51:53 +02:00
Antoine Nguyen 97db0811c0 Merge pull request #595 from aanriot/master 
Typo in doc/integration/web_servers.rst
 2014-08-13 11:58:22 +02:00
Alexandre Anriot 897d55b58e bootstrap-datepicker.js -> bootstrap-datetimepicker.js 2014-08-13 11:44:29 +02:00
Alexandre Anriot 965808a706 - Missing ";" in doc/integration/web_servers.rst. 2014-08-13 10:16:06 +02:00
Antoine Nguyen b899c85194 Merge pull request #593 from aanriot/master 
Fix typo
 2014-08-08 17:45:22 +02:00
Alexandre Anriot 130bf68621 - Fix typo. 2014-08-08 17:19:54 +02:00
Antoine Nguyen 0f72af0d2f Merge branch '1.1.x' 2014-08-07 11:21:43 +02:00
Antoine Nguyen 471acc144b Merge branch '1.1.x' into refactoring/amavis_queries 2014-08-07 11:20:11 +02:00
Antoine Nguyen b162a9bd8e Include the model name. 
see #574
 2014-08-05 09:03:18 +02:00
Antoine Nguyen bbdca2f03e Merge branch 'master' into feature/radicale 2014-08-05 08:46:01 +02:00