Jeff Mitchell
|
f767818966
|
Update some debug in twitter
|
2011-03-29 17:27:50 -04:00 |
|
Jeff Mitchell
|
a09167050f
|
Re-match the regex
|
2011-03-29 17:06:50 -04:00 |
|
Jeff Mitchell
|
3d25e6aefe
|
Add some twitter debug
|
2011-03-29 16:33:44 -04:00 |
|
Jeff Mitchell
|
de4df0060e
|
Merge branch 'stable'
|
2011-03-29 16:22:16 -04:00 |
|
Jeff Mitchell
|
0a0e27c717
|
Hopefully fix TWK-13 crash bug.
|
2011-03-29 16:20:04 -04:00 |
|
Jeff Mitchell
|
7c8b65a1d3
|
Hopefully fix TWK-13 crash bug.
|
2011-03-29 09:58:14 -04:00 |
|
Jeff Mitchell
|
b70491cc63
|
Disable acl box for now
|
2011-03-29 08:11:23 -04:00 |
|
Jeff Mitchell
|
e968298d7d
|
Coarse-grained ACL support is now implemented. This controls whether someone is allowed to connect to you in a global sense, and remembers the chosen value. For now there is no GUI way to revert this, but it is easily done via Tomahawk.conf
|
2011-03-29 02:42:46 -04:00 |
|
Jeffrey Finkelstein
|
6a605789e1
|
fixed typo - changed "indemify" to "indemnify"
|
2011-03-29 11:32:12 +08:00 |
|
Jeff Mitchell
|
942cc89a22
|
More work on the ACL system.
|
2011-03-28 19:25:25 -04:00 |
|
Jeff Mitchell
|
8d7f4a193b
|
Rename some classes/variables
|
2011-03-28 17:59:33 -04:00 |
|
Jeff Mitchell
|
40b202df74
|
Merge branch 'stable'
|
2011-03-28 17:31:01 -04:00 |
|
Jeff Mitchell
|
81141e4d50
|
Add a placeholder text for the jabberid field
|
2011-03-28 17:30:43 -04:00 |
|
Jeff Mitchell
|
e4fefe0600
|
Merge branch 'stable'
|
2011-03-28 17:26:06 -04:00 |
|
Jeff Mitchell
|
896d6ad9f4
|
Clean up port logic
|
2011-03-28 17:25:43 -04:00 |
|
Jeff Mitchell
|
ae5fa0c33a
|
Initial work on ACL system. Also makes much of Tomahawk handle a QStringList for collection directories.
|
2011-03-28 16:41:22 -04:00 |
|
Jeff Mitchell
|
1dd0f26fff
|
Remove MusixMatchHash
|
2011-03-28 13:31:00 -04:00 |
|
Jeff Mitchell
|
dd61f4a3cc
|
For sanity don't use "using namespace" in jabber_p.cpp and properly use namespaces. Google style guide doesn't let you do the former for very good reason.
|
2011-03-28 12:00:11 -04:00 |
|
Jeff Mitchell
|
9b71d1df0a
|
Merge branch 'stable'
|
2011-03-28 11:12:53 -04:00 |
|
Jeff Mitchell
|
f198cf51cc
|
Properly use the configured port number
|
2011-03-28 11:12:28 -04:00 |
|
Christian Muehlhaeuser
|
b6442ae76c
|
Merge remote-tracking branch 'origin/stable'
|
2011-03-28 09:25:49 +02:00 |
|
Christian Muehlhaeuser
|
e24aea480e
|
* Cleaned up Jabber auth.
|
2011-03-28 07:13:30 +02:00 |
|
Christian Muehlhaeuser
|
7b714f1735
|
Merge branch 'stable' of github.com:tomahawk-player/tomahawk
|
2011-03-28 05:58:26 +02:00 |
|
Christian Muehlhaeuser
|
6c49b2683e
|
* Changed win32-sparkle behaviour: It'll now look for beta versions if you run Tomahawk with --debug.
|
2011-03-28 05:28:05 +02:00 |
|
Christian Muehlhaeuser
|
b9d218b823
|
Merge remote-tracking branch 'origin/stable'
|
2011-03-28 05:01:50 +02:00 |
|
Christian Muehlhaeuser
|
6a2c2b147d
|
* Merged back my fixes.
|
2011-03-28 05:01:28 +02:00 |
|
Jeff Mitchell
|
5a08079740
|
Recovering from faulty merge...
Revert "* Fixed SIP plugins always reconnecting when the SettingsDialog was closed."
This reverts commit 057825bf970dbb9021d2ae46866dcfd49bde532d.
|
2011-03-27 22:45:31 -04:00 |
|
Jeff Mitchell
|
3f1274b90a
|
Recovering from faulty merge...
Revert "* Forgot to add one file."
This reverts commit 0bf3a1b8e792c0bf729f0ec352481d0d69021cf1.
|
2011-03-27 22:45:14 -04:00 |
|
Jeff Mitchell
|
1cd969af7f
|
Initial baby steps towards the info system cache
|
2011-03-27 22:38:00 -04:00 |
|
Christian Muehlhaeuser
|
db4f514181
|
Merge remote-tracking branch 'origin/stable'
|
2011-03-28 03:35:58 +02:00 |
|
Christian Muehlhaeuser
|
0bf3a1b8e7
|
* Forgot to add one file.
|
2011-03-28 03:31:53 +02:00 |
|
Christian Muehlhaeuser
|
057825bf97
|
* Fixed SIP plugins always reconnecting when the SettingsDialog was closed.
|
2011-03-28 03:31:10 +02:00 |
|
Jeff Mitchell
|
21eea9f0de
|
Merge branch 'stable'
|
2011-03-27 19:11:04 -04:00 |
|
Jeff Mitchell
|
608b90867a
|
Don't rescan the local collection if the settings dialog is closed with success but the path hasn't changed
|
2011-03-27 19:10:30 -04:00 |
|
Jeff Mitchell
|
96b4fbccc6
|
Merge branch 'stable'
Conflicts:
ChangeLog
|
2011-03-27 18:55:49 -04:00 |
|
Jeff Mitchell
|
63550ce712
|
Don't attempt to reconnect over and over with twitter if the peer hasn't changed status
|
2011-03-27 18:55:02 -04:00 |
|
Jeff Mitchell
|
cedcfdb714
|
Merge branch 'stable'
|
2011-03-27 16:10:40 -04:00 |
|
Jeff Mitchell
|
c4302e5f49
|
Show legal indemnity warning, and link to the legal page on the web site. Only displays the first time you go online (unless you don't accept it, of course).
|
2011-03-27 16:09:56 -04:00 |
|
Jeff Mitchell
|
2d5f8307d4
|
Merge branch 'stable'
|
2011-03-27 13:57:22 -04:00 |
|
Jeff Mitchell
|
474b9bc604
|
Merge branch 'stable' of github.com:tomahawk-player/tomahawk into stable
|
2011-03-27 13:57:13 -04:00 |
|
Jeff Mitchell
|
719255e4c9
|
Revamp twitter config widget again -- use a drop down box for message type. Also display name of saved user.
|
2011-03-27 13:56:49 -04:00 |
|
Dominik Schmidt
|
6bde5655cd
|
Hopefully fixed jabber auth completely now
|
2011-03-27 19:11:29 +02:00 |
|
Jeff Mitchell
|
26d4da4612
|
Don't just look at a user's latest tweet -- look at the latest tweet that matches our regex. Alternately for DMs look at latest matching regex or matching TOMAHAWKPEER format. Also some consolidation.
|
2011-03-27 10:48:00 -04:00 |
|
Jeff Mitchell
|
db53aabcf2
|
You can now send global, mentions, or private (direct message) Got Tomahawk? tweets
|
2011-03-27 10:47:11 -04:00 |
|
Christian Muehlhaeuser
|
d687219055
|
* Merged stable to master.
|
2011-03-27 06:57:33 +02:00 |
|
Jeff Mitchell
|
dffcd89c7c
|
Don't just look at a user's latest tweet -- look at the latest tweet that matches our regex. Alternately for DMs look at latest matching regex or matching TOMAHAWKPEER format. Also some consolidation.
|
2011-03-27 00:51:37 -04:00 |
|
Dominik Schmidt
|
cb405cde15
|
Make the sip plugin aware of subscription requests again
|
2011-03-27 05:44:16 +02:00 |
|
Dominik Schmidt
|
99e1b6f327
|
Make the subscription request box non-blocking.
|
2011-03-27 04:29:09 +02:00 |
|
Dominik Schmidt
|
5056aadcd2
|
Don't open more than one SubscriptionRequest window and auto-ack only contacts that the user is already subscribed to
|
2011-03-27 01:24:42 +01:00 |
|
Jeff Mitchell
|
9558270d86
|
Display a helpful message when someone gives non-JSON data to the xmpp bot
|
2011-03-26 16:51:33 -04:00 |
|