Commit Graph

575 Commits

Author SHA1 Message Date
csarven
8286fd1281 Fixed duplicate @class assignment to element
darcs-hash:20081208215420-eefa4-25bc0ed6c14d9031e8343e89c2cf6bde6ce35521.gz
2008-12-08 16:54:20 -05:00
Evan Prodromou
cd5eec767a add an unblock form
darcs-hash:20081208173722-5ed1f-fcdcb49e4958854ce9872beecee409737cacecb5.gz
2008-12-08 12:37:22 -05:00
Evan Prodromou
17fd7b1850 add returnto information to the block form
darcs-hash:20081208170931-5ed1f-e7c5853e6a222b04723f20c01ebaae15eeab3687.gz
2008-12-08 12:09:31 -05:00
Evan Prodromou
5915e15412 add block name to block form
darcs-hash:20081208072519-5ed1f-10e7d3e14e54f0d67c58504adbc4c81f3228944a.gz
2008-12-08 02:25:19 -05:00
Evan Prodromou
49adb8b552 add fancy url for block action
darcs-hash:20081208071521-5ed1f-1178a3c50f94c039d98112620e8bf78836e659bc.gz
2008-12-08 02:15:21 -05:00
Evan Prodromou
9b4df5056f add block form to subscribers list and profile page
I added a small form for blocking users to profiles in the profile
list, and also to the profile page.

I also added an action to handle the results of blocking someone.

This required some changes to the profile list class (so I could
add the block form), so I made them. And the gallery class lets its
subclasses return a subclass of ProfileList for their profile list.

darcs-hash:20081208055511-5ed1f-e2e09986bd3b9cbb6a00a0c6b94f49ea78b7bdab.gz
2008-12-08 00:55:11 -05:00
Evan Prodromou
ba8cc0df59 don't save replies from a blocked profile to the blocking user
darcs-hash:20081208031408-5ed1f-dfdb46fbcf5390d890b4db47c64da0b70ace8096.gz
2008-12-07 22:14:08 -05:00
Evan Prodromou
fd6df5402e pass profile id for subscriptions rather than user name
darcs-hash:20081208031312-5ed1f-b570b86b28e8eda763c51be1ae091034f76bd984.gz
2008-12-07 22:13:12 -05:00
Evan Prodromou
71c8d90378 add class to body element
darcs-hash:20081208055023-84dde-5ae95497ae63584f7b86e63eb62ed13607ee1ee8.gz
2008-12-08 00:50:23 -05:00
csarven
33a054ccc0 trac855 trac856 and Feed list for the Favorited page
darcs-hash:20081205221402-eefa4-9c765fe3c7a6e0cf9cdee1749ed2bebb24d3deaf.gz
2008-12-05 17:14:02 -05:00
millette
9c3c1e0272 trac494 email is now in recipient's language
darcs-hash:20081204203433-099f7-41be8f47b2a8e647414225f26318da005144006d.gz
2008-12-04 15:34:33 -05:00
millette
6eb5060621 done delete own profile (see other settings)
darcs-hash:20081204180233-099f7-7728ee57876b789278aa1cc35f54e0a422593e5d.gz
2008-12-04 13:02:33 -05:00
Evan Prodromou
acb00a903e unsubscribe from a remote profile
darcs-hash:20081203180945-5ed1f-747b3c0e00ced81c02953e1095a9b866a7876c43.gz
2008-12-03 13:09:45 -05:00
Evan Prodromou
f41e531737 fix conflict with Robin's changes on trunk
darcs-hash:20081203041730-5ed1f-1e1910cec75546291b14386d91f3bd22ae06b750.gz
2008-12-02 23:17:30 -05:00
Evan Prodromou
4b586436c8 better microformats from @singpolyma
darcs-hash:20081203035947-84dde-68ce5b3ba2b49bd76e9ef8572cea7857cd05a659.gz
2008-12-02 22:59:47 -05:00
millette
5878647c55 use label tab for checkboxes
darcs-hash:20081128223646-099f7-79b7c961b4494ff7430bd3c0a0f4742888098ede.gz
2008-11-28 17:36:46 -05:00
millette
ce08833303 shorten urls for posts > 140 chars only, from anywhere. Only show long urls in title attributes for links we shortened ourselves.
darcs-hash:20081128210114-099f7-4e4cde0a983c2ac6d41efb59b46cb7dbf45dc7a6.gz
2008-11-28 16:01:14 -05:00
millette
4fca9960cd only expand URLs we shortened ourselves + only shorten if notice > 140 chars
darcs-hash:20081128200004-099f7-085c833e3e34b2a13b5b3ec3b1316e7948ff196f.gz
2008-11-28 15:00:04 -05:00
millette
aa29ebf9f4 a step closer to deleting a user and hosts posts from the db
darcs-hash:20081124005054-099f7-a7b20c1e15900e1c696a33902a6612b8be2387fa.gz
2008-11-23 19:50:54 -05:00
Evan Prodromou
44a683bfab add some transaction voodoo to the insert for rememberme cookies
darcs-hash:20081209185424-84dde-d439346477811043ae471c5e68644b326b016713.gz
2008-12-09 13:54:24 -05:00
Evan Prodromou
60a43519b9 slightly better reporting when setting rememberme cookies
darcs-hash:20081209175446-84dde-ae63433fa42debe8fb2eb3862cac0b9f81f1e6de.gz
2008-12-09 12:54:46 -05:00
Evan Prodromou
7cbd2c4e1e common_warning() doesn't exist
darcs-hash:20081209174233-84dde-a5593f20cce3af07909ef9b3af7497ff61565fd3.gz
2008-12-09 12:42:33 -05:00
Evan Prodromou
6179d2d236 cache current user in a global variable
darcs-hash:20081209173402-84dde-eb1c47ddbf45a831379f6571729187267411ed07.gz
2008-12-09 12:34:02 -05:00
Evan Prodromou
ed440c734e better error reporting for rememberme cookie handling
rememberme cookies are probably the most complained-about parts of the
system. We use "weak", one-use, low-info cookies that don't allow
changing settings like passwords or email addresses.

This change adds some better error-reporting to the rememberme
function. Hopefully we'll find out if there are other rm problem.

darcs-hash:20081209170413-84dde-6845ae5524d3ee1d1a491548bb22386f11f0e867.gz
2008-12-09 12:04:13 -05:00
Evan Prodromou
5eb729b5d5 whitespace cleanup
darcs-hash:20081203032743-5ed1f-87f9b170e87d5e010564b6f3c6dc7b3ca2b9c719.gz
2008-12-02 22:27:43 -05:00
Evan Prodromou
06c7933168 add common_compatible_license() function
darcs-hash:20081203032705-5ed1f-c425d8aef897b4223db3f2cb0250ed6fbe816f67.gz
2008-12-02 22:27:05 -05:00
Evan Prodromou
6d355a9d60 correct the output formats for api user timelines
darcs-hash:20081124234115-5ed1f-4a136027fddd625c39f14b5ec2e3e9d0fd0a6b3b.gz
2008-11-24 18:41:15 -05:00
Evan Prodromou
a1da43417e support microsummaries
darcs-hash:20081124223533-5ed1f-1ae78e694043cef14d528dcd4201301eec8ad61b.gz
2008-11-24 17:35:33 -05:00
Evan Prodromou
02573ef6ce incorrect use of match results
darcs-hash:20081124040224-84dde-ca5e732949bf2f837b4d99f7fe705f0fd74b9a48.gz
2008-11-23 23:02:24 -05:00
Evan Prodromou
48c2d39ae4 little better handling of @#
darcs-hash:20081124035814-84dde-a0ccc1b19cd1dc1d3fed16d2dbe3ac712a0a986b.gz
2008-11-23 22:58:14 -05:00
Evan Prodromou
f8fa9a942f Make replies to @#
darcs-hash:20081124034952-84dde-e059f0800780de879ffa922e5ce379682a4f275a.gz
2008-11-23 22:49:52 -05:00
Zach Copley
3c8b7d0c22 Added 'Help' menu item to the header menu (in addition to the footer menu)
darcs-hash:20081123212532-7b5ce-0d5f6761f232975d721f02d16e90ad6d5dcf02d6.gz
2008-11-23 16:25:32 -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
Evan Prodromou
6af0534ea7 fix tag links in subs
darcs-hash:20081121154218-84dde-3c805fe52692950edd397ac184f68c09095419a7.gz
2008-11-21 10:42:18 -05:00
Evan Prodromou
75f107823e fancier urls for tagged subscriptions/subscribers
darcs-hash:20081121025749-84dde-9fd9a98c23ecabd1c1615dec938edbd4be884aec.gz
2008-11-20 21:57:49 -05:00
Evan Prodromou
cf54010e75 fancy url for tagother
darcs-hash:20081121005216-84dde-5dea247b1c64f276cf2b2b5d3d6ce51ba3d9d615.gz
2008-11-20 19:52:16 -05:00
csarven
171bedf24b (Un)Subscribe form using ajaxForm()
darcs-hash:20081120232655-eefa4-cf6a71e246828793d3bfa413db724ab33bc58bcf.gz
2008-11-20 18:26:55 -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
6f31f25105 let users set their own profile tags from profilesettings
darcs-hash:20081120214821-84dde-c8569ef645b389de545f78bf01a270f28b871f02.gz
2008-11-20 16:48:21 -05:00
Evan Prodromou
168693b103 common_(un)subscribe_form
darcs-hash:20081120203528-84dde-2b8d14a491ea4d44bebfdd4e4a3041dde3b375c1.gz
2008-11-20 15:35:28 -05:00
csarven
a8b7d0a7b5 Copy of (un)subscribe forms in util.php
Will remove the copies in showstream.php once everything is okay.

darcs-hash:20081120202448-eefa4-e2d294d906b0ff90f9977606d18ea6655a944452.gz
2008-11-20 15:24:48 -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
49bb4a7b84 add all params to subscribers
darcs-hash:20081120144300-84dde-bb02bac8053dacb470eeb357cdd43007c361cc9a.gz
2008-11-20 09:43:00 -05:00
zach
41b8c91c6b trac685 Twitter bridge - Sync Twitter friends
darcs-hash:20081117024624-462f3-91f148111c2c43ddd302fc63cfa8c8ef14e1f38e.gz
2008-11-16 21:46:24 -05:00
millette
9f1b4b3ed6 small nudge enhancements
darcs-hash:20081118155643-099f7-df2d332253d9acc007966b28f5afc2edcd7cc9ac.gz
2008-11-18 10:56:43 -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
2dd4857dac trac626 Bugfix: Atom URL missing a dot
darcs-hash:20081114214315-eefa4-f21edae797a7c9c685dd00c858731b173337bf85.gz
2008-11-14 16:43:15 -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
millette
0275676931 escaping was not needed at all to process short urls. Real fix.
darcs-hash:20081114195457-099f7-45f4f39d5f2eff980d903ca156170576323ec4a7.gz
2008-11-14 14:54:57 -05:00
millette
1227c9c2c2 fix longurl title attribute, removing extra backslashes.
darcs-hash:20081114192649-099f7-338368278173f5fa130e508316f5b8b252d90214.gz
2008-11-14 14:26:49 -05:00
millette
0e7541e9da silly escape problem with quotes, fixed.
darcs-hash:20081114173242-099f7-7cc37f036cc564ecde029bfce00b313eb047232c.gz
2008-11-14 12:32:42 -05:00
Evan Prodromou
e5abdb06fc add quotes to longurl title
darcs-hash:20081114142228-84dde-cc4a966817a1977282ef9a6845613ed5ec6c4e88.gz
2008-11-14 09:22:28 -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
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
2a8a0c9399 trac31 revert the "don't shorten URLs prefixed with a *" patch since we automatically shorten in notices > 140 chars
darcs-hash:20081107222100-099f7-18b3fc1c4e6939cdbc7a811a7df6f0e08068ea01.gz
2008-11-07 17:21:00 -05:00
millette
9c3eb0d361 trac31 don't shorten URLs prefixed with a *
darcs-hash:20081107203039-099f7-a059dab8d6b7909c309eacf5ef929408c3c6c6e0.gz
2008-11-07 15:30:39 -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
0bc9d9d032 trac31 added othersettings fancy url
darcs-hash:20081106224006-099f7-b1dee734b54c8426f386fd1eb0bf2f45bee302f9.gz
2008-11-06 17:40:06 -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
CiaranG
a50a159bf0 Fix to previous fix :(
darcs-hash:20081007155038-f6e2c-edf0c68026daa174123533af92edc5318a611ba0.gz
2008-10-07 11:50:38 -04:00
CiaranG
33b0410723 Only log locale sets that fail
darcs-hash:20081007145232-f6e2c-15812a2576e1ec270e26dcd61bbec5d07b2b7f05.gz
2008-10-07 10:52:32 -04: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
854e208c05 heuristics for paren linking (thanks @brion!)
darcs-hash:20081102090241-5ed1f-f5278c69aa0c7427294b40b91f8957530b07062f.gz
2008-11-02 04:02:41 -05:00
zach
3b62407067 Twitter bridge - change regex to look for mb @-replies
darcs-hash:20081027191629-462f3-ff16a45754e2370f62ebac06dc38c51981bb6ee6.gz
2008-10-27 15:16:29 -04:00
Evan Prodromou
91ce2ecd70 handle seconds argument to SUP
darcs-hash:20081026150623-5ed1f-2aff71bf8faf4957b09d968d60851b4f74f738c4.gz
2008-10-26 11:06:23 -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
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
a7c41c87b1 force util.js to reload on version change
darcs-hash:20081020174231-5ed1f-03ae9fa6cfde7d224fbf7fa81f8d9a577b89a7b5.gz
2008-10-20 13:42:31 -04:00
Evan Prodromou
cebcec1950 don't overwrite replies in notices
darcs-hash:20081020170828-5ed1f-9172e6ee88e1e70bfbd6695b44bfb82eef690c4b.gz
2008-10-20 13:08:28 -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
db236870c6 Twitter bridge - was checking the wrong bit (!) for reply sync preference
darcs-hash:20081007004432-462f3-6385dcaf69cbcf18ce36a45dc17f5e8b9a19ba31.gz
2008-10-06 20:44:32 -04:00
Zach Copley
654f9b8c97 Twitter bridge -- more explicit checking of noticesync bits
darcs-hash:20080926190543-7b5ce-b67b1f2a27825a38782ea8a7a11cc5f50e49725a.gz
2008-09-26 15:05:43 -04:00
CiaranG
b49c2f051a Combined language patches that got missed due to repo dependencies
darcs-hash:20081002181338-f6e2c-cf9cf3791680634fa457cb83dc2e4f933073a9b1.gz
2008-10-02 14:13:38 -04:00
Evan Prodromou
47edd73581 fancy url for favorites rss
darcs-hash:20080928175626-5ed1f-cb8775fbff6825e56378f4b900f496cbc6cb3678.gz
2008-09-28 13:56:26 -04:00
Evan Prodromou
82084ab74c move memcache connections to util.php
darcs-hash:20080926200102-5ed1f-debbc18981424d7724277ac82e5fbfd5e797090e.gz
2008-09-26 16:01:02 -04:00
Evan Prodromou
72b4196db1 correct url for new message form
darcs-hash:20080924210254-5ed1f-2c6fd16b9be0dafb3b72ef23b53193db5e188b46.gz
2008-09-24 17:02:54 -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
59682f24d0 change the rule for detecting replies.
darcs-hash:20080924200710-5ed1f-be75fac6babb59469a1967436c32f0d8c8271680.gz
2008-09-24 16:07:10 -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
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
Zach Copley
285f062197 Twitter bridge - Bugfix: You can now turn off brige via prefs
darcs-hash:20080923231921-7b5ce-751490e59ae0a76cebf83eea98da902a63e39645.gz
2008-09-23 19:19:21 -04:00
Zach Copley
6548c6cd18 Added option to add disable attr to common_checkbox()
darcs-hash:20080923213829-7b5ce-da5c5d25639812403eb59787c4c429cc9931d08a.gz
2008-09-23 17:38:29 -04:00
Zach Copley
04b95c25ad Twitter bridge: Hack to get around PHP cURL's use of @ as a metachar,
which was keeping @reply messages from getting posted to Twitter.

darcs-hash:20080923083632-7b5ce-02498acc9fba3070b984eb473ec7825a5eaa2a77.gz
2008-09-23 04:36:32 -04:00
Evan Prodromou
cf34bd5da5 make it look like a query
darcs-hash:20080923065211-5ed1f-7d028a9e42be5ba1151a172d0a4e81f4c618dd2e.gz
2008-09-23 02:52:11 -04:00
Evan Prodromou
07500a8d8b append LACONICA_VERSION to css files to force reload
darcs-hash:20080923065021-5ed1f-cef0ed94149b862aa4bf3b1d0189d6fb6d15aaf7.gz
2008-09-23 02:50:21 -04:00
Evan Prodromou
e24425d44e correct a couple of bugs
darcs-hash:20080922190937-5ed1f-9439cd9cff178323ac1445f33e2520260b4b267e.gz
2008-09-22 15:09:37 -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
cdf125c3e4 correct urls from fancy url for show-message
darcs-hash:20080917185950-5ed1f-27fc1ee8d68df57b8dd687eb4e701beba2269924.gz
2008-09-17 14:59:50 -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
7f8aaf46c8 move rendering stuff that doesn't depend on notice to a separate function
darcs-hash:20080917112730-84dde-d8bf234bf2a0bf0aca17d653c3cdf57a76ad1a00.gz
2008-09-17 07:27:30 -04:00
Evan Prodromou
00eb929c6b use common_local_url() in tagging, add canonicalization function
darcs-hash:20080917112234-84dde-69fb6c2dc279b8fffd5c524673808d8991e99429.gz
2008-09-17 07:22:34 -04:00
CiaranG
b57182a8ef Get correct configured language when all else fails
darcs-hash:20080916172706-f6e2c-762079233fd311ac6f1995415beb36d60484c496.gz
2008-09-16 13:27:06 -04:00
Zach Copley
6b42c984ee Twitter integration - added $config option for source attribute when posting to Twitter
darcs-hash:20080907062118-7b5ce-b4412446bbf245b1d14a78b01ecde0f71f621185.gz
2008-09-07 02:21:18 -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
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
412eae10fe Twitter integration - Notices now broadcast (directly) to Twitter from linked accts.
darcs-hash:20080828192509-7b5ce-8387c67500c082eb5a0107c0f78d4cf5620825af.gz
2008-08-28 15:25:09 -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
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
04f87895ba make favorites form use Ajax
darcs-hash:20080908211610-84dde-8a7819ee8733cf73a778c2448c93974e2adecca7.gz
2008-09-08 17:16:10 -04:00
Evan Prodromou
b4db40ce1d write our own submit so there's no <p>
darcs-hash:20080908202226-84dde-bf0bf0d67f1f9a9e4cf70bc20fb12b4ca736b594.gz
2008-09-08 16:22:26 -04:00
Evan Prodromou
9dafde2c9f styling on the favor/disfavor forms to show inline
darcs-hash:20080908201751-84dde-a498395d26b957b72350d8075d056b661a1f77c7.gz
2008-09-08 16:17:51 -04:00
Evan Prodromou
0075f1136f better styling for favor/disfavor buttons
darcs-hash:20080908183515-84dde-7630e2185aa2f0a4e95e3eb8502294361d9879e5.gz
2008-09-08 14:35:15 -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
c47a576f6c change input buttons to submit buttons
darcs-hash:20080908182353-84dde-c2825731b071e140b8bf8f633246eddc7c5b1f3c.gz
2008-09-08 14:23:53 -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
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
a442d4d04a fix the invite url
darcs-hash:20080825193450-84dde-a9a2e16b65c21a22adcb5574c4040d401513e961.gz
2008-08-25 15:34:50 -04:00
Evan Prodromou
245b9584bf invite fancy url
darcs-hash:20080825193333-84dde-d02930a6e8c2333cbaa3ec4cddb7e31d1cbaf3eb.gz
2008-08-25 15:33:33 -04:00
Evan Prodromou
1b7e8405c9 add invite to the nav menu
darcs-hash:20080825193235-84dde-fb91c560029b3aa7c73709dba57e00d3cc7f5122.gz
2008-08-25 15:32:35 -04:00
Evan Prodromou
ec3c936234 use common-config instead of $config in common_language
darcs-hash:20080922172631-84dde-357c532ac1fb1e2fec54680eb9d294a2ede23ab0.gz
2008-09-22 13:26:31 -04:00
Evan Prodromou
f246b8f2d7 cache noticesWithFriends in memcached
noticesWithFriends is turning out to be one of our most expensive
queries. The join is costly, and this method is hit over and over and
over by desktop clients and other API users.

So, I've added a first pass at caching the results. I store a "window"
of notices -- equal to the first 3 pages of notices, plus one for
pagination -- in the memcached cache. If with-friends notices are
requests, I fetch the whole window out of the cache and grab the slice
requested. If the requested notices are outside the window, we just do
the query. If there's nothing in the cache, we request the window and
store it, then return a slice.

I had to add a NoticeWrapper class that works like DB_DataObject
(well, just the fetch() part...) but just holds an array of notices
instead of a DB cursor.

Finally, saving a new notice blows away the caches for subscribed users.

darcs-hash:20080915065616-84dde-1b1e814c2294498a10b763b779cbb62c3f96aa84.gz
2008-09-15 02:56:16 -04:00
Evan Prodromou
f72b12c7b8 better @ links
darcs-hash:20080904224129-84dde-6844b29ab1818954aacaf6d9ef11371dbb11812a.gz
2008-09-04 18:41:29 -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
51caab6e5e Elide_Tags
Make "#sanfrancisco", "#SanFrancisco", "#san_francisco", "#San.Francisco", and "#SAN-FRANCISCO" all link to http://identi.ca/tag/sanfrancisco but preserve appearance

darcs-hash:20080901025932-e3c0d-c0a939eaf7e242d88cbcb0d651c9d53718c60a9d.gz
2008-08-31 22:59:32 -04:00
Garret Buell
cca78b26f7 Allow_multicase_tags
Make "#test", "#Test", and "#tEsT" all preserve appearance but link to the same tag

darcs-hash:20080901001241-e3c0d-b466f35f4f023c6c90a6d2817487c97be9a1bbca.gz
2008-08-31 20:12:41 -04:00
Garret Buell
e333345722 Tags_without_fancy
Change common_tag_link to format the tag link based on the setting of $config['site']['fancy']

darcs-hash:20080831233401-e3c0d-4e0e43f5a53a6659c49d65a2b1f2a47c5cdec228.gz
2008-08-31 19:34:01 -04:00
Evan Prodromou
439c14d986 use common log in error handler rather than echo
darcs-hash:20080830053052-84dde-279d1c52e9b8696079ba686009ce2d71725a690e.gz
2008-08-30 01:30:52 -04:00
Evan Prodromou
c4d6789275 split public stream to its own queue handler
Add another queue handler for the public stream. Should further
parallelize the work of sending out messages.

darcs-hash:20080829181702-84dde-594505aa73d2380b13bd98917b70b02bac597d12.gz
2008-08-29 14:17:02 -04:00
Evan Prodromou
f652418863 harmonize csrf and queues
darcs-hash:20080829174012-84dde-4859ce0a34a50080f8376fa3278c3aa3e3a3046d.gz
2008-08-29 13:40:12 -04:00
Evan Prodromou
241881238c misprint of omb as oms
darcs-hash:20080828012619-84dde-f7e993f345220d3642743e9f2567d7f8e6e4b6ce.gz
2008-08-27 21:26:19 -04:00
Evan Prodromou
7887147603 change return in queue function
darcs-hash:20080828001414-d018c-fa900f60f0af20c01e8b83a74834ddf46829f4b2.gz
2008-08-27 20:14:14 -04:00
Evan Prodromou
cd5dc3246e got two lines reversed
darcs-hash:20080827211940-84dde-d5b404023a2fb6b74b6255dd91910c9ec7df3cc6.gz
2008-08-27 17:19:40 -04:00
Evan Prodromou
b9f0ea6f0e break up monolithic xmppdaemon into multiple queue handlers
Eventually, the poor xmppdaemon has become overloaded with extra
tasks. So, I've broken it up. Now, we have 5 background scripts, and
more coming:

* xmppdaemon.php - handles incoming XMPP messages only.
* xmppqueuehandler.php - sends notices from the queue out through XMPP.
* smsqueuehandler.php - sends notices from the queue out over SMS
* ombqueuehandler.php - sends notices from the queue out over OMB
* xmppconfirmhandler.php - sends confirmation requests out over XMPP.

This is in addition to maildaemon.php, which takes incoming messages.

None of these are "true" daemons -- they don't daemonize themselves
automatically. Use nohup or another tool to background them. monit can
also be useful to keep them running.

At some point, these might become fork()'ing daemons, able to handle
more than one notice at a time. For now, I'm just running multiple
instances, hoping they don't interfere.

darcs-hash:20080827205407-84dde-97884a12f5f4e54c93bc785bd280683d1ee7e749.gz
2008-08-27 16:54:07 -04:00
Evan Prodromou
1df845db78 fix random function name
darcs-hash:20080829021854-84dde-818492a31c07dd0921c2a693095ca7ac901b6d35.gz
2008-08-28 22:18:54 -04:00
Evan Prodromou
54bee1b999 code for session token
darcs-hash:20080829015304-84dde-1c93203bdfbd4c1696cdd3c07212ff16a9f727dd.gz
2008-08-28 21:53:04 -04:00
Evan Prodromou
cf3902d8ac get language before setting it.
darcs-hash:20080828005323-84dde-8f69e1e6115faa544c22436539148dac53ed6f65.gz
2008-08-27 20:53:23 -04:00
Evan Prodromou
4cc84c3225 never allow blank passwords
darcs-hash:20080825185245-84dde-f2ad86c1aedc2a42f7b468775234be53a7e84d5b.gz
2008-08-25 14:52:45 -04:00
Evan Prodromou
cba4b50e44 use common_sql_now() instead of DB_DataObject_Cast
darcs-hash:20080825182338-84dde-ec0edef9469b294b7e23945f1bc7d810da988ed7.gz
2008-08-25 14:23:38 -04:00
Evan Prodromou
e8e91dc29d use UTF-8 as the internal encoding
darcs-hash:20080817153024-84dde-ca566d665fff08d52f1f9796e2731417585d4c6f.gz
2008-08-17 11:30:24 -04:00
Evan Prodromou
2c3ed64027 LOG_ERROR -> LOG_ERR (again)
darcs-hash:20080807234227-84dde-a64619c71de020aa2284ca1a36ea2a71ff8b29a6.gz
2008-08-07 19:42:27 -04:00
Evan Prodromou
80aa8b83db fix config global
darcs-hash:20080806122119-84dde-41fb0645db58ac5ce74b485c8cb68f7275e74915.gz
2008-08-06 08:21:19 -04:00
Evan Prodromou
0d58d4216b fixup locale stuff from mikenz
darcs-hash:20080806040433-84dde-a504751a8a0329a37d866e68a9ecda6a5d629c55.gz
2008-08-06 00:04:33 -04:00
mikec
369354505f Set the C locate to avoid tr_TR php bug see http://www.topolis.lt/php/#35050
darcs-hash:20080804133727-edabd-4bd34431d0ab8519ec512b59be354720925da9a0.gz
2008-08-04 09:37:27 -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
b1f28f4457 try to slim down the top menu so it all fits
darcs-hash:20080731020933-84dde-80d7abb2d681a9f748b16f6245d33396e1f899b2.gz
2008-07-30 22:09:33 -04:00
Evan Prodromou
f2ae665e13 let @rejon do the homework http://ur1.ca/17c
darcs-hash:20080731020433-84dde-641127c2de488087c1525fc773d544ba5b136550.gz
2008-07-30 22:04:33 -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
353aa5a0d8 move the language info, fix dir for locales
darcs-hash:20080730035446-84dde-8ce202ea6956bb49e1be98307136fc299862ab9b.gz
2008-07-29 23:54:46 -04:00
Evan Prodromou
4577182d2c rel
darcs-hash:20080729182558-84dde-3f3eab4da119cf57fb55896b114146fd72007824.gz
2008-07-29 14:25:58 -04:00
Evan Prodromou
7e8a58923f change 'deletenotice' to 'notice/delete'
darcs-hash:20080726034209-84dde-02b25960aeb361319f8037b17aed6290d477cf7b.gz
2008-07-25 23:42:09 -04:00
Evan Prodromou
b5bd567668 Queue_item correct name in dequeue function
darcs-hash:20080726033958-84dde-09d117b3e5bb997ddfd6548806ce7a51a38434e7.gz
2008-07-25 23:39:58 -04:00
Mike Cochrane
dd3ae36084 Cache the DateTimeZon objects
darcs-hash:20080724234619-533db-015a2751ade3b5b8befb8a735fe89acd4742c4b9.gz
2008-07-24 19:46:19 -04:00
Mike Cochrane
22c51b27ef No errors if it's not set
darcs-hash:20080722082840-533db-6df7b1fe05bbcaef6862d3e9b5ee3bcd277523e7.gz
2008-07-22 04:28:40 -04:00
Mike Cochrane
334b840c3e Only Set reply details if there is something to reply to
darcs-hash:20080722082724-533db-ead12f037aa716dc548d6a4b04493ada5049ec96.gz
2008-07-22 04:27:24 -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
de81e92f0b Strip characters that shouldn't be in xml. Fixes http://laconi.ca/PITS/00253 for future messages, or all after a regeneration of rendered messages
darcs-hash:20080720122832-533db-7fda43b257160b90788f0d860d50df995d463ee8.gz
2008-07-20 08:28:32 -04:00
Mike Cochrane
bd0b6970ae Fix undefined variable error
darcs-hash:20080720100024-533db-d2b5b63f169b6e16e08e81c8da63b7f9f69e7521.gz
2008-07-20 06:00:24 -04:00
Mike Cochrane
92e90ee636 Notice error
darcs-hash:20080720094917-533db-386e12dbeabcfb9bc74cdce11e6bc197964929b7.gz
2008-07-20 05:49:17 -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
5d84485001 First cut at hastags support.
darcs-hash:20080720055702-533db-193ed842b0d0a952bef71a3c5287213ada0ef15c.gz
2008-07-20 01:57:02 -04:00
Mike Cochrane
e4f1d6f504 More notice errors and fix and incorrect variable name
darcs-hash:20080720055558-533db-781488916e178921f1bcd6ea141df10c1a0ace55.gz
2008-07-20 01:55:58 -04:00
Evan Prodromou
e0e5013a32 don't show register link if the site is closed
darcs-hash:20080724235804-84dde-daf159e938289ad2d593d3825ce845bcbecac053.gz
2008-07-24 19:58:04 -04:00
Evan Prodromou
905ba4998b fix content check so it shows zeros
darcs-hash:20080722163618-84dde-5a519a92a84bb94de225fbb3da61af51cfdfdef4.gz
2008-07-22 12:36:18 -04:00
zach
140689800b Twitter-compatible API - Error handling that better matches Twitter's
darcs-hash:20080720070905-ca946-dda57dd92210461361fd58b7a3244bf24c01e801.gz
2008-07-20 03:09:05 -04:00
Evan Prodromou
0876b60006 rewrite for settings of sms
darcs-hash:20080721083758-84dde-76534893df215e9754c00c1e0a6d6351f64f1818.gz
2008-07-21 04:37:58 -04:00
Evan Prodromou
3372a98f8e add sms broadcast to broadcasting
darcs-hash:20080720195549-84dde-4193f27f8efda497fbe55f1c514fe30e4dd8a69d.gz
2008-07-20 15:55:49 -04:00
Evan Prodromou
5fd0a788d5 start sms settings
darcs-hash:20080720193005-84dde-97e098996309550dc98b658923d84620e7715c69.gz
2008-07-20 15:30:05 -04:00
Mike Cochrane
a1515e5411 Some more notice errors - I guess I'm the only one developing with E_ALL
darcs-hash:20080720033236-533db-95f6a169f73e69549a8ff0eefb0e4c8ba21f090e.gz
2008-07-19 23:32:36 -04:00
Mike Cochrane
08dfd72bad A couple more notice errors
darcs-hash:20080720025546-533db-7044949bfaa6676c86f3e1d84d20ecb85aab0937.gz
2008-07-19 22:55:46 -04:00
Mike Cochrane
32136f978a Another notice error
darcs-hash:20080720023510-533db-74cdcbc59c5956c1bd1ce3b01921fd4cd1c7376c.gz
2008-07-19 22:35:10 -04:00
Mike Cochrane
e59cfea9bc Fix a couple of notice errors
darcs-hash:20080720023259-533db-6a4e8abb730b2192fcf2887a665dee2e1048529a.gz
2008-07-19 22:32:59 -04:00
Evan Prodromou
54a931a31a LOG_ERROR -> LOG_ERR
darcs-hash:20080718190835-84dde-1ce20cb3ac604f0e9fa9e4ed86118bca7bec3a06.gz
2008-07-18 15:08:35 -04:00
zach
42bbd38417 Twitter-API: /account/verify_credentials.format now works
darcs-hash:20080718040332-ca946-0c8da4f5e98355ccbb1ee929693fa74bff3c2481.gz
2008-07-18 00:03:32 -04:00
zach
ac2d811a46 Twitter-compatible API - code cleanup
darcs-hash:20080716220223-ca946-e3eed117cded61eb9c2d2805fd07758f883fb85b.gz
2008-07-16 18:02:23 -04:00
zach
0c90e94864 First volly at a Twitter-compatible API. Just working out the
detials of 1) Basic Auth and 2) dispatch to the right Action class
files to handle the requests.

You can hit it with...

	http://localhost/laconica/api/public_timeline.json

or to try Basic Auth you can try something like:

	http://nickname:password@localhost/laconica/api/statuses/friends_timeline.xml

Although that actual method isn't done yet, so it should authenticate
and then complain.

darcs-hash:20080712081247-ca946-acd3e0e2762c7d9ff0cb3cd7a53cfdfcc5b26660.gz
2008-07-12 04:12:47 -04:00
Evan Prodromou
c51d1521f0 uniquify the list of reply nicknames (DOH!)
darcs-hash:20080717164042-84dde-191bc47dc302911e4ceae0d3b1e74116bb95bcba.gz
2008-07-17 12:40:42 -04:00
Evan Prodromou
3ea1119e50 define syslog variables in common.php
darcs-hash:20080717163613-84dde-2684415a03d1a2754e148e4921ce39ad075bbc5b.gz
2008-07-17 12:36:13 -04:00
Evan Prodromou
265d267d81 remove tag URI stuff; unused and confusing
darcs-hash:20080716205359-84dde-590916f8812c7c03a2b81b3e7aeb021194ac0f25.gz
2008-07-16 16:53:59 -04:00
Evan Prodromou
eb9715992c utility function for getting a profile URI
I added a utility function for getting a profile URI. At some point we
need to push commonalities between Remote_profile and User into the
Profile class; single-table inheritance. We do a lot of switching
around for no good reason on users and profiles.

darcs-hash:20080716152511-84dde-6f73d947d11083e7235756fde635e145f02e2483.gz
2008-07-16 11:25:11 -04:00
Dave Barry
8b1bf1e38c Fixup rememberme cookie handling in the POST only case
darcs-hash:20080714050037-08d49-b00c6370c4eed918eee94f828e2d6098b922ba69.gz
2008-07-14 01:00:37 -04:00
Evan Prodromou
a440afda54 sigh
darcs-hash:20080716031718-84dde-74ce45fdb3be03ae7974f76698d43ecf78730f23.gz
2008-07-15 23:17:18 -04:00
Evan Prodromou
c0527f7952 yet more array munging
darcs-hash:20080716031544-84dde-a04b4057e5d7aa394ae061daac47f38089ff5343.gz
2008-07-15 23:15:44 -04:00
Evan Prodromou
542cadd33c lcase tname
darcs-hash:20080716031459-84dde-ccb707bb9059bbc95eabb48cf32edf6dfe803108.gz
2008-07-15 23:14:59 -04:00
Evan Prodromou
af03429704 more array munging
darcs-hash:20080716031346-84dde-2aa160254fd80537ba89df2b39b4560c044d1bab.gz
2008-07-15 23:13:46 -04:00
Evan Prodromou
f3409f4e70 back out my change to the link format; see if it helps
darcs-hash:20080716030200-84dde-eaff2cdf00d9268594b5ecf7913a6746a516af62.gz
2008-07-15 23:02:00 -04:00
Evan Prodromou
1e9fabbfa3 got the args to array unshift backwards
darcs-hash:20080716030022-84dde-d24e4881e143163031a7b6c077d3eed77a58b579.gz
2008-07-15 23:00:22 -04:00
Evan Prodromou
225208e634 add alternative reply format
darcs-hash:20080716025842-84dde-b4100ca8cec891d34d14c1bc66912cbd3762bdfb.gz
2008-07-15 22:58:42 -04:00
erik
ae9fb6a4e5 PITS.00114: 'T USERNAME' should work like an @-link
darcs-hash:20080709010415-7f4fe-943321fd9ad9df3890599fc1b3f99e97db16e43d.gz
2008-07-08 21:04:15 -04:00
Earle Martin
1509f3893c Don't capture trailing ")", "]" or ">" as part of URLs
darcs-hash:20080715022045-68ac8-8f8222e7a97009297bed6ff88b6c020192fe6dd2.gz
2008-07-14 22:20:45 -04:00
Evan Prodromou
61487d4cd0 move email settings to its own tab
darcs-hash:20080715221826-84dde-8a3692f95199818c11dbb0be159d07f1ab10cf6a.gz
2008-07-15 18:18:26 -04:00
Evan Prodromou
8c42fac88a utility for getting avatar or default avatar
darcs-hash:20080714034443-84dde-f443b04e6733b22709d746a700c0ba032d7afb60.gz
2008-07-13 23:44:43 -04:00
Evan Prodromou
68528246e7 extra space in link
darcs-hash:20080714060517-84dde-7ff9417a790ded358d7fc5fe0d565fc5f3591906.gz
2008-07-14 02:05:17 -04:00
Mike Cochrane
834c21b2aa Merge some gettext strings to one line so translation tools are happier
darcs-hash:20080713044608-533db-ee16aecee9b6d82b22ce6a25f6a9573c23eee9f8.gz
2008-07-13 00:46:08 -04:00
Mike Cochrane
e6d74660c3 Stop after a redirect. Fixed remote subscription for me.
darcs-hash:20080710055726-533db-4b96201b090970f390d62b305256a786a1a96d44.gz
2008-07-10 01:57:26 -04:00
Mike Cochrane
8fe61b0b92 Missing sprintf
darcs-hash:20080710050459-533db-251d9fec6b700628e3e56607f25e551381f2fad2.gz
2008-07-10 01:04:59 -04:00
Mike Cochrane
da19d12620 Bracket in correct place
darcs-hash:20080710050202-533db-31739e6dc9d57058df99c8e6592249563f484179.gz
2008-07-10 01:02:02 -04:00
Mike Cochrane
7e38142d4a Resolve conflicts and convert _t( to _( where it was introduced again.
darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
2008-07-10 00:51:26 -04:00
Mike Cochrane
4b656f47df Merge conflicts and kill a whole lot of trailing whitespace on lines.
darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
2008-07-09 18:46:30 -04:00
Mike Cochrane
67921b1c18 bracket in the wrong place
darcs-hash:20080708130408-533db-9e7fb996a7c37af9557f097d785a53ff77c7559f.gz
2008-07-08 09:04:08 -04:00
Mike Cochrane
4d65b99c68 Translate a few more strings.
darcs-hash:20080708100519-533db-b326ea0bb16ea6c8244cfd00a0dd639d0553dd21.gz
2008-07-08 06:05:19 -04:00
Mike Cochrane
87b494f1eb Convert _t() to _() for gettext.
darcs-hash:20080708094531-533db-83399a46e6ec4c0fcc6249b0235961f969d1ae73.gz
2008-07-08 05:45:31 -04:00