Commit Graph

335 Commits (d0bb94b779003ed16135d5a3928996384a7bac26)

Author SHA1 Message Date
DiMartinoXBMC d0bb94b779 fixes 2016-03-22 19:48:48 +03:00
DiMartinoXBMC 45d71621fe callback fix 2016-03-22 18:46:30 +03:00
DiMartinoXBMC ec694f4fc9 fixes 2016-03-21 22:55:27 +03:00
DiMartinoXBMC 3196ee1437 Merge remote-tracking branch 'origin/master' 2016-03-21 19:38:02 +03:00
DiMartinoXBMC eff1306fdb Merge pull request #49 from inpos/master
На 2й малине очень долго инициализируется статус в libtorrent
2016-03-21 19:37:54 +03:00
DiMartinoXBMC 106e42279d SkorbaLoader 2016-03-21 19:36:44 +03:00
inpos 3d8803173d На 2й малине очень долго инициализируется статус в libtorrent 2016-03-21 07:59:19 +03:00
DiMartinoXBMC f9e54fd6ab Merge pull request #48 from inpos/master
последовательный просмотр
2016-03-20 19:50:29 +03:00
inpos c4bd1d89ec последовательный просмотр 2016-03-20 14:04:03 +03:00
inpos d51726605d Завершение слияния 2016-03-20 13:49:26 +03:00
inpos 6aea5b27e3 Merge branch 'DiMartinoXBMC-master' 2016-03-20 13:46:00 +03:00
inpos f921d242dc Merge branch 'master' of https://github.com/DiMartinoXBMC/plugin.video.torrenter into DiMartinoXBMC-master 2016-03-20 13:45:14 +03:00
DiMartinoXBMC 337de1c95f pyrrent fixes 2016-03-20 00:22:05 +03:00
inpos e6524f2918 следующая серия 2016-03-19 21:59:28 +03:00
DiMartinoXBMC f90db90730 Merge pull request #46 from inpos/master
ошибка с юникодом
2016-03-19 21:18:25 +03:00
inpos fc526e5ed8 лишняя функция 2016-03-19 20:44:25 +03:00
inpos 4c058b199f юникод - не юникод 2016-03-19 20:41:43 +03:00
inpos 65c9e8ef9e Merge pull request #6 from DiMartinoXBMC/master
merge from origin
2016-03-19 21:15:02 +04:00
DiMartinoXBMC 9c76442136 name fix 2016-03-19 18:43:39 +03:00
DiMartinoXBMC 2d95cad3e5 import opt 2016-03-19 18:11:14 +03:00
DiMartinoXBMC 6842ebd804 Merge pull request #45 from inpos/sandbox1
Разделил загрузчики
2016-03-19 18:09:16 +03:00
inpos 622c4dc3e7 Anteoloader и Inposloader разделены 2016-03-19 17:56:59 +03:00
inpos 9e588e5e9c Inposloader 2016-03-19 17:35:55 +03:00
inpos ba0f2263fd Merge pull request #5 from DiMartinoXBMC/master
merge from origin
2016-03-19 10:03:11 +04:00
DiMartinoXBMC 784ae2814b revert srg70 monster kill 2016-03-18 18:38:50 +03:00
DiMartinoXBMC fc3a83b421 revert srg70 monster kill 2016-03-18 18:35:38 +03:00
DiMartinoXBMC d150210340 Merge pull request #44 from srg70/master
Sorting by name and size
2016-03-18 18:30:01 +03:00
Sergey Shramchenko a0af92bd9f Settings for filesize after filename 2016-03-18 02:00:56 +02:00
Sergey Shramchenko 27e68911bf Post merge fix 2016-03-17 23:04:48 +02:00
Sergey Shramchenko fe40d79f2c Merge branch 'master-root'
# Conflicts:
#	Core.py
2016-03-17 23:01:03 +02:00
Sergey Shramchenko ef053f9b86 Sorting: name and size 2016-03-17 22:55:20 +02:00
DiMartinoXBMC 478e349c86 img fix 2016-03-17 23:39:23 +03:00
DiMartinoXBMC 2468ceb3da push 2016-03-17 23:13:41 +03:00
DiMartinoXBMC 63d75c3d2e push 2016-03-17 23:10:50 +03:00
DiMartinoXBMC 8eb47adbd0 push 2016-03-17 23:08:37 +03:00
inpos 009c321090 Декодировать строку статуса не надо 2016-03-17 22:33:13 +03:00
inpos 19f10a5500 . 2016-03-17 22:30:44 +03:00
inpos ed2bab0bd4 . 2016-03-17 22:27:18 +03:00
inpos eec20efba9 . 2016-03-17 22:26:04 +03:00
inpos 4924bd3061 . 2016-03-17 22:23:45 +03:00
inpos 6c6bf6f9d4 . 2016-03-17 22:14:53 +03:00
inpos 8e61b9353b проблема с юникодом 2016-03-17 22:12:02 +03:00
inpos 73a3d5ea25 Исправление ошибки слияния 2016-03-17 19:32:12 +03:00
inpos 57a15f6822 Merge branch 'master' of
https://github.com/DiMartinoXBMC/plugin.video.torrenter

# Conflicts:
#	Anteoloader.py
2016-03-17 19:13:32 +03:00
DiMartinoXBMC 1974c5a41a Merge pull request #42 from srg70/master
Old player fix
2016-03-16 01:00:53 +03:00
Sergey Shramchenko b45b8641eb Old player fix 2016-03-15 09:55:25 +02:00
DiMartinoXBMC ef6584dd8c rus fixes 2016-03-14 20:38:33 +03:00
DiMartinoXBMC ccfcbf6089 rus fixes 2016-03-14 13:58:42 +03:00
DiMartinoXBMC 09bb692650 rus fixes 2016-03-14 13:57:54 +03:00
DiMartinoXBMC 5879013616 delete pulsar 2016-03-14 00:23:00 +03:00