wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,896 Commits 8 Branches 0 Tags 330 MiB
9364e446b1
Commit Graph

1281 Commits

Author SHA1 Message Date
Brion Vibber
ae696728f5 Merge branch '0.9.x' into 1.0.x 2010-08-12 12:56:23 -07:00
Brion Vibber
08fc6053ec Fix for regression with OStatus mention processing (duplicated new and old style lead to trying to save a reply entry twice). 2010-08-10 13:49:11 -07:00
Brion Vibber
855f1f6623 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-08-09 13:11:41 -07:00
Brion Vibber
7e55fc0044 OStatus/FeedSub: tweaked PuSH feed garbage collection so other plugins can declare usage of a low-level feed or an OStatus profile besides profile subscriptions & group memberships. 
SubMirror: redid add-mirror frontend to accept a feed URL, then pass that on to OStatus, instead of pulling from your subscriptions.
Profile: tweaked subscriberCount() so it doesn't subtract 1 for foreign profiles who aren't subscribed to themselves; instead excludes the self-subscription in the count query.
Memcached_DataObject: tweak to avoid extra error spew in the DB error raising

Work in progress: tweaking feedsub garbage collection so we can count other uses
 2010-08-06 11:49:52 -07:00
Evan Prodromou
9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
Evan Prodromou
e2c90576c0 re-add mentioned link lost in last merge 2010-08-03 16:01:50 -07:00
Evan Prodromou
2ba36fc242 Merge branch 'activityhooks' into 0.9.x 
Conflicts:
	classes/Notice.php
 2010-08-03 16:01:18 -07:00
Evan Prodromou
cc71f1ae82 output Atom dates in UTC 2010-08-03 15:55:40 -07:00
Evan Prodromou
f83171824f correctly show <source> for atom feeds 2010-08-03 15:50:21 -07:00
Evan Prodromou
f12cafb275 correct output for EndActivityInReplyTo event 2010-08-02 17:56:44 -07:00
Evan Prodromou
fe2b4fdf1c add some activity hooks 2010-08-02 17:16:04 -07:00
James Walker
e603632f13 add support for Salmon's new "mentioned" rel value 2010-08-02 14:06:14 -04:00
Siebrand Mazeland
8f8588026b Fixes for messages after review by Brion. 2010-07-30 19:25:55 +02:00
Siebrand Mazeland
e753422480 * Address i18n related FIXMEs after talk with Brion. 
* Tweak message
 2010-07-30 19:15:07 +02:00
Zach Copley
fb2e00eacc Merge branch 'master' into 0.9.x 
Conflicts:
	classes/Notice.php
 2010-07-29 20:44:11 +00:00
James Walker
3fa76463ed oops. really embarassing typo (that explains some weird behaviour) 2010-07-29 16:32:41 -04:00
Zach Copley
4e8e77f6b0 Return HTTP 403 instead of 400 when silenced users try to post via API 2010-07-29 18:47:28 +00:00
Siebrand Mazeland
125ff142e8 * mark a few message for translation 
* add translator documentation
 2010-07-29 13:36:08 +02:00
Siebrand Mazeland
312c6b6865 * add FIXME for messages that may need i18n. 
* trailing whitespace removed.
 2010-07-29 13:18:41 +02:00
Siebrand Mazeland
5813ecada2 * add translator documentation 
* mark strings for translation
* add FIXME for unclear/confusing message
 2010-07-29 13:01:04 +02:00
Siebrand Mazeland
e7acb45b57 * add string for translation with translator documentation 
* add FIXMEs for strings that may need i18n, but leaving decision to other dev(s)
 2010-07-29 12:58:48 +02:00
Siebrand Mazeland
f241cdcbb3 * mark two untranslatable server exceptions as translatable 
* number parameters when multiple are user in a message
* update translator documentation
 2010-07-29 11:34:58 +02:00
Siebrand Mazeland
e694da24a9 Number parameters 2010-07-28 22:17:54 +02:00
Brion Vibber
189d341733 Merge branch 'master' into testing 2010-07-28 11:56:55 -07:00
James Walker
5688c635a6 backwards compatibility for old tags format in hasTag 2010-07-28 12:13:53 -04:00
James Walker
29b8a6a18f don't try to save empty tags 2010-07-28 11:57:54 -04:00
James Walker
772018810b Merge branch 'master' into testing 2010-07-27 12:18:40 -04:00
Zach Copley
25e963769c Revert "Revert "Change the cache window on notices from 61 to 200, the max number"" 
This reverts commit a65b3f171c.
 2010-07-21 12:29:47 -07:00
James Walker
7065450f03 normalizing tags for status_network 2010-07-20 17:34:58 -07:00
Eric Helgeson
9b899eea75 Make some messages gender neutral. 2010-07-19 21:09:09 -05:00
Zach Copley
a65b3f171c Revert "Change the cache window on notices from 61 to 200, the max number" 
This reverts commit d51820adc5.
 2010-07-19 17:38:11 -07:00
Zach Copley
d51820adc5 Change the cache window on notices from 61 to 200, the max number 
of notices available at one time through the API. Note: this will
require a memcache restart.
 2010-07-19 13:47:42 -07:00
Evan Prodromou
d73feb82d8 cache sitemap notice and user counts for 4h 2010-07-14 10:38:34 -04:00
Evan Prodromou
dfd65a4290 push exception on missing profile down to Notice::getProfile() 2010-07-13 10:51:25 -04:00
Zach Copley
4c5098cd32 Handle the case where a screen name has shifted from one Twitter ID to another 2010-07-08 21:17:11 +00:00
Brion Vibber
dcfe5b24f6 Fix regression in 92ded7c6cb56056a89bc8b3caabd08049104898e: spewed PHP notices when checking for enclosures due to uninitialized variables. 2010-06-28 15:20:50 -04:00
Brion Vibber
fa282823d9 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-26 15:10:47 -04:00
Brion Vibber
c6b1e25d17 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-26 15:09:30 -04:00
Brion Vibber
ef7e85c0ab Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-06-26 15:09:08 -04:00
Brion Vibber
f0c5e7eca3 Fix for bug #2382: releasing claim on failed queue item works again with DB-based queues. 
Warning: DB-based queue doesn't currently implement discarding of items after a retry limit. Failed items will be retried until they succeed.
 2010-06-26 15:07:32 -04:00
Brion Vibber
00e129b013 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-26 10:18:03 -04:00
Brion Vibber
696e4ba393 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	plugins/OpenID/openidserver.php (cleaned up mismatched comment)
 2010-06-26 10:17:36 -04:00
Brion Vibber
d9e56e15cc Merge branch 'master' into testing 2010-06-26 10:16:27 -04:00
Zach Copley
1eec7f779f - Add profile_info tag to Atom author 
- Normalize xmlns:statusnet links in the API
 2010-06-22 16:28:06 -07:00
Zach Copley
105c1a22d6 Include source client's related URL (if any) in source attribution for 
Atom notice feeds
 2010-06-17 23:08:40 +00:00
James Walker
b667092153 adding a Status_network::updateKeys() method, since DB_DataObject update doesn't do keys. 2010-06-17 13:44:17 -04:00
Zach Copley
d3d499879c - More useful group info from api/statusnet/group/show 
- Add statusnet:group_info tag to group Atom feeds
 2010-06-16 14:29:24 -07:00
Brion Vibber
004200f958 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-11 12:09:55 -07:00
Brion Vibber
7f3b3620af Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-11 12:05:53 -07:00
Brion Vibber
b1a68e15b7 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 
Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
 2010-06-10 15:37:06 -07:00
Brion Vibber
5a96b9e805 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-06-07 10:34:00 -07:00
Brion Vibber
d88b208edc Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	plugins/OpenID/openid.php
 2010-06-07 10:19:40 -07:00
Evan Prodromou
6d39a75137 use DB_DataObject_Cast objects in a couple of different places in the code 2010-06-04 15:29:38 -04:00
Evan Prodromou
cbdeb6fb8f Merge branch 'master' of gitorious.org:statusnet/mainline 2010-06-04 13:26:25 -04:00
Evan Prodromou
f1ea678aae memcache_dataobject supports some DB_DataObject_Cast objects as values 2010-06-04 12:52:05 -04:00
Brion Vibber
8b9436e8ae Option to divert PuSH items directly to the target site's queue when local 2010-06-03 18:06:55 -07:00
Brion Vibber
5f4c6ec626 Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, Facebook, RSSCloud, and OStatus checks were enqueued on these when they'd never do anything but churn the queue servers. 
Notice::isLocal() can replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or LOCAL_NONPUBLIC.
 2010-06-03 16:58:45 -07:00
Zach Copley
1a44d4272f Add repeated attr to Atom notices_info element 2010-06-03 22:24:55 +00:00
Brion Vibber
17ab15a3d0 Fix memory leak in Inbox::addToInbox() (usage of raw DB_DataObject::staticGet, which leaks memory into a process-global cache). 
On my test setup, this fixes inbox delivery to 10,000 local recipients from background queuedaemon running with a 32mb memory limit, completes the job within a minute from start.
 2010-06-01 13:53:44 -07:00
Craig Andrews
6317f7d92b Assigning my copyrights to the Free Software Foundation 2010-05-27 18:27:33 -04:00
Brion Vibber
696aeea113 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	lib/language.php
	plugins/OpenID/finishaddopenid.php
 2010-05-27 14:57:32 -07:00
Zach Copley
80d1e86a7c Add repeat info to statusnet:notice_info Atom element 2010-05-26 00:39:44 +00:00
Brion Vibber
e68d2c9015 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-05-25 13:11:36 -07:00
Brion Vibber
95159112b2 Hotpatch for infinite redirection-following loop seen processing URLs to http://clojure.org/ -- if we end up with an unstable redirect target (final item in a redirect chain ends up redirecting us somewhere else when we visit it again), just save the last version we saw instead of trying to start over. 
Pretty much everything in File and File_redirection initial processing needs to be rewritten to be non-awful; this code is very hard to follow and very easy to make huge bugs. A fair amount of the complication is probably obsoleted by the redirection following being built into HTTPClient now.
 2010-05-25 13:09:21 -07:00
Brion Vibber
f7add6f25f Handle funky notice deletion cases more gracefully: if we already have a deleted_notice entry, don't freak out when we try to save it again on the second try. 2010-05-24 07:47:15 -07:00
Zach Copley
114df39822 Need to always emit statusnet:notice_info so it's available in profile feeds 2010-05-18 15:17:05 -07:00
Zach Copley
5ea019c41a Remove errant double HTML entity encoding in API source attribution 2010-05-18 15:16:23 -07:00
Zach Copley
68634f0496 Add source link attr to statusnet:notice_info element in Atom output for notices 2010-05-18 15:15:41 -07:00
Zach Copley
c78f67aa73 Refactor and centralize notice source link calculation 2010-05-18 15:15:27 -07:00
Zach Copley
d9fddff539 Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices 2010-05-18 15:15:14 -07:00
Brion Vibber
91367dbc21 Merge branch '0.9.x' into 1.0.x 2010-05-14 12:15:13 -07:00
Zach Copley
df034f0a1e Need to always emit statusnet:notice_info so it's available in profile feeds 2010-05-12 15:08:01 -07:00
Brion Vibber
d9c1ac9053 Merge branch '0.9.x' into 1.0.x 2010-05-06 18:49:01 -07:00
Zach Copley
869bc32d0d Remove errant double HTML entity encoding in API source attribution 2010-05-06 21:48:12 +00:00
Zach Copley
292ea33dbd Add source link attr to statusnet:notice_info element in Atom output for notices 2010-05-06 21:48:11 +00:00
Zach Copley
22fde00def Refactor and centralize notice source link calculation 2010-05-06 21:48:11 +00:00
Zach Copley
b547079b28 Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices 2010-05-06 21:48:11 +00:00
Brion Vibber
173778eab1 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 
Conflicts:
	lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
 2010-05-05 17:11:23 -07:00
Brion Vibber
e05415f621 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	locale/ca/LC_MESSAGES/statusnet.po
	locale/de/LC_MESSAGES/statusnet.po
	locale/statusnet.pot
 2010-05-05 17:07:50 -07:00
Zach Copley
b50f300566 Implement since_id and max_id param handling for /api/favorites 2010-05-05 14:46:36 -07:00
Brion Vibber
5414396a2e IM cleanup on 1.0.x branch: 
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them.
* fix fatal error in IM settings while waiting for a Jabber confirmation.
* Caching fix for user_im_prefs
* fix for saving multiple transport settings
* some fixes for AIM & using normalized addresses for lookups
 2010-04-30 15:29:05 -07:00
Brion Vibber
cae1329f3b Merge branch '0.9.x' into 1.0.x 
Conflicts:
	lib/util.php
 2010-04-30 13:16:13 -07:00
Brion Vibber
2260d6ec7c Merge branch 'testing' into 0.9.x 
Conflicts:
	index.php
 2010-04-29 15:14:51 -07:00
Evan Prodromou
5c05cd2b1a Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-04-26 02:43:33 -04:00
Evan Prodromou
14adb7cc41 Give users more control over URL shortening 
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.

Squashed commit of the following:

commit d136b39011
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:39:00 2010 -0400

    use site and user settings to determine when to shorten URLs

commit 1e1c851ff3
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:38:40 2010 -0400

    add a method to force shortening URLs

commit 4d29ca0b91
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:41 2010 -0400

    static method for getting best URL shortening service

commit a9c6a3bace
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:11 2010 -0400

    allow 0 in numeric entries in othersettings

commit 767ff2f7ec
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:36:46 2010 -0400

    allow 0 or blank string in inputs

commit 1e21af42a6
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:01:11 2010 -0400

    add more URL-shortening options to othersettings

commit 869a6be0f5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:22:51 2010 -0400

    move url shortener superclass to lib from plugin

commit 9c0c9863d5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:20:28 2010 -0400

    documentation and whitespace on UrlShortenerPlugin

commit 7a1dd5798f
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:05:46 2010 -0400

    add defaults for URL shortening

commit d259c37ad2
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 13:40:10 2010 -0400

    Add User_urlshortener_prefs

    Add a table for URL shortener prefs, a corresponding class, and the
    correct mumbo-jumbo in statusnet.ini to make everything work.
 2010-04-26 02:40:36 -04:00
Brion Vibber
dd7b95c2cf Merge branch 'master' into testing 2010-04-23 14:26:57 -07:00
Brion Vibber
7bdea95ccb Fix to make blowing of replies stream cache more consistent when receiving replies. (Was being done at mail notify time instead of at save time for local replies; now moved to reply save time internally so it can't get forgotten) 2010-04-23 06:55:46 -07:00
Brion Vibber
df41287226 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-04-20 13:52:58 +02:00
Brion Vibber
61098faf5d Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-04-20 13:52:18 +02:00
Brion Vibber
c48caa85e1 Fix email notifications for @-replies that come via OStatus. 
* Moved notification sending from Notice::saveReplies to distrib queue handler, so it'll pull from the reply set we've saved regardless of how we got it.
* Set up gettext infrastructure for command-line scripts; gets localization mail notifications etc working from background queues.
* Adjusted locale switching: common_switch_locale() works at runtime for bg scripts, forces a message catalog update
 2010-04-20 13:49:29 +02:00
Craig Andrews
39392e03a7 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	actions/confirmaddress.php
	actions/imsettings.php
 2010-04-18 19:21:15 -04:00
Brion Vibber
f789928942 Merge branch 'testing' into 0.9.x 2010-04-14 11:15:48 +02:00
Brion Vibber
3da50c19df Merge branch 'master' into testing 2010-04-14 11:15:21 +02:00
Brion Vibber
a21a172639 Fix for "#foo !foo" in same notice failing during save, causing failout before distribution. Move saveGroups after saveTags when saving notices; groups may save additional tags, so need to be moved after so the check for duplicates actually works. 2010-04-14 11:11:02 +02:00
Brion Vibber
d445b977fc move comment to correct place 2010-04-14 11:09:54 +02:00
Brion Vibber
1eeb23e1e3 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	actions/confirmaddress.php
 2010-04-10 17:56:11 -07:00
Brion Vibber
edd883d3b0 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-04-10 17:54:37 -07:00
Brion Vibber
71c828de89 Allow blocking someone who's not currently subscribed to you (prevents seeing @-replies from them, or them subbing to you in future) 2010-04-10 17:52:40 -07:00
Siebrand Mazeland
af06c554a0 * DB -> Database in message 
* some translator documentation added
 2010-04-11 01:08:51 +02:00
Brion Vibber
6fb60fb57f Fix for conversation check in @-reply notification email; i18n cleanup on mail messages: fixed some bad gettext usage, added trans doc comments. 2010-04-09 12:02:11 -07:00