diff --git a/chat/migrations/0001_initial.py b/chat/migrations_mukhtar/0001_initial.py similarity index 100% rename from chat/migrations/0001_initial.py rename to chat/migrations_mukhtar/0001_initial.py diff --git a/chat/migrations/0002_auto_20160608_1555.py b/chat/migrations_mukhtar/0002_auto_20160608_1555.py similarity index 100% rename from chat/migrations/0002_auto_20160608_1555.py rename to chat/migrations_mukhtar/0002_auto_20160608_1555.py diff --git a/chat/migrations/0003_auto_20160629_1914.py b/chat/migrations_mukhtar/0003_auto_20160629_1914.py similarity index 100% rename from chat/migrations/0003_auto_20160629_1914.py rename to chat/migrations_mukhtar/0003_auto_20160629_1914.py diff --git a/chat/migrations/0004_auto_20160630_1204.py b/chat/migrations_mukhtar/0004_auto_20160630_1204.py similarity index 100% rename from chat/migrations/0004_auto_20160630_1204.py rename to chat/migrations_mukhtar/0004_auto_20160630_1204.py diff --git a/chat/migrations/0005_notes.py b/chat/migrations_mukhtar/0005_notes.py similarity index 100% rename from chat/migrations/0005_notes.py rename to chat/migrations_mukhtar/0005_notes.py diff --git a/chat/migrations/0006_auto_20160704_1811.py b/chat/migrations_mukhtar/0006_auto_20160704_1811.py similarity index 100% rename from chat/migrations/0006_auto_20160704_1811.py rename to chat/migrations_mukhtar/0006_auto_20160704_1811.py diff --git a/chat/migrations/__init__.py b/chat/migrations_mukhtar/__init__.py similarity index 100% rename from chat/migrations/__init__.py rename to chat/migrations_mukhtar/__init__.py diff --git a/chat/templates/chat_contractor.html b/chat/templates/chat_contractor.html index 89f5380..2f27655 100644 --- a/chat/templates/chat_contractor.html +++ b/chat/templates/chat_contractor.html @@ -1,495 +1,512 @@ {% extends 'partials/base.html' %} {% load staticfiles %} - {% load thumbnail %} +{% load thumbnail %} {% block content %} -{% include 'partials/header.html' %} -
-
-
-

Чат {{ request.user }} {{ request.user.pk }}

-
-
-
-
-
- +
+
+
+
+
+
+
+

Контакты

+ {% for contact in contacts_users %} +
+
+ {% thumbnail contact.avatar "60x60" crop="center" as im %} + mess-image + {% endthumbnail %} +
+

+ + {{ contact.username }}{{ contact.username }}{{ contact.first_name }} {{ contact.last_name }} +

+ Контакты + + 0 + + Удалить контакт + +
+ {% endfor %} + +
+
+
+
+ +
+ + + + + +
+
+

Прикрепить файл

Не более 10 файлов с общим объемом 500мб -
- - отправить - -
- - -
-
-
-

Контакты

- -
-
-
- Начало: - Срок сдачи: -
-
- 13.0.2016 - 13.0.2016 -
-
-
-

Входящие документы

-
    -
  • - Архитерурное 2.jpg - 7мб -
    -
  • - -
- - Распечатать с помощью ресурса - -
-
-

Для заметок

- - сохранить -
- - -
-
-
-
- -
-

Заказы

- {% for order in orders %} -
- -

- {{ order }} -

-
-

- Испонитель: {{ request.user.get_full_name }} -

-

- Чаты: Иванов, Петров, Пенкин -

- - - Полное описание заказа - -
-
- {% endfor%} -
- -
-
-
-{# {% for msg in chat_messages %}#} -{#
#} -{#
#} -{#

{{ msg.sender.get_full_name }}

#} -{# {{ msg.created }}#} -{#
#} -{#

{{ msg }}

#} -{#
#} -{# {% endfor %}#} +
+ + отправить + +
+ + +
+
+
+

Контакты

+ +
+
+
+ Начало: + Срок сдачи: +
+
+ 13.0.2016 + 13.0.2016 +
+
+
+

Входящие документы

+
    +
  • + Архитерурное 2.jpg + 7мб +
    +
  • + +
+ + Распечатать с помощью ресурса + +
+
+

Для заметок

+ + сохранить +
+ + +
-
- - - - - -
-
-

Прикрепить файл

+
+
+ +
+

Заказы

+ {% for order in orders %} +
+ +

+ {{ order }} +

+
+

+ Испонитель: {{ request.user.get_full_name }} +

+

+ Чаты: Иванов, Петров, Пенкин +

+ + + Полное описание заказа + +
+
+ {% endfor %} +
+ +
+
+
+ {# {% for msg in chat_messages %}#} + {#
#} + {#
#} + {#

{{ msg.sender.get_full_name }}

#} + {# {{ msg.created }}#} + {#
#} + {#

{{ msg }}

#} + {#
#} + {# {% endfor %}#} +
+ + + + + + +
+
+

Прикрепить файл

Не более 10 файлов с общим объемом 500мб -
- отправить -
- -
-
-
-

Для заметок

- - сохранить -
- -
-
-
-
-
-

Заказы

-
- -

- Дизай-проект квартиры на набережной 200 m2 -

-
-

- Заказчик: Группа Икс -

-
    -
  • Иванов Петр Иванович
  • -
  • Сергей Пенкин
  • -
- - - Полное описание заказа - -
-
-
- -

- Дизай-проект квартиры на набережной 200 m2 -

-
-

- Заказчик: Группа Икс -

-
    -
  • Иванов Петр Иванович
  • -
  • Сергей Пенкин
  • -
- - - Полное описание заказа - -
-
-
-
-
-
-
-

- Иванов Петр Иванович -

+
+ отправить +
+ +
+
+
+

Для заметок

+ + сохранить +
+ +
+
+
+
+
+

Заказы

+
+ +

+ Дизай-проект квартиры на набережной 200 m2 +

+
+

+ Заказчик: Группа Икс +

+
    +
  • Иванов Петр Иванович
  • +
  • Сергей Пенкин
  • +
+ + + Полное описание заказа + +
+
+
+ +

+ Дизай-проект квартиры на набережной 200 m2 +

+
+

+ Заказчик: Группа Икс +

+
    +
  • Иванов Петр Иванович
  • +
  • Сергей Пенкин
  • +
+ + + Полное описание заказа + +
+
+
+
+
+
+
+

+ Иванов Петр Иванович +

13.0.2016 / 21:05 -
-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit

-
-
-
-

- Вы -

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit

+
+
+
+

+ Вы +

13.0.2016 / 21:05 -
-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit.

-
- -
-
-

Прикрепить файл

+
+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit.

+
+ +
+
+

Прикрепить файл

Не более 10 файлов с общим объемом 500мб -
- отправить -
-
-
-

Этапы работы

-
-

1 / Согласование условий

-

- Обсуджение задания и условий выполнения работы. Подтверждение заказа исполнителем. -

-
-
-
-

- Этап 1Название этапа -

-

- Результаты этапа: Готовый чертеж 1 -

-
-

до 16.03.2015

- 30 000 -
-
-
-
-
-

- Этап 2Название этапа -

-

- Результаты этапа: Готовый чертеж 1 -

-
-

до 16.03.2015

- 30 000 -
-
-
- -
-

2 / Резервирование

-

- Резервирование заказчиком суммы оплаты по заказ. Деньги перечисляются и хранятся на сайте. -

-
    -
  • Сумма еще не зарезервирована
  • -
  • Сумма за этап1, Зарезервирована
  • -
-
-
-

3 / Выполнение работы

-

- Процесс выполнения задания в заказе до получения заказчиком итогового результата работы. -

-
-
-
-
- {% include 'partials/footer.html' %} -
-
+
+ отправить + + +
+

Этапы работы

+
+

1 / Согласование условий

+

+ Обсуджение задания и условий выполнения работы. Подтверждение заказа исполнителем. +

+
+
+
+

+ Этап 1Название этапа +

+

+ Результаты этапа: Готовый чертеж 1 +

+
+

до 16.03.2015

+ 30 000 +
+
+
+
+
+

+ Этап 2Название этапа +

+

+ Результаты этапа: Готовый чертеж 1 +

+
+

до 16.03.2015

+ 30 000 +
+
+
+
+ согласовать +
+
+

2 / Резервирование

+

+ Резервирование заказчиком суммы оплаты по заказ. Деньги перечисляются и хранятся на + сайте. +

+ +
+
+

3 / Выполнение работы

+

+ Процесс выполнения задания в заказе до получения заказчиком итогового результата работы. +

+
+
+ + + {% include 'partials/footer.html' %} + + {% endblock %} {% block js_block %} -{# #} - #} + + }); + {% endblock %} diff --git a/chat/templates/chat_customer.html b/chat/templates/chat_customer.html index 57924d8..8e2c2d9 100644 --- a/chat/templates/chat_customer.html +++ b/chat/templates/chat_customer.html @@ -181,6 +181,49 @@
+

Этапы работы

+
+

1 / Согласование условий

+

+ Обсуджение задания и условий выполнения работы. Подтверждение заказа исполнителем. +

+
+
+
+

+ Этап 1 +

+
+
+ + + + +
+ + сохранить +
+ +
+
+
+
+

+ Этап 2Название этапа +

+

+ Результаты этапа: Готовый чертеж 1 +

+
+

до 16.03.2015

+ 30 000 +
+
+
+
+ согласовать +
+

Для заметок

diff --git a/common/migrations/0001_initial.py b/common/migrations_mukhtar/0001_initial.py similarity index 100% rename from common/migrations/0001_initial.py rename to common/migrations_mukhtar/0001_initial.py diff --git a/common/migrations/0002_auto_20160615_1625.py b/common/migrations_mukhtar/0002_auto_20160615_1625.py similarity index 100% rename from common/migrations/0002_auto_20160615_1625.py rename to common/migrations_mukhtar/0002_auto_20160615_1625.py diff --git a/common/migrations/0003_mainpage.py b/common/migrations_mukhtar/0003_mainpage.py similarity index 100% rename from common/migrations/0003_mainpage.py rename to common/migrations_mukhtar/0003_mainpage.py diff --git a/common/migrations/0004_settings.py b/common/migrations_mukhtar/0004_settings.py similarity index 100% rename from common/migrations/0004_settings.py rename to common/migrations_mukhtar/0004_settings.py diff --git a/common/migrations/__init__.py b/common/migrations_mukhtar/__init__.py similarity index 100% rename from common/migrations/__init__.py rename to common/migrations_mukhtar/__init__.py diff --git a/projects/migrations/0001_initial.py b/projects/migrations_mukhtar/0001_initial.py similarity index 100% rename from projects/migrations/0001_initial.py rename to projects/migrations_mukhtar/0001_initial.py diff --git a/projects/migrations/0002_auto_20160519_1022.py b/projects/migrations_mukhtar/0002_auto_20160519_1022.py similarity index 100% rename from projects/migrations/0002_auto_20160519_1022.py rename to projects/migrations_mukhtar/0002_auto_20160519_1022.py diff --git a/projects/migrations/0003_auto_20160519_1312.py b/projects/migrations_mukhtar/0003_auto_20160519_1312.py similarity index 100% rename from projects/migrations/0003_auto_20160519_1312.py rename to projects/migrations_mukhtar/0003_auto_20160519_1312.py diff --git a/projects/migrations/0004_auto_20160519_1338.py b/projects/migrations_mukhtar/0004_auto_20160519_1338.py similarity index 100% rename from projects/migrations/0004_auto_20160519_1338.py rename to projects/migrations_mukhtar/0004_auto_20160519_1338.py diff --git a/projects/migrations/0005_auto_20160524_1053.py b/projects/migrations_mukhtar/0005_auto_20160524_1053.py similarity index 100% rename from projects/migrations/0005_auto_20160524_1053.py rename to projects/migrations_mukhtar/0005_auto_20160524_1053.py diff --git a/projects/migrations/0006_auto_20160524_1208.py b/projects/migrations_mukhtar/0006_auto_20160524_1208.py similarity index 100% rename from projects/migrations/0006_auto_20160524_1208.py rename to projects/migrations_mukhtar/0006_auto_20160524_1208.py diff --git a/projects/migrations/0007_auto_20160525_0948.py b/projects/migrations_mukhtar/0007_auto_20160525_0948.py similarity index 100% rename from projects/migrations/0007_auto_20160525_0948.py rename to projects/migrations_mukhtar/0007_auto_20160525_0948.py diff --git a/projects/migrations/0008_auto_20160525_1044.py b/projects/migrations_mukhtar/0008_auto_20160525_1044.py similarity index 100% rename from projects/migrations/0008_auto_20160525_1044.py rename to projects/migrations_mukhtar/0008_auto_20160525_1044.py diff --git a/projects/migrations/0009_auto_20160525_1524.py b/projects/migrations_mukhtar/0009_auto_20160525_1524.py similarity index 100% rename from projects/migrations/0009_auto_20160525_1524.py rename to projects/migrations_mukhtar/0009_auto_20160525_1524.py diff --git a/projects/migrations/0010_auto_20160525_1525.py b/projects/migrations_mukhtar/0010_auto_20160525_1525.py similarity index 100% rename from projects/migrations/0010_auto_20160525_1525.py rename to projects/migrations_mukhtar/0010_auto_20160525_1525.py diff --git a/projects/migrations/0011_auto_20160525_1526.py b/projects/migrations_mukhtar/0011_auto_20160525_1526.py similarity index 100% rename from projects/migrations/0011_auto_20160525_1526.py rename to projects/migrations_mukhtar/0011_auto_20160525_1526.py diff --git a/projects/migrations/0012_auto_20160530_1355.py b/projects/migrations_mukhtar/0012_auto_20160530_1355.py similarity index 100% rename from projects/migrations/0012_auto_20160530_1355.py rename to projects/migrations_mukhtar/0012_auto_20160530_1355.py diff --git a/projects/migrations/0013_auto_20160602_1203.py b/projects/migrations_mukhtar/0013_auto_20160602_1203.py similarity index 100% rename from projects/migrations/0013_auto_20160602_1203.py rename to projects/migrations_mukhtar/0013_auto_20160602_1203.py diff --git a/projects/migrations/0014_auto_20160602_1559.py b/projects/migrations_mukhtar/0014_auto_20160602_1559.py similarity index 100% rename from projects/migrations/0014_auto_20160602_1559.py rename to projects/migrations_mukhtar/0014_auto_20160602_1559.py diff --git a/projects/migrations/0015_auto_20160602_1606.py b/projects/migrations_mukhtar/0015_auto_20160602_1606.py similarity index 100% rename from projects/migrations/0015_auto_20160602_1606.py rename to projects/migrations_mukhtar/0015_auto_20160602_1606.py diff --git a/projects/migrations/0016_auto_20160603_1140.py b/projects/migrations_mukhtar/0016_auto_20160603_1140.py similarity index 100% rename from projects/migrations/0016_auto_20160603_1140.py rename to projects/migrations_mukhtar/0016_auto_20160603_1140.py diff --git a/projects/migrations/0017_auto_20160606_1659.py b/projects/migrations_mukhtar/0017_auto_20160606_1659.py similarity index 100% rename from projects/migrations/0017_auto_20160606_1659.py rename to projects/migrations_mukhtar/0017_auto_20160606_1659.py diff --git a/projects/migrations/0018_auto_20160607_1915.py b/projects/migrations_mukhtar/0018_auto_20160607_1915.py similarity index 100% rename from projects/migrations/0018_auto_20160607_1915.py rename to projects/migrations_mukhtar/0018_auto_20160607_1915.py diff --git a/projects/migrations/0019_auto_20160607_1916.py b/projects/migrations_mukhtar/0019_auto_20160607_1916.py similarity index 100% rename from projects/migrations/0019_auto_20160607_1916.py rename to projects/migrations_mukhtar/0019_auto_20160607_1916.py diff --git a/projects/migrations/0020_auto_20160608_1555.py b/projects/migrations_mukhtar/0020_auto_20160608_1555.py similarity index 100% rename from projects/migrations/0020_auto_20160608_1555.py rename to projects/migrations_mukhtar/0020_auto_20160608_1555.py diff --git a/projects/migrations/0021_auto_20160608_1602.py b/projects/migrations_mukhtar/0021_auto_20160608_1602.py similarity index 100% rename from projects/migrations/0021_auto_20160608_1602.py rename to projects/migrations_mukhtar/0021_auto_20160608_1602.py diff --git a/projects/migrations/0022_auto_20160608_1605.py b/projects/migrations_mukhtar/0022_auto_20160608_1605.py similarity index 100% rename from projects/migrations/0022_auto_20160608_1605.py rename to projects/migrations_mukhtar/0022_auto_20160608_1605.py diff --git a/projects/migrations/0023_auto_20160608_1609.py b/projects/migrations_mukhtar/0023_auto_20160608_1609.py similarity index 100% rename from projects/migrations/0023_auto_20160608_1609.py rename to projects/migrations_mukhtar/0023_auto_20160608_1609.py diff --git a/projects/migrations/0024_auto_20160609_1808.py b/projects/migrations_mukhtar/0024_auto_20160609_1808.py similarity index 100% rename from projects/migrations/0024_auto_20160609_1808.py rename to projects/migrations_mukhtar/0024_auto_20160609_1808.py diff --git a/projects/migrations/0025_auto_20160609_1916.py b/projects/migrations_mukhtar/0025_auto_20160609_1916.py similarity index 100% rename from projects/migrations/0025_auto_20160609_1916.py rename to projects/migrations_mukhtar/0025_auto_20160609_1916.py diff --git a/projects/migrations/0026_auto_20160610_1204.py b/projects/migrations_mukhtar/0026_auto_20160610_1204.py similarity index 100% rename from projects/migrations/0026_auto_20160610_1204.py rename to projects/migrations_mukhtar/0026_auto_20160610_1204.py diff --git a/projects/migrations/0027_auto_20160610_1231.py b/projects/migrations_mukhtar/0027_auto_20160610_1231.py similarity index 100% rename from projects/migrations/0027_auto_20160610_1231.py rename to projects/migrations_mukhtar/0027_auto_20160610_1231.py diff --git a/projects/migrations/0028_auto_20160610_1301.py b/projects/migrations_mukhtar/0028_auto_20160610_1301.py similarity index 100% rename from projects/migrations/0028_auto_20160610_1301.py rename to projects/migrations_mukhtar/0028_auto_20160610_1301.py diff --git a/projects/migrations/0029_project_active.py b/projects/migrations_mukhtar/0029_project_active.py similarity index 100% rename from projects/migrations/0029_project_active.py rename to projects/migrations_mukhtar/0029_project_active.py diff --git a/projects/migrations/0030_auto_20160610_1430.py b/projects/migrations_mukhtar/0030_auto_20160610_1430.py similarity index 100% rename from projects/migrations/0030_auto_20160610_1430.py rename to projects/migrations_mukhtar/0030_auto_20160610_1430.py diff --git a/projects/migrations/0031_auto_20160610_1434.py b/projects/migrations_mukhtar/0031_auto_20160610_1434.py similarity index 100% rename from projects/migrations/0031_auto_20160610_1434.py rename to projects/migrations_mukhtar/0031_auto_20160610_1434.py diff --git a/projects/migrations/0032_auto_20160615_1610.py b/projects/migrations_mukhtar/0032_auto_20160615_1610.py similarity index 100% rename from projects/migrations/0032_auto_20160615_1610.py rename to projects/migrations_mukhtar/0032_auto_20160615_1610.py diff --git a/projects/migrations/0033_auto_20160621_1057.py b/projects/migrations_mukhtar/0033_auto_20160621_1057.py similarity index 100% rename from projects/migrations/0033_auto_20160621_1057.py rename to projects/migrations_mukhtar/0033_auto_20160621_1057.py diff --git a/projects/migrations/0034_auto_20160622_1200.py b/projects/migrations_mukhtar/0034_auto_20160622_1200.py similarity index 100% rename from projects/migrations/0034_auto_20160622_1200.py rename to projects/migrations_mukhtar/0034_auto_20160622_1200.py diff --git a/projects/migrations/0035_auto_20160630_1635.py b/projects/migrations_mukhtar/0035_auto_20160630_1635.py similarity index 100% rename from projects/migrations/0035_auto_20160630_1635.py rename to projects/migrations_mukhtar/0035_auto_20160630_1635.py diff --git a/projects/migrations/0036_auto_20160630_1846.py b/projects/migrations_mukhtar/0036_auto_20160630_1846.py similarity index 100% rename from projects/migrations/0036_auto_20160630_1846.py rename to projects/migrations_mukhtar/0036_auto_20160630_1846.py diff --git a/projects/migrations/0037_auto_20160704_1444.py b/projects/migrations_mukhtar/0037_auto_20160704_1444.py similarity index 100% rename from projects/migrations/0037_auto_20160704_1444.py rename to projects/migrations_mukhtar/0037_auto_20160704_1444.py diff --git a/projects/migrations/0038_auto_20160706_1249.py b/projects/migrations_mukhtar/0038_auto_20160706_1249.py similarity index 100% rename from projects/migrations/0038_auto_20160706_1249.py rename to projects/migrations_mukhtar/0038_auto_20160706_1249.py diff --git a/projects/migrations/0039_auto_20160707_1724.py b/projects/migrations_mukhtar/0039_auto_20160707_1724.py similarity index 100% rename from projects/migrations/0039_auto_20160707_1724.py rename to projects/migrations_mukhtar/0039_auto_20160707_1724.py diff --git a/projects/migrations/__init__.py b/projects/migrations_mukhtar/__init__.py similarity index 100% rename from projects/migrations/__init__.py rename to projects/migrations_mukhtar/__init__.py diff --git a/reviews/migrations/0001_initial.py b/reviews/migrations_mukhtar/0001_initial.py similarity index 100% rename from reviews/migrations/0001_initial.py rename to reviews/migrations_mukhtar/0001_initial.py diff --git a/reviews/migrations/0002_auto_20160531_0906.py b/reviews/migrations_mukhtar/0002_auto_20160531_0906.py similarity index 100% rename from reviews/migrations/0002_auto_20160531_0906.py rename to reviews/migrations_mukhtar/0002_auto_20160531_0906.py diff --git a/reviews/migrations/__init__.py b/reviews/migrations_mukhtar/__init__.py similarity index 100% rename from reviews/migrations/__init__.py rename to reviews/migrations_mukhtar/__init__.py diff --git a/specializations/migrations/0001_initial.py b/specializations/migrations_mukhtar/0001_initial.py similarity index 100% rename from specializations/migrations/0001_initial.py rename to specializations/migrations_mukhtar/0001_initial.py diff --git a/specializations/migrations/0002_auto_20160602_1203.py b/specializations/migrations_mukhtar/0002_auto_20160602_1203.py similarity index 100% rename from specializations/migrations/0002_auto_20160602_1203.py rename to specializations/migrations_mukhtar/0002_auto_20160602_1203.py diff --git a/specializations/migrations/__init__.py b/specializations/migrations_mukhtar/__init__.py similarity index 100% rename from specializations/migrations/__init__.py rename to specializations/migrations_mukhtar/__init__.py diff --git a/users/migrations/0001_initial.py b/users/migrations_mukhtar/0001_initial.py similarity index 100% rename from users/migrations/0001_initial.py rename to users/migrations_mukhtar/0001_initial.py diff --git a/users/migrations/0002_team_groups.py b/users/migrations_mukhtar/0002_team_groups.py similarity index 100% rename from users/migrations/0002_team_groups.py rename to users/migrations_mukhtar/0002_team_groups.py diff --git a/users/migrations/0003_user_created_at.py b/users/migrations_mukhtar/0003_user_created_at.py similarity index 100% rename from users/migrations/0003_user_created_at.py rename to users/migrations_mukhtar/0003_user_created_at.py diff --git a/users/migrations/0004_auto_20160524_1053.py b/users/migrations_mukhtar/0004_auto_20160524_1053.py similarity index 100% rename from users/migrations/0004_auto_20160524_1053.py rename to users/migrations_mukhtar/0004_auto_20160524_1053.py diff --git a/users/migrations/0005_auto_20160524_1054.py b/users/migrations_mukhtar/0005_auto_20160524_1054.py similarity index 100% rename from users/migrations/0005_auto_20160524_1054.py rename to users/migrations_mukhtar/0005_auto_20160524_1054.py diff --git a/users/migrations/0006_auto_20160525_0948.py b/users/migrations_mukhtar/0006_auto_20160525_0948.py similarity index 100% rename from users/migrations/0006_auto_20160525_0948.py rename to users/migrations_mukhtar/0006_auto_20160525_0948.py diff --git a/users/migrations/0007_auto_20160525_1526.py b/users/migrations_mukhtar/0007_auto_20160525_1526.py similarity index 100% rename from users/migrations/0007_auto_20160525_1526.py rename to users/migrations_mukhtar/0007_auto_20160525_1526.py diff --git a/users/migrations/0008_auto_20160525_1527.py b/users/migrations_mukhtar/0008_auto_20160525_1527.py similarity index 100% rename from users/migrations/0008_auto_20160525_1527.py rename to users/migrations_mukhtar/0008_auto_20160525_1527.py diff --git a/users/migrations/0009_auto_20160602_1213.py b/users/migrations_mukhtar/0009_auto_20160602_1213.py similarity index 100% rename from users/migrations/0009_auto_20160602_1213.py rename to users/migrations_mukhtar/0009_auto_20160602_1213.py diff --git a/users/migrations/0010_user_last_time_visit.py b/users/migrations_mukhtar/0010_user_last_time_visit.py similarity index 100% rename from users/migrations/0010_user_last_time_visit.py rename to users/migrations_mukhtar/0010_user_last_time_visit.py diff --git a/users/migrations/0011_user_contractor_specializations.py b/users/migrations_mukhtar/0011_user_contractor_specializations.py similarity index 100% rename from users/migrations/0011_user_contractor_specializations.py rename to users/migrations_mukhtar/0011_user_contractor_specializations.py diff --git a/users/migrations/0012_user_status.py b/users/migrations_mukhtar/0012_user_status.py similarity index 100% rename from users/migrations/0012_user_status.py rename to users/migrations_mukhtar/0012_user_status.py diff --git a/users/migrations/0013_auto_20160610_1703.py b/users/migrations_mukhtar/0013_auto_20160610_1703.py similarity index 100% rename from users/migrations/0013_auto_20160610_1703.py rename to users/migrations_mukhtar/0013_auto_20160610_1703.py diff --git a/users/migrations/0014_auto_20160615_1611.py b/users/migrations_mukhtar/0014_auto_20160615_1611.py similarity index 100% rename from users/migrations/0014_auto_20160615_1611.py rename to users/migrations_mukhtar/0014_auto_20160615_1611.py diff --git a/users/migrations/0015_auto_20160615_1747.py b/users/migrations_mukhtar/0015_auto_20160615_1747.py similarity index 100% rename from users/migrations/0015_auto_20160615_1747.py rename to users/migrations_mukhtar/0015_auto_20160615_1747.py diff --git a/users/migrations/0016_auto_20160617_1815.py b/users/migrations_mukhtar/0016_auto_20160617_1815.py similarity index 100% rename from users/migrations/0016_auto_20160617_1815.py rename to users/migrations_mukhtar/0016_auto_20160617_1815.py diff --git a/users/migrations/0017_user_phone.py b/users/migrations_mukhtar/0017_user_phone.py similarity index 100% rename from users/migrations/0017_user_phone.py rename to users/migrations_mukhtar/0017_user_phone.py diff --git a/users/migrations/0018_auto_20160710_1838.py b/users/migrations_mukhtar/0018_auto_20160710_1838.py similarity index 100% rename from users/migrations/0018_auto_20160710_1838.py rename to users/migrations_mukhtar/0018_auto_20160710_1838.py diff --git a/users/migrations/0019_auto_20160710_1950.py b/users/migrations_mukhtar/0019_auto_20160710_1950.py similarity index 100% rename from users/migrations/0019_auto_20160710_1950.py rename to users/migrations_mukhtar/0019_auto_20160710_1950.py diff --git a/users/migrations/0020_auto_20160711_1759.py b/users/migrations_mukhtar/0020_auto_20160711_1759.py similarity index 100% rename from users/migrations/0020_auto_20160711_1759.py rename to users/migrations_mukhtar/0020_auto_20160711_1759.py diff --git a/users/migrations/0021_contractorresumefiles_resume.py b/users/migrations_mukhtar/0021_contractorresumefiles_resume.py similarity index 100% rename from users/migrations/0021_contractorresumefiles_resume.py rename to users/migrations_mukhtar/0021_contractorresumefiles_resume.py diff --git a/users/migrations/__init__.py b/users/migrations_mukhtar/__init__.py similarity index 100% rename from users/migrations/__init__.py rename to users/migrations_mukhtar/__init__.py diff --git a/work_sell/migrations/0001_initial.py b/work_sell/migrations_mukhtar/0001_initial.py similarity index 100% rename from work_sell/migrations/0001_initial.py rename to work_sell/migrations_mukhtar/0001_initial.py diff --git a/work_sell/migrations/0002_auto_20160607_1755.py b/work_sell/migrations_mukhtar/0002_auto_20160607_1755.py similarity index 100% rename from work_sell/migrations/0002_auto_20160607_1755.py rename to work_sell/migrations_mukhtar/0002_auto_20160607_1755.py diff --git a/work_sell/migrations/0003_auto_20160621_1259.py b/work_sell/migrations_mukhtar/0003_auto_20160621_1259.py similarity index 100% rename from work_sell/migrations/0003_auto_20160621_1259.py rename to work_sell/migrations_mukhtar/0003_auto_20160621_1259.py diff --git a/work_sell/migrations/0004_worksell_price.py b/work_sell/migrations_mukhtar/0004_worksell_price.py similarity index 100% rename from work_sell/migrations/0004_worksell_price.py rename to work_sell/migrations_mukhtar/0004_worksell_price.py diff --git a/work_sell/migrations/0005_auto_20160704_1449.py b/work_sell/migrations_mukhtar/0005_auto_20160704_1449.py similarity index 100% rename from work_sell/migrations/0005_auto_20160704_1449.py rename to work_sell/migrations_mukhtar/0005_auto_20160704_1449.py diff --git a/work_sell/migrations/0006_worksellphoto.py b/work_sell/migrations_mukhtar/0006_worksellphoto.py similarity index 100% rename from work_sell/migrations/0006_worksellphoto.py rename to work_sell/migrations_mukhtar/0006_worksellphoto.py diff --git a/work_sell/migrations/0007_auto_20160705_1514.py b/work_sell/migrations_mukhtar/0007_auto_20160705_1514.py similarity index 100% rename from work_sell/migrations/0007_auto_20160705_1514.py rename to work_sell/migrations_mukhtar/0007_auto_20160705_1514.py diff --git a/work_sell/migrations/0008_auto_20160706_1249.py b/work_sell/migrations_mukhtar/0008_auto_20160706_1249.py similarity index 100% rename from work_sell/migrations/0008_auto_20160706_1249.py rename to work_sell/migrations_mukhtar/0008_auto_20160706_1249.py diff --git a/work_sell/migrations/0009_auto_20160707_1315.py b/work_sell/migrations_mukhtar/0009_auto_20160707_1315.py similarity index 100% rename from work_sell/migrations/0009_auto_20160707_1315.py rename to work_sell/migrations_mukhtar/0009_auto_20160707_1315.py diff --git a/work_sell/migrations/0010_auto_20160707_1401.py b/work_sell/migrations_mukhtar/0010_auto_20160707_1401.py similarity index 100% rename from work_sell/migrations/0010_auto_20160707_1401.py rename to work_sell/migrations_mukhtar/0010_auto_20160707_1401.py diff --git a/work_sell/migrations/0011_picture.py b/work_sell/migrations_mukhtar/0011_picture.py similarity index 100% rename from work_sell/migrations/0011_picture.py rename to work_sell/migrations_mukhtar/0011_picture.py diff --git a/work_sell/migrations/__init__.py b/work_sell/migrations_mukhtar/__init__.py similarity index 100% rename from work_sell/migrations/__init__.py rename to work_sell/migrations_mukhtar/__init__.py