Commit Graph

142 Commits

Author SHA1 Message Date
Evan Prodromou
6be15dfcac Merge branch '0.8.x' of git://gitorious.org/laconica/fmarani-clone into fmarani/0.8.x 2009-04-02 06:23:50 -04:00
Sarven Capadisli
27b45eeb48 Merge branch '0.7.x' into 0.8.x 2009-03-30 15:15:40 +00:00
Federico Marani
4b3f022fc2 Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:

	lib/jabber.php
2009-03-28 13:52:01 +00:00
CiaranG
2c8f67f6a9 A different search pagination fix (see ticket #1333) that doesn't require fixing the upstream code, thus undoing the change made in d64be5108d 2009-03-25 15:39:58 +00:00
Evan Prodromou
8c073a34ce Merge branch '0.7.x' into 0.8.x 2009-03-23 15:55:07 -04:00
CiaranG
d64be5108d Fix to Net_URL_Mapper to make search pagination work. See Ticket #1333 2009-03-21 14:24:19 +00:00
Federico Marani
420c361304 Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x 2009-03-16 22:43:51 +00:00
Evan Prodromou
b3a0eea3b6 Merge branch '0.7.x' into 0.8.x
Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php
2009-03-12 11:56:23 -04:00
Evan Prodromou
93030ae7b6 add missing PEAR_Exception file 2009-03-12 00:02:25 -04:00
Federico Marani
bab3e1b858 Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:

	lib/util.php
2009-03-07 13:54:54 +00:00
Evan Prodromou
e8f36b4f6a Upstream changes to OAuth.php 2009-03-06 16:27:00 -08:00
Evan Prodromou
399669b1fb Upstream changes to OAuth.php 2009-03-06 16:26:28 -08:00
Evan Prodromou
34a61b40f4 Merge branch '0.7.x' into 0.8.x 2009-02-26 13:22:51 -08:00
Federico Marani
2ac684f53d * implemented STOMP support for external message queueing systems
* (ticket-724)
* included PHP STOMP libraries (http://code.google.com/p/stompcli/)
2009-02-20 18:57:20 +00:00
Evan Prodromou
b45ea01dab Required Net URL needed for Net URL Mapper 2009-02-10 16:19:45 -05:00
Evan Prodromou
e21f2cf29e Move Mapper to correct spot in the hierarchy 2009-02-10 15:55:37 -05:00
Evan Prodromou
3f859026e6 Add Net_URL_Mapper to extlib 2009-02-10 15:54:13 -05:00
Robin Millette
c62c0602fe Added PEAR Services/oEmbed and its dependencies for multimedia integration. 2009-02-03 21:35:25 +00:00
Evan Prodromou
b5a197217c Upgrade included OpenID libraries to version 2.1.2 2009-01-06 22:54:10 -05:00
Evan Prodromou
939a400fd3 upgrade XMPPHP to upstream version
darcs-hash:20081211181500-5ed1f-5042b1ff2ed5de36500200f3ea2aa91108f1f853.gz
2008-12-11 13:15:00 -05:00
Zach Copley
e35f40528b trac750 added Facebook client libs for PHP to extlib dir
darcs-hash:20081208005816-7b5ce-b7ec90e310ddc609fe88d54cfac5ec7bc67da6ca.gz
2008-12-07 19:58:16 -05:00
Evan Prodromou
4f3d1e93e9 add Net Socket
darcs-hash:20081114021217-84dde-e3758114435b794b0d1be0c135419390ab06be13.gz
2008-11-13 21:12:17 -05:00
CiaranG
537819ba8a Add a sys_get_temp_dir substitute to extlib for easier installation on versions that lack it
darcs-hash:20080924150828-f6e2c-4c592c60b7ff6b0cae5a222a5d871fc875217e13.gz
2008-09-24 11:08:28 -04:00
Evan Prodromou
02befa21c3 some extlibs that were missing from 0.6.0
darcs-hash:20080930133847-5ed1f-429b4b3c6ff4f56f50e2dad19de76066589b9e05.gz
2008-09-30 09:38:47 -04:00
Evan Prodromou
a73d800100 add additional licenses into extlib subdir
darcs-hash:20080922212120-5ed1f-951b3a20590bbbb317909953287f6afb5354afa6.gz
2008-09-22 17:21:20 -04:00
Evan Prodromou
0efea73b12 reconnect timeout
darcs-hash:20080902172256-84dde-fa354cc9cb21361074553ad099827fdff84e8048.gz
2008-09-02 13:22:56 -04:00
Evan Prodromou
307b9527e6 variable name conflict on reconnect
darcs-hash:20080902172039-84dde-2b1bbac407959af2a5ca0c764aa503f0cb05c785.gz
2008-09-02 13:20:39 -04:00
Evan Prodromou
65e462858e set the reconnect timeout
darcs-hash:20080902171740-84dde-ee629f4b5dbcf712cd350c37d0f1814ca1b7f237.gz
2008-09-02 13:17:40 -04:00
Evan Prodromou
695da8311a use updated xmpphp library
darcs-hash:20080902163718-84dde-80ccca8a5ad66b9993ced2419aa76f686d098334.gz
2008-09-02 12:37:18 -04:00
Evan Prodromou
7ba8bce1d3 slightly better int math
darcs-hash:20080831014404-84dde-ef3f9aa997b6d0727958f56d68c9b6738e20225e.gz
2008-08-30 21:44:04 -04:00
Evan Prodromou
53854b7cb1 int div games
darcs-hash:20080831013603-84dde-e4e04c8bbb97cf9ed300a9c07dc4e33f8a5edd05.gz
2008-08-30 21:36:03 -04:00
Evan Prodromou
4fccba70f1 floor
darcs-hash:20080831013132-84dde-dc51363f8f6c6a0fece8b4acf7088b64acedc5f9.gz
2008-08-30 21:31:32 -04:00
Evan Prodromou
f7865b1d41 debug logging in __process
darcs-hash:20080831012136-84dde-801afb153d5f5c761336394647788e99e845f4a6.gz
2008-08-30 21:21:36 -04:00
Evan Prodromou
d5f83d9252 switch around how XMLStream does processing
darcs-hash:20080831003210-84dde-92ccffd5b2e1d50963b18babd93c70fb1d20cdba.gz
2008-08-30 20:32:10 -04:00
Evan Prodromou
e4d42b2355 better check for ready state on connection
darcs-hash:20080830171441-84dde-bb5373c4af2ae223d7b4b150f5a76404247a7570.gz
2008-08-30 13:14:41 -04:00
Evan Prodromou
0217a74f13 check the state of the queue before diving in to process it
darcs-hash:20080830095709-84dde-a64262c1b32e506cb2c43f8b4fb55ab88effc22f.gz
2008-08-30 05:57:09 -04:00
Evan Prodromou
377115cad3 make XMPP take a priority for presence
darcs-hash:20080830091430-84dde-cb0bc7d8957fd295c823298b137c4cf4b285f689.gz
2008-08-30 05:14:30 -04:00
Evan Prodromou
9907a2101d add 'raw' to payload to allow getting to the raw xml
darcs-hash:20080830000314-84dde-c83d970dbaf046fa37b4af13a23795abcc20e33b.gz
2008-08-29 20:03:14 -04:00
Evan Prodromou
b69b206c97 restoring upstream XMLStream.php after pulling ciarang's patch
darcs-hash:20080827133048-84dde-cb99ac89c65008a8832395684386518718247887.gz
2008-08-27 09:30:48 -04:00
CiaranG
b6d67b06d4 XMPP daemon that doesn't eat messages - note change to XMPPHP as well (Ticket #551)
darcs-hash:20080826200057-f6e2c-fb9a88251d034824218d20b3fefcde96ddaef827.gz
2008-08-26 16:00:57 -04:00
Evan Prodromou
44c1863f0e import upstream XMPPHP with @ciarang's fix
darcs-hash:20080827124430-84dde-654751781702f5518153a01aa3dae4a8580b7f35.gz
2008-08-27 08:44:30 -04:00
Evan Prodromou
14c9366aac include external libs in a subdir to make install easier
darcs-hash:20080822131714-84dde-6978424ded2ed1041a65142a25560654ac717fcd.gz
2008-08-22 09:17:14 -04:00