Commit Graph

371 Commits

Author SHA1 Message Date
Mads T Marquart
7a0c64bf9e Merge pull request #141 from Dainius14/dev
reintroduce things skipped on conflict
2017-05-11 10:26:21 +02:00
Dainius
ef352f097a update test_data.json 2017-05-10 18:44:20 +03:00
Dainius
357083efce reintroduce things skipped on conflict 2017-05-10 18:16:41 +03:00
Mads Marquart
0d75c09036 Added support for deprecating items, and maybe support for python 2.7
- Changed `test_data.js` to `test_data.json`
- Added `deprecated` decorator
- Added `deprecation` function
- Readded old functions, and marked them as deprecated
- Changed parameters back to being type-in-specific (support for python
2.x)
- Deprecated `info_log` and `debug` init paramters
2017-05-10 14:54:07 +02:00
Mads T Marquart
58c7e08d12 Merge pull request #140 into development branch from Dainius14/dev 2017-05-10 11:10:16 +02:00
Dainius
b5443daeb1 Merge branch 'development' into dev 2017-05-10 12:02:39 +03:00
Dainius
5da3e5e4bf update tests 2017-05-09 21:27:32 +03:00
Dainius
f4dec2e48e update send methods 2017-05-09 10:25:04 +03:00
Mads T Marquart
d381d8c940 Version up because of PR revert 2017-05-09 07:35:38 +02:00
Taehoon Kim
524b5e1d91 Merge pull request #135 from Dainius14/revert-134-master
Revert "add event hooks, change method names"
2017-05-08 12:54:28 -07:00
Dainius
94682dbe1a Revert "add event hooks, change method names" 2017-05-08 22:34:15 +03:00
Mads T Marquart
68e5b2c16c Version up thanks to @Dainius14 2017-05-08 20:30:10 +02:00
Mads T Marquart
7793b53a6d Merge pull request #134 from Dainius14/master
NOT BACKWARDS COMPATIBLE: Added event hooks, changed method names
2017-05-08 20:27:26 +02:00
Dainius
329f8e5ae8 fix of conflict resolution 2017-05-08 17:02:28 +03:00
Dainius
22688fe847 Merge branch 'master' into master 2017-05-08 16:54:32 +03:00
Dainius
2721004777 proper implementation of new message, color, emoji, title, nick change 2017-05-08 16:05:14 +03:00
Dainius
1700f95810 add event hooks, change method names 2017-05-06 00:16:20 +03:00
Taehoon Kim
b804dc3f94 Version up thanks to @madsmtm and @tmcadam 2017-05-05 12:59:48 -07:00
Taehoon Kim
921fbb44d9 Merge pull request #133 from madsmtm/patch-1
Fixes #126
2017-05-05 12:54:51 -07:00
Taehoon Kim
6138c56053 Merge pull request #132 from madsmtm/master
Added unit/integration tests, and cleaned up sessions
2017-05-05 12:51:35 -07:00
Taehoon Kim
f88c296706 Merge pull request #131 from tmcadam/patch-1
Fix for getUserInfo method throwing an error
2017-05-05 12:49:03 -07:00
Mads T Marquart
2aa1978274 Update README.rst 2017-05-05 21:17:35 +02:00
Mads T Marquart
c4aa6b4523 Update client.py 2017-05-05 21:15:43 +02:00
Mads Marquart
3b4a369586 Improved error handling in send() 2017-05-05 20:26:23 +02:00
Mads Marquart
f4165462dc Updated README, to reflect changes 2017-05-05 20:16:40 +02:00
Mads Marquart
64243c20b2 Fixed tests, and improved send() 2017-05-05 20:12:17 +02:00
Mads Marquart
2280d31cbb Added an extra test 2017-05-05 18:59:38 +02:00
Mads Marquart
fa026021b2 Added unit/integration tests 2017-05-05 18:54:35 +02:00
Mads Marquart
a280555536 Cleaned up login process, changed saveSession and loadSession and added is_logged_in 2017-05-05 14:24:03 +02:00
Mads Marquart
05ca457946 Added a helper function strip_to_json 2017-05-05 11:39:51 +02:00
Mads Marquart
f4af46cacf Merge branch 'carpedm20/master' 2017-05-05 11:39:12 +02:00
Tom McAdam
dc1d158059 Fix for getUserInfo method throwing an error
The participants property on thread object is return a list of unicodes. If you then pass these unicodes to getUserInfo, they are not being picked up in the if statement on line 905 in the fbidStrip method, so the fbidStrip method was returning a tuple of None objects. The conditional now matches and reformats both str and unicode objects.
2017-05-05 17:03:21 +09:00
Taehoon Kim
5019671b35 version up from 0.8.2 to 0.8.5 thx to @Dainius14 2017-05-04 09:30:27 -07:00
Taehoon Kim
2973a6d301 Merge pull request #129 from Dainius14/master
fix inconsistencies, remove some deprecated and unused things
2017-05-04 09:28:20 -07:00
Dainius
dc95f367b8 fix typo 2017-05-04 17:51:32 +03:00
Dainius
2054cf3ca3 fix import 2017-05-04 17:16:26 +03:00
Dainius
04322c5330 fix 2FA for python 2, add default recipient 2017-05-02 19:40:41 +03:00
Dainius
3e327747bc fix inconsistencies, remove some deprecated and unused things 2017-05-01 15:57:26 +03:00
Mads Marquart
ac50932c34 Merge branch 'carpedm20/master' 2017-04-19 13:04:04 +02:00
Taehoon Kim
1475d8c4db update pypi dist 2017-04-05 00:04:56 +09:00
Taehoon Kim
08ad9ae1bf Merge pull request #122 from thgcode/master
added the hability to control fbchat from an external event loop
2017-04-05 00:02:42 +09:00
Taehoon Kim
660e58dc77 Merge pull request #121 from TimLChan/master
Add 2FA Support
2017-04-05 00:00:58 +09:00
Thiago
2c4b9fbf80 added the hability to control fbchat from an external event loop 2017-04-04 11:14:12 -03:00
Taehoon Kim
62ce49bd17 Merge pull request #120 from thgcode/master
fixed a bug that prevented fbchat from returning the list of all users
2017-04-04 22:00:15 +09:00
Tim Chan
ca606b04b8 Added logging 2017-04-04 20:18:55 +10:00
Tim Chan
fd6a3ab3e4 Added 2FA Support
Added new function _2FA.
Specified that two things that are definitely shown when 2FA is enabled
2017-04-04 20:17:13 +10:00
Tim Chan
83b5918a6d Update client.py 2017-04-04 20:12:00 +10:00
Tim Chan
10430a5c5f Update client.py 2017-04-04 20:09:28 +10:00
Tim Chan
de6880d933 Update client.py 2017-04-04 20:08:07 +10:00
Tim Chan
d7f2bb3e8b Adding 2FA Support
Rudamentary 2FA support
2017-04-04 20:05:50 +10:00