Alexander Burdeiny
|
bae3ca28fa
|
Merge remote-tracking branch 'origin/search' into stage3_release
|
10 years ago |
ya_dim4ik
|
aba6f77bd2
|
t1202: remove ~~text~~ from html tags + new version of dnajs
|
10 years ago |
|
Alexander Burdeiny
|
cb7cdbc6fe
|
admin/stats/events bug with no themes choices for conference
|
10 years ago |
|
Alexander Burdeiny
|
20cf3e7929
|
/admin/stats/events/
filter form error parent div size changed from 8 to 7
|
10 years ago |
|
Alexander Burdeiny
|
ae3d01d484
|
Merge branch 'stage3_release' of bitbucket.org:Bonus_05/expomap into stage3_release
|
10 years ago |
|
Alexander Burdeiny
|
6991710efa
|
1. multiple tags in select field fixed
2. admin statistic (section/event) date range error fixed; 'no data" message added
|
10 years ago |
|
ya_dim4ik
|
8af3f69ee4
|
update South
|
10 years ago |
|
Alexander Burdeiny
|
19cae53c1c
|
places fixes
|
10 years ago |
|
Alexander Burdeiny
|
1fb9d259ea
|
participationcomment migration fix
|
10 years ago |
|
Alexander Burdeiny
|
8c1e820bf1
|
settings updated
|
10 years ago |
|
Alexander Burdeiny
|
3b54bd1813
|
settings updated
|
10 years ago |
|
Alexander Burdeiny
|
fda0a014e7
|
Merge branch '1322_part1_stage2_final' into stage3_release
Conflicts:
article/forms.py
theme/forms.py
merged
|
10 years ago |
|
Alexander Burdeiny
|
d495988a7c
|
1327: Этап №3 - Переводчик функционала
|
10 years ago |
|
Alexander Burdeiny
|
7f03825c22
|
django-pandas removed
|
10 years ago |
|
Alexander Burdeiny
|
d72b62248a
|
django-graphos removed from settings
|
10 years ago |
|
Alexander Burdeiny
|
a8181be01f
|
1321: Этап №3 - Лендинг
done
|
10 years ago |
|
Alexander Burdeiny
|
a96fc8ad63
|
1328: Этап №3 - Статистика разделов
Seems to be done. Tested localy.
|
10 years ago |
|
Alexander Burdeiny
|
e99456175f
|
1324: Этап №3 - Платная конференция
seems to be done
|
10 years ago |
|
Alexander Burdeiny
|
9f4ce6b887
|
Merge branch 'top_year_choice'
|
10 years ago |
|
Alexander Burdeiny
|
641a6fba0e
|
update from PM
|
10 years ago |
|
Alexander Burdeiny
|
3eccbae47c
|
merged with .gitignore update commit
|
10 years ago |
|
Alexander Burdeiny
|
0f3af12bd9
|
.gitignore_global updated
|
10 years ago |
|
Alexander Burdeiny
|
d8d141be03
|
fabfile created
1345: Права на домен
|
10 years ago |
|
Alexander Burdeiny
|
52c2638dc4
|
1323: Этап №3 - Новости в событии
done
|
10 years ago |
|
Alexander Burdeiny
|
59d3102e17
|
Merge branch '1322_part1_stage2'
|
10 years ago |
|
Alexander Burdeiny
|
ed095384dc
|
1326: Этап №3 - Рубрикатор раздела «Места»
done
|
10 years ago |
|
Alexander Burdeiny
|
80c88f6357
|
Merge branch 'top_year_choice'
merge with top create fix
|
10 years ago |
|
Alexander Burdeiny
|
3fc830e7c6
|
1330
top create form fieldsets fix
|
10 years ago |
|
Alexander Burdeiny
|
b6a3e19e8f
|
migrations added
|
10 years ago |
|
Alexander Burdeiny
|
985a1fd674
|
done
|
10 years ago |
|
Alexander Burdeiny
|
2ba6556e01
|
almost done
|
10 years ago |
|
Alexander Burdeiny
|
60ece0c155
|
1322
theme/management/commands/themeblog_to_blog.py added
|
10 years ago |
|
Alexander Burdeiny
|
b9f9c3801d
|
Merge branch '1322'
1322
|
10 years ago |
|
Alexander Burdeiny
|
8da54fb8a3
|
Merge branch 'top_year_choice'
1330
|
10 years ago |
|
Alexander Burdeiny
|
656d943d28
|
1322: Этап №3 - Статьи
part 2,3,4 done
part 1/2 done
|
10 years ago |
|
Alexander Burdeiny
|
4cfb81fa5d
|
1322: Этап №3 - Статьи
part 2, 3 done
|
10 years ago |
|
Alexander Burdeiny
|
14912f001b
|
1330: Этап №3 - ГОРИТ, плашка ТОП размещения
top year added
|
10 years ago |
|
Alexander Burdeiny
|
7c94bf4ef6
|
current
|
10 years ago |
|
Alexander Burdeiny
|
04ba938b7b
|
1325: Этап №3 - кнопки «Переводчик» и «ближайшие»
part 3
|
10 years ago |
|
Alexander Burdeiny
|
19cca5f830
|
1325: Этап №3 - кнопки «Переводчик» и «ближайшие»
part 2
|
10 years ago |
|
Alexander Burdeiny
|
8ea5892035
|
1325: Этап №3 - кнопки «Переводчик» и «ближайшие»
part 1
|
10 years ago |
|
Alexander Burdeiny
|
dea30fa231
|
1329: Этап №3 - Кнопка "Отправить сообщения"
|
10 years ago |
|
Alexander Burdeiny
|
b55a2ee9ea
|
fix 2
|
10 years ago |
|
Alexander Burdeiny
|
8230a7d1e4
|
TypeError fix
(caused by different python versions: 2.7.3 vs 2.7.6)
|
10 years ago |
|
Alexander Burdeiny
|
1047c564ec
|
Merge branch 'top_banners2'
1330: Этап №3 - ГОРИТ, плашка ТОП размещения
Conflicts:
templates/client/includes/banners/catalog_inner_2.html
|
10 years ago |
|
Alexander Burdeiny
|
cc7acb2525
|
1330: Этап №3 - ГОРИТ, плашка ТОП размещения
seems to be done
|
10 years ago |
|
Alexander Burdeiny
|
d4b89ca71a
|
1more
|
10 years ago |
|
Alexander Burdeiny
|
bab5788f83
|
created second migration
|
10 years ago |
|
Alexander Burdeiny
|
6e39afbc35
|
created initial expobanner migration
|
10 years ago |
|
ya_dim4ik
|
00f402dd08
|
t1239: catalog_inner_2.html banner fix
|
10 years ago |
