Evan Prodromou
8b3080faf4
whitespace fixup in userauthorization
...
darcs-hash:20081203032650-5ed1f-1f9affd557cf958cdfe7ed224433199b22e1c56a.gz
2008-12-02 22:26:50 -05:00
Evan Prodromou
58beea9798
check for license compatibility
...
darcs-hash:20081203032632-5ed1f-2213efd018913e3253082dbe83d7b906c4f0ff76.gz
2008-12-02 22:26:32 -05:00
Evan Prodromou
f84dbce164
better instructions
...
darcs-hash:20081202194816-5ed1f-93a18c7b978950a770b833e7dea9e1fd5bb71de8.gz
2008-12-02 14:48:16 -05:00
Evan Prodromou
6a96639b24
better registration instructions
...
darcs-hash:20081202194633-5ed1f-ebf0c5f54f4080dc70489d58777ad66d4f1b9bc8.gz
2008-12-02 14:46:33 -05:00
Evan Prodromou
e7853982b1
cleanup whitespace in public.php
...
darcs-hash:20081202194043-5ed1f-35ee3a57c08febe282082d829063489b51a8fb96.gz
2008-12-02 14:40:43 -05:00
Evan Prodromou
a8551093e2
better formatting for home page
...
darcs-hash:20081202194027-5ed1f-5ebbc762496b6f6675a98271acbdd1851439471b.gz
2008-12-02 14:40:27 -05:00
Evan Prodromou
4c26cb1a81
add instructions to the public page for people who aren't logged in
...
darcs-hash:20081202193857-5ed1f-1705c3f615b96790dcae30ec240c25721ea443cc.gz
2008-12-02 14:38:57 -05:00
Evan Prodromou
de9ea671fc
whitespace in actions/register
...
darcs-hash:20081202185444-5ed1f-a84761dfb4ffb40d6e90c79d92dcd4b029745300.gz
2008-12-02 13:54:44 -05:00
Evan Prodromou
c3b884e707
check for blank email when rejecting a dupe
...
darcs-hash:20081202185343-5ed1f-99c314aac9e59ddbddd59ee403d4111c3639aa98.gz
2008-12-02 13:53:43 -05:00
Evan Prodromou
a6a0cf08a2
don't show self-subscriptions in FOAF
...
darcs-hash:20081130213755-5ed1f-bfece58a97ae85f959eb27a38d9bbb622e178793.gz
2008-11-30 16:37:55 -05:00
Evan Prodromou
fb312a9de9
fix problems with blank tag strings (!)
...
darcs-hash:20081125000556-5ed1f-d19f3a1e723695122a8e75fb881846bcbc48ebda.gz
2008-11-24 19:05:56 -05:00
Evan Prodromou
a9d628c2b3
better output for microsummary
...
darcs-hash:20081124223848-5ed1f-754db592b88dfc577370c77415ae1c96e09a188a.gz
2008-11-24 17:38:48 -05:00
Evan Prodromou
eea7e46e41
microsummary doesn't need stream stuff
...
darcs-hash:20081124223733-5ed1f-48a17c80c49f5d35b1f45b113b863913cdd703ae.gz
2008-11-24 17:37:33 -05:00
Evan Prodromou
a1da43417e
support microsummaries
...
darcs-hash:20081124223533-5ed1f-1ae78e694043cef14d528dcd4201301eec8ad61b.gz
2008-11-24 17:35:33 -05:00
Evan Prodromou
138b1b2767
whitespace and fixup problem with blank string
...
darcs-hash:20081124150638-5ed1f-994af62567660c7f09985bf449a344df104548eb.gz
2008-11-24 10:06:38 -05:00
Zach Copley
8d8bc706d8
Allow the toggling of XMLWriter's indenting on and off
...
IE needs and unindented XML response in for ajax calls.
darcs-hash:20081123211348-7b5ce-426c07ee1d1884c691b659e8a9b359bb95afc61e.gz
2008-11-23 16:13:48 -05:00
Zach Copley
63a1b9151a
Send raw UTF-8 chars instead of escaped entities in newnotice.php's ajax response
...
darcs-hash:20081123193727-7b5ce-0771232a9771e1325f937ccc87e6ba319dd97590.gz
2008-11-23 14:37:27 -05:00
Zach Copley
7cb0609e72
Set encoding for xml response in newnotice.php to UTF-8
...
darcs-hash:20081123183613-7b5ce-9c6bd2b2efb679bce9f710f5f5ad9c48bf652e29.gz
2008-11-23 13:36:13 -05:00
Zach Copley
fbfbe7fbc7
Don't display avatars when posting to personal streams via ajax
...
darcs-hash:20081123022902-7b5ce-fbdd4e9a3df3e206caec0ca37c10a2e0a58cef85.gz
2008-11-22 21:29:02 -05:00
csarven
04a4e883f0
PostNotice AJAX working in all browsers except IE
...
darcs-hash:20081123015559-eefa4-5ce05e6e79236c6d5ebc87f0aa3ec4de51bae130.gz
2008-11-22 20:55:59 -05:00
Evan Prodromou
cc10e1505f
merge save and ajax save
...
darcs-hash:20081123014003-84dde-ea8f5d167a544617efb22bb0c553f18d718a65c6.gz
2008-11-22 20:40:03 -05:00
Zach Copley
b2285dcb56
EXPERIMENTAL PATCH #3 - ajax response for newnotice.php
...
darcs-hash:20081122043145-7b5ce-0fc4b2ed06e29437c54e3c2f1a64b6d0fbeb9058.gz
2008-11-21 23:31:45 -05:00
millette
095ff0feed
conflict resolution on people search
...
darcs-hash:20081123190555-099f7-cd09b07e99355e2f61562324221840f869fea5bb.gz
2008-11-23 14:05:55 -05:00
millette
6b29f6ed70
sphinx integration for notices and profiles
...
darcs-hash:20081123185136-099f7-ca600dbdfff09762802e1cc58cf8777c45a24402.gz
2008-11-23 13:51:36 -05:00
millette
bf72cde96f
sphinx search for notices
...
darcs-hash:20081120215041-099f7-db396a60755d551099122b58634b7550d5606d88.gz
2008-11-20 16:50:41 -05:00
csarven
ca8f45fc6e
Tag markup and styling for tag_self, tag_user, form#tag_user
...
darcs-hash:20081121023827-eefa4-ed91f63cac35c078dc385546a69209cbef2a0d5e.gz
2008-11-20 21:38:27 -05:00
Zach Copley
dac0314e0a
Public 'Featured' tab now shows profiles instead of notices!
...
darcs-hash:20081121005338-7b5ce-1e2b30a5f7de6900cdc865246c1ed65d0dfe29f6.gz
2008-11-20 19:53:38 -05:00
csarven
7b099a4c6b
Don't allow user to send a new message or nudge right after subscribing to another contact
...
darcs-hash:20081120235752-eefa4-42e67140086035ae57c4db38aea48cabb0486d75.gz
2008-11-20 18:57:52 -05:00
Evan Prodromou
b2fcbba665
missed $tags in setTags
...
darcs-hash:20081121003655-84dde-56051867f44c63546a972dd55d364e3dc43f799c.gz
2008-11-20 19:36:55 -05:00
Evan Prodromou
9325fec4f0
a little better presentation for tag-other
...
darcs-hash:20081121003608-84dde-1bae74a9d4635423965c8f18a7555c2b0eab982e.gz
2008-11-20 19:36:08 -05:00
Evan Prodromou
909b0d9311
fix some stuff with tagother link
...
darcs-hash:20081121003338-84dde-45745ca353eb5a68627335115d2993fd15a38498.gz
2008-11-20 19:33:38 -05:00
Evan Prodromou
6dac9870bb
tag other users
...
darcs-hash:20081121002038-84dde-2d9800f8c0ad3d22d13ca7b497f2914c9d9719fd.gz
2008-11-20 19:20:38 -05:00
csarven
171bedf24b
(Un)Subscribe form using ajaxForm()
...
darcs-hash:20081120232655-eefa4-cf6a71e246828793d3bfa413db724ab33bc58bcf.gz
2008-11-20 18:26:55 -05:00
Zach Copley
41f29ab662
Public tabs - added instructions for 'Featured' and 'Favorited'; removed notice input boxes
...
darcs-hash:20081120214557-7b5ce-df1993ee7a761d109e9346d9817ead147d015962.gz
2008-11-20 16:45:57 -05:00
Zach Copley
f3b5b5de8a
Only show 'Recent tags' tab for tag cloud, not for tag streams
...
darcs-hash:20081120212142-7b5ce-9b0325c43a423de108b221325446969dc240d916.gz
2008-11-20 16:21:42 -05:00
millette
0bd6f76451
sphinx search of people
...
darcs-hash:20081120211347-099f7-d5588788dcd9a16cf72ece59da3d2bf9b8171b85.gz
2008-11-20 16:13:47 -05:00
Evan Prodromou
a31d13e020
links to people tags
...
darcs-hash:20081120225137-84dde-03ae7562e67c825bb7bf29805d32a351f8b095c5.gz
2008-11-20 17:51:37 -05:00
Evan Prodromou
243f7ec4a2
fix timestamp name
...
darcs-hash:20081120224918-84dde-c964bdb77618d6a208efe581dd570b6ea1e23e7d.gz
2008-11-20 17:49:18 -05:00
Evan Prodromou
6bb88196e5
bad page
...
darcs-hash:20081120224708-84dde-2c259c12a3ac553f431430e016074e02ad5ae3b9.gz
2008-11-20 17:47:08 -05:00
Evan Prodromou
21dfd5e11e
p-wrapper for instructions
...
darcs-hash:20081120224540-84dde-adc442888ce7e5faacffb062ed07b4508aed4538.gz
2008-11-20 17:45:40 -05:00
Evan Prodromou
4cee2ab72a
fix instructions in peopletag
...
darcs-hash:20081120224429-84dde-e9f2abbb6dba5576f21ee02ca9e5371d468c9249.gz
2008-11-20 17:44:29 -05:00
Evan Prodromou
8d718906bc
add peopletag action for tagged people
...
darcs-hash:20081120224207-84dde-3fe1c8936ca93fc8c65e9a9b4680e8a7b3dd38b8.gz
2008-11-20 17:42:07 -05:00
Evan Prodromou
48b55301d4
show self-tags
...
darcs-hash:20081120215751-84dde-8954f2dd5be0a333329d035a649676193c8844e9.gz
2008-11-20 16:57:51 -05:00
Evan Prodromou
73bf014fa4
correct tags method for user
...
darcs-hash:20081120215222-84dde-340269eb99daff7815bb2e17a04341f603eef438.gz
2008-11-20 16:52:22 -05:00
Evan Prodromou
6f31f25105
let users set their own profile tags from profilesettings
...
darcs-hash:20081120214821-84dde-c8569ef645b389de545f78bf01a270f28b871f02.gz
2008-11-20 16:48:21 -05:00
millette
7c2c1855ba
more ajax coming (un-sub)
...
darcs-hash:20081118174857-099f7-bb67199062174a41433c34434f4832a8f48898ee.gz
2008-11-18 12:48:57 -05:00
Zach Copley
727c4060a5
New public tabs - Public, Recent tags, Featured, and Favorited
...
darcs-hash:20081120071930-7b5ce-a15d7308bde085f03aa335c98ecd0aaa3833bc35.gz
2008-11-20 02:19:30 -05:00
Evan Prodromou
aab4228b53
display subscriptions/subscribers as a list
...
darcs-hash:20081120113839-84dde-169dceadab4d365c81282e8a68a744b7c1aa6a94.gz
2008-11-20 06:38:39 -05:00
Evan Prodromou
d94e5f57ac
correct constructor for PeopleSearchResults
...
darcs-hash:20081120105223-84dde-d4b44f20e9bd0e3ce96e6834e04ad05cb451ba6a.gz
2008-11-20 05:52:23 -05:00
Evan Prodromou
d1361c6e27
abstract people lists from search results
...
darcs-hash:20081120105027-84dde-e1c0faace07d9f2439d3a51a42cfe83464da5319.gz
2008-11-20 05:50:27 -05:00
Zach Copley
147dd16ab3
trac685 Twitter bridge - Shell script to sync all users' Twitter friends
...
darcs-hash:20081119011128-7b5ce-74471277443b44d0075f66131028447cfda3b1e4.gz
2008-11-18 20:11:28 -05:00
zach
41b8c91c6b
trac685 Twitter bridge - Sync Twitter friends
...
darcs-hash:20081117024624-462f3-91f148111c2c43ddd302fc63cfa8c8ef14e1f38e.gz
2008-11-16 21:46:24 -05:00
zach
fed15bd6b7
Twitter bridge - don't delete Twitter users. Update them instead.
...
darcs-hash:20081114053044-462f3-30e2d27261bca1977b89dee409383e178f446149.gz
2008-11-14 00:30:44 -05:00
millette
9f1b4b3ed6
small nudge enhancements
...
darcs-hash:20081118155643-099f7-df2d332253d9acc007966b28f5afc2edcd7cc9ac.gz
2008-11-18 10:56:43 -05:00
millette
d1ecedfffe
nudge: better nudge email, better nudge disable language.
...
darcs-hash:20081117175627-099f7-59da80fe33257fa736a354c0a422a227e534ab2c.gz
2008-11-17 12:56:27 -05:00
millette
e369c5f740
nudge : added js code to enable ajax
...
darcs-hash:20081117173144-099f7-b475f072ddc36e03143e05698e86186955566db9.gz
2008-11-17 12:31:44 -05:00
millette
87d0235b54
nudge: only show it when other person has enabled it.
...
darcs-hash:20081117154147-099f7-cf844aabcc3866eaf42312050a959dbc7cb10ed9.gz
2008-11-17 10:41:47 -05:00
millette
afe3b1a268
fix nudge typo and add emailnotifynudge to laconica.ini
...
darcs-hash:20081117001644-099f7-9b086e032d0bc4d74da426c7dd363bb9a4f9aed4.gz
2008-11-16 19:16:44 -05:00
csarven
1b9bab7328
added nudge.php action file
...
darcs-hash:20081116033155-eefa4-3fedb1932819520c6b35b2a543f4dcfd5014e872.gz
2008-11-15 22:31:55 -05:00
csarven
f3572aec7f
Nudge feature
...
darcs-hash:20081116022735-eefa4-366f6deb85942f859ebd532e477b57737bcafbf8.gz
2008-11-15 21:27:35 -05:00
csarven
322a79739d
trac670 trac689 Favorites (duplicate id, background image, JavaScript)
...
darcs-hash:20081115033549-eefa4-cfbca6f9c723aa63869c39d6851de7a7803f0703.gz
2008-11-14 22:35:49 -05:00
csarven
67f3c1a8d4
trac626 Put a list of feed links
...
darcs-hash:20081114210506-eefa4-ba7e9bdd794ddfcacc397d732073abf99e97f3a5.gz
2008-11-14 16:05:06 -05:00
Evan Prodromou
7877e86506
check URI before sending
...
darcs-hash:20081118192227-84dde-3318e91d2366f3cb70bc795e313072f8e81a190c.gz
2008-11-18 14:22:27 -05:00
Evan Prodromou
a179a816b5
add some extra checks to avoid remote subscriptions to local users
...
darcs-hash:20081118180644-84dde-ab152249ac0844a482029b7e0f8db2780a0f15d6.gz
2008-11-18 13:06:44 -05:00
Evan Prodromou
67340ce11c
♫ Don't you forget about me ♫
...
darcs-hash:20081118024947-84dde-46f68dff10cd2b5665fbd482f90ac83601df4228.gz
2008-11-17 21:49:47 -05:00
zach
1d8bac816e
RSS alternate link for tag pages
...
darcs-hash:20081114052528-462f3-741f881a49934cb5a3ef9196ad6df872f387a748.gz
2008-11-14 00:25:28 -05:00
tryggvib
8250d8a350
Ticket 753
...
darcs-hash:20081113024833-0aa81-27d1d08708ddc96fb37b30d3547c1e54108fe409.gz
2008-11-12 21:48:33 -05:00
zach
158d6ba1f4
Conflict resolution patch for newnotice.php (zach vs. millette)
...
darcs-hash:20081113195237-462f3-35c44753490c57e30d0adf661ae4c8a08af7e39c.gz
2008-11-13 14:52:37 -05:00
millette
0633d0404d
trac31 added longurl title to anchors when applicable. Also removed * url prefix feature to prevent short urls.
...
darcs-hash:20081113182834-099f7-f55adc95eb8fb46f8cee1c176653c88f65e27ab6.gz
2008-11-13 13:28:34 -05:00
millette
f2506b0339
trac31 let * preceding a url prevent its shortening.
...
darcs-hash:20081113170234-099f7-b714b0640370b8ecf37aa422455831dae5ce4c5e.gz
2008-11-13 12:02:34 -05:00
millette
efabf7d341
trac31 forgot about twitapi, now fixed.
...
darcs-hash:20081113164741-099f7-c8994bc8902df1cfc9fe62bf6d556a5c3f521b8f.gz
2008-11-13 11:47:41 -05:00
millette
5fc9f11677
trac31 shorten all URLs even if notice is already <
...
darcs-hash:20081113153216-099f7-81c4aba01babca97edeaf55b230dee300dbeb57a.gz
2008-11-13 10:32:16 -05:00
millette
14f69f8d2e
trac31 pg support, fixing 2tu typo, set ur1.ca as default service
...
darcs-hash:20081113152718-099f7-42b60d02395f016c54c5f3c301f9dbe987c1283f.gz
2008-11-13 10:27:18 -05:00
millette
3971772432
trac31 added bit.ly support
...
darcs-hash:20081107201926-099f7-bee53da36841b7dc048591ed91ea35d3e3522d34.gz
2008-11-07 15:19:26 -05:00
millette
4eecefb548
trac31 added 3 more short url services: ur1.ca, 2tu.ru and ptiturl.com
...
darcs-hash:20081107194735-099f7-fe1ef28b4d36e5dde9e6addc287ad22946b060cd.gz
2008-11-07 14:47:35 -05:00
millette
e5d47b0eee
trac31 forgot actions/othersettings.php file
...
darcs-hash:20081106210552-099f7-c5275ef0cc17622b60cb6e04ef7d1f420379f768.gz
2008-11-06 16:05:52 -05:00
millette
15c1d4f5e4
trac31 url_auto_shortening by sgmurphy
...
darcs-hash:20081106205926-099f7-6bcfd7969a159a12b1ba6a9ee254e44a07b94761.gz
2008-11-06 15:59:26 -05:00
zach
1e8d26baec
CSRF Protection for login and new notice. Ticket #503
...
darcs-hash:20081111022330-462f3-810b2a86e6e209330ade628fc0e97df96151d496.gz
2008-11-10 21:23:30 -05:00
zach
aac0605bd1
Twitter-compatible API - don't strip XML-illegal chars from JSON output
...
darcs-hash:20081106225721-462f3-b80ba75f87a4b36b803868653c956c393a236626.gz
2008-11-06 17:57:21 -05:00
zach
e0c3bf5a75
Better UTF-8 escaped entity handling. Fixed bad chars in all RSS feeds.
...
darcs-hash:20081104084027-462f3-ea7ab93938358bf90a1c1851d6f665973beae767.gz
2008-11-04 03:40:27 -05:00
zach
485247e901
Twitter-compatible API - properly encode and decode UTF-8 HTML entities
...
darcs-hash:20081103211653-462f3-58a0ad41ab0426c21aceb04b4a91dc52559018d0.gz
2008-11-03 16:16:53 -05:00
Evan Prodromou
a528cff1a1
fix calls to show_rss_timeline
...
darcs-hash:20081026145749-5ed1f-f2e566947ee5724aeb9c6e91922477cbfc60e144.gz
2008-10-26 10:57:49 -04:00
Evan Prodromou
90e4512df2
add SUP links to RSS and Atom, too
...
darcs-hash:20081026145326-5ed1f-430b98eedef21903caaae47e3355482ae7bfa616.gz
2008-10-26 10:53:26 -04:00
Evan Prodromou
6503fd72e1
a SUP action to product correct SUP json output
...
darcs-hash:20081026033353-5ed1f-f449572d9069add47dd88749be73e7550d260a0f.gz
2008-10-25 23:33:53 -04:00
Evan Prodromou
39a6c94959
fixed use of header()
...
darcs-hash:20081025023347-5ed1f-b8dbb87a4dff048e9cab136c54564413c63ad4d4.gz
2008-10-24 22:33:47 -04:00
Evan Prodromou
9e6aa21e56
override initrss
...
darcs-hash:20081025023252-5ed1f-ce96bbd6374b28a6380383ccfc6f78fb8ee67854.gz
2008-10-24 22:32:52 -04:00
Evan Prodromou
22057e01bd
add SUP link to User RSS
...
darcs-hash:20081025022849-5ed1f-edd99a830ff285f4d0468e0e9ce3ceba4a885352.gz
2008-10-24 22:28:49 -04:00
zach
85b9e58e53
Twitter-compatible API - removed debugging statement
...
darcs-hash:20081024215101-462f3-cef62f04283d58538dd7aab621668ce2274593f7.gz
2008-10-24 17:51:01 -04:00
zach
f8a73c157e
Twitter-compatible API - checks for is_readonly() now work!
...
darcs-hash:20081024213745-462f3-7c26611e7f75265affafd471c3d66e02ec7e686e.gz
2008-10-24 17:37:45 -04:00
Evan Prodromou
18d4226ead
add atom and RSS 2.0 link elements to head of profile page
...
darcs-hash:20081023212659-5ed1f-0efa86cf7fbcc7bae4cb468fc514f33adf15ba0d.gz
2008-10-23 17:26:59 -04:00
Evan Prodromou
22cb0c5687
add is_readonly() to api.php
...
darcs-hash:20081024201234-84dde-06d2c147ec967cb8123ee0639a76f00a5f44e5c5.gz
2008-10-24 16:12:34 -04:00
Evan Prodromou
0f6572fdba
full sentence for invite-only error
...
darcs-hash:20081021183035-5ed1f-c40445017094a3f6c0e89fa8744ede28fd5ab20a.gz
2008-10-21 14:30:35 -04:00
Evan Prodromou
3a246c1726
add 'invite-only' mode for registration
...
darcs-hash:20081021182822-5ed1f-9a8ee3960f82d115d43e35baac646f69bc702533.gz
2008-10-21 14:28:22 -04:00
Evan Prodromou
44a90a7fa7
accidentally setting replies to 'false'
...
darcs-hash:20081020174956-5ed1f-f0a632482ab9d2f2d15baa3a524bc312d7be5755.gz
2008-10-20 13:49:56 -04:00
Evan Prodromou
278f5cf842
correct number of args to saveNew in newnotice
...
darcs-hash:20081020173108-5ed1f-06b346f0f341bf8401d29dcf725db69c5d26cc14.gz
2008-10-20 13:31:08 -04:00
Evan Prodromou
613b75e7b7
add a little debugging for replyto
...
darcs-hash:20081020171033-5ed1f-00bdf131a25c86ae1d400a238eee070cb19ebec9.gz
2008-10-20 13:10:33 -04:00
Evan Prodromou
f2e3021b59
try to make replies point to the clicked-on notice
...
darcs-hash:20081020170245-5ed1f-b84f63d9d9b589bd18f97924db547e348beb6647.gz
2008-10-20 13:02:45 -04:00
zach
b2f0ad1ccc
Twitter-compatible API:
...
- Filled in favorites tags in statuses
- Filled in more tags in user/show, including undocumented features
- Better error handling and more consistent error messages
- Code clean-up and refactoring
- Removed huge obnoxious comments
darcs-hash:20081017023638-462f3-27b5d2709e423c616723d4bcfbc9d7d30a4ad161.gz
2008-10-16 22:36:38 -04:00
zach
9b75a8ea9f
Twitter-compatible API - added favorites/favorites to list of methods only requiring bare auth
...
darcs-hash:20081015163112-462f3-ca22e3fcf4a5d3ad4613dd08c4bf7ce59e296385.gz
2008-10-15 12:31:12 -04:00
zach
738d50a631
Added OnCommand and OffCommand to the list of cmds the Twitter API
...
supports thru statuses/update
darcs-hash:20081005183850-462f3-1fcbf873c14f1048ba7c3ac23f6cd394066170c7.gz
2008-10-05 14:38:50 -04:00
zach
2c2821799d
Twitter-compatible API - hooked in command interpreter
...
darcs-hash:20081005030915-462f3-0c0541f062020ee958f1df0361e27f44d6c35e95.gz
2008-10-04 23:09:15 -04:00
zach
6beddfdbb9
Twitter-compatible API - cleaned up sloppy control flow: exit() statements everywhere
...
darcs-hash:20081001025421-462f3-3bf666327de3a3c5ea506b2c387741dc3d0e82bf.gz
2008-09-30 22:54:21 -04:00
zach
dec2f29c6a
Twitter-compatible API - Added content-type checks to several methods. Calling an API
...
method with a bad content type used to return a blank page.
darcs-hash:20081001020959-462f3-83b0241ba7dc99c4e3a52148a46deb8182e005b0.gz
2008-09-30 22:09:59 -04:00
mac65
c08a67094c
Add support for since_id and before_id to Twitter API. Ticket #540 .
...
darcs-hash:20081001001233-e558a-3fcc269985050021ec9b44c052206c731cc4689d.gz
2008-09-30 20:12:33 -04:00
zach
1c4f7722da
Twitter-compatible API - factored out redundant JSON printing functions
...
darcs-hash:20080930212526-462f3-abe9f1f2fc395c751b2861e686d638ea0a8ca001.gz
2008-09-30 17:25:26 -04:00
zach
37b3bd5489
Twitter-compatible API - Favorites now working!
...
darcs-hash:20080930194435-462f3-a0a7fec3f0d05dc3b1fe8a9219155f4d59092e43.gz
2008-09-30 15:44:35 -04:00
Zach Copley
924491f08a
Twitter-compatible API: Direct messages work (everything but destroy())
...
darcs-hash:20080929050826-7b5ce-201624b32e174ae85b906b92353e39aa043838fa.gz
2008-09-29 01:08:26 -04:00
Zach Copley
10f4ee7abb
Twitter-compatible API - rss and atom feeds for direct messages
...
darcs-hash:20080926012015-7b5ce-da94465ff9c027183e0e674b6152902c302d0131.gz
2008-09-25 21:20:15 -04:00
Zach Copley
d687f16525
Twitter-API: Viewing direct msgs in xml and json now work
...
darcs-hash:20080924234857-7b5ce-2f0c60901ee582bdd76ae9596253c2efcc6dc50d.gz
2008-09-24 19:48:57 -04:00
Evan Prodromou
bdeba50c34
text -> content in newnotice
...
darcs-hash:20081004170136-5ed1f-4eca2ee2c7ebb7f2d3c6b49ecd634a8ceee28054.gz
2008-10-04 13:01:36 -04:00
Evan Prodromou
f072147e4e
add channels and use command interpreter in different channels
...
darcs-hash:20081004163213-5ed1f-684ecb464e843b1bbe456c348e56b40a39a83ecd.gz
2008-10-04 12:32:13 -04:00
Evan Prodromou
fa2d50f481
move fave notification to mail library
...
darcs-hash:20081004154454-5ed1f-6b5b66945d415690f4cac5e66c1edad71ec031a5.gz
2008-10-04 11:44:54 -04:00
Evan Prodromou
a43d24b1b8
better instructions in the password recovery page
...
darcs-hash:20081004232554-5ed1f-06b3464638a6dbd6d4090afafa600578ad151b39.gz
2008-10-04 19:25:54 -04:00
support
3bd710d153
Fix replies tab pagination issue
...
Problem:
Before / After links in replies tab don't work. When clicked they show "No such user" error.
How to reproduce:
1. Access http://identi.ca/evan/replies
2. Click on Before button
darcs-hash:20081001010741-352e0-4cbf4afc0f12aa850c1cc7145324477157f24d98.gz
2008-09-30 21:07:41 -04:00
CiaranG
411db90e25
Fix problem with tags in different locales (Ticket #679 )
...
darcs-hash:20080924092031-f6e2c-8def504406ee1a13273bb67faafe3a3327ae4a44.gz
2008-09-24 05:20:31 -04:00
Evan Prodromou
ce1002c7be
use two-arg constructor for confirmation code
...
darcs-hash:20080930130530-5ed1f-48d4d4a503a6bb37c91d828139d652a272b9734a.gz
2008-09-30 09:05:30 -04:00
Evan Prodromou
15a089f46e
log a warning on recovery of old recovery codes
...
darcs-hash:20080930124452-5ed1f-31cc4ff18994880f9ab36b57cdfc6d9fb19b99d1.gz
2008-09-30 08:44:52 -04:00
Evan Prodromou
d1660b3c4d
trying to fix up pages in tags
...
darcs-hash:20080929230047-5ed1f-1fee58a5bb18c71de7abeef67d89b087d84cc853.gz
2008-09-29 19:00:47 -04:00
Evan Prodromou
ddf2dce601
fixup tag display code
...
darcs-hash:20080928181503-5ed1f-4a4046000646530b8462f06d0cfc0d2fe862dc48.gz
2008-09-28 14:15:03 -04:00
Evan Prodromou
fc7f32e35d
pass tag parameter along to stream query
...
darcs-hash:20080928181255-5ed1f-fd49afc180bda9ae7875ad7b70a337e4cd5771d2.gz
2008-09-28 14:12:55 -04:00
Evan Prodromou
8d53a7d463
cache tag streams in Memcached, too
...
darcs-hash:20080928180904-5ed1f-ebf95f6f04ee4128a1ab2bb9a6a06a946926665d.gz
2008-09-28 14:09:04 -04:00
Evan Prodromou
b204650242
add favoritesrss
...
darcs-hash:20080928180132-5ed1f-6e8ab82b22e71ad59b83579f17b9c3d01fcc29e2.gz
2008-09-28 14:01:32 -04:00
Evan Prodromou
dc5f47ab4a
remove unneeded find() in userrss.php
...
darcs-hash:20080928175156-5ed1f-f33007b9dd9ee73632e48fc4bf45f29fb63ae494.gz
2008-09-28 13:51:56 -04:00
Evan Prodromou
d3d5942ae3
change arguments to Notice::publicStream
...
darcs-hash:20080928132747-5ed1f-9e9b6d8b91f855758ca4b269418f6d5d6e4a2ae0.gz
2008-09-28 09:27:47 -04:00
Evan Prodromou
3544fca932
shownotices takes user rather than profile in showstream
...
darcs-hash:20080928120616-5ed1f-fc0b136afff897a2d69f88dd83b6fc5df4f675b6.gz
2008-09-28 08:06:16 -04:00
Evan Prodromou
02a3f24b92
single function for important streams, with memcached support
...
I moved the 4 streams for a user (with friends, faves, replies,
personal) into functions on the User object. Added a helper function
in Notice for making notice streams. Also, will fetch notice streams
out of the memcached server, if possible. Made the API, RSS, and HTML
output all use the same streams (hopefully cached).
Added some code to Notice to blow the cache when a notice is posted.
Also, added code to favor and disfavor actions to blow the faves
cache, too.
darcs-hash:20080928120119-5ed1f-ead542348bcd3cf315be6f42934353154402eb16.gz
2008-09-28 08:01:19 -04:00
Evan Prodromou
7ff02bb7d4
try to clean up user-without-profile errors
...
darcs-hash:20080926145008-5ed1f-8a60ed3c5adbfe75aa044732e8d10dbdb9b93089.gz
2008-09-26 10:50:08 -04:00
Evan Prodromou
cb265a2d8d
better redirect to outbox
...
darcs-hash:20080924210757-5ed1f-beca326b5c38b086f5ab195b7478c944881ca469.gz
2008-09-24 17:07:57 -04:00
Evan Prodromou
362a854cb1
redirect to outbox after posting
...
darcs-hash:20080924210459-5ed1f-8fb83a73373b4077a47a7f78b26161adcbe1f977.gz
2008-09-24 17:04:59 -04:00
Evan Prodromou
fc7663e86a
put message form on inbox and outbox
...
darcs-hash:20080924204131-5ed1f-099c73720b3a4f2263ca28566fcd6b4c809fd4ab.gz
2008-09-24 16:41:31 -04:00
Evan Prodromou
ffeeec392e
change handle() to use message-getting helper
...
darcs-hash:20080924202211-5ed1f-a39e520b113a843bee6dd9e2e56c1a7afb2bb896.gz
2008-09-24 16:22:11 -04:00
Evan Prodromou
f112b4e1fd
default sending local @ replies to Twitter
...
darcs-hash:20080924161708-5ed1f-c215f149abc11b07c34fda59c90a26d8b7603d38.gz
2008-09-24 12:17:08 -04:00
mac65
b0b1d201d7
Fix ticket 460
...
The show action for the twitter user API was using subscribed instead of
subscriber to grab the friends_count.
darcs-hash:20080922223429-e558a-4b456954f475c022be288e85a186ffa8794fad03.gz
2008-09-22 18:34:29 -04:00
mac65
3017ad3f01
Fix ticket 662
...
The user_timeline action for the Twitter API was not reading the page
argument. Added in one line to assign the page argument. Tested on local
install and it worked.
darcs-hash:20080922213314-e558a-1e429af6660de21990236b2bb444f2b6f36e08df.gz
2008-09-22 17:33:14 -04:00
Evan Prodromou
392137b403
change foreign links flags code to use bitmasks
...
Zach was doing a lot of integer comparisons on the Foreign_link sync
fields. I switched them to use named bitmasks instead. I also switched
the semantics of bit 3 to be the opposite of what Zach had -- I find
lots of double-negatives in a checkbox to be hard to read.
darcs-hash:20080924150834-5ed1f-54cd945f61e43bc06768037c60c1e6180a8feead.gz
2008-09-24 11:08:34 -04:00
Zach Copley
845db5ec16
Twitter bridge - Was using the wrong idiom to update foreign_link
...
objs, which was causing UI inconsistencies. Fixed.
darcs-hash:20080924060455-7b5ce-71ac4bb3a80ca44e6ae758d2287d50c918d1d908.gz
2008-09-24 02:04:55 -04:00
Zach Copley
e8b6e394dc
Twitter bridge - fixed another bug that kept prefs from saving properly
...
darcs-hash:20080924052431-7b5ce-589a3f5352f241c5c938ed855601d971e8d69fff.gz
2008-09-24 01:24:31 -04:00
Zach Copley
06859cc14e
Twitter bridge - pref setting to turn off sending @-replies to Twitter
...
darcs-hash:20080924023615-7b5ce-c747e8236b3967824ed93f18285e1b6e0b46c3f0.gz
2008-09-23 22:36:15 -04:00
Evan Prodromou
60baacf80e
better logic around protecting messages
...
darcs-hash:20080923182024-5ed1f-cd751ae81cde929ab377734a41e0cdad321ffec5.gz
2008-09-23 14:20:24 -04:00
Evan Prodromou
49a79590b0
rationalize Zach's change of length with my added _ and caps
...
darcs-hash:20080923174302-5ed1f-bf1e3339745eb497523912c2e58298b25ebe89d5.gz
2008-09-23 13:43:02 -04:00
Zach Copley
cbd8f39f24
Twitter bridge - Changed Twitter username length check from 64 chars to Twitter max of 15.
...
darcs-hash:20080923084145-7b5ce-25cfef64778010135234046be25294a3c7860419.gz
2008-09-23 04:41:45 -04:00
Evan Prodromou
394a37fc0a
was notifying user name not object
...
darcs-hash:20080923080246-5ed1f-a14a101fe2c8cb436ba278dc1b1af9ca3a02f634.gz
2008-09-23 04:02:46 -04:00
Zach Copley
80cd381ab0
Twitter bridge - fix to allow linking to 'protected' Twitter users
...
darcs-hash:20080923074529-7b5ce-818fc75dd3a59ae2f1de1b73e1884dd8a826bd6e.gz
2008-09-23 03:45:29 -04:00
Evan Prodromou
64c27d57cf
incorrect message info shown in title
...
darcs-hash:20080923063029-5ed1f-de15e9af49acb7e402127b45cd5b6c2814f559bb.gz
2008-09-23 02:30:29 -04:00
Evan Prodromou
b2b475d313
change twitter username to allow uppercase letters and underscores
...
darcs-hash:20080923060314-5ed1f-2ec4894251b99a2f9e9763ecc41659533bfab2eb.gz
2008-09-23 02:03:14 -04:00
Evan Prodromou
858e55f5b4
change how Foreign_link fetches, and fix mixup between user-ids and foreign-ids in twittersettings
...
darcs-hash:20080923054413-5ed1f-a317e07925101215e87d2db0c574d20c1cfac665.gz
2008-09-23 01:44:13 -04:00
Evan Prodromou
44f7dc2a76
403 for a message that isn't yours.
...
darcs-hash:20080923050637-5ed1f-c568033b5c00ac32d9ad63b5a4d18a81c09ad525.gz
2008-09-23 01:06:37 -04:00
Evan Prodromou
d2fb829296
CSRF protection in newmessage.php
...
darcs-hash:20080923031419-5ed1f-5435509496b882de27d4c3acca4697cc410ee7be.gz
2008-09-22 23:14:19 -04:00
Evan Prodromou
6e646570de
Fix quotes in favorite notification
...
darcs-hash:20080922232328-5ed1f-846910a5f0bb379130055d035c3686e3e639912d.gz
2008-09-22 19:23:28 -04:00
Evan Prodromou
c060a84c5b
check for cur before message link
...
darcs-hash:20080922225620-5ed1f-0dd8e76bcb8850744040e234e04b3182a0e13add.gz
2008-09-22 18:56:20 -04:00
Evan Prodromou
ac60342e89
merge CiaranG's changes for subs
...
darcs-hash:20080922225031-84dde-c6967f46ae642f8943b0de77d9a82892ecadb4ce.gz
2008-09-22 18:50:31 -04:00
Evan Prodromou
d73ed53535
don't notify you favor your own notice
...
darcs-hash:20080918152823-5ed1f-bc7bea3305c39cfbc41f4a116b9a602ada556365.gz
2008-09-18 11:28:23 -04:00
Evan Prodromou
bd828b9fc7
add favor/disfavor to profile
...
darcs-hash:20080918152612-5ed1f-5ce8b0a834ffa50e04d6b47d1cac4c4b94f28e9e.gz
2008-09-18 11:26:12 -04:00
Evan Prodromou
054b4d0be6
if favor/disfavor submitted through ajax, return micro-html of form
...
darcs-hash:20080918135608-5ed1f-d753cb01f96e04871eb4f503ccd258674a03623a.gz
2008-09-18 09:56:08 -04:00
Evan Prodromou
560cab3427
remove tabs from showmessage
...
darcs-hash:20080918025713-5ed1f-8bb2f106a567ef657a314f800da32efb7409ce2b.gz
2008-09-17 22:57:13 -04:00
Evan Prodromou
ff5f0a15a6
more id -> message shenanigans
...
darcs-hash:20080918025543-5ed1f-c017a351fce611516b18d64724ee2d7977a0bd47.gz
2008-09-17 22:55:43 -04:00
Evan Prodromou
d5b4dbbca3
fetch -> find
...
darcs-hash:20080918025232-5ed1f-825b72c981ee5e03391d5c84eca5dc4f9805227c.gz
2008-09-17 22:52:32 -04:00
Evan Prodromou
35bf8d7eaf
return correct data structure for messages in showmessage
...
darcs-hash:20080918023032-5ed1f-e8789b391eb88a181bb6232a5e5f199b0ccb2098.gz
2008-09-17 22:30:32 -04:00
Evan Prodromou
8ef9d9d0cc
no instructions for 'to' dropdown
...
darcs-hash:20080918022410-5ed1f-0c4f5ca478246d4d8e56a0b71419d179ea66ff2b.gz
2008-09-17 22:24:10 -04:00
Evan Prodromou
892132549e
change id of message textarea
...
darcs-hash:20080918021926-5ed1f-93d05fdd25606664a619e027178d188a46cbde83.gz
2008-09-17 22:19:26 -04:00
Evan Prodromou
edc11b1157
rearrange paragraphs in message form
...
darcs-hash:20080918021727-5ed1f-ad74f71450db27e587b04fe19dfbbaf51f4d0300.gz
2008-09-17 22:17:27 -04:00
Evan Prodromou
671282fcd5
some minor fixes for new messages
...
darcs-hash:20080917192121-5ed1f-15603b7f7d5246caed3e1633cc3361e1288d8653.gz
2008-09-17 15:21:21 -04:00
Evan Prodromou
823737891b
fix titles in showmessage
...
darcs-hash:20080917190745-5ed1f-c9305b7ee5f4cd79524491e8e0d676cf42f6ebc1.gz
2008-09-17 15:07:45 -04:00
Evan Prodromou
24496bafd2
skip over Mailbox::handle to Action::handle
...
darcs-hash:20080917190445-5ed1f-4fdf97356c40eb076185eff790ce0d34b5117699.gz
2008-09-17 15:04:45 -04:00
Evan Prodromou
46965a816d
not a nickname so don't canonicalize
...
darcs-hash:20080917185723-5ed1f-1795b591692f804df3140012af69560aa8204b77.gz
2008-09-17 14:57:23 -04:00
Evan Prodromou
f65039212d
to parameter is an ID not a nickname
...
darcs-hash:20080917185142-5ed1f-1f87afb283161609bfc202824a39c53f3239b716.gz
2008-09-17 14:51:42 -04:00
Evan Prodromou
e42de1ccc1
fancy urls for show message, new message
...
darcs-hash:20080917180244-5ed1f-06e2ac2d8f094eacd12b316794b0599b57d76596.gz
2008-09-17 14:02:44 -04:00
Evan Prodromou
ae6ba61d43
don't show message link on your own page
...
darcs-hash:20080917175512-5ed1f-0242ead7766806165266e424ed6d1cb9dd19abca.gz
2008-09-17 13:55:12 -04:00
Evan Prodromou
124762160a
add new message link to showstream
...
darcs-hash:20080917175356-5ed1f-5a84dc8363d7c1dbf60a82782aefe5a0bd6f3d59.gz
2008-09-17 13:53:56 -04:00
Evan Prodromou
130ba28886
newmessage and showmessage
...
darcs-hash:20080917174741-5ed1f-c090055487bab0df52d25ad6550d3850ef5f7661.gz
2008-09-17 13:47:41 -04:00
CiaranG
1c3afaea89
Fix missing nickname in rss replies to title
...
darcs-hash:20080915190953-f6e2c-40510d7407ccb621680489780dec79e581e59d1c.gz
2008-09-15 15:09:53 -04:00
CiaranG
3632a76773
PostgreSQL: support for full text searching (notice and people)
...
darcs-hash:20080914201744-f6e2c-71b2a3aec4c0b91557465323d79645e7eab2bfd1.gz
2008-09-14 16:17:44 -04:00
CiaranG
b13233fed4
PostgreSQL: Make tag cloud query work - also fixes what is surely an ignored error in the mysql query
...
darcs-hash:20080911192348-f6e2c-b846b777b382386de56ca01d957dc5e55161fced.gz
2008-09-11 15:23:48 -04:00
CiaranG
ce2eaf84aa
Fix unquoted array key, causes b0rkage on some php setups (via @bopuc)
...
darcs-hash:20080911163558-f6e2c-ae857f68936ed4328d4e38323f7e77ce25a0236a.gz
2008-09-11 12:35:58 -04:00
CiaranG
e322732bd3
Fix remote sub when redirected via login (Ticket #618 )
...
darcs-hash:20080909202259-f6e2c-8c7e836fd1f0ce9de3ea3802161e1068e346e5dd.gz
2008-09-09 16:22:59 -04:00
Zach Copley
2fcc9ff65f
Twitter integration - wording change
...
darcs-hash:20080907063339-7b5ce-bce7b96763adcac5746b1b4d930b636ae0852491.gz
2008-09-07 02:33:39 -04:00
Zach Copley
9eca4e0874
Fold password form into profile settings
...
darcs-hash:20080907053604-7b5ce-4e01cefdbab4cc73a28960b265c23abf5e2f2b0a.gz
2008-09-07 01:36:04 -04:00
Zach Copley
4f19a9462c
Moved avatar upload down below timezone on profile settings
...
darcs-hash:20080906070651-7b5ce-23c17932cc9c474dfbeb530d29b1bd1adb3a4260.gz
2008-09-06 03:06:51 -04:00
Zach Copley
4f1c30fd88
Conflated Avatar and Profile settings + removed a bunch of unnecessary whitespace
...
darcs-hash:20080905194732-7b5ce-2797acd4d04f3b02c4ad67be629badbae469e8ed.gz
2008-09-05 15:47:32 -04:00
Zach Copley
6c4dc071bf
CSRF protection in twittersettings.php
...
darcs-hash:20080829045724-7b5ce-66fdc5e54155012e41eb09c6a41bc94619bf520f.gz
2008-08-29 00:57:24 -04:00
Zach Copley
a637f36214
CSRF protection for invites.php
...
darcs-hash:20080829045441-7b5ce-a1382496d8d6b043a1a72c0fb32051f1b43163c8.gz
2008-08-29 00:54:41 -04:00
Zach Copley
bf14709fe2
Twitter integration - support for new foreign_link table and prefs now save/update
...
darcs-hash:20080828072205-7b5ce-16510357343f1d9a3acc696f39a28a723005f3a4.gz
2008-08-28 03:22:05 -04:00
Zach Copley
f5c9a6ebcf
Twitter integration - decided to change Twitter to service ID #1
...
darcs-hash:20080827021635-7b5ce-9b96743999aa85a505aecd5f25867937f0c34434.gz
2008-08-26 22:16:35 -04:00
Zach Copley
3cf6cef9b9
Twitter integration - Foreign_user::getForeignUser() to retrieve
...
Foreign_user by multi-part key: user_id + service
darcs-hash:20080827005444-7b5ce-2b53a2c1a917539248b68f21f94e0f9f5fe810f2.gz
2008-08-26 20:54:44 -04:00
Zach Copley
803bdff3f6
Twitter integration - Add and remove Twitter accnt now working
...
darcs-hash:20080827000327-7b5ce-453aad833576b9c76e19b8aa3ba34b24203dd377.gz
2008-08-26 20:03:27 -04:00
zach
661202be3e
Twitter-integration - Twitter settings tab now saves Twitter credentials
...
darcs-hash:20080826225615-462f3-8d881eda7be43623e10b83e8d1e157f4096734cd.gz
2008-08-26 18:56:15 -04:00
zach
a90b556e21
Twitter integration - Oh look, a Twitter settings tab.
...
darcs-hash:20080822034157-462f3-398e2ba92d9c38520ea6518c3ff614b41f3cc7ec.gz
2008-08-21 23:41:57 -04:00
Evan Prodromou
92d6ae6fae
correct title on inbox and outbox
...
darcs-hash:20080916200942-84dde-257499b7cbc4553d3f4cf5c0eafc891b860a53b8.gz
2008-09-16 16:09:42 -04:00
Evan Prodromou
827fdc63a0
instructions for inbox and outbox
...
darcs-hash:20080916200703-84dde-4984552dfc6865f6660d45670af6e3dc56395ff5.gz
2008-09-16 16:07:03 -04:00
Evan Prodromou
7416e50daa
inbox and outbox for direct messages
...
Added an inbox and outbox for direct messages.
Factored common code to mailbox.php. Factored common code with
stream.php to personal.php.
darcs-hash:20080916195346-84dde-b5c846f713a970c41fd1b0671cb333e91f3cb920.gz
2008-09-16 15:53:46 -04:00
Evan Prodromou
dd4c0ebaa8
correct action for showfavorites in disfavor
...
darcs-hash:20080908182716-84dde-fad2159212dd427d596a8ace7aa4032be8446799.gz
2008-09-08 14:27:16 -04:00
Evan Prodromou
59ef19b7d3
fix requires in dis/favor and correct url in form
...
darcs-hash:20080908182559-84dde-27b288efd341a4dd148abb641064d9e48ca2aa11.gz
2008-09-08 14:25:59 -04:00
Evan Prodromou
a8a3667774
initial non-Ajax version of favorites
...
darcs-hash:20080908181624-84dde-8200e1d91eb5f560ef0f296c9e1c56f93ef1b0c5.gz
2008-09-08 14:16:24 -04:00
Evan Prodromou
75f285ddf6
merge in changes for CSRF, too
...
darcs-hash:20080830162223-84dde-573e490dc4fde68512ea4ec28599019d2740cfcf.gz
2008-08-30 12:22:23 -04:00
CiaranG
bfb22a9932
XMPP daemon updates including help, sub and subsub commands, plus subscribe/unsubcribe logic broken out into standalone module for sharing
...
darcs-hash:20080816083422-f6e2c-fb8b4e0581719bd8c3f433e661ec9742e1b84cbc.gz
2008-08-16 04:34:22 -04:00
Evan Prodromou
9bff7c9a76
removed the preview, so use "Send" for the button
...
darcs-hash:20080827011921-84dde-622d4c8eab1b05ce999bba4554b85c08a5840c79.gz
2008-08-26 21:19:21 -04:00
Evan Prodromou
c55e3089c5
fix format string, again again
...
darcs-hash:20080827010138-84dde-db15d5a4408a9cca08822b4c4946e2dfc60ea3db.gz
2008-08-26 21:01:38 -04:00
Evan Prodromou
37991eace8
lost the names when making a new function send_invitation
...
darcs-hash:20080827005418-84dde-7e7a4be646c520542e8c065ba90ba759c100b481.gz
2008-08-26 20:54:18 -04:00
Evan Prodromou
ebf5d52f74
send personal message through to send_invitation function
...
darcs-hash:20080827005155-84dde-02a097e286800519fe5294cb7005ead533db478f.gz
2008-08-26 20:51:55 -04:00
Evan Prodromou
0ce9b20566
fix runon string in invites format
...
darcs-hash:20080827004854-84dde-a558664ac7f02ff319e3c29ac4516f491abef29a.gz
2008-08-26 20:48:54 -04:00
Evan Prodromou
6a57f42606
fix format for subject
...
darcs-hash:20080827004755-84dde-d3275abf281b1d4790806357d3d0bcba634f28f3.gz
2008-08-26 20:47:55 -04:00
Evan Prodromou
b158658caa
save invitation code and improve format of outgoing mail
...
darcs-hash:20080827004410-84dde-226101a8482f511ff9df7546342f84dd94ceca54.gz
2008-08-26 20:44:10 -04:00
Evan Prodromou
11be8376dd
correct output on invitations
...
darcs-hash:20080827003529-84dde-614dc517061e76d180823c0aaf3fc9f434f6480c.gz
2008-08-26 20:35:29 -04:00
Evan Prodromou
e248066b74
updates for invitations
...
Add the code to registration to handle invitation codes.
Some edge cases on invitations: is the user already subbed to this
person? Tell them. Is the person already on the system? Sub the user
to them, then, and tell the user.
Add some code to User to auto-sub invitees whenever the email address
changes. Call it from a new registration with an invite code, and also
from confirmaddress.
Some whitespace cleanup in the files touched.
darcs-hash:20080827001927-84dde-b50e5d921ca3f2fb894821730ff93cac09d2ba66.gz
2008-08-26 20:19:27 -04:00
Evan Prodromou
19614f33a4
skip preview, just send the darn thing
...
darcs-hash:20080826021227-84dde-22f709bf330bcfa46b93eadd11700723bf640a6b.gz
2008-08-25 22:12:27 -04:00
Evan Prodromou
1e78f020e9
fix instructions
...
darcs-hash:20080825193738-84dde-d58e63ee015a52ccf065d17a2fc16d2d1899f805.gz
2008-08-25 15:37:38 -04:00
Evan Prodromou
55fe8f8ff8
start the invite form
...
darcs-hash:20080825192946-84dde-c48e79699e5c0bc51ce5ab1fa921c49abbf2c4f5.gz
2008-08-25 15:29:46 -04:00
Evan Prodromou
a64330b77c
blow subscriptions cache when the user deletes a notice
...
darcs-hash:20080920175339-84dde-e46d0e7b86e0752e8331cdfba26257b3ff9e601c.gz
2008-09-20 13:53:39 -04:00
CiaranG
95d9920d78
Fix typo in finishremotesubscribe
...
darcs-hash:20080904201921-f6e2c-44a5fc1dbf699b9c2b6919eaabd7db12c7c65ef8.gz
2008-09-04 16:19:21 -04:00
Evan Prodromou
9078e95e5f
fix bad args in postnotice for new notices
...
darcs-hash:20080904195720-84dde-f286bfe898ef3e08f07fd977bfe692e9cff6c375.gz
2008-09-04 15:57:20 -04:00
CiaranG
fff677e6c4
Resolve remote subscribe and omb problems with quotes (Tickets #604 and #567 )
...
darcs-hash:20080904065504-f6e2c-f0c770f52624e7151a93f2ed2b8813657ca88c14.gz
2008-09-04 02:55:04 -04:00
Garret Buell
4d1528734d
RequirePassword
...
Require a password with at least 6 characters when registering.
darcs-hash:20080830195036-e3c0d-6b4cac221674240e1a8383675b69863f54dd2525.gz
2008-08-30 15:50:36 -04:00
Evan Prodromou
44f02dd9c1
move broadcast in OMB postnotice for bad case
...
darcs-hash:20080828221420-84dde-713f564d28d2e548a09a325443b37d6dc1e9a7e7.gz
2008-08-28 18:14:20 -04:00
Evan Prodromou
adeb19f1f7
clean up username entered at login
...
darcs-hash:20080829225258-84dde-6fee5f0beea62f023c13436b8d7044241bc0d01a.gz
2008-08-29 18:52:58 -04:00
Zach Copley
9fb08ec45e
CSRF protection in remotesubscribe
...
darcs-hash:20080829054038-7b5ce-d0503a8eb7f89a9d2de4aadd4550f4342b943b09.gz
2008-08-29 01:40:38 -04:00
Zach Copley
a034e13bf0
CSRF protection in emailsettings
...
darcs-hash:20080829053337-7b5ce-6d94638c57d185e5d44e02ad458593a3f4de36d9.gz
2008-08-29 01:33:37 -04:00
Evan Prodromou
2dc50d7e37
CSRF protection in user registration
...
darcs-hash:20080829054017-84dde-c9268e5c815934dcbca2451dd6c9016f2ac4a03a.gz
2008-08-29 01:40:17 -04:00
Zach Copley
47726844a0
CSRF protection in recoverpassword
...
darcs-hash:20080829052824-7b5ce-39a8fd299b7a85793ad7a19fe00c93813ca882b6.gz
2008-08-29 01:28:24 -04:00
Evan Prodromou
98e941753b
session token in userauthorization form
...
darcs-hash:20080829052847-84dde-a64918a75f8300ec8fb230202881691066147652.gz
2008-08-29 01:28:47 -04:00
Evan Prodromou
63438008e0
csrf protection in userauthorization
...
darcs-hash:20080829052732-84dde-0ebb7e32236b480cc3aa2eb7a4bb2b41ff6177d6.gz
2008-08-29 01:27:32 -04:00
Evan Prodromou
9b741c4f9a
better client error on CSRF problem with subscribe/unsubscribe
...
darcs-hash:20080829051628-84dde-2a339a35c422afb9ec04f757771764ed43b2c28b.gz
2008-08-29 01:16:28 -04:00
Evan Prodromou
4272da4e9e
CSRF protection for subscription/unsubscription
...
darcs-hash:20080829051104-84dde-9bd23c28c2c8a720046060a33ff3e5f246c47116.gz
2008-08-29 01:11:04 -04:00
Zach Copley
2e239e3fbb
CSRF protection in imsettings.php
...
darcs-hash:20080829035707-7b5ce-69a9ff98390ff8b9671ede948d78fdb37371aac6.gz
2008-08-28 23:57:07 -04:00
Zach Copley
6be7cbc5cd
CSRF protection in smssettings.php
...
darcs-hash:20080829035118-7b5ce-57613e88b29617ea422c7f7003e81ef885e3debb.gz
2008-08-28 23:51:18 -04:00
Evan Prodromou
6afb7f576e
add csrf protection to profile settings
...
darcs-hash:20080829043909-84dde-c70a633c93ab89560bc300817bda66eebf6176cf.gz
2008-08-29 00:39:09 -04:00
Evan Prodromou
9a65f45c45
CSRF protection in openidsettings
...
darcs-hash:20080829042908-84dde-1d1a22dfd3d89c5521aeb9069dc64c5f6dad3a27.gz
2008-08-29 00:29:08 -04:00
Evan Prodromou
d0a466bdb7
swap around some stuff to show the form correctly on a CSRF error in openidlogin
...
darcs-hash:20080829040925-84dde-7195734eeb3df6439c099c1139caf77e2c2ea3c1.gz
2008-08-29 00:09:25 -04:00
Evan Prodromou
42a6492152
CSRF protection for OpenID form
...
darcs-hash:20080829035934-84dde-cf36fd802bed76fdf15ac39b838494a414d5cc1e.gz
2008-08-28 23:59:34 -04:00
Evan Prodromou
d6dd35a66a
add a token for CSRF avoidance
...
darcs-hash:20080829034854-84dde-a636b446dc254aaa77ac65f63be01e49c192bf32.gz
2008-08-28 23:48:54 -04:00
Evan Prodromou
93e67c7133
show error in delete notice
...
darcs-hash:20080829025559-84dde-bd29b5e6750a1ff72bd39e8e76bde325b0313fb8.gz
2008-08-28 22:55:59 -04:00
Evan Prodromou
dd55916d56
CSRF protection in deletenotice
...
darcs-hash:20080829025127-84dde-b3e2eb64b7dd8302037f471f6dba6949e2e15ecc.gz
2008-08-28 22:51:27 -04:00
Evan Prodromou
d3c86d0016
add CSRF protection to avatar
...
darcs-hash:20080829023919-84dde-38e4bf6bddc120a221af5f856d9f88b7a532096b.gz
2008-08-28 22:39:19 -04:00
Evan Prodromou
d146355875
return after failed token
...
darcs-hash:20080829023731-84dde-8920bbaf1e1f171829d0acff3f89ec987deb6368.gz
2008-08-28 22:37:31 -04:00
Evan Prodromou
ff566a149d
add session token check to password change
...
darcs-hash:20080829014515-84dde-bce51f66ba0b3b4347a55a70b2b266b72c242304.gz
2008-08-28 21:45:15 -04:00
Evan Prodromou
b1ff7d7a2b
fix error storing uris of remote notices
...
darcs-hash:20080826211108-84dde-b277bdb1476b9cec0c0d93fa8d565c4642ba16c8.gz
2008-08-26 17:11:08 -04:00
Evan Prodromou
3fda5a684f
notify user of remote subscriptions
...
darcs-hash:20080824200517-84dde-9662d89dbcd948e3ef7b7f8d4e82d90b4891c684.gz
2008-08-24 16:05:17 -04:00
Evan Prodromou
a20a038542
be a little more liberal for sites that accidentally put whitespace before the xml decl
...
darcs-hash:20080824013803-84dde-9c5d9ce9c588cfb9baddae64366e3417f0a5fee9.gz
2008-08-23 21:38:03 -04:00
Evan Prodromou
7d6e1bb47f
request token is not readonly
...
darcs-hash:20080824011706-84dde-bf35373c3bfc631f8285f8630155195c3c5cc304.gz
2008-08-23 21:17:06 -04:00
CiaranG
92645bbc57
XMPP sub/unsub and help commands
...
darcs-hash:20080822191032-f6e2c-a3a7efbbaad1ec7c48ef132a8ba34fc8b8651969.gz
2008-08-22 15:10:32 -04:00
Evan Prodromou
ea40dabb39
better error reporting in user authorization action
...
darcs-hash:20080822212111-84dde-2770093fcfaa6fe03abb1143d3828f0622382b45.gz
2008-08-22 17:21:11 -04:00
Evan Prodromou
a91cd75c17
local-only is optional on public timeline
...
darcs-hash:20080822210307-84dde-c90f6e7953d11c5b12c7a084ac23e5578412932c.gz
2008-08-22 17:03:07 -04:00
zach
0b87bf6c54
Twitter-compatible API - RESTfulness checks as per Twitter
...
darcs-hash:20080819214923-462f3-83ab492cb93c1ba643beb70853578cbd7ac35d61.gz
2008-08-19 17:49:23 -04:00
zach
9c29b9ad62
Twitter-compatible API - /statuses/show - better err msg if notice doesn't exist
...
darcs-hash:20080819202318-462f3-bc08a105c6b41b6a89a2358962440f68a9a79c7f.gz
2008-08-19 16:23:18 -04:00
zach
e980ebc714
Twitter-compatible API - Added /statuses/followers to methods that
...
require bareauth only if no nickname/id is supplied.
darcs-hash:20080819195431-462f3-93d27cf980fd09aeb30ea741639c1650baecad60.gz
2008-08-19 15:54:31 -04:00
zach
55f5bea21e
Twitter-compatible API - /statuses/destroy method implemented
...
darcs-hash:20080819194610-462f3-eb736e4cfc817b479e1e8e52db03b5f44cdb3d2a.gz
2008-08-19 15:46:10 -04:00
zach
e440b9cea0
Twitter-compatible API - moved show() to the right file
...
darcs-hash:20080819003931-462f3-4b5b838a2fc5f872391581a189d33abdd8eeb744.gz
2008-08-18 20:39:31 -04:00
zach
d57bc1b8e9
Twitter-compatible API - running all strings through gettext() now
...
darcs-hash:20080819002903-462f3-94e62891db9b9de049a918034742e545f663e840.gz
2008-08-18 20:29:03 -04:00
Evan Prodromou
d1277820f8
add remote flag to broadcast of notices
...
darcs-hash:20080819182824-84dde-84d93fae2c4b0d6acee646999bad8e8bb9752c7b.gz
2008-08-19 14:28:24 -04:00
Evan Prodromou
0dce3d959b
broadcast remote notices
...
darcs-hash:20080819182724-84dde-d2cece72dfb7f4f9f5b5cb4574812fdd32daa601.gz
2008-08-19 14:27:24 -04:00
Evan Prodromou
ee858bc880
accept 140 chars in API, too
...
darcs-hash:20080817192710-84dde-47e8da809c930c7c4528e3cb920d9a448e56d4c0.gz
2008-08-17 15:27:10 -04:00
Evan Prodromou
1c021edad5
typo in forgotten password string
...
darcs-hash:20080817163324-84dde-0b7f3449b7f6e96704518340351ada9ec0e56bbb.gz
2008-08-17 12:33:24 -04:00
Evan Prodromou
bee7caaafc
debug for content too long
...
darcs-hash:20080817152419-84dde-5df1554695bd8560e5affa0ff74f7d0ab7c7c3ff.gz
2008-08-17 11:24:19 -04:00
Evan Prodromou
164a15d253
accept 140-character UTF-8 strings to content
...
darcs-hash:20080817151751-84dde-b3fc3ee57872f53a465fd9b45f4255e5e3be3450.gz
2008-08-17 11:17:51 -04:00
Evan Prodromou
5b01880685
name omb_listener param so we can refer to it in error msg
...
darcs-hash:20080816151057-84dde-e9df2c91a2711b235aa936a28e250715fc7c6d50.gz
2008-08-16 11:10:57 -04:00
zach
35d1714621
Twitter-compatible API: support for new in_reply_to_status_id in statuses/update
...
darcs-hash:20080815185317-ca946-11c3f9f7255180d5d6ea7b115b3e33b2abb7fe93.gz
2008-08-15 14:53:17 -04:00
zach
a95242bd1d
Twitter-compatible API: removed redundant decoding step; already taken care of by util.php's common_render_content()
...
darcs-hash:20080813193327-ca946-c0160fbcc04771e39e303470d3418e84973a8189.gz
2008-08-13 15:33:27 -04:00
Evan Prodromou
7554f2561c
move user registration to a single static method
...
darcs-hash:20080814002038-84dde-8505d4e083056b770db128129a95be639d8e7f0a.gz
2008-08-13 20:20:38 -04:00
Evan Prodromou
0bba990e2f
fix problem with new notices
...
darcs-hash:20080811181158-84dde-338f926bd4c161ea55ef8600fac254f216413ad4.gz
2008-08-11 14:11:58 -04:00
zach
3a124c5f53
Twitter-compatible API - /statuses/update.format now decodes HTML chars, such as &
...
darcs-hash:20080731224911-ca946-1cb52c7592d48174437c1896c41a4dd853a9e5c7.gz
2008-07-31 18:49:11 -04:00
Evan Prodromou
37c5e8ca3c
make tag dropoff configurable
...
darcs-hash:20080811175820-84dde-f3d934495fa90fadde5f7d5d0c37c5f2a575a9d8.gz
2008-08-11 13:58:20 -04:00
Evan Prodromou
12aba8ba32
emergency fixup for bad notices in notice search
...
darcs-hash:20080811175318-84dde-080db6e81589e794761daab868706704d39e2f1b.gz
2008-08-11 13:53:18 -04:00
Evan Prodromou
4c8dfadf2d
make init of lang environment happen earlier, or when user language may have changed
...
darcs-hash:20080806034515-84dde-e32cbfec2890f50b610d0441659180038b060473.gz
2008-08-05 23:45:15 -04:00
Evan Prodromou
f2203d1df6
better handling of unconfirmed email addresses
...
darcs-hash:20080804133253-84dde-4b1ceb6feabaaad503f8777d6f21545b2bb87e85.gz
2008-08-04 09:32:53 -04:00
Evan Prodromou
506843e55d
use an outstanding unconfirmed email address for password recovery if available
...
darcs-hash:20080804130914-84dde-77e1683ec76b26e9a3838d82cbe7827246db22dd.gz
2008-08-04 09:09:14 -04:00
Evan Prodromou
222b974b23
change no-such-user error to a 404 instead of a 400
...
darcs-hash:20080804132001-84dde-e6fae9837f87d80356317e4815516dd9ff03e674.gz
2008-08-04 09:20:01 -04:00
ehs
48fcfb8b0d
added conneg for action/userbyid so that foaf can be delivered to clients that want application/rdf+xml
...
darcs-hash:20080801164623-b1e77-1e8786743cc02e3d6f2320edff0f2f474f4ed76b.gz
2008-08-01 12:46:23 -04:00
Evan Prodromou
4bd68f89c3
ksort() the tags list
...
darcs-hash:20080731041000-84dde-09a4b1d69cc42b7380582d1a2f5d718b6e57dcd2.gz
2008-07-31 00:10:00 -04:00
zach
93d25bec33
Twitter-compatible API: implemented /users/show.format method
...
(and some API bug fixes)
darcs-hash:20080730213226-ca946-eb89bad91eee630ac286d537ba42f0042b8d2109.gz
2008-07-30 17:32:26 -04:00
Mike Cochrane
16daa87a39
Resolve conflicts
...
darcs-hash:20080731004922-533db-96d62078f226ffc18db71d222d1c47524ac1319d.gz
2008-07-30 20:49:22 -04:00
Mike Cochrane
9d89e7b4ac
Update some gettext strings and number the arguements so life is easier for translators
...
darcs-hash:20080729080641-533db-560337e226a02dd6fc671f090883d4bedd50eaaa.gz
2008-07-29 04:06:41 -04:00
Evan Prodromou
ba3ca4f6bb
show the right stuff on profile page, too
...
darcs-hash:20080730033939-84dde-21b90f9c8b5fcede12a71f12fee20a4faaf1c549.gz
2008-07-29 23:39:39 -04:00
Evan Prodromou
2090e0aa78
show where a notice came from
...
darcs-hash:20080730032651-84dde-0685ec5f899129bc75745ca8d1d083f56f3f1ff5.gz
2008-07-29 23:26:51 -04:00
Evan Prodromou
e998cc3960
remember to broadcast in api, and also use the right ID
...
darcs-hash:20080730030012-84dde-9ceea12e90a4b4b4bbe35cb6cb50b6bcbb6085b7.gz
2008-07-29 23:00:12 -04:00
Evan Prodromou
d79dc8344b
refactor notice-adding code to one static method on Notice
...
darcs-hash:20080730022856-84dde-f19e4ff5d5ae2603b63b8aebd8f878ec90b3ce22.gz
2008-07-29 22:28:56 -04:00
Evan Prodromou
575f705451
if-else instead of ?:
...
darcs-hash:20080729194735-84dde-246582a47d4a384375d153bff0e724c778c4b3af.gz
2008-07-29 15:47:35 -04:00
Evan Prodromou
f26ed46266
relative info, too
...
darcs-hash:20080729194457-84dde-fd0545edb3af519ccc43ee3ac50ad5eb14c35dad.gz
2008-07-29 15:44:57 -04:00
Evan Prodromou
8fd20f58e6
show the weight in output (for my own edification)
...
darcs-hash:20080729194246-84dde-4a47578d8727720097dab9362cb356bd8f4d2a7d.gz
2008-07-29 15:42:46 -04:00
Evan Prodromou
7d43f211c0
change tag output to a tag cloud
...
darcs-hash:20080729193533-84dde-1e7deeb0c7d7fb7686653be17d197e871aded8be.gz
2008-07-29 15:35:33 -04:00
Mike Cochrane
213ecbf35d
Correct variable name
...
darcs-hash:20080724234601-533db-c9fe139144a5ec9f58b8ab612331fa31bd55967b.gz
2008-07-24 19:46:01 -04:00
Mike Cochrane
278006e4cc
Lazy/Auto load the class files as needed
...
darcs-hash:20080724234533-533db-ec2e235401e7f670ee8094ba8d70dc95c3e6dd63.gz
2008-07-24 19:45:33 -04:00
mikec
a4fa34cecb
Resolve conflicts after pull from evan
...
darcs-hash:20080721135637-edabd-cca33bc0a0936423b9fd2ffdf9413236123d680e.gz
2008-07-21 09:56:37 -04:00
mikec
334c652e80
Publish MicroIDs for email and mpp on profile and notice pages.
...
darcs-hash:20080721120036-edabd-838335c0e23c80a657d353955b25b52a9a8624b2.gz
2008-07-21 08:00:36 -04:00
mikec
fbf2a58ac3
Get text wrappers around strings so they can be in the native language of the site and use fancy urls if appropriate
...
darcs-hash:20080721090110-edabd-aea47e1cbcc2527fdb0274cb29638d2abc108a35.gz
2008-07-21 05:01:10 -04:00
matthew.gregg
ed37d83fa3
Opensearch updates
...
This adds htaccess and searches for people and notices.
darcs-hash:20080720195505-982e4-3f03e6ab4c466ae131e025b6a3c26c7bb9a99c03.gz
2008-07-20 15:55:05 -04:00
Mike Cochrane
88717d8805
User definable timezones. Work in UTC internally and display per user/site default. http://laconi.ca/PITS/00011
...
darcs-hash:20080720141325-533db-87cb60501434c9dc0ac13716ba5d8b17754431f5.gz
2008-07-20 10:13:25 -04:00
Mike Cochrane
060fecf5ec
Clean up delete code. Add missing htaccess rule. Exit after errors so the code doesn't continue running.
...
darcs-hash:20080720124552-533db-81be2c04445f146e477b1bb7e6e8e7d0eb27431d.gz
2008-07-20 08:45:52 -04:00
Mike Cochrane
26f6c917a7
Fix errors from delete code when viewing a user's profile while not logged in.
...
darcs-hash:20080720122715-533db-64247879e336666835880cd3de10bc2ef27e46c7.gz
2008-07-20 08:27:15 -04:00
Mike Cochrane
3c56b10036
Add rel
...
darcs-hash:20080720101947-533db-a7ddbd4d33b492196cf9a4287dfbfa3e341d6f40.gz
2008-07-20 06:19:47 -04:00
Mike Cochrane
fdfb806801
Sort tags by highest frequency then most recent
...
darcs-hash:20080720094832-533db-91b0cf2e0589ca4008b3011d5acd41449caa0904.gz
2008-07-20 05:48:32 -04:00
matthew.gregg
e20362a60a
Adds Opensearch description
...
darcs-hash:20080720015823-982e4-b33e1ef01cd071e958c9c51625190513b86594f3.gz
2008-07-19 21:58:23 -04:00
matthew.gregg
6dd211530f
Patch for PITS 00032, 00033, 00034
...
darcs-hash:20080719003417-982e4-7004f8a4dfb447f941457c30b0b2289eee5582e6.gz
2008-07-18 20:34:17 -04:00
matthew.gregg
faa3933fbb
Added notice deletion http://laconi.ca/PITS/00045
...
Removes selected notice and any replies that reference it.
Attempts to de-queue anything pending.
This patch does not archive notices.
darcs-hash:20080716032045-982e4-a0b5d37ecfa84796f1681dda54110094ad1424c6.gz
2008-07-15 23:20:45 -04:00
Mike Cochrane
1467300152
Set constant to propper value, not debug value
...
darcs-hash:20080720082641-533db-fa5b327a6670fd77f55cc028fc3a3a66664d4bb3.gz
2008-07-20 04:26:41 -04:00
Mike Cochrane
f08fe3d1c2
Add tag action
...
darcs-hash:20080720081838-533db-bfe217657f0c3327fa8facc66b41b00f6c8f1948.gz
2008-07-20 04:18:38 -04:00
Mike Cochrane
5d84485001
First cut at hastags support.
...
darcs-hash:20080720055702-533db-193ed842b0d0a952bef71a3c5287213ada0ef15c.gz
2008-07-20 01:57:02 -04:00
Mike Cochrane
4b8ae3e339
Resolve conflict
...
darcs-hash:20080714025853-533db-e215a2ab0277acafc1c01d2c12c20ec452ed53e2.gz
2008-07-13 22:58:53 -04:00
Mike Cochrane
d9aea8cb9a
Fixed location of bracket for gettext.
...
darcs-hash:20080713053033-533db-c1b4e827abd764dc173173556ec889290b0643bf.gz
2008-07-13 01:30:33 -04:00
Evan Prodromou
2e0b64a9ba
add local flag for stuff posted over the API
...
darcs-hash:20080727023516-84dde-7ebc4ccc8065dd1df9a414d5c39df70dbfebf487.gz
2008-07-26 22:35:16 -04:00
Evan Prodromou
e97c06e8e2
let admins prevent registration
...
darcs-hash:20080724235508-84dde-8bac4d9dd772adb9f27d083b3d0b6ed5b7526dbf.gz
2008-07-24 19:55:08 -04:00
Evan Prodromou
3a262a3bcd
ensure that there's a session before redirecting the user
...
darcs-hash:20080724231833-84dde-965c41484ecf9b85b1979e8ac76314a6b0d951ee.gz
2008-07-24 19:18:33 -04:00