Potato#4

Open

jerrylewisbh wants to merge 401 commits intoruckus-dj:masterfrom

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 18, 2017

убрал ненужные колонки
toxydose
committed

Commits on Oct 20, 2017

Выход с отряда
Alexey Pankratov
committed
Забыль
Alexey Pankratov
committed
Косячёк
Alexey Pankratov
committed
Фикс отправки сообщения
ruckus-dj
committed
Напоминания об обновлении профиля и изгнание из отряда
ruckus-dj
committed

Commits on Oct 22, 2017

Commits on Oct 25, 2017

Merge branch 'master' of https://github.com/DuskDev/HelperBot into toxydose
toxydose
committed
Баньчики-бананьчики
Alexey Pankratov
committed

Commits on Oct 26, 2017

Merge branch 'test' into toxydose
Alexey Pankratov
committed
Быстрофиксы
Alexey Pankratov
committed
Merge pull request #28 from DuskDev/test
toxydose
authored
Упс
Alexey Pankratov
committed
Merge pull request #29 from DuskDev/test
toxydose
authored
убрал поиск строительных репортов в группах и чатах.
toxydose
committed
пропущенный коммит
toxydose
committed
Merge pull request #27 from DuskDev/toxydose
ruckus-dj
authored

Commits on Oct 27, 2017

Сообщения об удалении по неактивности админам и в отряд, а заодно отключил удаление репортов
Alexey Pankratov
committed
При удалении отряда вычищаем его из списков рассылки
Alexey Pankratov
committed
Фиксы по стройкам
Alexey Pankratov
committed

Commits on Oct 31, 2017

счетчик строй репортов
toxydose
committed
Фикс статистики и удаления картинок
Alexey Pankratov
committed
Правильный фикс статистики и удаления картинок
Alexey Pankratov
committed
Merge pull request #30 from DuskDev/toxydose
ruckus-dj
authored
Merge remote-tracking branch 'origin/master'
Alexey Pankratov
committed

Commits on Nov 2, 2017

PY-2017.2.3 <rucku@DESKTOP-UOGVR34 Create vcs.xml
Alexey Pankratov
committed
PY-2017.2.3 <rucku@DESKTOP-UOGVR34 Merge branch 'master'
Alexey Pankratov
committed
PY-2017.2.3 <rucku@DESKTOP-UOGVR34 Create ignore.xml, ide.general.xml, git.xml, filetypes.xml, editor.codeinsight.xml, colors.scheme.xml, laf.xml, editor.xml, Default.xml, debugger.xml
Alexey Pankratov
committed
Функция созыва отряда
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Показ репортов
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Небольшая поправочка
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
И админпанельку вернём
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Непоняточка с join вышла
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Ещё небольшая поправочка
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Теперь всё как должно
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed

Commits on Nov 7, 2017

Фикс необходимости двух кликов по приказу
Alexey Pankratov
committed
PY-2017.2.3 <rucku@DESKTOP-UOGVR34 Create find.xml
Alexey Pankratov
committed
Приказы без кнопки.
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Фастфикс
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Фастфикс2
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Изменено отображение репортов
Alexey Pankratov
committed
Теперь репорты выглядят ещё красивей
Alexey Pankratov
committed
Репорты теперь можно полистать
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed

Commits on Nov 9, 2017

PY-2017.2.3 <rucku@DESKTOP-UOGVR34 Merge branch 'master'
Alexey Pankratov
committed
PY-2017.2.4 <rucku@DESKTOP-UOGVR34 Update ignore.xml
Alexey Pankratov
committed

Commits on Nov 10, 2017

PY-2017.2.4 <rucku@DESKTOP-UOGVR34 Create applicationLibraries.xml
Alexey Pankratov
committed

Commits on Nov 13, 2017

PY-2017.2.4 <rucku@DESKTOP-UOGVR34 Update applicationLibraries.xml
Alexey Pankratov
committed
PY-2017.2.4 <rucku@DESKTOP-UOGVR34 Update applicationLibraries.xml
Alexey Pankratov
committed

Commits on Nov 14, 2017

PY-2017.2.4 <rucku@DESKTOP-UOGVR34 Update applicationLibraries.xml
Alexey Pankratov
committed
PY-2017.2.4 <rucku@DESKTOP-UOGVR34 Create ui.lnf.xml
Alexey Pankratov
committed

Commits on Nov 15, 2017

Логирование всех операций
Alexey Pankratov
committed
Merge branch 'test'
ruckus-dj
committed

Commits on Nov 20, 2017

"Хочу в отряд" теперь внутри кнопки "отряд"
toxydose
committed

Commits on Nov 23, 2017

Фастфикс логов
Alexey Pankratov
committed
Merge remote-tracking branch 'origin/master'
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed

Commits on Nov 24, 2017

Мутим авторизацию на сайте
Alexey Pankratov
committed

Commits on Nov 27, 2017

Commits on Nov 28, 2017

PY-2017.2.4 <rucku@DESKTOP-UOGVR34 Merge branch 'master'
Alexey Pankratov
committed

Commits on Nov 30, 2017

PY-2017.3 <rucku@DESKTOP-UOGVR34 Update ignore.xml
Alexey Pankratov
committed

Commits on Dec 1, 2017

another math in average exp
eclipse7
committed

Commits on Dec 2, 2017

reports count
toxydose
committed

Commits on Dec 3, 2017

Commits on Dec 4, 2017

PY-2017.3 <rucku@DESKTOP-UOGVR34 Create baseRefactoring.xml
Alexey Pankratov
committed
Add days counter to level up
eclipse7
committed

Commits on Dec 5, 2017

Fix days text
eclipse7
committed
fast fix
eclipse7
committed
PY-2017.3 <rucku@DESKTOP-UOGVR34 Update vcs.xml Create usageView.xml
Alexey Pankratov
committed
Merge pull request #40 from DuskDev/luna
ruckus-dj
authored
fix zeroExp
eclipse7
committed
fix endpoint
eclipse7
committed
Merge pull request #42 from DuskDev/luna
ruckus-dj
authored
Новые топы часть первая.
Alexey Pankratov
committed
Фастфикс логина
ruckus-dj
committed
Merge branch 'fastfix' into test
ruckus-dj
committed

Commits on Dec 6, 2017

Новые топы часть последняя.
Alexey Pankratov
committed
Merge remote-tracking branch 'origin/test' into test
Alexey Pankratov
committed

Commits on Dec 7, 2017

Commits on Dec 8, 2017

Порядок кнопок приказов изменён. Теперь флаг из настроек выводится последним.
Alexey Pankratov
committed
Merge remote-tracking branch 'origin/master'
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Снова левые xml :/
Alexey Pankratov
committed
PY-2017.3 <rucku@DESKTOP-UOGVR34 Update applicationLibraries.xml
Alexey Pankratov
committed

Commits on Dec 10, 2017

Commits on Dec 11, 2017

PY-2017.3 <rucku@DESKTOP-UOGVR34 Merge branch 'master'
Alexey Pankratov
committed
PY-2017.3 <rucku@DESKTOP-UOGVR34 Create ignore.xml, filetypes.xml, editor.codeinsight.xml, colors.scheme.xml, laf.xml, editor.xml, github_settings.xml, Default.xml, debugger.xml
Alexey Pankratov
committed
PY-2017.3 <rucku@DESKTOP-UOGVR34 Create git.xml
Alexey Pankratov
committed
PY-2017.3 <rucku@DESKTOP-UOGVR34 Create ui.lnf.xml, vcs.xml
Alexey Pankratov
committed
поменял эмодзи на кнопках
toxydose
committed
Merge pull request #44 from DuskDev/toxydose
ruckus-dj
authored
Что-то там с юзернэймами
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Что, а5?
Alexey Pankratov
committed
PY-2017.3 <rucku@DESKTOP-UOGVR34 Update vcs.xml
Alexey Pankratov
committed
поменял эмодзи на кнопках2
toxydose
committed
поменял эмодзи на кнопках2
toxydose
committed
поменял эмодзи на кнопках2
toxydose
committed
Set minimum character level when applying for squad membership.
Andrey Strizhevsky
committed
Add newline.
Andrey Strizhevsky
committed

Commits on Dec 12, 2017

Add minimum level restriction to squad invite function.
Andrey Strizhevsky
committed
Merge pull request #45 from DuskDev/toxydose
ruckus-dj
authored
Merge branch 'test'
Alexey Pankratov
committed
Вроде новый формат времени, но не тестил.
Alexey Pankratov
committed
Atack symbol. Again....
Alexey Pankratov
committed
Atack symbol. Again....
Alexey Pankratov
committed
PY-2017.3 <rucku@DESKTOP-UOGVR34 Create markdown.xml
Alexey Pankratov
committed
Remove age limit on invites, make leaving squad possible if you are below limit.
Andrey Strizhevsky
committed

Commits on Dec 13, 2017

Merge pull request #47 from DuskDev/soljarka-MinSquadMemberLvl
ruckus-dj
authored
Merge branch 'master' into Moonlight
Alexey Pankratov
committed
Тестим сдвиг реаортов на 1 час назад
Alexey Pankratov
committed
Тексты
Alexey Pankratov
committed
Фиксики хардкода
Alexey Pankratov
committed
Merge remote-tracking branch 'origin/test' into test
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Merge branch 'master' into Moonlight
Alexey Pankratov
committed
Для мунлайта 1 лвл пока норм
Alexey Pankratov
committed
Time fix
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Merge branch 'master' into Moonlight
Alexey Pankratov
committed
Битвы смещены
Alexey Pankratov
committed
PY-2017.3 <rucku@DESKTOP-UOGVR34 Create find.xml
Alexey Pankratov
committed
Fix exp in reports
Alexey Pankratov
committed
Fix reports
Alexey Pankratov
committed
Fix reports
Alexey Pankratov
committed
Fix battle times
Alexey Pankratov
committed
Texts
Alexey Pankratov
committed

Commits on Dec 14, 2017

Constants
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Merge branch 'master' into Moonlight
Alexey Pankratov
committed
Сорян, так надо.
Alexey Pankratov
committed
И снова время
Alexey Pankratov
committed

Commits on Dec 16, 2017

наброски на инлайн кнопки переспрашивалки
toxydose
committed

Commits on Dec 17, 2017

Commits on Dec 18, 2017

Commits on Dec 20, 2017

PY-2017.3 <rucku@DESKTOP-UOGVR34 Merge branch 'master'
Alexey Pankratov
committed

Commits on Dec 21, 2017

PY-2017.3 <rucku@DESKTOP-UOGVR34 Create ignore.xml, filetypes.xml, laf.xml, editor.xml, usageView.xml, Default.xml, debugger.xml Delete markdown.xml
Alexey Pankratov
committed
Silence time fix
Alexey Pankratov
committed
Фикс терний и прветов капельку.
Alexey Pankratov
committed
Merge remote-tracking branch 'origin/test' into test
Alexey Pankratov
committed

Commits on Dec 22, 2017

Фиксы связанные с неодобренными заявками
Alexey Pankratov
committed

Commits on Dec 24, 2017

Merge branch 'test' into Moonlight
ruckus-dj
committed

Commits on Dec 25, 2017

Рефакторинг ухода с отряда, нужны тесты
Alexey Pankratov
committed
Лишние импорты
Alexey Pankratov
committed

Commits on Dec 26, 2017

Текст перед битвой
ruckus-dj
committed

Commits on Dec 27, 2017

Вроде теперь все тексты (по крайней мере языкозависимые) перенесены в texts.py
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Никогда больше не торогайте это в тесте и мастере :/
Alexey Pankratov
committed
Merge branch 'test'
Alexey Pankratov
committed
Merge branch 'master' into Moonlight
Alexey Pankratov
committed
Merge remote-tracking branch 'origin/Moonlight' into Moonlight
Alexey Pankratov
committed
Снова мусор
Alexey Pankratov
committed
Merge branch 'master' into Moonlight
Alexey Pankratov
committed
translating commands from RU to ENG
jerrylewisbh
committed
Merge pull request #49 from DuskDev/command_translation
ruckus-dj
authored
Теперь вроде все тексты в отдельных файлах и можно нормально переводить
ruckus-dj
committed
Merge remote-tracking branch 'origin/master'
ruckus-dj
committed
Merge branch 'master' into Potato
ruckus-dj
committed
Stock calculation
ruckus-dj
committed
Merge branch 'master' into Moonlight
ruckus-dj
committed
Stock calculation
ruckus-dj
committed
Stock calculation fixed
ruckus-dj
committed
Stock calculation fixed
ruckus-dj
committed

Commits on Dec 28, 2017

Update texts.py
Shidimmah
authored
Merge pull request #50 from Shidimmah/patch-1
ruckus-dj
authored
Now we can set special groups for function calls
Alexey Pankratov
committed
Merge remote-tracking branch 'origin/test' into test
Alexey Pankratov
committed
translating
jerrylewisbh
committed
Merge branch 'Potato' of https://github.com/DuskDev/HelperBot into command_translation
jerrylewisbh
committed
Two new roles
Alexey Pankratov
committed
more translations
jerrylewisbh
committed
last sentence
jerrylewisbh
committed
fixing leading spaces
jerrylewisbh
committed
fixing leading spaces
jerrylewisbh
committed
Merge pull request #51 from DuskDev/command_translation
ruckus-dj
authored
translating MSG_SQUAD_ADD
jerrylewisbh
committed
Merge pull request #52 from DuskDev/command_translation
ruckus-dj
authored
Some cleanup
Alexey Pankratov
committed
Merge remote-tracking branch 'origin/Potato' into Potato
Alexey Pankratov
committed
fixing text
jerrylewisbh
committed
Squad kick fix
ruckus-dj
committed
Merge remote-tracking branch 'origin/test' into test
ruckus-dj
committed
Merge branch 'test'
ruckus-dj
committed
Merge branch 'master' into Potato
ruckus-dj
committed
Merge remote-tracking branch 'origin/Potato' into Potato
ruckus-dj
committed
Merge branch 'Potato' into command_translation
ruckus-dj
authored
Merge pull request #53 from DuskDev/command_translation
ruckus-dj
authored
text fix
jerrylewisbh
committed
Some fixes with new rights
ruckus-dj
committed
Merge branch 'test'
ruckus-dj
committed
Merge branch 'master' into Potato
ruckus-dj
committed
text fix
jerrylewisbh
committed

Commits on Dec 29, 2017

update messages
jerrylewisbh
committed

Commits on Feb 11, 2018