Evan Prodromou
1598050f54
Show more menu items when you click More
...
I added the necessary JavaScript to show more menu items when you click More.
2011-07-07 10:26:07 -04:00
Evan Prodromou
1c917ac28f
start making more menu work
2011-07-06 18:40:02 -04:00
Evan Prodromou
74f8c51358
correctly output richer nav IDs
2011-07-06 11:19:47 -04:00
Evan Prodromou
eb430f9cb3
don't add empty classes to menu items
2011-07-06 11:18:53 -04:00
Evan Prodromou
663bc35390
GroupsNav uses new Menu class functionality
2011-07-06 11:10:26 -04:00
Evan Prodromou
0e07124a1e
make Menu class more functional
2011-07-06 11:10:08 -04:00
Evan Prodromou
97d77a7c75
Revert "add a 'more' button for groups menu"
...
This reverts commit 3226f2bef6
.
2011-07-06 10:17:22 -04:00
Zach Copley
038ee13e79
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-07-05 17:30:01 -07:00
Zach Copley
7150c54a3f
Fix invite button for public sites
2011-07-05 17:27:11 -07:00
Evan Prodromou
3226f2bef6
add a 'more' button for groups menu
2011-07-05 19:20:44 -04:00
Evan Prodromou
7e9c17bd15
make the default scope depend on site/private
2011-07-01 21:50:04 -04:00
flyingmana
3c47d158f4
make cors header deactivatable
2011-06-29 22:39:33 +02:00
Evan Prodromou
13d479bc18
stop sending OMB by default
2011-06-27 13:02:32 -04:00
Evan Prodromou
b25e957be5
correct const for ActivityStreamJSONDocument::CONTENT_TYPE
2011-06-23 11:39:08 -04:00
Evan Prodromou
fadc4df039
use application/stream+json for Activity Streams
2011-06-23 11:24:37 -04:00
Evan Prodromou
83a8cac961
Merge branch '1.0.x' into testing
2011-06-22 17:21:20 -04:00
Evan Prodromou
e5d8fd6857
Add Activity Streams feeds to export data
2011-06-22 17:09:04 -04:00
Evan Prodromou
0f53c07f56
Merge branch '1.0.x' into testing
2011-06-21 11:33:18 -04:00
Evan Prodromou
9f785f6734
Fix addressees when drop-down for a single user is used
2011-06-21 11:32:26 -04:00
Evan Prodromou
f078c19f09
Merge branch '1.0.x' into testing
2011-06-20 12:23:16 -04:00
Evan Prodromou
01996b1a46
Merge remote-tracking branch 'evan/blogplugin' into newblogplugin
2011-06-20 09:34:32 -04:00
Evan Prodromou
8104b1f766
Merge branch '1.0.x' into testing
2011-06-20 09:13:42 -04:00
Evan Prodromou
ab98458399
push regex pattern for UUID to that class
2011-06-20 01:11:08 -04:00
Siebrand Mazeland
26a92b2801
Hopefully fix TRANS message not getting picked up by xgettext.
2011-06-19 11:45:37 +02:00
Siebrand Mazeland
c2ab4af804
Fix incorrect tag (missing colon).
2011-06-19 11:30:35 +02:00
Siebrand Mazeland
173d20e1f9
L10n updates.
2011-06-17 22:36:24 +02:00
Evan Prodromou
e43a6241cb
pass nickname into mail_send_sms_notice_address()
2011-06-14 11:33:52 -04:00
Zach Copley
e1ac64f2cb
Add current class to selected menu items
2011-06-09 19:29:19 -04:00
Zach Copley
36d619480a
Rip out user, group and site design customization code
...
Squashed commit of the following:
commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:51:47 2011 -0400
Remove design-related stuff from the API
commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:40:16 2011 -0400
Mop up misc design related code
commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 15:21:00 2011 -0400
Remove Design DB_DataObject class and references to it in schema
commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:15:54 2011 -0400
Remove design-related actions and widgets
commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:10:57 2011 -0400
Remove navigation / routing to design settings actions
commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 13:03:09 2011 -0400
CurrentUserDesignAction -> Action
commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 12:54:22 2011 -0400
* GroupDesignAction -> GroupAction (new base class for group actions)
commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date: Thu Jun 9 12:36:40 2011 -0400
OwnerDesignAction -> Action
2011-06-09 16:20:19 -04:00
Evan Prodromou
a10edb3183
Merge branch 'testing' into 1.0.x
...
Conflicts:
plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
2011-06-07 16:04:49 -04:00
Zach Copley
895447f3dc
Upgrade anti-framing, anti-clickjacking code
2011-06-06 06:08:17 +00:00
Siebrand Mazeland
3dcdf2ef03
Update translator documentation.
2011-06-05 11:12:34 +02:00
Evan Prodromou
f4e17c1bdf
Merge branch '1.0.x' into testing
2011-05-31 17:16:45 -04:00
Evan Prodromou
506958f2c8
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-05-31 17:01:11 -04:00
Evan Prodromou
60a1b0a15a
Change 'listening to your notices' to 'following you'
2011-05-31 17:00:23 -04:00
Evan Prodromou
ac55efeecf
Don't show empty addressees in noticelistitem
2011-05-30 16:20:52 -04:00
Evan Prodromou
0dbdcf2936
Merge branch 'master' into 1.0.x
2011-05-30 11:18:34 -04:00
Evan Prodromou
19b965d991
Merge branch 'master' into testing
2011-05-30 11:18:22 -04:00
Evan Prodromou
9167ba8d2d
ActivityImporter catches thrown exceptions by plugins and marks entry done
2011-05-30 09:57:49 -04:00
Evan Prodromou
97debbab68
use integer iterator for childNodes in ActivityUtils::getLinks()
2011-05-30 09:57:11 -04:00
Evan Prodromou
d7a16929b9
Set the current user on API calls
2011-05-25 14:01:22 -04:00
Evan Prodromou
a838891c0e
set the current user in api actions
2011-05-25 13:04:35 -04:00
Ian Denhardt
31b29fde50
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
plugins/OStatus/actions/ostatusinit.php
2011-05-23 21:50:48 -04:00
Evan Prodromou
b34e267e53
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/EmailRegistration/scripts/cancelemailregistration.php
2011-05-23 18:20:18 -04:00
Evan Prodromou
cb090ab48d
increment alpha version revision
2011-05-23 12:37:29 -04:00
Siebrand Mazeland
e48c26e156
Update translator documentation, i18n and L10n.
2011-05-20 16:57:05 +02:00
Evan Prodromou
5a86900a34
minor alpha version for i18n build errors
2011-05-20 06:09:37 -07:00
Evan Prodromou
c2f735a84e
rev to alpha3
2011-05-20 06:03:36 -07:00
Samantha Doherty
fbc5de3268
Add missing li tags in settings and admin menus.
2011-05-18 12:13:34 -04:00
Samantha Doherty
4549d36862
Change addressees arrow from hardcoded to CSS.
2011-05-18 09:49:01 -04:00
Samantha Doherty
37cf7c0e8c
Style for invite forms and width fix for Onboard popup.
2011-05-11 17:07:08 -04:00
Zach Copley
8597856b56
Fancier invitation form for whitelisted domains
...
Squashed commit of the following:
commit 1c0766e8f9d9e962ec553e2fb35bd2f944ffb4b0
Author: Zach Copley <zach@status.net>
Date: Mon May 9 17:00:51 2011 -0700
Make the invites from the fancier invite form save
commit 9ea45b7cf38eda8dad1d82e87b3400413a532079
Author: Zach Copley <zach@status.net>
Date: Fri May 6 16:14:40 2011 -0700
.js to let the user add (and remove) additional invitees from their domain
commit b2a02339bd11d02c7cba24629dde359e22de32b6
Author: Zach Copley <zach@status.net>
Date: Thu May 5 15:44:49 2011 -0700
Load special whitelist invite .js when loading the invite page
commit 132fed7550b40cd1d46ee506fd83974a116bce32
Author: Zach Copley <zach@status.net>
Date: Wed May 4 18:35:49 2011 -0700
Remove settings class from whitelist inviter form
commit a38437351b505594aead5da86af9a5ed089666b6
Author: Zach Copley <zach@status.net>
Date: Wed May 4 18:21:18 2011 -0700
Make a fancier form for whitelist domain invites
commit 710d4f41edf412871a9c1fbf33af317226485325
Author: Zach Copley <zach@status.net>
Date: Wed May 4 17:34:09 2011 -0700
Add some more events to the invitation page
commit 2449e4e0c1bf11568968cfc3ea2d8e69db2d875e
Author: Zach Copley <zach@status.net>
Date: Wed May 4 17:12:36 2011 -0700
Refactor invite action a bit
2011-05-09 17:07:36 -07:00
Siebrand Mazeland
3b3bf74176
Harcode three newlines that lead to issues with translations (as fixed in Commit:5e7e5dd93cd3d73e2f2c93225cf8688844138380 by Evan).
2011-05-05 12:36:56 +02:00
Evan Prodromou
c97048d01b
merge 0.9.x into 1.0.x
2011-05-04 14:59:39 -07:00
Evan Prodromou
c46406b209
low-level hook for loading templates
2011-05-04 11:28:49 -07:00
Evan Prodromou
6b1732d9a2
remove object nav for search
2011-05-04 10:43:47 -07:00
Evan Prodromou
90eb09624c
let users login with email address
2011-05-02 15:17:08 -07:00
Evan Prodromou
02c5d68bed
Merge branch 'emailsitesetup' into 1.0.x
2011-04-28 12:44:21 -07:00
Evan Prodromou
fad0c875ca
Don't redefine 'STATUSNET' in installer
2011-04-28 12:38:07 -07:00
Siebrand Mazeland
7c3818c00e
Update translator documentation.
2011-04-27 14:30:58 +02:00
Evan Prodromou
d09df28040
utility functions for setting config options in memory
2011-04-26 16:50:42 -04:00
Siebrand Mazeland
a2e4a1803c
Harmonize message for 'User has no profile.' and update translator documentation.
2011-04-25 22:44:19 +02:00
Siebrand Mazeland
413d9e2fd0
Whitespace updates.
2011-04-24 18:50:55 +02:00
Siebrand Mazeland
8afda686d2
@evan Please check. Doesn't look correct/complete.
2011-04-24 18:50:03 +02:00
Evan Prodromou
f79d59a081
Merge branch '1.0.x' into testing
2011-04-21 16:16:07 -04:00
Evan Prodromou
5fd08b798f
show thumbnails even for links that arent enclosures
2011-04-21 16:13:32 -04:00
Evan Prodromou
963d052653
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-21 15:23:22 -04:00
Siebrand Mazeland
5e97047f8f
Update translator documentation.
...
i18n fixes.
Whitespace updates.
2011-04-21 20:26:58 +02:00
Siebrand Mazeland
98cc1da7b5
Update indentation.
2011-04-21 20:19:51 +02:00
Evan Prodromou
63009f1e1b
Merge branch '1.0.x' into testing
2011-04-21 13:37:15 -04:00
Evan Prodromou
36d56232c6
a little better notice hiding
2011-04-21 13:37:05 -04:00
Evan Prodromou
9fcda5b2da
show the full name for likes
2011-04-21 12:00:10 -04:00
Evan Prodromou
34e26b53d5
show list of people who like something in threadednoticelist
2011-04-21 11:58:24 -04:00
Evan Prodromou
5899a3f5ee
fail gracefully when no IDs for tag cloud
2011-04-20 19:07:07 -04:00
Evan Prodromou
0c0aabeda5
show tag cloud in public stream
2011-04-20 17:17:36 -04:00
Evan Prodromou
4fa7f147b0
Make tag-per-group optional, default false
2011-04-20 16:19:07 -04:00
Evan Prodromou
e686199616
accidentally stored wrong personaltagcloudsection
2011-04-20 16:12:49 -04:00
Evan Prodromou
776c2c99ea
inbox tag cloud section
2011-04-20 16:11:42 -04:00
Evan Prodromou
3904ab9983
only 10 tags per section
2011-04-20 16:11:04 -04:00
Evan Prodromou
cacf627ce3
remove hidden <h2> in notice list
2011-04-20 13:41:50 -04:00
Evan Prodromou
1e2bd48c30
correctly output notice data for nli in microapp
2011-04-19 17:55:57 -04:00
Evan Prodromou
7c31462f86
Let showNotice() go unimplemented
...
Default implementation of showNotice().
2011-04-19 16:00:31 -04:00
Evan Prodromou
efabb002e4
use an adapter pattern to customize notice list item output
2011-04-19 15:43:06 -04:00
Evan Prodromou
1619578818
fix bad variable, show frame length
2011-04-18 19:33:00 -04:00
Evan Prodromou
3fd6b9d474
capture some info if serialization fails on stomp frame
2011-04-18 17:55:38 -04:00
Evan Prodromou
2757bd8428
Revert "put some debugging code into the home and public timelines"
...
This reverts commit aa7b6447a1
.
2011-04-18 16:43:54 -04:00
Evan Prodromou
aa7b6447a1
put some debugging code into the home and public timelines
2011-04-18 16:20:51 -04:00
Evan Prodromou
b81ddc70df
correct category on inboxnoticestream
2011-04-18 16:19:15 -04:00
Evan Prodromou
d3215adfa1
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-18 12:54:23 -04:00
Evan Prodromou
9e7b880df7
Revert "disable showing tags; it throws a notice for me"
...
This reverts commit 7d6efbf29e
.
2011-04-18 10:08:26 -04:00
Evan Prodromou
7d6efbf29e
disable showing tags; it throws a notice for me
2011-04-18 10:03:38 -04:00
Evan Prodromou
28d0d9caad
loop through args in common_markup_to_html
2011-04-18 09:51:26 -04:00
Evan Prodromou
b72788d9ce
pass args from Docfile to renderer
2011-04-18 09:47:08 -04:00
Evan Prodromou
99d538af58
docfiles can take arguments
2011-04-18 09:03:43 -04:00
Evan Prodromou
551a4e8324
mail paths for docfile
2011-04-18 09:03:28 -04:00
Evan Prodromou
4784e3fe36
correctly parse help files
2011-04-18 06:30:33 -04:00
Evan Prodromou
e53edc2b6b
allow user properties in documentation files
2011-04-18 06:17:28 -04:00
Evan Prodromou
ef67262a3f
Externalize document-finding code so plugins can use it
2011-04-18 06:16:32 -04:00
Samantha Doherty
368b810a0e
Add new Infield Label jQuery plugin files to action.php
2011-04-18 00:27:46 -04:00
Zach Copley
5206ee7f9a
Allow setting separate name and id in textare inputs, and cols and rows
2011-04-17 15:09:00 -07:00
Zach Copley
606d7d7185
Allow setting separate name and id on form input elements
2011-04-17 14:29:38 -07:00
Evan Prodromou
5e50acb23b
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-17 17:00:54 -04:00
Evan Prodromou
b1cc12af2c
use small triangle for notice addressees
2011-04-17 17:00:38 -04:00
Siebrand Mazeland
4ab995dd1e
Complete "people tag" to "list" in UI messages.
...
Update translator documentation accordingly.
Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
2011-04-17 20:08:03 +02:00
Siebrand Mazeland
25e38ebeca
Add/update translator documentation.
2011-04-17 13:00:52 +02:00
Siebrand Mazeland
d26d408304
Add support for Tagalog.
2011-04-17 10:49:48 +02:00
Siebrand Mazeland
8cfd8450d5
Update/fix translator documentation.
2011-04-17 02:26:53 +02:00
Siebrand Mazeland
858aa37985
i18n fixes.
...
Translator documentation added.
2011-04-17 00:36:14 +02:00
Evan Prodromou
f548831eb1
hide the nickname so it doesn't go into replies
2011-04-16 16:29:09 -04:00
Evan Prodromou
51a7e9961d
Merge branch '1.0.x' into testing
2011-04-16 15:58:16 -04:00
Evan Prodromou
53c927ed8e
don't show addressee info for root notice of conversation
2011-04-16 15:39:54 -04:00
Evan Prodromou
1c3ce200e7
show addressee arrow if just a notice to a user
2011-04-16 15:39:34 -04:00
Evan Prodromou
83dfe5ed3e
show addressees in notice lists
2011-04-16 15:30:50 -04:00
Evan Prodromou
b3e7838552
show best name in noticelistitem
2011-04-16 11:22:46 -04:00
Evan Prodromou
ff782f1d97
Thread by conversation, not id
2011-04-15 18:28:36 -04:00
Evan Prodromou
2dd81d9a5c
add a threading notice stream class
2011-04-15 18:20:54 -04:00
Evan Prodromou
97bae46da1
Revert "Add threading notice stream class to threaded pages"
...
This reverts commit 97a8bae4a9
.
2011-04-15 18:20:06 -04:00
Evan Prodromou
97a8bae4a9
Add threading notice stream class to threaded pages
...
For those pages where threading is important, we now have an extra filtering stream
class to skip stuff in conversations that have "already" been seen.
2011-04-15 18:17:48 -04:00
Zach Copley
da6822c1f0
Merge branch 'lists_fixes' into 1.0.x
2011-04-15 20:50:04 +00:00
Shashi Gowda
b78e5de474
Profile::getOwnedTags -> Profile::getLists, first argument is the current user, or the user accessing the lists.
2011-04-16 00:52:58 +05:30
Siebrand Mazeland
c27b9c0722
Update translator documentation.
...
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
Siebrand Mazeland
edb467978d
Fix incorrect translator documentation.
2011-04-15 09:31:30 +02:00
Zach Copley
bef1ed75b5
Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x
2011-04-14 22:29:11 +00:00
Evan Prodromou
3d9dc111a2
class on the invite link
2011-04-14 18:28:37 -04:00
Shashi Gowda
7224ca571c
List timeline cache blowing wasn't working. fixed.
2011-04-14 22:28:25 +00:00
Evan Prodromou
873b1fb186
invite button section
2011-04-14 18:19:09 -04:00
Evan Prodromou
f512e3df40
breakup Section::show()
2011-04-14 18:18:39 -04:00
Evan Prodromou
9eba121339
better title for active groups
2011-04-14 18:16:27 -04:00
Evan Prodromou
e5a84bfca2
better title for active groups
2011-04-14 18:16:10 -04:00
Evan Prodromou
9208c94b29
don't show private lists; correct link in header
2011-04-14 17:27:26 -04:00
Evan Prodromou
edee3995c2
no All groups link
2011-04-14 17:14:57 -04:00
Evan Prodromou
c8a58c924b
show lists as a comma-separated list in sidebar
2011-04-14 17:03:10 -04:00
Evan Prodromou
90e6eab68e
show user's lists in sidebar
2011-04-14 16:57:50 -04:00
Evan Prodromou
14308c21db
Don't show featuredusersection by default
2011-04-14 16:25:13 -04:00
Evan Prodromou
a2d1eb399f
disable sms, email by post by default
2011-04-14 16:24:56 -04:00
Evan Prodromou
9ef13976fc
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-14 16:09:18 -04:00
Evan Prodromou
80ba45d665
better title for personal tagcloud section
2011-04-14 16:08:26 -04:00
Evan Prodromou
ddb03c9fc6
move follower/following/groups stats to those sections
2011-04-14 16:08:10 -04:00
Evan Prodromou
0c52ed76dd
gallery actions use same aside as profile
2011-04-14 15:50:45 -04:00
Zach Copley
7a00be5cc7
Merge branch 'people_tag_fixes' into 1.0.x
2011-04-14 19:50:44 +00:00
Shashi Gowda
45952ff164
"Lists with you" and "List subscriptions" in the right aside, "Lists" in the left aside
2011-04-14 19:49:43 +00:00
Shashi Gowda
53af608ef8
People tags -> Lists (only UI changes, for experimentation)
2011-04-14 19:49:42 +00:00
Shashi Gowda
22f6151a10
Annihilate profile_tag_inbox.
2011-04-14 19:45:31 +00:00
Evan Prodromou
b64a1ef0e7
No All subscriptions/subscribers links
2011-04-14 15:43:08 -04:00
Evan Prodromou
0ff4dc0a03
just 8 groups per minilist
2011-04-14 15:07:24 -04:00
Evan Prodromou
52e3a72102
just one line of 8 in the minilist
2011-04-14 14:58:24 -04:00
Zach Copley
bcafe0f819
Can't put a form (block level element) inside a span; changed it to a div
2011-04-13 17:34:31 -07:00
Zach Copley
e188a11ef6
Fix public group nav to highlight properly when our group directory is selected
2011-04-13 16:11:34 -07:00
Zach Copley
0f9d6f4c82
DirectoryPlugin - Hijack router mapping for normal groups page to substitute a directory page
2011-04-13 15:09:45 -07:00
Siebrand Mazeland
f20ddaec56
Add plural support where needed for added/removed tags messages.
2011-04-13 13:30:21 +02:00
Zach Copley
03de85ed46
Make it so input forms that don't have navigation don't accidentally get hidden. Add a "nonav" class to them.
2011-04-12 14:20:19 -07:00
Zach Copley
fcd863bba9
Theming - add some new markup to DM and new notice pages
2011-04-12 11:54:12 -07:00
Evan Prodromou
be467fef91
like search is the default for 1.0.x
2011-04-11 19:00:25 -04:00
Evan Prodromou
4331b8b4f1
make search results privacy-aware
2011-04-11 18:59:58 -04:00
Evan Prodromou
9204719522
inviteonly by default
2011-04-11 17:06:20 -04:00
Evan Prodromou
09cffc1928
hide and disable ToSelector for replies
2011-04-11 12:55:49 -04:00
Evan Prodromou
d197c86a61
show full threaded notice list in conversation view
2011-04-11 12:39:06 -04:00
Evan Prodromou
d7f96307dc
all filtering stream classes take an optional profile parameter
2011-04-11 12:32:35 -04:00
Evan Prodromou
820e19e197
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-11 11:20:27 -04:00
Evan Prodromou
61f62241da
Get conversation root visible to this user in threadednoticelist
2011-04-11 11:19:11 -04:00
Evan Prodromou
cc9f65ac81
pass profile down to ScopingNoticeStream in publicnoticestream
2011-04-11 11:17:38 -04:00
Evan Prodromou
bae9eacaa1
use -1 for invalid arg default in ScopingNoticeStream
2011-04-11 11:17:14 -04:00
Samantha Doherty
13e2acaf5c
Formatting for profile/group account blocks and entity action buttons.
2011-04-11 10:05:36 -04:00
Zach Copley
3ddaa5bff4
Fix bad i18n function call
2011-04-10 19:07:30 -07:00
Evan Prodromou
70faf76001
threadednoticelist takes a profile param
2011-04-10 20:16:51 -04:00
Evan Prodromou
dfdde5d2bc
groupnoticelist takes a profile param
2011-04-10 20:16:37 -04:00
Evan Prodromou
8b54f28330
getNotices() takes optional last 2 params
2011-04-10 20:16:14 -04:00
Evan Prodromou
dad5db25e2
start the div
2011-04-10 19:34:48 -04:00
Evan Prodromou
57741c46ef
try to fall back to default for exceptions on microapps
2011-04-10 19:33:11 -04:00
Siebrand Mazeland
f0d762f196
Update/add translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
Add FIXME for a few i18n issues I couldn't solve this quickly.
Takes care of documentation for all core code added in merge of "people tags" feature (Commit:e75c9988ebe33822e493ac225859bc593ff9b855).
2011-04-10 19:59:55 +02:00
Siebrand Mazeland
cad040ce4e
Leding tabs to spaces.
...
Superfluous whitespace removed.
2011-04-10 19:33:58 +02:00
Zach Copley
e75c9988eb
Merge branch 'people_tags_rebase' into 1.0.x
...
Conflicts:
EVENTS.txt
2011-04-10 08:10:01 +00:00
Evan Prodromou
c382a1d8cc
fix errant class in notice content
2011-04-09 17:05:59 -04:00
Evan Prodromou
4d0f42aea2
Events for showing the 'tail' of a threaded notice
2011-04-09 16:58:38 -04:00
Evan Prodromou
8aacc4b84a
Revert "Add an indicator saying to whom a notice is addressed"
...
This reverts commit 2c14185a52
.
2011-04-09 16:30:52 -04:00
Evan Prodromou
ec1579474c
add classes to profile and group links in notices
2011-04-09 15:42:27 -04:00
Evan Prodromou
2c14185a52
Add an indicator saying to whom a notice is addressed
2011-04-09 15:41:48 -04:00
Shashi Gowda
f47027abbe
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
lib/profileblock.php
theme/default/css/display.css
2011-04-09 21:57:45 +05:30
Zach Copley
285c2ee72d
Remove debugging statement
2011-04-08 17:41:40 -07:00
Zach Copley
e3789488c6
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
use conversationnoticestream in conversationrepliesaction
use conversationnoticestream in conversationaction
make ConversationNoticeStream accept a profile parameter
enable user directory and extended profile by default
Remove incompatible theme victorian
Remove incompatible theme shiny
Remove incompatible theme pigeonthoughts
Remove incompatible theme mnml
Remove incompatible theme identica
Remove incompatible theme h4ck3r
Remove incompatible theme default
Remove incompatible theme cloudy
Remove incompatible theme cleaner
Remove incompatible theme clean
Remove incompatible theme biz
correctly return for deleted items
show event as deleted
Use pkeyGet() instead of idStream() for fave caching
store oft-requested stuff in the data object
2011-04-08 15:47:18 -07:00
Zach Copley
3022d711e3
Add some more events to aside profile blocks and rework a bit
2011-04-08 15:45:49 -07:00
Evan Prodromou
85c4e11f83
make ConversationNoticeStream accept a profile parameter
2011-04-08 18:03:18 -04:00
Evan Prodromou
dc25564251
enable user directory and extended profile by default
2011-04-08 17:46:49 -04:00
Shashi Gowda
4d61760154
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-08 17:16:20 +05:30
Shashi Gowda
d442f59693
Fix weird alignment of controls in subscriptions page. The dots are gone now
2011-04-08 17:10:48 +05:30
Shashi Gowda
14a82dae61
Sidebar sections to show peopletags and tag subscriptions.
...
FIXME: currently you can see the subscriptions section only on *your* profileaction pages, is this OK?
2011-04-08 16:22:51 +05:30
Shashi Gowda
c44a94e8f5
Port autocomplete from tagInput to jQuery UI, send Last-Modified header and look for it in JS.
2011-04-08 14:51:05 +05:30
Siebrand Mazeland
8d99a5f949
Whitespace updates.
2011-04-08 01:49:34 +02:00
Siebrand Mazeland
f9f437f5da
Update translator documentation.
2011-04-08 01:22:00 +02:00
Evan Prodromou
684d0a386d
allow passing a profile to inboxnoticestream
2011-04-07 15:39:23 -04:00
Shashi Gowda
e5495e7df8
Fix subscription lists
2011-04-08 00:39:40 +05:30
Evan Prodromou
5dfb8e2bc4
Use InboxNoticeStream class for inbox
...
Move the code for inbox fetching to the InboxNoticeStream class.
2011-04-07 14:54:42 -04:00
Shashi Gowda
ad86eb78d3
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
js/util.min.js
lib/default.php
2011-04-07 23:13:45 +05:30
Evan Prodromou
ca0f59d46a
Revert "add some timing comments to output to debug poor performance"
...
This reverts commit a2782523d7
.
2011-04-07 00:07:39 -04:00
Evan Prodromou
59d0e2f373
cache the notice count for threaded view
2011-04-06 23:17:17 -04:00
Evan Prodromou
a2782523d7
add some timing comments to output to debug poor performance
2011-04-06 18:33:05 -04:00
Evan Prodromou
4b5f76d688
more flexible oEmbed handling
2011-04-06 17:57:33 -04:00
Shashi Gowda
14aef781ad
Use the cool and new NoticeStream for people tag timeline
2011-04-06 11:25:50 +05:30
Siebrand Mazeland
69778f12c8
Update translator documentation.
...
Whitespace updates.
2011-04-06 01:55:29 +02:00
Siebrand Mazeland
3d36c755a3
Fix translator documentation issues.
2011-04-06 01:40:03 +02:00
Evan Prodromou
2138c3b339
a hook for showing the default local nav
2011-04-05 18:07:10 -04:00
Evan Prodromou
a36fa8364a
Move streams nav to groups nav
2011-04-05 17:49:45 -04:00
Evan Prodromou
77441beb97
Merge branch '1.0.x' into testing
2011-04-05 17:20:48 -04:00
Evan Prodromou
9568d17cb9
Add streams to left nav
2011-04-05 17:02:48 -04:00
Evan Prodromou
8697f1a1e7
alpha2
2011-04-05 15:47:35 -04:00
Evan Prodromou
1328023f88
Merge branch '1.0.x' into testing
2011-04-05 13:30:21 -04:00
Evan Prodromou
4b9c3335d4
default to private sites
2011-04-05 13:30:05 -04:00
Evan Prodromou
2d2c134a1f
fix constructor error in FileNoticeStream
2011-04-05 13:28:41 -04:00
Evan Prodromou
36b331d469
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
Evan Prodromou
7533c7cfe1
Revert "Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view."
...
This reverts commit 880661de4e
.
2011-04-05 12:53:49 -04:00
Samantha Doherty
5bc6a8c614
Style changes for privacy selectors and markers.
2011-04-05 12:38:15 -04:00
Shashi Gowda
ced00cf0bd
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-05 10:28:05 +05:30
Evan Prodromou
ddbd4801e0
include protected flag for users in JSON or XML
2011-04-04 17:44:23 -04:00
Evan Prodromou
b41c62a27c
single flag for private groups
2011-04-04 16:58:52 -04:00
Shashi Gowda
57198a7464
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
lib/subscriberspeopleselftagcloudsection.php
lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
Siebrand Mazeland
cdebd59970
L10n consistency tweak.
2011-04-04 01:08:11 +02:00
Siebrand Mazeland
2dbdb0f185
Translator documentation updated/added.
...
i18n tweaks.
Superfluous whitespace removed.
YAY! All StatusNet core messages in the 1.0.x branch have been documented at this point in time!!!
2011-04-04 00:41:48 +02:00
Brion Vibber
c642eb2771
Switch some strings from heredoc to double-quotes so xgettext picks them up.
2011-04-03 15:37:39 -07:00
Siebrand Mazeland
9a6ee5e859
Update translator documentation.
2011-04-03 23:47:46 +02:00
Siebrand Mazeland
18185b2237
Tabs to spaces.
2011-04-03 23:02:24 +02:00
Siebrand Mazeland
7bd594e9d3
Use _m() instead of ngettext().
2011-04-03 22:08:50 +02:00
Siebrand Mazeland
ea8b468348
Update translator documentation.
...
Remove superfluous whitespace.
i18n/L10n tweaks.
2011-04-03 14:43:18 +02:00
Siebrand Mazeland
b1d451f98b
Upadte translator documentation.
...
Add FIXME for missing class documentation.
i18n/L10n tweaks.
Superfluous whitespace removed.
2011-04-03 14:24:55 +02:00
Siebrand Mazeland
fec3edee45
Fix several L10n and i18n issues.
...
Add dummy method MessageListItem::messageListItemDummyMessages() to allow xgettext to add possible sources to POT files.
Mark a few i18n issues as FIXME as well as some messages for which the use case was not clear to me.
Merged some code on multiple lines into one.
Translator documentation added.
Remove superfluous whiteapace.
2011-04-03 01:09:02 +02:00
Siebrand Mazeland
a466d4573a
Fix incorrect parameter numbering.
2011-04-01 23:40:20 +02:00
Siebrand Mazeland
7abecb61bd
i18n/L10n updates.
...
Translator documentation updated.
Superfluous whitespace removed.
Some FIXMEs added.
2011-04-01 19:47:24 +02:00
Siebrand Mazeland
c17d8e0f5f
Update translator documentation.
...
i18n tweaks.
Add FIXME for missing class documentation.
Remove superfluous whitespace.
2011-04-01 19:47:22 +02:00
Evan Prodromou
61fe49b100
ActivityImporter gives up on any exception
2011-03-31 13:53:17 -04:00
Brion Vibber
02c2c3a6cc
Provisional workaround for router inconsistencies in background processes that switch site configs.
...
Ensure that router is cleared when we do site setup; we can still fetch the data from cache, so it should stay fast, but should ensure that we don't end up with someone else's routes still set up, which may be an issue breaking some of the bookmark handling that needs routing with a rare plugin.
2011-03-30 14:18:29 -07:00
Brion Vibber
da7c54023d
Format timestamps as UTC in ActivityStreams output. While using local times is legit per spec, it's confusing to have it change around and confuses some clients that don't handle zones right.
2011-03-30 12:36:54 -07:00
Shashi Gowda
5a2bab07b2
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
classes/Profile.php
classes/Profile_tag.php
js/util.min.js
2011-03-30 15:47:42 +05:30
Evan Prodromou
f213ac33db
fix call-by-reference deprecation warning in microappplugin.php
2011-03-30 05:10:07 -04:00
Brion Vibber
674e3c2a0e
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/apistatusesretweet.php
actions/repeat.php
classes/Notice.php
lib/command.php
2011-03-29 16:26:20 -07:00
Brion Vibber
9adbb49fc9
Consolidate some precondition checks for repeats, fix a couple bits in the repeat command.
...
Notice::saveNew() now does these checks directly when making a repeat:
* make sure the original is valid and existing
* stop you from repeating your own message
* stop you from repeating something you've previously repeated
* prevent repeats of any non-public messages
* explicit inScope() check to make sure you can read the original too (just in case there's a funky extension at play that changes scoping rules)
These error conditions throw exceptions, which the caller either uses as an error message or passes on up the stack, without having to duplicate the checks in each i/o channel.
2011-03-29 16:20:12 -07:00
Siebrand Mazeland
0a19674c9f
@evan Fixed message domain for messages in plugins for recent commits.
...
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
Brion Vibber
880661de4e
Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view.
2011-03-29 15:40:07 -07:00
Brion Vibber
18a994d105
Fix typo in filteringnoticestream that caused some messages to get lost
2011-03-29 15:19:04 -07:00
Brion Vibber
d7304d5659
php notice fix -- misspelled bit
2011-03-29 15:05:54 -07:00
Evan Prodromou
9f1603462d
Merge branch 'limitdist2' into 1.0.x
2011-03-29 17:32:17 -04:00
Siebrand Mazeland
700018fd09
L10n/i18n updated.
...
Translator documentation updated.
FIXME added for missing class documentation.
Various documentation tweaks.
2011-03-29 23:00:29 +02:00
Evan Prodromou
32145484c2
Disallow repeats (retweets) of private notices
...
We disallow repeating a notice (or whatever) if the scope of the
notice is too private. So, only notices that are public scope
(available to everyone in the world) or site scope (available to
everyone on the site) can be repeated.
Enforce this rule at a low level in Notice.php, and in the API,
commands, and Web UI. Repeat button doesn't appear on tightly-scoped
notices in the Web UI.
2011-03-29 11:53:26 -04:00
Evan Prodromou
e862dcdb8a
Merge branch '1.0.x' into limitdist2
2011-03-28 21:56:34 -04:00
Brion Vibber
5d31dd259a
Subscription pending notification mail
2011-03-28 17:15:48 -07:00
Brion Vibber
e5b5c256a3
Working subscription approval!
2011-03-28 17:08:04 -07:00
Brion Vibber
a70e68e09c
Work in progress: can create & cancel sub requests
2011-03-28 16:12:51 -07:00
Evan Prodromou
ec5a43bf4f
let actions set a default address for toselector
2011-03-28 16:24:02 -04:00
Evan Prodromou
dca5e20b91
Make the to-selector clear left
2011-03-28 16:23:31 -04:00
Evan Prodromou
b1783e8d49
make to_user/to_profile consistent in NoticeForm
2011-03-28 12:13:46 -04:00
Evan Prodromou
5147404ea2
ToSelector widget to send private notices
...
A new widget, ToSelector (Sorry, couldn't think of anything better)
that lets you select an addressee for a notice and whether it's
private.
2011-03-28 11:02:20 -04:00
Ian Denhardt
d36f0707a4
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
2011-03-28 03:25:40 -04:00
Evan Prodromou
c1fd36c043
Merge branch '1.0.x' into limitdist2
2011-03-27 11:36:57 -04:00
Evan Prodromou
c7defb32f9
NoticeForm constructor takes array of optional parameters
...
NoticeForm::__construct() had 9 parameters, and I was about to add a
few more, so I figured it'd be better to use an $options array instead.
2011-03-27 11:25:24 -04:00
Evan Prodromou
53a3fd822d
add indicator for limited-scope notices
2011-03-26 16:47:36 -04:00
Evan Prodromou
c7f866b032
Caller can set scope for Notice::saveNew()
2011-03-26 15:49:46 -04:00
Evan Prodromou
d69f912b00
Merge branch '1.0.x' into limitdist2
2011-03-25 16:18:10 -04:00
Evan Prodromou
7a56637baa
Make function signature for getNoticeIds agree
...
There were some differences between defaults for the
NoticeStream::getNoticeIds() function and some of its subclasses'
implementations. So, I got them rationalized.
2011-03-25 16:15:55 -04:00
Evan Prodromou
e0d5093ee5
Merge branch '1.0.x' into limitdist2
...
Conflicts:
lib/groupnoticestream.php
lib/taggedprofilenoticestream.php
2011-03-25 15:57:07 -04:00
Evan Prodromou
84984fdbfe
All notice streams check notice scope
...
Added filtering code so that notice streams check notice scope.
Added new class to implement filtering a stream, FilteringNoticeStream.
Added a subclass that does the logic for checking Notice scope.
And made all the streams use ScopingNoticeStream.
2011-03-25 12:22:22 -04:00
Siebrand Mazeland
ac955699b6
Fix use of incorrect method causing i18n issue.
2011-03-25 10:13:26 +01:00
Siebrand Mazeland
3cc7dda478
* PHP short tags "<?" to full tag "<?php".
...
* superfluous whitespace removed.
2011-03-25 10:02:02 +01:00
Evan Prodromou
22bf63bb46
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-24 18:05:32 -04:00
Evan Prodromou
44bcc942b8
Break up stream code to use separate notice stream classes
...
Rearchitect (again!) notice stream code to delegate different functionality up and down the stack.
Now, different classes implement NoticeStream.
2011-03-24 18:04:19 -04:00
Siebrand Mazeland
8a8a194316
Fix typo in documentation.
2011-03-24 17:02:28 +01:00
Siebrand Mazeland
3810482d1c
Fix i18n.
2011-03-24 16:52:32 +01:00
Siebrand Mazeland
53d3455749
Change formatting of i18n slightly. Translator hints were not picked up in pot file. May now they are.
2011-03-24 16:47:29 +01:00
Siebrand Mazeland
3be26565fb
Update translator documentation.
...
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME in files with missing documentation.
2011-03-24 11:48:51 +01:00
Brion Vibber
265f9af6f7
Retool group join queue list ajax forms to use two buttons in one form, making it more ajax-submit-friendly. Needs util.js fixes for AJAX submission input buttons...
2011-03-23 15:21:12 -07:00
Evan Prodromou
fd4d535d91
add a fix1 to the version number
2011-03-23 14:34:32 -04:00
Evan Prodromou
2b901894c2
Some fixes to make the notice stream class work
2011-03-23 11:59:01 -04:00
Evan Prodromou
efb6a7b441
let Inbox class go fingerpokin' in streams
2011-03-23 11:42:52 -04:00
Evan Prodromou
0b35ce7c37
New NoticeStream class to reify streams of notices
...
We've been muddling through with 6- or 8-argument functions for managing streams. I'd
like to start thinking of streams as their own thing, and give them some more value.
So, the new NoticeStream class takes over the Notice::stream() function and Notice::getStreamByIds().
There's probably some fine-tuning to do on the object interface.
2011-03-23 11:29:55 -04:00
Brion Vibber
14a6ab2b04
Refactoring on notification mail generation: common profile & footer chunks pulled out, notifications added for group joins.
2011-03-22 16:50:27 -07:00
Brion Vibber
a12680e8d5
Fix typo in cf45c978
2011-03-22 14:20:21 -07:00
Evan Prodromou
83fb5e6023
Mass replacement of #-comments with //-comments
...
like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh?
2011-03-22 11:54:23 -04:00
Shashi Gowda
f81aaa5375
Blend people tags UI into the new theme!
2011-03-22 12:18:12 +05:30
Shashi Gowda
bf121a695a
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
classes/Profile.php
2011-03-22 07:59:06 +05:30
Shashi Gowda
31c1177970
Merge branch '1.0.x' into people_tags_rebase
...
Conflicts:
EVENTS.txt
actions/peopletag.php
actions/tagother.php
classes/Notice.php
js/util.js
js/util.min.js
lib/accountprofileblock.php
lib/action.php
lib/activityobject.php
lib/command.php
lib/personalgroupnav.php
plugins/OStatus/OStatusPlugin.php
2011-03-22 07:56:25 +05:30
Brion Vibber
61960d3668
Add pending members list to group navigation, if group has joins moderated or if it has pending requests open
2011-03-21 17:23:13 -07:00
Brion Vibber
942887ca8c
Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working.
2011-03-21 17:17:18 -07:00
Brion Vibber
6bdb1053ad
Pending members queue list -- doesn't yet allow approval.
2011-03-21 16:40:10 -07:00
Brion Vibber
471a480587
Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests.
2011-03-21 16:26:41 -07:00
Brion Vibber
a54eb0941e
Tweaking request_queue -> group_join_queue, easier to deal with the indexes and keys and caching this way.
2011-03-21 15:05:36 -07:00
Brion Vibber
541dfa04fe
Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated.
2011-03-21 14:35:29 -07:00
Brion Vibber
0bec9cfdbc
Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation.
...
UI for setting the join policy is in, but not yet used.
2011-03-21 13:51:13 -07:00
Brion Vibber
089c10d5d8
get_class -> class_exists for class loading hack (fixme for 1.0: make sure all these classes are in own files)
2011-03-21 11:43:02 -07:00
Evan Prodromou
0a71622aa7
Widget automatically delegates unimplemented methods to attribute
2011-03-21 11:09:16 -04:00
Zach Copley
fc0ed76ebd
Remove stray get_class() call
2011-03-20 19:37:25 -07:00
Brion Vibber
1fdc72f595
Merge branch '0.9.x'
2011-03-18 14:11:27 -07:00
Brion Vibber
df4afee86c
Tickets #1610 , #1949 : show permalinks on Popular Notices, attachments aside sections
...
These mini notice lists were previously not actually showing links to the notices, making them hard to use. There was code to output a link, but it had been unused due to the config options triggering it not being set. The links also looked bad ("( see )" with bad spacing).
Replaced that code with a call into NoticeListItem's existing code to format a relative timestamp with the notice permalink, which looks nice. Used a div rather than p to avoid clearing the float, so it flows nicely.
2011-03-18 14:09:41 -07:00
Brion Vibber
4874ab0e7d
Tickets #1610 , #1949 : show permalinks on Popular Notices, attachments aside sections
...
These mini notice lists were previously not actually showing links to the notices, making them hard to use. There was code to output a link, but it had been unused due to the config options triggering it not being set. The links also looked bad ("( see )" with bad spacing).
Replaced that code with a call into NoticeListItem's existing code to format a relative timestamp with the notice permalink, which looks nice. Used a div rather than p to avoid clearing the float, so it flows nicely.
2011-03-18 13:58:13 -07:00
Siebrand Mazeland
a4e334a0ba
Translator documentation added/updated.
...
i18n updates.
Superfluous whitespace removed.
2011-03-18 18:03:41 +01:00
Siebrand Mazeland
cf45c978d9
Fixed issues with plural handling.
...
L10n/I18n updates.
Translator documentation added.
Superfluous whitespace removed.
2011-03-18 17:59:51 +01:00
Brion Vibber
90a7631592
Caching for conversation root lookup, some logic fixes in threaded view
2011-03-17 17:36:53 -07:00
Brion Vibber
0c2c73659c
Use cached sources for favorites & repeats info on threaded notice lists
2011-03-17 17:06:04 -07:00
Brion Vibber
4afa3caae3
ajax load for additional inline replies; /replies variant of conversationview
2011-03-17 16:27:42 -07:00
Brion Vibber
94ecfc3fcd
Initial use of inline reply area for marking repeats...
2011-03-17 15:17:45 -07:00
Brion Vibber
c70fdef368
Merge branch 'faves' into 1.0.x
2011-03-17 14:48:14 -07:00
Brion Vibber
ed6d5c6e7a
Initial inline listing of favoriters
2011-03-17 14:19:03 -07:00
Brion Vibber
58d39153c6
Favored lists in progress: 'foo, bar and baz'
2011-03-17 13:51:55 -07:00
Brion Vibber
6c236ab0ff
work in progress
2011-03-17 13:25:20 -07:00
Brion Vibber
8ef9d75bbc
Work in progress: faves in the threaded reply area
2011-03-17 13:07:17 -07:00
Evan Prodromou
60a237ac62
some flushing in the UI
2011-03-17 15:26:37 -04:00
Evan Prodromou
a430540155
configuration option to bust frames or not
2011-03-17 11:32:14 -04:00
Evan Prodromou
531400be6f
upgrade lifecycle to release
2011-03-17 09:58:41 -04:00
Evan Prodromou
409f5f5658
alpha1 version of the software
2011-03-17 09:21:26 -04:00
Brion Vibber
bd12546984
Allow plugins to modify or append command help text; broke the command help down into pieces which also will aid translators in future, as the entire message blob won't change every time something gets fiddled with.
2011-03-16 17:07:06 -07:00
Evan Prodromou
f5bde9b693
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-16 18:54:07 -04:00
Evan Prodromou
0791d0034f
return Ajax-y XML on exceptions
2011-03-16 18:53:46 -04:00
Brion Vibber
a81a599d8a
MESSAGES_PER_PAGE constant missing (merge error?)
2011-03-16 11:11:06 -07:00
Samantha Doherty
5e40450efd
Quick style update for profile blocks.
2011-03-16 13:50:24 -04:00
Zach Copley
3692a09095
Extended profile - add nav link to new profile block
2011-03-16 10:30:57 -07:00
Evan Prodromou
c99f6f6afc
remove a bunch of common_debug() calls for url shortening
2011-03-16 10:26:14 -04:00
Evan Prodromou
32aa061c17
remove debugging code for microapp
2011-03-16 10:16:29 -04:00
Evan Prodromou
519bbfb2e9
use <p> to keep stuff in profile block from bunching
2011-03-16 10:03:28 -04:00
Evan Prodromou
410ca34ce9
remove edit link from profileblock
2011-03-16 09:59:36 -04:00
Evan Prodromou
07d9cca004
fix bug with undefined variable
2011-03-16 09:57:10 -04:00
Evan Prodromou
bbba1f6e16
Show group actions in profile block
2011-03-16 09:57:10 -04:00
Evan Prodromou
2d4554ea03
Remove UserProfile class
2011-03-16 09:57:10 -04:00
Evan Prodromou
3d68474e14
move UserProfile actions to account profile block
2011-03-16 09:57:10 -04:00
Evan Prodromou
051e374792
profile block can have actions
2011-03-16 09:57:10 -04:00
Evan Prodromou
a661b22fad
use stream-sized avatar for default profileblock
2011-03-16 09:57:10 -04:00
Evan Prodromou
fbc11b72d7
Allow profileblock subclasses to show different sized avatars
2011-03-16 09:57:10 -04:00
Evan Prodromou
f242cf0e58
move profile block to the aside
2011-03-16 09:57:09 -04:00
Evan Prodromou
f23184a8d6
add newline to group profile block
2011-03-16 09:57:09 -04:00
Evan Prodromou
66b505a341
show group profile block for group pages
2011-03-16 09:57:09 -04:00
Evan Prodromou
561458650f
profile group uses account profile block
2011-03-16 09:57:09 -04:00
Evan Prodromou
e5133f8150
add accountprofileblock and make defaultprofileblock use it
2011-03-16 09:57:08 -04:00
Evan Prodromou
d0317d96e1
hide profile block on settings and admin panels
2011-03-16 09:57:08 -04:00
Evan Prodromou
a72dbc1aff
add a profile block to left column
2011-03-16 09:57:07 -04:00
Evan Prodromou
41420449f8
Merge branch 'jqueryui' into 1.0.x
...
Conflicts:
lib/action.php
2011-03-16 09:56:26 -04:00
Evan Prodromou
afa1aa6c9b
Revert "use jquery-ui for input_forms tabset"
...
This reverts commit c4bada9022
.
2011-03-16 09:53:27 -04:00
Brion Vibber
7345de1202
Add layout divs to InfoAction's core block; fixes error display layout in Neo skin
2011-03-15 17:32:25 -07:00
Ian Denhardt
27ef3b1d90
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
actions/public.php
2011-03-15 12:42:58 -04:00
Samantha Doherty
4334bb7132
Adding wrapper divs for equal height columns.
2011-03-14 15:30:51 -04:00
Brion Vibber
2bccd18d9a
JS optimization: move creation of inline reply placeholders to server-side so we don't have to create them client-side (which causes reflows and takes about 25-30ms on my test system)
...
Using live instead of bind for the event handling, we don't have to play any games on the ones that we do add at runtime. Yay!
2011-03-11 15:20:20 -08:00
Brion Vibber
4e2a0e2fd0
Use non-minified jQuery when $config['site']['minify'] is off; aids in debugging when something fails deep in jQuery-land.
2011-03-11 14:48:47 -08:00
Brion Vibber
717fed785e
Update PersonalGroupNav with fixed highlighting checks.
...
Couldn't use Menu::item() as its checks are only for the action name, so would have highlighted stuff for other users though it always links to self.
2011-03-11 14:25:57 -08:00
Brion Vibber
d393ac4bbb
remove stray close div from empty search results doc bits
2011-03-11 14:08:48 -08:00
Brion Vibber
3c9561b3f0
Merge branch 'atomic-json' into 1.0.x
2011-03-11 12:47:11 -08:00
Brion Vibber
3146c9fae8
Add event hooks for customizing ActivityObject output to Atom and JSON, and helpers for MicroAppPlugin.
...
New hooks:
* StartActivityObjectOutputAtom
* EndActivityObjectOutputAtom
$obj ActivityObject
$out XMLOutputter
* StartActivityObjectOutputJson
* EndActivityObjectOutputJson
$obj ActivityObject
&$out array
2011-03-11 11:58:53 -08:00
Siebrand Mazeland
eff26421ab
Move translator documentation one line lower. Otherwise it will not be added to the POT file.
2011-03-11 19:32:35 +01:00
Brion Vibber
0f3af3e3b7
Keep 'Status' tab current while showing the placeholder -- pretend like it's a mini version of the status notice form :D
2011-03-10 18:01:40 -08:00
Brion Vibber
771682b6eb
Add placeholder status form for the top (needs to hook up to JS)
2011-03-10 17:40:25 -08:00
Brion Vibber
874804a0c4
use a data attribute instead of 'title' for geo lookup api; fixes failure of cloned forms to work
2011-03-10 16:49:24 -08:00
Brion Vibber
acd3f957ba
Micro-app fix: pass foreign options (remote source & original URI) with OStatus input
2011-03-10 12:05:25 -08:00
Brion Vibber
0511800351
Provisional tweak for polls to go through atom feeds / ostatus
...
Had to fix some calls to MicroAppPlugin->saveNoticeFromActivity() which passed an OStatus_profile instead of a Profile...
Imported polls don't get data from upstream or send it back currently.
2011-03-10 11:35:04 -08:00
Evan Prodromou
c4bada9022
use jquery-ui for input_forms tabset
2011-03-10 10:53:11 -06:00
Evan Prodromou
a5daed0aa8
load jquery-ui css and js by default
2011-03-10 10:28:08 -06:00
Brion Vibber
cecc2576a5
Fixes for direct message form for JS changes to the main form
2011-03-09 16:55:52 -08:00
Brion Vibber
040baf291d
Fix for input tab selection
2011-03-09 13:05:12 -08:00
Brion Vibber
381ffc3fe8
Stub 'home' subsection at top of settings & admin nav panels, so folks always know how to get home.
...
(If we drop the section titles, these'll look a little cleaner since it'll only show 'Home' once :D)
2011-03-09 12:38:06 -08:00
Brion Vibber
1f9a9c69bc
Only show the site_nav_object block if Action::showObjectNav has been overridden to do something.
...
(Copied similar check from showPageNoticeBlock, handy!)
2011-03-09 12:07:26 -08:00
Brion Vibber
0a19949f6d
Allow theme.ini to specify external CSS URLs, such as Google Font API loaders.
...
Example theme.ini:
external="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic "
include=rebase
Notes:
* URLs must be quoted in the .ini file or the .ini file parser explodes!
* To do multiples, list as external[] instead of external.
* If there's an included base theme, any externals it lists will be included first.
* All externals are loaded before any local styles.
2011-03-09 11:38:43 -08:00
Brion Vibber
7f42e48631
section class on object nav
2011-03-09 10:53:45 -08:00
Brion Vibber
1f86f45bb9
Move object menu into aside
2011-03-09 10:38:44 -08:00
Evan Prodromou
b150b9439a
don't show register in login if already logged in
2011-03-09 10:15:19 -05:00
Evan Prodromou
3d310c80be
no notice form on error pages
2011-03-09 10:12:53 -05:00
Evan Prodromou
88e09d45c9
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-08 22:48:34 -05:00
Evan Prodromou
b8b1fbb6b5
Give NoticeListItem its own class
2011-03-08 22:48:16 -05:00
Brion Vibber
cbf16a4974
Bookmark and poll plugins' custom notice forms now do AJAX submit, with the resulting notice appearing in the timeline.
...
FormNoticeXHR now is triggered on any form labeled with class 'ajax-notice', so those other than the traditional notice form should work as long as they handle the AJAX submission and return a properly formatted notice.
Things to watch out for:
* to determine whether the resulting notice should show on the current timeline, the JS code needs to be able to check the author and such. Keeping the existing vcard bits helps for this!
* the notice form submission stuff clears out inputs from your form -- test to make sure this behaves correctly
* error messages returned from the thingy _should_ come through, but this needs more testing for consistency
* while form components that aren't in a custom form should just be ignored, this should be tested more. (eg there's no location or attachment box for poll or bookmark plugins)
* NoticeListItem isn't currently reachable via autoloader -- touch NoticeList explicitly before calling into it for now.
2011-03-08 15:10:30 -08:00
Brion Vibber
28809035d0
Replace explicit FormXHR setup for a bunch of simple AJAX form submissions with adding the 'ajax' class on them.
...
This avoids having to add extra custom JS bits just to initialize forms using the common AJAX submission path.
2011-03-08 13:58:28 -08:00
Brion Vibber
ba1ada2880
de-IDifying labels in notice form to fix issue with geo pin activating the wrong place when cloning the form
...
Note that changes to the attachment from <label for/><input id/> to <label><input></label> affect some of the existing styles which attempt to place them both in the same place based on having a common parent. Only 'neo' has been fully tested and fixed for this case, as the others all fail due to the new layout anyway. :)
2011-03-08 12:14:44 -08:00
Zach Copley
cfe3e83293
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice form.
Localisation updates from http://translatewiki.net .
More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out
Doc comments for MicroAppPlugin
mailboxes were wrongly overriding global menu
2011-03-07 21:35:48 -08:00
Brion Vibber
541613ce69
More doc comments on MicroApp stuff; some of the show-notice code & the ActivityStreams stuff is a bit wonky and may need smoothing out
2011-03-07 15:15:21 -08:00
Brion Vibber
4a54bb337a
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-07 13:36:54 -08:00
Brion Vibber
9a837ee33b
Doc comments for MicroAppPlugin
2011-03-07 13:36:15 -08:00
Zach Copley
4b24f09ab4
Merge branch '1.0.x' into directory
...
* 1.0.x: (68 commits)
Avoid AJAX fetch delay for inline replies when possible; we clone a copy of the notice form skeleton at initialization, then insert it in place instead of fetching a new one.
Fix bad reference
lost a </div> in input_forms
neo is the default
First version of 3cl theme neo.
cleaner is the new default theme (for now)
store reply_to notices as comment activity objects
fix object errors with bookmark notices
save the object type when saving a new bookmark notice
ActivityObject uses Notice's object_type by default
Notice saves its object type
show correct notice in output
UR FACE
wrapper div for primary nav
Revert "abstraction for starting and ending a menu"
Revert "primarynav uses menustart and menuend"
primarynav uses menustart and menuend
abstraction for starting and ending a menu
remove adminpanelnav from adminpanelaction module
Input form switcher works
...
2011-03-07 12:37:51 -08:00
Evan Prodromou
f8427f3d1e
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-07 15:12:51 -05:00
Evan Prodromou
884c3d06d2
mailboxes were wrongly overriding global menu
2011-03-07 15:11:38 -05:00
Zach Copley
985ff92431
Fix bad reference
2011-03-07 12:10:34 -08:00
Evan Prodromou
b7a8863b27
lost a </div> in input_forms
2011-03-07 15:06:21 -05:00
Evan Prodromou
4c0a746831
neo is the default
2011-03-07 15:00:43 -05:00
Evan Prodromou
0b95d68910
cleaner is the new default theme (for now)
2011-03-07 14:32:21 -05:00
Evan Prodromou
55b4303ea4
Merge branch '3cl' into 1.0.x
2011-03-07 14:30:30 -05:00
Evan Prodromou
6862f765f6
ActivityObject uses Notice's object_type by default
2011-03-07 14:21:16 -05:00
Evan Prodromou
618a658985
show correct notice in output
2011-03-07 14:06:46 -05:00
Evan Prodromou
998733cdd4
UR FACE
2011-03-07 12:49:20 -05:00
Evan Prodromou
2272044ad1
wrapper div for primary nav
2011-03-07 12:42:51 -05:00
Evan Prodromou
b751ab70fb
Revert "abstraction for starting and ending a menu"
...
This reverts commit b4f1281799
.
2011-03-07 12:39:52 -05:00
Evan Prodromou
6ab7329e85
Revert "primarynav uses menustart and menuend"
...
This reverts commit 8e03c83a57
.
2011-03-07 12:39:31 -05:00
Evan Prodromou
8e03c83a57
primarynav uses menustart and menuend
2011-03-07 12:37:07 -05:00
Evan Prodromou
b4f1281799
abstraction for starting and ending a menu
2011-03-07 12:36:45 -05:00
Evan Prodromou
876c7a42c8
remove adminpanelnav from adminpanelaction module
2011-03-07 12:36:04 -05:00
Evan Prodromou
cf1a4d8292
Input form switcher works
...
This change adds the input form switcher, which adds a navigation menu
across the top of the input form, letting you switch between different kinds of input.
The input menu doesn't yet look like a nice set of tabs; it could use some love.
2011-03-07 04:57:49 -05:00
Evan Prodromou
7aa55f8200
made the input-form switcher work, kinda
2011-03-07 03:34:20 -05:00
Evan Prodromou
52952d13c0
first (non-working) move to microapp structure for bookmarks
2011-03-07 03:34:20 -05:00
Evan Prodromou
0c3d27046e
move microapp.php to microappplugin.php
2011-03-07 03:34:20 -05:00
Evan Prodromou
a7b6f7a669
add a couple of methods to MicroAppPlugin
2011-03-07 03:34:20 -05:00
Evan Prodromou
97dc0260d9
first pass at microapp class
2011-03-07 03:34:20 -05:00
Evan Prodromou
457d76c0ca
submenu headers are <h3> elements
2011-03-06 17:32:26 -05:00
Shashi Gowda
b176f0fb58
tag / untag commands for people tags
2011-03-07 00:46:42 +05:30
Shashi Gowda
382e4d2cdb
people tag actions
2011-03-07 00:43:31 +05:30
Shashi Gowda
f446db8e2a
people tag UI elements
2011-03-07 00:39:24 +05:30
Shashi Gowda
371e923c37
Twitter lists compatible people tags api
2011-03-07 00:36:06 +05:30
Shashi Gowda
4b8ee81ca9
Utility functions for people tags
2011-03-06 23:33:39 +05:30
Zach Copley
1256181d36
Merge branch '1.0.x' into directory
...
* 1.0.x:
* translator documentation updated. * superfluous whitespace removed. * small refactoring in noticeform.php to allow proper translator hints.
* translator documntation updated * superfluous whitespace remove * minor L10n and i18n updates
Cleanup & minification for migration to reusable notice form in inline replies. Yay!
Work in progress: inline reply form reusing the main reply form now inserts the successful result more or less right
style fixes for new notice form being reused in reply area
Reusable notice form fixes for geolocation
Loading the original form instead of faking up our own. Sorta works but not pretty :D
Kill some more hardcoded ids...
More hardcoded id cleanup in notice form...
'link' to 'links' in feed document
2011-03-05 01:57:50 -08:00
Zach Copley
5f1a795b73
Add some other ways to order searches to the base search engine class
2011-03-05 01:54:47 -08:00
Siebrand Mazeland
a127ba78a8
* translator documentation updated.
...
* superfluous whitespace removed.
* small refactoring in noticeform.php to allow proper translator hints.
2011-03-05 00:24:19 +01:00
Brion Vibber
5358f78e82
Reusable notice form fixes for geolocation
2011-03-04 14:27:55 -08:00
Brion Vibber
d8e30fa495
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-04 13:41:01 -08:00
Brion Vibber
56d5c4a4d1
More hardcoded id cleanup in notice form...
2011-03-04 13:40:33 -08:00
Evan Prodromou
8dbbee92e9
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-04 16:31:58 -05:00
Evan Prodromou
1c87e32cd1
'link' to 'links' in feed document
2011-03-04 16:09:59 -05:00
Evan Prodromou
316fd01e20
format Atom datetimes as UTC
2011-03-04 15:27:37 -05:00
Evan Prodromou
64925a275e
format Atom datetimes as UTC
2011-03-04 15:26:25 -05:00
Brion Vibber
b58aa29168
Notice form cleanup: removing hardcoded id from counter references; prep for reusable notice forms.
2011-03-03 17:15:17 -08:00
Brion Vibber
77a3017e9e
Can now set $config['site']['minify'] = false; to use util.js and friends non-minified; aids in browser-side debugging.
2011-03-03 16:53:16 -08:00
Brion Vibber
5a404ee713
'Comment' -> 'Reply' in inline comment/reply messages
2011-03-03 12:26:07 -08:00
Evan Prodromou
6b5d183bac
beta3
2011-03-03 12:10:43 -05:00
Evan Prodromou
418abd8da4
Revert "New version, dev cycle"
...
This reverts commit 96d0141848
.
2011-03-03 12:09:51 -05:00
Evan Prodromou
85610d0881
no notice form on settings pages
2011-03-02 22:09:26 -05:00
Evan Prodromou
53db4c2b85
move notice form to content block
2011-03-02 22:09:11 -05:00
Brion Vibber
e42db528e2
More fixes for 'fav' IM command: don't die with a fatal error if the notice has already been favored, and don't spew a warning when checking for user ID match.
2011-03-01 17:17:41 -08:00
Brion Vibber
5519da95fd
Merge branch 'master' into 0.9.x
2011-03-01 17:11:29 -08:00
Brion Vibber
3eb900e31f
More fixes for 'fav' IM command: don't die with a fatal error if the notice has already been favored, and don't spew a warning when checking for user ID match.
2011-03-01 17:09:41 -08:00
Brion Vibber
764d069ccd
Clean up threaded notices vs replies classes, and fixed realtime's threaded behavior to only run on threaded lists
2011-03-01 16:08:37 -08:00
Evan Prodromou
5bbcededa7
move inbox/outbox to object menu
2011-03-01 16:48:20 -05:00
Evan Prodromou
815a9a0c3e
fixup link to your profile
2011-03-01 16:37:21 -05:00
Evan Prodromou
c4b53b4aef
don't show full profile menu all the time
2011-03-01 16:35:25 -05:00
Brion Vibber
35ce314bfb
Hide context entries in threaded lists; it's redundant (and if there's more than a few messages, we have the context link still :D)
...
Also hides them via CSS for new ajax additions
2011-03-01 13:30:38 -08:00
Evan Prodromou
0fef2cb66d
personal group nav uses current user
2011-03-01 16:04:36 -05:00
Evan Prodromou
c925a4d181
search actions show the search menu in object area
2011-03-01 15:54:43 -05:00
Evan Prodromou
805d14577d
subscriber actions show the profile menu in object area
2011-03-01 15:54:32 -05:00
Evan Prodromou
0e1a221423
add object menu to actions, default empty
2011-03-01 15:52:46 -05:00
Evan Prodromou
7d77bdcc48
move top-level navigation to default local navigation
2011-03-01 06:30:51 -05:00
Evan Prodromou
dba2aaa59f
new mega-menu for default local navigation
2011-03-01 06:30:27 -05:00
Evan Prodromou
d8cbc20a79
method to show submenus
2011-03-01 06:29:24 -05:00
Evan Prodromou
a64c6c5015
all nav menus use menu superclass
2011-03-01 06:00:03 -05:00
Evan Prodromou
d6d3dfda81
AdminPanelNav has own module, uses Menu
2011-03-01 05:51:00 -05:00
Evan Prodromou
903053caec
primary and secondary nav use menu superclass
2011-03-01 05:46:03 -05:00
Evan Prodromou
c8d6a77d8a
common superclass for menu widgets
2011-03-01 05:45:38 -05:00
Brion Vibber
082ddf365e
Cut repeats out of the magic handling
2011-02-28 17:23:01 -08:00
Brion Vibber
407cc851cc
Collapse long threaded displays with a link to the convo view (todo: turn it into an ajax loader for inline expansion)
2011-02-28 17:13:54 -08:00
Brion Vibber
59a0b2a82d
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments
...
Conflicts:
js/util.min.js
2011-02-28 16:18:38 -08:00
Brion Vibber
62712b794a
More interactive magic for inline replies: placeholder at the end of list
2011-02-28 16:13:16 -08:00
Zach Copley
f3ffc8bc46
Missed a couple of conflicts
2011-02-28 15:51:46 -08:00
Brion Vibber
3b456b4ffe
Paging fix for threaded notice lists
2011-02-28 15:40:43 -08:00
Zach Copley
b7d0746694
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/emailsettings.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/profilesettings.php
actions/showgroup.php
actions/smssettings.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
index.php
lib/accountsettingsaction.php
lib/action.php
lib/common.php
lib/connectsettingsaction.php
lib/designsettings.php
lib/personalgroupnav.php
lib/profileaction.php
lib/userprofile.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Facebook/FBConnectSettings.php
plugins/Facebook/FacebookPlugin.php
plugins/NewMenu/NewMenuPlugin.php
plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
Brion Vibber
e89bffc3f1
Work in progress: setting up inline reply mini-form in js
2011-02-28 15:38:54 -08:00
Brion Vibber
fb9418b99d
some quick visual tweaks
2011-02-28 12:50:26 -08:00
Brion Vibber
2370208540
quickie inline reply posting form
2011-02-28 12:41:03 -08:00
Brion Vibber
2c03dd569c
visual tweaks for convo view
2011-02-28 12:20:47 -08:00
Brion Vibber
31bf2cd6b9
quick hack -- switch order on inline convo view (comments in forward chron)
2011-02-28 11:59:37 -08:00
Brion Vibber
d806907b81
Initial test threaded convo view inline on public, all timelines
2011-02-28 11:53:48 -08:00
Brion Vibber
8cdf8cf33e
Fix for schema_version checksum table when checking schemas before the table's been added. :)
2011-02-28 11:19:47 -08:00
Brion Vibber
836f4ea6ea
fix - Notice: Undefined variable: action in /Library/WebServer/Documents/mublog/lib/action.php on line 521
2011-02-28 11:02:38 -08:00
Brion Vibber
2bd9532ebe
Merge branch 'master' into 0.9.x
2011-02-28 10:18:18 -08:00
Brion Vibber
6a6584741f
Fix for ticket #2248 : flickr etc URLs that contain @ in the paths etc no longer accidentally trip the mailto: thingy
2011-02-25 15:46:35 -08:00
Siebrand Mazeland
4e3537a12b
* add support for Friulian
...
* move a line around for sorting reasons
2011-02-26 00:34:46 +01:00
Brion Vibber
880b1b666e
Merge branch 'master' into 0.9.x
2011-02-25 12:24:18 -08:00
Brion Vibber
55b1f3d84c
Scalability work on user backup stream generation.
...
UserActivityStream -- used to create a full activity stream including subscriptions, favorites, notices, etc -- normally buffers everything into memory at once. This is infeasible for accounts with long histories of serious usage; it can take tens of seconds just to pull all records from the database, and working with them all in memory is very likely to hit resource limits.
This commit adds an alternate mode for this class which avoids pulling notices until during the actual output. Instead of pre-sorting and buffering all the notices, empty spaces between the other activities are filled in with notices as we're making output. This means more smaller queries spread out during operations, and less stuff kept in memory.
Callers (backupaccount action, and backupuser.php) which can stream their output pass an $outputMode param of UserActivityStream::OUTPUT_RAW, and during getString() it'll send straight to output as well as slurping the notices in this extra funky fashion.
Other callers will let it default to the OUTPUT_STRING mode, which keeps the previous behavior.
There should be a better way to do this, swapping out the stringer output for raw output more consitently.
2011-02-25 12:15:38 -08:00
Brion Vibber
0291c6f7cd
Merge branch 'unicode-tag' into 0.9.x
2011-02-25 10:17:03 -08:00
Brion Vibber
59a413cf5e
Merge branch 'master' into 0.9.x
2011-02-25 10:16:00 -08:00
Evan Prodromou
81bcdfe2be
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2011-02-25 08:02:26 -08:00
Evan Prodromou
ecfb3b9288
allow passing an url to email confirmation function
2011-02-25 08:00:55 -08:00
Zach Copley
17176ee445
Merge branch 'json-activities' into 0.9.x
2011-02-25 00:15:26 -08:00
Brion Vibber
295e2bde56
Unicodize a couple regexes for tags: fixes linking & detection of non-ASCII tags that match the current regexes.
...
(Checks for 'letter' and 'number' characters, underscore, dash, and period.)
2011-02-23 16:37:55 -08:00
Brion Vibber
1be2226019
replace router regexes with tags with a fixed chunk that takes any non-/ char. This'll let other code decide what's a valid tag.
2011-02-23 16:32:56 -08:00
Brion Vibber
2a42dac72a
Partial implementation for ticket #2442 : MobileProfile plugin should allow manual switching between regular and mobile rendering modes
...
http://status.net/open-source/issues/2442
Notes:
* Mapstraction causes JavaScript errors in XHTML mode, breaking our code if we're run later so the link doesn't work to get back to Desktop.
* not 100% sure how safe feature detection is here?
* Currently will be useless but visible links if no JS available; need to fall back to server-side for limited browsers
2011-02-21 16:10:07 -08:00
Evan Prodromou
f743a233ab
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2011-02-21 16:36:12 -05:00
Brion Vibber
2e1c7c779d
Merge branch 'master' into 0.9.x
2011-02-21 12:33:47 -08:00
Brion Vibber
eb7e3ee528
Fixes for ticket #3052 : some commands started triggering when extra text is supposed to suppress them
...
Regressions caused by bad refactoring in commit 21feac3bea
.
Test cases in tests/CommandInterpreterTest.php were made against the pre-refactoring code, and now check out with the fixed code.
Failures were caused by not changing logic structure when moving from multiple exit points (each if point would return directly with a null or an object) to setting a result variable and then falling through to a common exit point. Without the if statements being restructured, the result variable would just get overridden by the next case.
2011-02-21 12:12:10 -08:00
Evan Prodromou
1525acdca1
Extend authorization framework to cover login and API use
...
I've extended the rights framework (centering on the Right class and Profile::hasRight()) to cover
Web login and API use. This will make it possible to prevent login and API use by users.
I added two new Right constants to the Right class: WEBLOGIN and API. I check these rights using
Profile::hasRight() when initializing users. If the rights check fails, I throw an exception.
I created a new AuthorizationException class for this particular
exception, in order to allow a different UI for these kinds of exceptions (or whatever).
2011-02-21 10:20:42 -05:00
Zach Copley
93e3d49044
Activity Streams JSON: inReplyTo objects weren't being output. Fixed.
2011-02-18 18:52:49 -08:00
Zach Copley
b741184d9b
Add provider to Activity Streams JSON
2011-02-18 18:10:21 -08:00
Zach Copley
68017392ff
Make other timeline API endpoints output Activity Streams JSON
2011-02-18 15:43:40 -08:00
Zach Copley
da42d36d7f
Activity Streams JSON - express to and in-reply-to stuff as person objects
2011-02-18 10:02:41 -08:00
Zach Copley
20e414665d
Add tags to Activity Streams JSON
2011-02-18 09:29:49 -08:00
Zach Copley
60f62199a1
Add context to Activity Streams JSON
2011-02-18 00:51:08 -08:00
Zach Copley
11f77b2fca
Add PoCo to Activity Streams JSON
2011-02-17 22:36:14 -08:00
Zach Copley
97af5e1954
Add geopoint (GeoJSON) extension to AS JSON output
2011-02-17 20:12:28 -08:00
Zach Copley
e84b01c76f
avatars -> avatarLinks
2011-02-17 19:34:39 -08:00
Zach Copley
e98e443605
Merge branch '0.9.x' into json-activities
...
* 0.9.x:
* update translator documentation. * remove superfluous whitespace. * tab to spaces. * add FIXME for undocumented class.
* update translator documentation. * remove superfluous whitespace. * L10n updates. * small refactoring in publicrss.php. * remove PHP4-isms
Localisation updates from http://translatewiki.net .
Double quotes to single quotes.
* improve L10n consistency for English. For example proper punctuation for all button and label titles. * fix some i18n bugs (in-message variables). * update/add translator documentation. * remove superfluous whitespace.
add path separators for Plugin::path()
argument to send email summary to all users on all sites
fix indentation in siteemailsummaryhandler
fix indentation in sendemailsummary.php
fix indentation in Email_summary_status.php
fix indentation in EmailSummaryPlugin.php
fix indentation in usermailsummaryhandler.php
2011-02-17 19:11:29 -08:00
Zach Copley
29ce5dd19a
Reinstate profile_info in author/actor
2011-02-17 19:02:57 -08:00
Zach Copley
a199192ebf
Add avatars and notice info
2011-02-16 18:55:13 -08:00
Zach Copley
b1675ff175
Rudimentary support for enclosures and some fiddling
2011-02-16 18:14:58 -08:00
Zach Copley
ddda31038e
Use simple relative object and verb references
2011-02-16 16:44:02 -08:00
Zach Copley
e4d5c47ebf
Add image to JSON ActivityObject and title + links to the JSON document
2011-02-16 16:21:46 -08:00
Evan Prodromou
be682a3f8c
Merge branch 'master' into 0.9.x
2011-02-16 13:56:55 -05:00
Evan Prodromou
39c6e34098
add path separators for Plugin::path()
2011-02-16 13:56:30 -05:00
Zach Copley
a1b436a8c6
First cut at some JSON Activity Streams output
2011-02-15 20:25:39 -08:00
Evan Prodromou
96d0141848
New version, dev cycle
2011-02-15 12:26:40 -05:00
Zach Copley
7de1aaf86d
Atom - output nickname for atom:name in atom:author
2011-02-13 00:40:28 +00:00
Evan Prodromou
f6e614b894
add plugins/sslpath setting, default to site path/plugins
2011-02-11 15:58:47 -05:00
Evan Prodromou
ff2553b9c7
get the subject first if you go to the feed
2011-02-11 03:01:24 +00:00
Evan Prodromou
fc317f8b72
check legacy <actor> and <subject> first from feed
2011-02-11 02:59:18 +00:00
Zach Copley
df19e88323
Atom output - Reinstate activity:actor and activity:subject
...
w/deprecation warnings. Also add statusnet:profile_info back into
author/actor.
2011-02-09 23:18:14 -08:00
Brion Vibber
dc5daa237e
Further tweak for ssl paths in plugin check (sslserver may be set but empty)
2011-02-09 00:09:25 -08:00
Brion Vibber
9efedfc217
Tweak to use site/server fallback when no plugins/sslserver or site/sslserver and generating plugin CSS
2011-02-09 00:04:01 -08:00
Brion Vibber
a277a003b9
0.9.7beta2 (for js update)
2011-02-08 22:55:15 -08:00
Evan Prodromou
399977aebf
Merge remote branch 'origin/pluginstatic' into testing
2011-02-08 13:39:17 -05:00
Evan Prodromou
ecf0dec0c1
change alpha1 to beta1
2011-02-08 11:53:30 -05:00
Evan Prodromou
3b19b63bab
correctly show the source of messages in a message list
2011-02-08 11:32:35 -05:00
Evan Prodromou
f500d4ea5b
Create and use MessageList widget
...
Our mailbox actions (inbox and outbox) were doing their own display of
messages. This was causing issues with especially showmessage, which
since the more rigourous nickname checks were added, no longer works as
a mailbox subclass.
I've taken the time to rip out the message listing code from MailboxAction
and moved it to a MessageList widget. The different mailboxes now have their
own subclasses that show the correct profile in the list.
2011-02-08 11:11:21 -05:00
Brion Vibber
c858e2bc34
Issue #3025 : string -> boolean for profile_background_tile entry in JSON user results from Twitter-compat API
...
This entry was using the strings 'true' and 'false' instead of literal booleans, which could confuse clients expecting literal booleans as in other places and on Twitter in this place.
2011-02-07 14:38:35 -08:00
Evan Prodromou
cd536e3099
move MESSAGES_PER_PAGE to common.php
2011-02-05 16:18:59 -05:00
Evan Prodromou
d7b2b141be
commands are always lowercased in interpreter
2011-02-03 17:06:15 -05:00
Evan Prodromou
21feac3bea
hooks for commands
2011-02-03 17:04:16 -05:00
Evan Prodromou
99db745f9d
Merge branch 'testing' into privategroup
...
Conflicts:
lib/groupeditform.php
2011-02-03 12:56:55 -05:00
Evan Prodromou
f06e661a9b
new methods for paths to plugin static files
2011-02-03 10:36:25 -05:00
Brion Vibber
ec93184d7b
Merge branch '3022' into testing
2011-02-01 14:37:46 -08:00
Brion Vibber
7977454456
Ticket #3022 : fix formatting output for ApiAction::clientError and ApiAction::serverError when caller doesn't explicitly pass the format.
...
Format's already available as a member variable, so use it!
Fixes some error reponses in api/statusnet/groups/leave.json which were coming through as XML.
May fix some others as well.
2011-02-01 14:35:42 -08:00
Zach Copley
b595c3f0d5
API - Return integers instead of strings for group IDs and DM sender/recipients in JSON output
2011-01-31 21:01:03 -08:00
Brion Vibber
b46ce3b67d
Fix "$s"s that slipped into double-quoted translatable strings' '%1$s' pattern. Switch to single-quote to fix.
2011-01-31 14:00:22 -08:00
Brion Vibber
de7726dd00
Performance counters: records number of total and unique cache get/set/incr/deletes and queries, and logs to syslog.
...
$config['site']['logperf'] = true; // to record & dump total hits of each type and the runtime to syslog
$config['site']['logperf_detail'] = true; // very verbose -- dump the individual cache keys and queries as they get used (may contain private info in some queries)
Seeing 180 cache gets on a timeline page seems not unusual currently; since these run in serial, even relatively small roundtrip times can add up heavily.
We should consider ways to reduce the number of round trips, such as more frequently storing compound objects or the output of processing in memcached.
Doing parallel multi-key lookups could also help by collapsing round-trip times, but might not be easy to fit into SN's object model. (For things like streams this should actually work pretty well -- grab the list, then when it's returned go grab all the individual items in parallel and return the list)
2011-01-31 13:12:56 -08:00
Brion Vibber
b896a37da0
Use cachedQuery on File::getAttachments, plus other cleanups:
...
* dropped unnecessary join on notice table
* made the function actually static, since it makes no sense as an instance variable. The only caller (in AttachmentList) is updated.
2011-01-31 12:22:50 -08:00
Brion Vibber
47f31bce47
Merge branch 'master' into testing
...
Conflicts:
classes/Profile.php
2011-01-31 11:50:06 -08:00
Brion Vibber
9573f725c1
Merge branch '0.9.x' into testing
2011-01-31 11:08:15 -08:00
Evan Prodromou
adaad5bb5e
Merge branch 'runtime' into testing
2011-01-31 14:02:17 -05:00
Evan Prodromou
ca4bf54131
add a comment to show runtime at the end of a page
2011-01-31 13:59:38 -05:00
Siebrand Mazeland
9c8b2b567f
* Add/update translator documentation.
...
* L10n tweaks (mostly domain MENU assignments).
* Remove superfluous whitespace.
2011-01-30 19:03:55 +01:00
Siebrand Mazeland
c29a938895
* update punctuation for translator documentation.
...
* remove superfluous whitespace.
2011-01-30 18:48:09 +01:00
Siebrand Mazeland
7db24c32d6
* fix some i18n and L10n issues
...
* update/add translator documentation
* remove superfluous whitespace
2011-01-29 00:33:13 +01:00
Brion Vibber
433ec21119
Add $config['sessions']['gc_limit'] to limit how much work we do in each session GC; defaulting to killing 1000 sessions at a time.
2011-01-27 12:08:24 -08:00
Evan Prodromou
5fee38b025
events for modifying group edit form
2011-01-26 18:21:43 -07:00
Brion Vibber
54e98ffe22
Fix ticket #3013 : MAX_FILE_SIZE hidden fields were incorrectly placed
...
In order to apply to PHP's POST processing, the MAX_FILE_SIZE field must appear *before* the file upload field. They were incorrectly placed after, where they had no effect on POST processing.
2011-01-26 15:49:57 -08:00
Brion Vibber
621a7cb36d
Merge branch '0.9.x' into testing
2011-01-25 12:57:49 -08:00
Brion Vibber
820dd293c9
Fix for ticket #3007 : .bmp avatar uploads weren't being properly converted to PNG in all cases
...
Part of the reported issue was previuosly fixed by dc497ed0
(smaller size images being blanked).
This commit fixes the remaining bug with original-size avatars being left as BMP (which could include the 96px size for instance, which could cause problems in browsers not supporting BMP natively)
Added ImageFile::copyTo() as a convenient alias for resizeTo() when not resizing; this performs the BMP/XPM/XBM->PNG conversion if needed, or copies the original file.
Copying instead of using move_uploaded_file() is fine here since:
a) the files are cleaned up on script completion anyway (vs moving to remove it)
b) we're already performing getimagesize() and possibly load/resize on the file before this point (vs needing to move the file into a usable area to work with open_basedir restrictions that prevent working directly with uploaded files in the temp dir; since this would fail anyway, we lose nothing)
ImageFile::preferredType() now works on $this->type instead of asking for one, to make it handier to use from outside. (This is still needed in order for calling code to generate a target filename.)
Recommended for future:
* additional consolidation between the various ways of uploading avatars (touched avatarsettings, grouplogo, and apiaccountupdateprofileimage with similar minor changes)
* consolidate type checks and file naming into Avatar class
2011-01-24 12:22:47 -08:00
Evan Prodromou
570c7b63a2
Add internal URL shortener
2011-01-23 16:49:12 -05:00
Evan Prodromou
592e2be5e1
Make new menu the default menu
...
There's a new menu layout in this version of the software. It was
implemented as a plugin in 0.9.x to avoid clashes with existing themes,
but we're going to break that compatibility in this version, so we're just going for it.
This change involved moving all the changes in NewMenuPlugin into the
default code that was calling it. In addition, since
accountsettingsaction and connectsettingsaction differed only by menu,
I removed them, changed all references to them to the settingsmenu, and moved
the combined nav to its own class.
Let's put that episode behind us.
The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions
was removed.
2011-01-23 12:35:35 -05:00
Evan Prodromou
e53793edf4
make 'admin' a safe user name
...
'admin' is a pretty common username that people try when installing;
it was blacklisted because all of our admin panels were at /admin/*,
which would conflict with the admin user's namespace.
Changed the location of all admin panels to /panel/*, blacklisted the
nickname 'panel', and allowed 'admin'. Tested with a fresh install;
seems to work great.
2011-01-23 10:18:35 -05:00
Siebrand Mazeland
6c0e43be9e
L10n consistency updates in wording and punctuation.
...
Translator documentation added/updated.
Superfluous whitespace removed.
2011-01-21 22:45:37 +01:00
Siebrand Mazeland
08cb576b52
Add translator documentation
...
Fix L10n issues
Remove superfluous whitespace
2011-01-21 16:35:00 +01:00
Brion Vibber
6fa0bea76d
Merge branch '0.9.x' into testing
2011-01-20 15:12:57 -08:00
Brion Vibber
6455461c19
Merge branch 'master' into 0.9.x
2011-01-20 15:08:31 -08:00
Zach Copley
05361bb686
OAuth: Fix rare problem in which request tokens were sometimes being
...
returned as access tokens.
2011-01-20 10:44:31 -08:00
Zach Copley
3a24b95edb
Fix a couple spelling mistakes in comments and remove redundant statement terminator
2011-01-20 10:44:05 -08:00
Zach Copley
882b6862a3
OAuth: Fix rare problem in which request tokens were sometimes being
...
returned as access tokens.
2011-01-19 23:00:24 -08:00
Zach Copley
114d9ebf28
Fix a couple spelling mistakes in comments and remove redundant statement terminator
2011-01-19 22:59:51 -08:00
Zach Copley
1543af748c
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline: (63 commits)
Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php
fix wrong datatypes (saving string instead of array) in AtomPub notice processing
Account moving is a background activity
return a 409 Conflict when subscription already exists
OStatusPlugin does discovery in Profile::fromURI()
considerably more logging and error checking in AccountMover
add a log method to AccountMover
normalize accounts and check for return in HTTP for moving
move account-moving classes to their own libraries
execution protection on discovery.php
PHPCS discovery.php
Move discovery library from OStatus plugin to core
Revert "Revert "0.9.7alpha1""
first example of moving a user
Parse properties of links in XRD files
Add the Atom username to the XRD output
preserve activities in object
let callers pass in an XMLOutputter to output to
execution protection on discovery.php
PHPCS linkheader.php
...
2011-01-19 22:58:07 -08:00
Zach Copley
e475bdfe77
OAuth: Fix rare problem in which request tokens were sometimes being
...
returned as access tokens.
2011-01-19 22:55:00 -08:00
Zach Copley
6eca8188b6
Fix a couple spelling mistakes in comments and remove redundant statement terminator
2011-01-19 15:52:18 -08:00
Brion Vibber
963e7576f2
Merge branch 'testing' into moveaccount
2011-01-19 10:41:14 -08:00
Brion Vibber
397f7cd0d8
Refactor profile sidebar statistics output so plugins can hook it and add entries.
2011-01-18 13:32:00 -08:00
Brion Vibber
ff6df8061b
Refactor profile sidebar stats generation: factor out giant chunk of repeated method calls
2011-01-18 13:12:08 -08:00
Brion Vibber
9be770e609
Start cleaning up profile sidebar: link the header text on subscription/subscriber/groups sections to the tabs so users don't have to dance around looking for the link if they don't have enough to trigger a 'more' link.
...
Consolidated some of that link generation; sooooo much more dupe code to kill in this section!
2011-01-18 12:52:38 -08:00
Brion Vibber
56e2bc10d9
Cleanup stray PHP 4-style references in hook calls for navigation bars. We can't replace the live action from here, and don't need a reference to keep the object mutable. Dumping the references helps ensure we don't end up getting errors when things calling the hooks might forget to use the reference and the PHP error reporting settings expose this fact at us.
2011-01-18 12:34:27 -08:00
Evan Prodromou
2a59453d4c
Merge branch 'testing' into moveaccount
2011-01-17 17:34:03 -05:00
Evan Prodromou
fb681990d9
Account moving is a background activity
2011-01-17 17:31:56 -05:00
Evan Prodromou
dce2824747
considerably more logging and error checking in AccountMover
2011-01-17 15:25:58 -05:00
Evan Prodromou
feb3ae4c09
add a log method to AccountMover
2011-01-17 15:06:15 -05:00
Evan Prodromou
b11426dbf4
normalize accounts and check for return in HTTP for moving
2011-01-16 17:17:55 -05:00
Evan Prodromou
905aded81a
move account-moving classes to their own libraries
2011-01-16 17:17:55 -05:00
Evan Prodromou
81079fe522
execution protection on discovery.php
2011-01-16 17:17:55 -05:00
Evan Prodromou
fafb6733db
PHPCS discovery.php
2011-01-16 17:17:55 -05:00
Evan Prodromou
1152b0c3e8
Move discovery library from OStatus plugin to core
2011-01-16 17:16:01 -05:00
Evan Prodromou
a953b93194
Revert "Revert "0.9.7alpha1""
...
This reverts commit fd20554651
.
Conflicts:
lib/common.php
2011-01-16 17:15:26 -05:00
Evan Prodromou
fd7dd9b10f
Parse properties of links in XRD files
2011-01-16 17:15:26 -05:00
Evan Prodromou
8653d8a252
Add the Atom username to the XRD output
2011-01-16 17:15:26 -05:00
Evan Prodromou
aa9137ca71
preserve activities in object
2011-01-16 17:15:26 -05:00
Evan Prodromou
e433e559f8
let callers pass in an XMLOutputter to output to
2011-01-16 17:15:26 -05:00
Evan Prodromou
2a54919d1f
execution protection on discovery.php
2011-01-16 17:15:26 -05:00
Evan Prodromou
0649b96e9b
PHPCS linkheader.php
2011-01-16 17:15:26 -05:00
Evan Prodromou
02cf7d47f8
PHPCS discovery.php
2011-01-16 17:15:26 -05:00
Evan Prodromou
abf694ae5b
move linkheader.php to core
2011-01-16 17:15:26 -05:00
Evan Prodromou
7d1f609bf0
Move discovery library from OStatus plugin to core
2011-01-16 17:15:26 -05:00
Evan Prodromou
39cf147a77
remove dt/dd pairs for license blocks
2011-01-14 15:56:25 -05:00
Siebrand Mazeland
02f005fe5f
* L10n updates
...
* translator documentation added
2011-01-14 21:53:39 +01:00
Evan Prodromou
bbaf9d7f42
some fixes for new no-dl layout
2011-01-14 15:53:02 -05:00
Siebrand Mazeland
bf40b3e694
* remove i18n for debug message.
...
* add i18n for some exceptions.
* add translator documentation.
* L10n updates.
* remove superfluous whitespace.
2011-01-14 21:41:36 +01:00
Evan Prodromou
5c25364141
remove extraneous <dl> and <dt> tags
2011-01-14 15:36:06 -05:00
Evan Prodromou
ca75adf408
Update version number and codename
2011-01-12 18:14:57 -05:00
Evan Prodromou
f9b2feb7f5
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
README
2011-01-12 18:05:56 -05:00
Brion Vibber
cb56f445b8
Ticket #2166 : accept aliases for local group names in API
...
Also simplifies the code by using User_group::getForNickname instead of duplicating half of it :D
2011-01-07 16:23:54 -08:00
Brion Vibber
5616bfb5ff
Fix warning in subscribers/subscriptions list pages where we attempted to call free() an ArrayWrapper after it was used up, thus trying to forward the call to a nonexistent object.
...
Removed the free calls (unneeded since destructors now work), and added an error check w/ logging & an exception for future attempts to forward calls to nonexistent object.
2011-01-07 15:29:30 -08:00
Brion Vibber
0ec07e9c65
Use ReflectionFunction to check for a present-but-disabled dl() function instead of manually parsing the disable_functions php.ini setting.
...
We were checking the list as comma-delimited (per the description of it as comma-delimited), but in fact spaces are also accepted, and who knows what else.
2011-01-07 14:48:40 -08:00
Brion Vibber
35507cd039
Fix ticket #2392 : sending invitation email fails when site name contains double quotes
...
Gotta escape quotes!
2011-01-06 17:43:00 -08:00
Brion Vibber
f2a43769e7
Fix for atom/activity streams parsing: feed's <activity:subject> was being taken at a higher priority than entry's <atom:author>, which broke OStatus group posting since we retired <activity:actor>.
...
Added test case to ActivityParseTests.
2011-01-06 15:13:38 -08:00
Brion Vibber
4b29d0ebb6
Merge branch 'testing-sig' of gitorious.org:~brion/statusnet/brion-fixes into testing
2011-01-05 16:04:32 -08:00
Brion Vibber
f5650806cc
Switch autoloader from '__autoload' magic function name to registering our function with spl_autoload_register(); fixes compat problem with PHPUnit 3.5+ which seems to break the old __autoload
2011-01-05 23:27:17 +00:00
Evan Prodromou
60d8fcd0e7
Revert "Revert "0.9.7alpha1""
...
This reverts commit fd20554651
.
Conflicts:
lib/common.php
2011-01-05 10:52:44 -08:00
Evan Prodromou
a7e5c58a82
Merge branch 'revertversion' into 0.9.x
2011-01-03 10:51:42 -08:00
Evan Prodromou
fd20554651
Revert "0.9.7alpha1"
...
This reverts commit 3d62c1cf51
.
2011-01-03 10:51:29 -08:00
Evan Prodromou
98a0d7f538
Configuration options for using an HTTP proxy
...
We can make a lot of HTTP requests from the server side. This change
adds some configuration options for using an HTTP proxy, which can
cache hits from multiple sites (good for status.net-like services, for example).
2011-01-03 10:38:32 -08:00
Brion Vibber
80e2f4f529
Fix up edge case in nickname processing: overlong display forms should be rejected before normalization (storage of display forms will also have fields with limited length)
2010-12-30 17:11:16 -08:00
Evan Prodromou
66f6b2a342
Events to hook for NoticeListElement <li> generation
2010-12-30 16:57:05 -08:00
Evan Prodromou
32eb4c5e2d
Merge remote branch 'gitorious/0.9.x' into 1.0.x
...
Conflicts:
lib/common.php
2010-12-30 15:52:08 -08:00
Evan Prodromou
3b5c3d2c84
UUID-generation tools
2010-12-30 12:15:34 -08:00
Evan Prodromou
c91b080a8e
version 0.9.8dev
2010-12-29 16:18:43 -08:00
Evan Prodromou
3d62c1cf51
0.9.7alpha1
2010-12-29 16:15:57 -08:00
Evan Prodromou
d8219c07be
update version to 0.9.7
2010-12-29 16:14:00 -08:00
Evan Prodromou
80191b56df
Show <activity:subject> in Atom group notice feed
...
Version 0.9.6 and below of StatusNet assume anything in <author> is a
Person. So, we include an <activity:subject> element, which will be
checked first by those versions of the code, only for group feeds.
At some point we'll take this out, but it's useful for now.
2010-12-29 15:33:57 -08:00
Evan Prodromou
d3b10959f4
Merge branch '0.9.x' into noactor
2010-12-29 15:29:29 -08:00
Evan Prodromou
26afe79ed9
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-29 14:53:38 -08:00
Brion Vibber
e211e6228d
Merge branch '0.9.x' into 1.0.x
2010-12-28 11:38:34 -08:00
Brion Vibber
90c7ff1983
Merge branch 'master' into 0.9.x
2010-12-28 11:37:38 -08:00
Brion Vibber
d3d9797496
Prevent group creation by silenced users.
...
* adds Right::CREATEGROUP
* logic in Profile::hasRight() checks for silencing
* NewgroupAction checks for the permission before letting you see or process the form in the UI
* User_group::register() logic does a low-level check on the specified initial group admin, and rejects creation if that user doesn't have the right; guaranteeing that API methods etc will also have this restriction applied sensibly.
2010-12-28 11:34:02 -08:00
Evan Prodromou
8814fb3822
Merge branch '0.9.x' into socialbookmark
2010-12-27 22:38:36 -08:00
Evan Prodromou
1996545947
add events for restoring activities
2010-12-27 22:28:20 -08:00
Evan Prodromou
6393326557
Merge branch '0.9.x' into socialbookmark
2010-12-27 20:49:31 -08:00
Evan Prodromou
c78170a275
Better job making an ActivityObject from an <atom:author>
2010-12-27 10:19:51 -08:00
Evan Prodromou
ab92496ddc
Stop using <activity:subject> for atom feeds
2010-12-27 10:03:34 -08:00
Evan Prodromou
f5128015be
Use outputTo() instead of asString() for including sub-elements
2010-12-27 09:46:25 -08:00
Evan Prodromou
1188d5bab2
Don't output deprecated <activity:actor> element
2010-12-27 09:25:26 -08:00
Brion Vibber
26baad63f2
Merge branch '0.9.x' into 1.0.x
2010-12-22 15:25:38 -08:00
Brion Vibber
464e0f8115
Don't trust text/xml mime types; generic content detection gives useless stuff like that on SVG images! Todo: replace the extension check in this case with better content-based checks.
2010-12-22 13:56:19 -08:00
Evan Prodromou
402cac2f93
Merge branch '0.9.x' into socialbookmark
...
Conflicts:
lib/activityobject.php
2010-12-22 12:09:42 -08:00
Evan Prodromou
35d9a065fb
Revert "initialize ActivityObject::$extra"
...
This reverts commit 3e82000d57
.
2010-12-22 12:07:13 -08:00
Evan Prodromou
e11ca1e052
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-22 12:05:40 -08:00
Brion Vibber
448dfb69d4
Initialize $extra member to empty array on ActivityObject
2010-12-22 12:03:05 -08:00
Evan Prodromou
3e82000d57
initialize ActivityObject::$extra
2010-12-22 12:02:50 -08:00
Evan Prodromou
5fe8301129
disable account deletion by default
2010-12-22 11:25:47 -08:00
Evan Prodromou
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:22:51 -08:00
Evan Prodromou
17515aacac
drop previous in oembedhelperexception code
2010-12-20 18:32:43 -05:00
Evan Prodromou
f63355451d
fixup exception constructor for php 5.2
2010-12-20 18:28:42 -05:00
Brion Vibber
f82dd4e14f
Merge branch '0.9.x' into 1.0.x
2010-12-20 14:28:43 -08:00
Ian Denhardt
e36399974e
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
lib/action.php
plugins/OStatus/actions/ostatusinit.php
2010-12-20 15:19:33 -05:00
Evan Prodromou
24f9a991b6
Let activity objects write directly to activity's own outputter
2010-12-20 13:30:33 -05:00
Evan Prodromou
6a6dd81d1f
Let activity objects write directly to activity's own outputter
2010-12-20 13:26:57 -05:00
Evan Prodromou
688841fb41
ActivityObject has attribute for other elements
2010-12-19 10:16:44 -05:00
Evan Prodromou
25d03c42e6
Add events for representing objects as activity:object
...
Add 6 new events to make it easier to override the type of an activity object.
2010-12-18 17:24:41 -05:00
Brion Vibber
d8a3a88ec8
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/Memcached_DataObject.php
2010-12-17 17:13:21 -08:00
Brion Vibber
fb8312ebf4
Ticket #2959 : implement api/users/profile_image endpoint in Twitter-compat API
2010-12-17 17:10:52 -08:00
Evan Prodromou
573bbeced1
action to restore a user's backup from the Web interface
2010-12-17 18:56:48 -05:00
Evan Prodromou
1d6091cad2
Two bug fixes in activityimporter
2010-12-17 18:56:17 -05:00
Evan Prodromou
120802b807
change code order to make shorter lines
2010-12-17 18:55:00 -05:00
Evan Prodromou
1a81356622
I'm still not sure when it's useful to reset a notice's author
2010-12-17 17:37:43 -05:00
Evan Prodromou
4b41d05a13
Make restoreuser use new FeedImporter queue handler
2010-12-17 16:27:20 -05:00
Evan Prodromou
044763cf06
move activity importing code to two different queuehandler classes
2010-12-17 13:12:17 -05:00
Evan Prodromou
6469d75fb0
Move accountrestorer class to feed importer
2010-12-17 13:10:23 -05:00
Evan Prodromou
16fc5314fb
move code to get an author object for a feed to a library from Ostatus_profile
2010-12-17 13:09:37 -05:00
Brion Vibber
e79034e163
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-12-16 15:56:19 -08:00
Brion Vibber
ed24c95ac2
Fix ticket #2929 : router cache now clears itself when switching singleuser mode in and out
2010-12-16 13:42:10 -08:00
Evan Prodromou
39804809dd
distribute flag for Notice::saveNew()
2010-12-16 16:17:38 -05:00
Evan Prodromou
2e2519afee
Move account restoration code to a shared library
...
Moved most of the heavy-lifting for account restoration out of
restoreuser.php and into its own class, with the hope that we'll do
the work from the Web eventually.
2010-12-15 17:53:38 -05:00
Evan Prodromou
e16cb8c03a
Merge branch '0.9.x' into righttoleave
2010-12-15 16:48:28 -05:00
Brion Vibber
bf20258f4b
Merge branch '0.9.x' into 1.0.x
2010-12-15 11:59:31 -08:00
Brion Vibber
6c67114198
Mark OembedAction, XrdAction, and (plugin) AutocompleteAction as read-only. Tweaked ApiStatusesShow and ApiTimelineUser to still claim read-only when hit with a HEAD request (usually link checkers or a precursor to a GET, and should be semantically equivalent to a GET without actually transferring data)
2010-12-14 16:14:15 -08:00
Brion Vibber
2ed1e9b126
AtomPub discovery fix: gets MarsEdit's auto API detection working.
...
Router entry for AtomPubService was slightly off, generating an incorrect link in the RSD data.
2010-12-14 14:43:50 -08:00
Evan Prodromou
d840578aa0
An action to delete your own account
...
The new DeleteaccountAction lets a user delete their own account
(subject to global rights set by the admin). It presents a form to
delete the account, with an "I am sure." text entry box.
It then schedules the account for deletion and logs the user out.
2010-12-14 12:38:43 -05:00
Evan Prodromou
5089d3065c
add an action to backup the current account in ActivityStreams format
2010-12-13 16:32:39 -05:00
Evan Prodromou
75aaa98462
define rights for account maintenance and default rules
2010-12-13 16:28:32 -05:00
Evan Prodromou
7c7b91e61a
define configuration settings for account maintenance security
2010-12-13 16:28:02 -05:00
Evan Prodromou
4be9c0a0e9
fix URL for memberships feed
2010-12-13 13:50:57 -05:00
Evan Prodromou
4b7a0d366c
add atompub membership actions to router
2010-12-13 12:40:01 -05:00
Evan Prodromou
37c447be46
Show a single favorite for AtomPub
2010-12-10 18:50:50 -05:00
Evan Prodromou
167f760ab8
Merge branch '0.9.x' into activityatompub
...
Conflicts:
lib/router.php
2010-12-10 17:04:55 -05:00
Brion Vibber
d55f606cf8
Tweaking nickname format regexes: added one that explicitly allows numbers, to be used in router setup.
2010-12-09 16:43:35 -08:00
Evan Prodromou
c619a257fe
Add subscription feed for AtomPub
2010-12-09 16:05:07 -05:00
Evan Prodromou
11a0bde459
AtomPub for single subscription
2010-12-09 13:11:02 -05:00
Evan Prodromou
94ff04e190
Don't cache user-specific information for Notice atom entries
2010-12-08 13:59:12 -05:00
Evan Prodromou
db519d3ffb
whitespace problems in lib/router
2010-12-07 16:23:12 -05:00
Evan Prodromou
57859a4bc8
generate links for apinamespace.org/atom and /twitter in userxrd
2010-12-07 15:53:34 -05:00
Evan Prodromou
eab8d752e8
allow <Property> elements in <Link> in XRD
2010-12-07 15:53:08 -05:00
Evan Prodromou
d5466ac87e
fix whitespace in lib/xrdaction.php
2010-12-07 15:26:43 -05:00
Brion Vibber
9df856e667
Merge branch '0.9.x' into merge
...
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
Evan Prodromou
1fb506c27d
use codeKey() in activity caching
2010-12-06 17:28:22 -05:00
Evan Prodromou
25f644f4b9
Merge branch '0.9.x' into cacheactivity
2010-12-06 17:22:34 -05:00
Evan Prodromou
b35352790f
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-12-06 17:21:38 -05:00
Evan Prodromou
49757c79ee
Config flag to disable router caching if needed
2010-12-06 17:21:01 -05:00
Evan Prodromou
a33d1d6090
use Cache::codeKey() in Router class
2010-12-06 17:20:44 -05:00
Evan Prodromou
004d58fdb8
Make code-dependent cache entries more volatile
...
If a cache entry is dependent on the code that's running, upgrading
(or enabling/disabling plugins) can generate hard-to-track
inconsistencies.
This change adds a close-to-unique fingerprint of the running code to
some cache keys, so that if the fingerprint changes, the old values
are ignored and new values are used.
If the automated uniqueness fails, an administrator can add an extra
config value, $config['site']['build'], that's thrown into the key also.
2010-12-06 17:20:26 -05:00
Evan Prodromou
bb63fd4b75
Config flag to disable router caching if needed
2010-12-06 17:19:41 -05:00
Evan Prodromou
8c4e14b59c
use Cache::codeKey() in Router class
2010-12-06 17:08:52 -05:00
Evan Prodromou
b3d47ed6cc
Make code-dependent cache entries more volatile
...
If a cache entry is dependent on the code that's running, upgrading
(or enabling/disabling plugins) can generate hard-to-track
inconsistencies.
This change adds a close-to-unique fingerprint of the running code to
some cache keys, so that if the fingerprint changes, the old values
are ignored and new values are used.
If the automated uniqueness fails, an administrator can add an extra
config value, $config['site']['build'], that's thrown into the key also.
2010-12-06 17:05:32 -05:00
Evan Prodromou
8564fc51c5
cache generated activity info
2010-12-06 16:38:02 -05:00
Evan Prodromou
da8b268e06
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-06 15:52:03 -05:00
Evan Prodromou
0c0418bdfb
correctly generate enclosure in Activity::asString()
2010-12-06 15:51:42 -05:00
Brion Vibber
2617c40e04
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
classes/User.php
2010-12-06 12:44:19 -08:00
Brion Vibber
76f3dc32e0
Added User::singleUserNickname() as (temporary?) fallback for single-user lookup as a workaround for site setup of 1user sites. We found that an external tool attempting to spin up StatusNet and then register the user would fail because StatusNet's router setup dies on being unable to find its single-user account, since the nickname is needed in setting up routing entries. This tweak will let it survive, using the configured setting as a fallback if it can't actually find the user account.
2010-12-06 12:39:09 -08:00
Evan Prodromou
1f0949f9ac
remove common_debug() from Activity::asString()
2010-12-06 15:22:52 -05:00
Evan Prodromou
b28266b3d6
Convert Notice::asAtomEntry() to use Notice::asActivity() and Activity::asString()
...
We had two ways to generate an activity entry from a notice; one through
Notice::asAtomEntry() and one through Notice::asActivity() and
Activity::asString(). The code paths had already diverged somewhat. I
took the conditions that were in Notice::asAtomEntry() and made sure
they were replicated in the other two functions. Then, I rewrote
Notice::asAtomEntry() to use the other two functions instead.
This change passes the ActivityGenerationTests unit tests, but there
may be some other stuff that's not getting covered.
2010-12-05 16:15:05 -05:00
Brion Vibber
aa96c3c1d9
Fix for tickets #2917 , #2262 : user URL shortening options not being applied in non-web channels
...
common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc.
Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that.
Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little.
Note also ticket #2919 : there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance.
2010-12-02 13:41:56 -08:00
Brion Vibber
f68d4e7d06
Fix dumb mistake -- changed function names partway through writing Nickname and forgot to update a couple places. :)
2010-12-01 11:21:00 -08:00
Evan Prodromou
7aa201fa52
Merge branch 'master' into 0.9.x
...
Conflicts:
lib/router.php
2010-11-30 14:46:26 -05:00
Evan Prodromou
af31767b63
was using Cache::get() and ::set() wrong
2010-11-30 14:44:16 -05:00
Evan Prodromou
c86dff9901
use a CRC32 of the plugin names rather than actual names
2010-11-30 10:11:53 -05:00
Evan Prodromou
8c993a502c
use a CRC32 of the plugin names rather than actual names
2010-11-30 10:11:39 -05:00
Evan Prodromou
f5c8549068
Squashed commit of the following:
...
commit 39fdd181d95d2c39a3ea1ca330b10a99a92b961f
Author: Evan Prodromou <evan@status.net>
Date: Mon Nov 29 10:37:49 2010 -0500
use cache key prefix for router cache key
commit 4cb9e56941922489b83d6425c059cf770991e68f
Author: Evan Prodromou <evan@status.net>
Date: Mon Nov 29 10:31:21 2010 -0500
use a unique hashkey based on the software version and loaded plugins
commit 44458b48aef719543e11f83b41fded65cbcb8be9
Author: Evan Prodromou <evan@status.net>
Date: Sat Nov 27 17:04:15 2010 -0500
cache the NUM object
commit 809c188307a9b4ada15f3d7fa573a6034341efef
Author: Evan Prodromou <evan@status.net>
Date: Sat Nov 27 15:44:12 2010 -0500
accelerate routing by pivoting paths on actions
2010-11-30 09:58:00 -05:00
Evan Prodromou
02da858cef
Squashed commit of the following:
...
commit 39fdd181d95d2c39a3ea1ca330b10a99a92b961f
Author: Evan Prodromou <evan@status.net>
Date: Mon Nov 29 10:37:49 2010 -0500
use cache key prefix for router cache key
commit 4cb9e56941922489b83d6425c059cf770991e68f
Author: Evan Prodromou <evan@status.net>
Date: Mon Nov 29 10:31:21 2010 -0500
use a unique hashkey based on the software version and loaded plugins
commit 44458b48aef719543e11f83b41fded65cbcb8be9
Author: Evan Prodromou <evan@status.net>
Date: Sat Nov 27 17:04:15 2010 -0500
cache the NUM object
commit 809c188307a9b4ada15f3d7fa573a6034341efef
Author: Evan Prodromou <evan@status.net>
Date: Sat Nov 27 15:44:12 2010 -0500
accelerate routing by pivoting paths on actions
2010-11-30 09:57:02 -05:00
Brion Vibber
3be352551a
Normalize username strings in command parsing
2010-11-29 16:44:40 -08:00
Brion Vibber
3f0557aa8e
General code safety: validate input and escape SQL strings in common_relative_profile()
2010-11-29 16:44:01 -08:00
Brion Vibber
e03d2584aa
Use Nickname::DISPLAY_FMT instead of manual regex fragments in router setup for nickname parameters.
2010-11-29 16:02:35 -08:00
Brion Vibber
82799f675f
Add Nickname test cases for @-reply regexes in common_find_mentions
2010-11-29 15:07:55 -08:00
Brion Vibber
fffc10a230
Nickname class to encapsulate validation & common regexes for nickname formats.
...
This provides initial infrastructure for decoupling display names from internal canonical names, but continues to have us storing and using the canonical forms.
It should be/become possible to provide mixed-case and underscore-containing names in links, @-mention, !-group, etc, but we don't store those alternate forms generally.
2010-11-29 14:46:10 -08:00
Brion Vibber
dc350b5463
Work in progress on nickname validation changes. lib/nickname.php appears to have been destroyed by NetBeans and will be rewritten shortly. Sigh.
2010-11-29 14:15:25 -08:00
Brion Vibber
6c4e5a89c1
Add some doc comments on nickname-related stuff in util.php
2010-11-29 11:31:10 -08:00
Evan Prodromou
edf660c6ff
Make userxrd work without OStatus enabled
2010-11-26 22:09:51 -05:00
Evan Prodromou
fcc0825b14
Make userxrd part of the default hostmeta
2010-11-26 21:46:51 -05:00
Evan Prodromou
0a4911552e
Move user xrd action to core and use hooks to extend
...
Moved the Webfinger user XRD action from the OStatus plugin to core.
Added hooks to add OStatus-specific stuff, but kept general stuff in
the core.
2010-11-26 21:38:38 -05:00
Craig Andrews
3f3b38766f
move xrd and hostmeta out of the OStatus plugin and into core
...
add event for setting up hostmeta, and use them in the OStatus plugin
2010-11-26 21:12:14 -05:00
Brion Vibber
cff14c7e10
Merge branch 'master' into 0.9.x
2010-11-19 16:18:53 -08:00
Brion Vibber
b615998309
Fix ticket #2700 : some numeric IDs were misinterpreted as hex numbers instead of strings when '0x123' passed in.
...
Switched from is_numeric() to a custom self::is_decimal() which is more strict.
This makes our behavior match Twitter's API a bit better, so eg this:
http://identi.ca/api/statuses/home_timeline/0x6d686b.xml
should now be equivalent to:
http://identi.ca/api/statuses/home_timeline.xml?screen_name=0x6d686b
instead of:
http://identi.ca/api/statuses/home_timeline.xml?user_id=7170155
2010-11-19 16:12:28 -08:00
Brion Vibber
826a695077
Ticket #2797 : replace addslashes() with explicit escape calls on the DB objects
2010-11-19 15:06:26 -08:00
Brion Vibber
e0e7cb7c53
Merge branch 'master' into 0.9.x
2010-11-19 14:03:59 -08:00
Brion Vibber
ca55d6c514
Ticket #1987 : support since_id on API notice search methods.
...
max_id is not yet implemented, as it'll need support added to the search backends. (since_id we get 'for free' by just cropping off the list, it'll do for now)
2010-11-19 14:00:22 -08:00
Brion Vibber
834acaaa79
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-19 12:00:42 -08:00
Brion Vibber
d961925874
Ticket #2899 : clean up inbox/outbox DM form a bit:
...
- "To" drop-down list now defaults to showing "Select recipient:" instead of the first person on your list, reducing liklihood of accidentally sending a message to the wrong person.
- When there are no mutual subscribers to send to, instead of an empty list the list now shows 'No mutual subscribers.'
In both cases, attempting to send when the default is selected displays an error message.
I'm not disabling form elements in part because our themes right now don't show disabled button state correctly; we might want to tighten that up a bit more once fixed.
2010-11-19 11:56:03 -08:00
Brion Vibber
9a590e0843
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-19 10:43:20 -08:00
Brion Vibber
f468180743
Fix regression in PopularNoticeSection: tag parameter was broken, causing sidebar on tag pages to show untagged favorites.
2010-11-18 14:30:00 -08:00
Zach Copley
645a4d1754
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-11-17 22:16:08 +00:00
Zach Copley
2c68703923
Facebook: Gracefully handle disconnection
2010-11-17 21:53:56 +00:00
Brion Vibber
197b56778a
Add $config['attachments']['process_links'] to allow disabling processing of mentioned URL links for attachment info (oEmbed lookups) and dereferencing of redirects that we didn't have shortened ourselves.
...
This option may be useful for intranet sites that don't have direct access to the internet, as they may be unable to successfully fetch those resources.
2010-11-17 13:03:59 -08:00
Evan Prodromou
589aee587f
include full updated source of JSON2 and use updated minified version
2010-11-17 12:34:04 -05:00
Evan Prodromou
d2ddda16e9
use minified version of jquery.cookie.js
2010-11-17 12:32:11 -05:00
Evan Prodromou
d3d91f0f6e
use minified version of jquery.form.js
2010-11-17 12:31:35 -05:00
Evan Prodromou
11805c97d6
Merge branch '0.9.x' into minifyjs
2010-11-17 12:19:19 -05:00
Evan Prodromou
bacc3d2a74
move EndScriptMessages event into if block
2010-11-17 12:19:01 -05:00
Evan Prodromou
da4f8d465f
Use minified version of util.js
2010-11-17 12:16:50 -05:00
Brion Vibber
fa6c6077d6
Merge branch 'master' into 0.9.x
2010-11-16 11:17:29 -08:00
Brion Vibber
0265cdc1c9
Ticket 2895: exclude silenced users from popular notice lists
2010-11-16 11:13:52 -08:00
Brion Vibber
9b9db3b28a
Prep for ticket #2895 : consolidate common code from PopularNoticeList and FavoritedAction for fetching popular notice lists
2010-11-16 11:10:32 -08:00
Zach Copley
64a29bd401
Fix syntax error
2010-11-16 06:10:49 +00:00
Zach Copley
0b573e0d2b
Store the current user in the CurrentUserDesignAction
2010-11-15 22:01:28 -08:00
Zach Copley
bd566b6f85
Merge branch '0.9.x' into facebook-upgrade
2010-11-16 02:32:46 +00:00
Brion Vibber
e4eb3b3dfd
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-15 17:36:48 -08:00
Brion Vibber
5fdcba472b
RemoteProfileAction cleanup:
...
- meta robots to prevent spidering
- a little notice if silenced
2010-11-15 16:12:16 -08:00
Brion Vibber
6849b8f9e5
Workaround for display of Twitter remote users in remoteprofile (ModPlus plugin): use 73px avatar if no 96px present
2010-11-15 15:39:42 -08:00
Brion Vibber
0d0e51292d
some User -> Profile cleanup to help in adapting the profile page action to show stuff for remote users. Subscriptions, groups, roles, etc are all on profiles now so go ahead and use em.
2010-11-15 15:32:57 -08:00
Brion Vibber
fe7cb35551
restore empty showFallback() for attachment display; still needed for one-offs
2010-11-15 12:56:56 -08:00
Brion Vibber
5c00848b74
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-15 12:38:53 -08:00
Brion Vibber
87114a5c30
Add some basic oEmbed lookup test cases; fixed a bug in discovery fallback.
2010-11-15 11:55:28 -08:00
Brion Vibber
57ec01d0b8
Drop some debug lines
2010-11-15 11:30:35 -08:00
Brion Vibber
c8445299c7
Swap the Services_oEmbed wrapper in oEmbedHelper out for doing it ourselves...
...
- workaround for providers that are skimpy on their data, such as missing width/height or thumbnail_width/thumbnail_height
- workaround for YFrog listing "image" instead of "photo" type
- generally more lax about formatting: if it comes back and looks kinda ok, we'll take it.
- discovery uses system HTML parser, should be more robust if the links include things like ampersands with proper HTML-level escaping
2010-11-15 11:25:38 -08:00
Evan Prodromou
8a21b13ee9
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-11-15 11:57:31 -05:00
Evan Prodromou
c1cee3b27f
Merge branch 'atompub' into 0.9.x
...
Conflicts:
actions/apistatusesshow.php
actions/apitimelineuser.php
2010-11-15 11:57:19 -05:00
Evan Prodromou
01f32e3998
Merge remote branch 'gitorious/1.0.x' into 1.0.x
...
Conflicts:
actions/urlsettings.php
2010-11-14 06:49:43 -05:00
Brion Vibber
4f323efdf7
Encapsulate the oEmbed -> oohembed fallback into oEmbedHelper class. Also added a chance to whitelist sites that don't show discovery info but do have oEmbed API endpoints, and to provide alternate APIs for some common services.
...
Newly supported:
- TwitPic: added a local function using TwitPic's API, since the oohembed implementation for TwitPic produced invalid output which Services_oEmbed rejects. (bug filed upstream)
Tweaked...
- Flickr: works, now using whitelist to use their endpoint directly instead of going through oohembed
- Youtube: worked around a bug in Services_oEmbed which broke the direct use of API discovery info, so we don't have to use oohembed.
Not currently working...
- YFrog: whitelisting their endpoint directly as the oohembed output is broken, but this doesn't appear to work currently as I think things are confused by YFrog's servers giving a '204 No Content' response on our HEAD checks on the original link.
2010-11-12 17:41:35 -08:00
Brion Vibber
2c33fdd2fb
Only use saved thumbnails for notice list attachment thumbs -- don't attempt to search enclosures for photo types. We now save thumbs directly for oEmbed photos that don't list a separate thumb entry (like Flickr), so it's not needed. Keeps things cleaner :D
2010-11-12 14:03:57 -08:00
Brion Vibber
65eeb7cba5
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/newgroup.php
2010-11-12 13:32:48 -08:00
Brion Vibber
5d12ec0532
Merge branch 'oembed-thumbnails' into 0.9.x
2010-11-12 12:28:44 -08:00
Brion Vibber
cb124fe831
Add a quick config setting to disable/enable display of thumbnails in regular notice lists (attachments/show_thumbs) - disabling gives the same display as before this feature was added (but changes to oembed handling are still there, and the lightbox popup is gone)
2010-11-12 12:24:55 -08:00
Brion Vibber
fbd8052d05
Add error logging for a couple send-fail cases in XMPP out
2010-11-10 15:26:18 -08:00
Brion Vibber
46223da594
CSS class tweak for inline attachment thumbnails to avoid things thinking they're content links
2010-11-10 14:31:55 -08:00
Craig Andrews
cc0038d47c
Fix isHTTPS to work correctly for Cherokee and IIS
2010-11-10 15:53:20 -05:00
Brion Vibber
592e0bc505
add title attribute on attachment list items
2010-11-09 16:43:37 -08:00
Zach Copley
5b94d9e86b
Merge branch '0.9.x' into facebook-upgrade
2010-11-09 23:16:17 +00:00
Brion Vibber
f25accc43e
split out InlineAttachmentList from AttachmentList
2010-11-09 10:45:19 -08:00
Brion Vibber
504529e8cd
Keep aspect ratio when generating local thumbnails
2010-11-08 17:51:53 -08:00
Brion Vibber
694448e0aa
Add attachments 'thumb_width' and 'thumb_height' settings for inline thumbs, defaulting to 100x75.
...
This is used as the max thumb width/height for oEmbed requests (replacing the old default of 500x400 which was more suitable for the lightbox).
2010-11-08 17:36:02 -08:00
Brion Vibber
c36fecb794
Save a thumbnail image when uploading an image file into the file attachments system. Currently hardcoded to 100x75, needs aspect-sensitivity etc.
2010-11-08 17:20:04 -08:00
Brion Vibber
dc497ed090
Break out ImageFile->resizeTo() from ImageFile->resize(); allows resizing images to non-square sizes and to arbitrary destinations. Will be used for creating thumbnails as well as the originala use of cropping/sizing avatars.
2010-11-08 16:56:08 -08:00
Brion Vibber
a2994e3aa2
Testing... using photo info for temp thumbnails
2010-11-08 15:50:06 -08:00
Brion Vibber
551b196a35
doomy doom doom
2010-11-08 15:32:41 -08:00
Brion Vibber
883f7a6c0b
Avoid marking files as attachments that are not locally uploaded, unless they're really oembedable. HTML-y things now excluded properly.
2010-11-08 13:27:54 -08:00
Evan Prodromou
719b480eaa
use subclassing to change notice list output for single notice
2010-11-08 13:08:59 -05:00
Siebrand Mazeland
bb31c25c2d
* i18n/L10n updates.
...
* translator documentation added.
* superfluous whitespace removed.
2010-11-04 19:16:19 +01:00
Brion Vibber
2692b5fc84
Fix for ticket #2853 : fix for some unknown MIME type error cases by adjusting the PEAR error handling temporarily around MIME_Type_Extension usage.
2010-11-03 17:05:26 -07:00
Brion Vibber
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
Brion Vibber
28e009898f
Fix for ticket #2852 : skip sending favorite notification emails if the favoriter is someone you've blocked.
2010-11-03 15:17:46 -07:00
Brion Vibber
8e04e88800
Use Profile->getBestName() in PersonalGroupNav instead of manually picking nickname vs fullname. Logic should still work the same when no nickname is provided, but it doesn't make any sense -- probably needs cleanup. :)
2010-11-03 13:11:34 -07:00
Brion Vibber
6e03456753
Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens.
2010-11-03 13:10:42 -07:00
Brion Vibber
dc4fafbbd1
General cleanup & part of ticket #2864 : use User_group->getFancyName() instead of replicating the logic in various places. Encapsulates and allows for localization of parens.
2010-11-03 12:59:19 -07:00
Zach Copley
e716c3ebaf
Merge branch '0.9.x' into facebook-upgrade
2010-11-02 23:17:07 +00:00
Zach Copley
764a297383
Output filename in log msg if one is supplied
2010-11-02 23:13:20 +00:00
Siebrand Mazeland
973a48bded
i18n/L10n fixes and translator documentation addded/updated.
2010-11-02 23:48:36 +01:00
Siebrand Mazeland
a65362f7fa
Add context for different uses of "%1$s (%2$s)"
2010-11-02 23:08:59 +01:00
Brion Vibber
0229c22d23
Merge branch '1.0.x' into schema-x
2010-11-02 15:02:55 -07:00
Brion Vibber
04ca706601
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
2010-11-02 15:02:10 -07:00
Brion Vibber
86201761ea
Use SN.msg() and onEndScriptMessages() to export localized UI messages from Realtime plugin and its descendents.
2010-11-02 13:12:58 -07:00
Brion Vibber
5a9bb0adc4
Tossing in a basic i18n message export to script code. Plugins can hook StartScriptMessage/EndScriptMessage, or directly add needed mappings in Action::getScriptMessages(). Exported entries are accessible as SN.msg(key) at runtime.
...
StatusNet core code now sets the tooltip text on .attachment.more links when they receive their attachment-expansion magic; this will override the hardcoded tooltip text saved from OStatus plugin when displaying timelines in the web UI.
2010-11-02 13:05:16 -07:00
Brion Vibber
692ef9c330
Include fulltext indexes in MySQL table create
2010-11-01 13:27:44 -07:00
Zach Copley
2306f7a7f4
Merge branch '0.9.x' into facebook-upgrade
2010-11-01 19:13:31 +00:00
Siebrand Mazeland
6ab34fd8e8
* i18n/L10n updates.
...
* translator documentation added.
* superfluous whitespace removed.
2010-11-01 16:49:35 +01:00
Siebrand Mazeland
9b7ac27c69
* add translator documentation.
...
* i18n FIXME tagging.
2010-11-01 16:49:34 +01:00
Siebrand Mazeland
b89dfa3a5b
Fix i18n issues that are solved by using plural.
2010-11-01 16:49:33 +01:00
Siebrand Mazeland
08edd1fedf
* i18n/L10n updates.
...
* translator documentation added/updated.
* superfluous whitespace removed.
2010-10-31 00:58:35 +02:00
Siebrand Mazeland
83233a8a43
Fix i18n for B/kB/MB and add translator documentation.
2010-10-31 00:34:28 +02:00
Siebrand Mazeland
234b03d945
* translator documentation updates.
...
* added FIXMEs in actions/showgroup.php.
* superfluous whitespace removed.
2010-10-30 14:36:54 +02:00
Siebrand Mazeland
8391058ea4
Tabs to spaces, superfluous whitespace removed.
2010-10-30 13:47:19 +02:00
Zach Copley
2c420cc5eb
New Start/EndHtmlElement events. Allows adding namespaces.
2010-10-29 23:38:00 +00:00
Brion Vibber
f5019ac5aa
tweaks for the installer whee
2010-10-29 16:26:45 -07:00
Brion Vibber
345b7d33b8
some sorta vaguely working bits
2010-10-29 15:28:48 -07:00
Brion Vibber
ac2447c395
tweak
2010-10-29 14:58:52 -07:00
Brion Vibber
1daa1bfa39
fix notice
2010-10-29 14:49:05 -07:00
Evan Prodromou
c4b8f68a1a
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-29 11:14:02 -04:00
Evan Prodromou
36baff3d41
Merge remote branch 'gitorious/master'
2010-10-29 11:14:00 -04:00
Evan Prodromou
c8dab140f4
add a hack to show ads on single-notice pages
2010-10-29 11:13:33 -04:00
Brion Vibber
e7c7fd39fc
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-28 16:27:53 -07:00
Brion Vibber
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
Brion Vibber
fb0c3f4f99
Kill a ping queue item if we get an error on loading up the notice's poster's profile, rather than letting the item be retried over and over as if it were a transitory error.
...
This shouldn't generally happen as it's an indicator of database inconsistency, but it's a condition we know happens.
2010-10-28 12:58:30 -07:00
Evan Prodromou
9e15290963
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-27 13:47:54 -04:00
Craig Andrews
1851933c34
Enable Strict Transport Security plugin by default
2010-10-27 10:12:35 -04:00
Craig Andrews
22a0cf6251
Set cookies with "secure" flag on SSL sites. Improves security.
2010-10-26 17:55:09 -04:00
Evan Prodromou
93a8718f97
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-26 09:22:21 -04:00
Brion Vibber
b483a0549f
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-25 13:14:33 -07:00
Brion Vibber
ca489631db
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
Zach Copley
78396db28a
Forgot to add the OAuth verifier pin page to sensitive array
2010-10-25 12:36:03 -07:00
Zach Copley
0dcc3f8d71
We don't need to have editapplication (only showapplication) in the
...
sensitive array because it doesn't expose the consumer keypair
2010-10-25 12:10:52 -07:00
Zach Copley
3954ab39ae
Add OAuth token exchange endpoint to 'sensitive' array; i.e.: use SSL if
...
available
2010-10-25 11:52:17 -07:00
Evan Prodromou
59a7d78acb
Atom Service Document
2010-10-24 23:43:26 -04:00
Evan Prodromou
43a67b150a
show a single notice in atom entry format
2010-10-24 15:58:53 -04:00
Evan Prodromou
69a1ecec9b
check for a post
2010-10-24 15:04:12 -04:00
Brion Vibber
eb30c6651a
Additional fixes found while looking at ticket #2532 : when given a screen name as API parameter for a profile, do the nickname lookup on local users only. The profile table can't guarantee unique lookups, so using names isn't currently safe there. This won't affect anything using local nicknames correctly, and may avoid some weird bugs if there were conflicts between local and remote nicknames.
2010-10-22 13:53:10 -07:00
Brion Vibber
2d124e4aab
Fix for ticket #2532 : fixed API block create/destroy when specifying the target user/profile as a separate query parameter, such as api/blocks/create.xml?param=xxx
...
The router settings weren't quite right so we ended up with bogus regex values passed in as the 'id' parameter, which broke the regular fallback ordering of parameter checks.
2010-10-22 13:51:28 -07:00
Zach Copley
3969870cf3
Normalize HTML body ids to lowercase when the user is logged out as well.
2010-10-22 18:32:08 +00:00
Evan Prodromou
568cb8a205
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-22 09:24:50 -04:00
Brion Vibber
d6f4588b9e
Workaround for http_build_query() oddities in low-level router parent code when PHP config is set with non-default separator.
2010-10-21 19:10:43 -07:00
Zach Copley
0b134d3e69
Re-camelcase ApiOauthAuthorizeAction so it will be accessible when
...
a site is in pivate mode
2010-10-21 18:15:11 -07:00
Zach Copley
fb86e7c285
Normalize all action HTML body ids to lowercase
2010-10-21 13:03:56 -07:00
Zach Copley
648f79be10
Change OAuth authorization page's action name to be inline with
...
other web page action names so the body id outputs correctly. Fix
some other bugs.
2010-10-21 13:00:59 -07:00
Zach Copley
500157998a
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-10-21 01:18:53 +00:00
Zach Copley
f283a283b7
Fix syntax error
2010-10-21 01:17:59 +00:00
Siebrand Mazeland
fb12094f61
i18n/L10n updates, translator docs updated, superfluous whitespace removed.
2010-10-21 03:10:46 +02:00
Zach Copley
bfdb8385ec
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/apioauthauthorize.php
lib/apioauthstore.php
2010-10-20 17:28:28 -07:00
Zach Copley
e56385a7bb
Use a new table (oauth_token_association) to associate authorized
...
request tokins with OAuth client applications and profiles.
2010-10-20 17:21:04 -07:00
Siebrand Mazeland
28ec9d6463
* translator documentation added.
...
* moved some translator comments that were not directly above the line with the message to the correct location.
* i18n for UI text.
* superfluous whitespace removed.
2010-10-21 01:12:56 +02:00
Brion Vibber
8004e2809d
Fix for ticket #2845 : singleuser nickname configuration was being overridden by site owner in router setup.
...
I've consolidated the checks for which user to use for single-user mode into User::singleUser(), which now uses the configured nickname by preference, falling back to the site owner if it's unset.
This is now called consistently from the places that needed to use the primary user's nickname in routing setup.
Setting $config['singleuser']['nickname'] should now work again as expected.
2010-10-20 14:34:25 -07:00
Siebrand Mazeland
e980da3d20
Add FIXME
2010-10-20 20:01:12 +02:00
Siebrand Mazeland
dc62cf1c0b
* i18n/L10n fixes.
...
* translator documentation updated/added.
* superfluous whitespace removed.
2010-10-20 19:34:27 +02:00
Siebrand Mazeland
17f5cc4f29
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-10-20 18:26:51 +02:00
Siebrand Mazeland
1459110124
Fix nasty bug in parameter for e-mail notification for favourite.
2010-10-20 11:16:21 +02:00
Zach Copley
5ca29ab0de
Merge branch 'anon-consumer' into 0.9.x
2010-10-19 21:01:53 -07:00
Zach Copley
e8b6d7c946
Add support for an anonymous OAuth consumer. Note: this requires a
...
small DB tweak. Oauth_application_user needs to have the primary
compound key: (profile_id, application_id, token).
http://status.net/open-source/issues/2761
This should also make it possible to have multiple access tokens
per application.
http://status.net/open-source/issues/2788
2010-10-19 20:54:53 -07:00
Brion Vibber
3b6f738ab7
Convert SamplePlugin to new-style table defs, tweak some stuff to test basic checkschema
2010-10-19 17:25:56 -07:00
Brion Vibber
8b0ba03a2e
Starting to encapsulate some of the schema_version checksum / updater logic
2010-10-19 17:07:37 -07:00
Siebrand Mazeland
25b9552ec3
More complete sentence and translator documentation added.
2010-10-20 00:53:42 +02:00
Siebrand Mazeland
4b4894b121
Many i18n/L10n updates and lots of descriptions for translators added.
2010-10-20 00:35:39 +02:00
Brion Vibber
a67160e01e
Merge branch '1.0.x' into schema-x
...
Conflicts:
lib/common.php
2010-10-19 15:19:46 -07:00
Brion Vibber
3593f3f132
Merge branch '0.9.x' into 1.0.x
2010-10-19 15:18:07 -07:00
Brion Vibber
aeb1c23a2f
fix index drop on pg
2010-10-19 12:23:49 -07:00
Brion Vibber
e07254d15b
$config['db']['mysql_foreign_keys'] option to experimentally enable foreign keys on MySQL. (Would only work on InnoDB tables, may explode, etc)
2010-10-19 12:11:49 -07:00
Brion Vibber
7751d455de
Initial foreign key setup support
2010-10-19 12:08:59 -07:00
Zach Copley
5ac694c74f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-19 12:08:48 -07:00
Zach Copley
5866493cae
OAuth - better log messages
2010-10-19 12:07:59 -07:00
Brion Vibber
53cf39c97a
strip column prefix lengths from key defs on pg
2010-10-18 18:26:11 -07:00
Brion Vibber
d3f8a880a9
Fix misnamed unique constraint
2010-10-18 18:16:07 -07:00
Brion Vibber
b865ded7ff
Quoting fixes for postgres
2010-10-18 18:15:58 -07:00
Brion Vibber
ebe9972df6
tweak unique constraint setup
2010-10-18 18:07:25 -07:00
Brion Vibber
4aa6c4e49f
MySQL schema: fix dropping unique indexes, add support for changing table properties back from old code.
2010-10-18 17:44:41 -07:00
Brion Vibber
a923ef9719
Drop reverseTypeMap from schemas; we're now doing the forward-mapping on the canonical def before comparing
2010-10-18 17:21:12 -07:00
Brion Vibber
e44f1fe989
PG tweak
2010-10-18 17:15:51 -07:00
Brion Vibber
f1bfbece06
Merge branch '1.0.x' into schema-x
2010-10-18 15:26:20 -07:00
Brion Vibber
e8da3618c2
Bump version/string: 0.9.6 "Man on the Moon"
2010-10-18 14:49:02 -07:00
Evan Prodromou
3a36714847
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-18 15:42:21 -04:00
Brion Vibber
7765ddae81
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
README
lib/default.php
2010-10-18 12:17:11 -07:00
Brion Vibber
edf8990aa9
fix notice on non-https views
2010-10-18 11:12:26 -07:00
Evan Prodromou
47ac8458ca
default for nofollow external is sometimes
2010-10-18 11:41:18 -04:00
Evan Prodromou
7c05b0dafc
options to nofollow external links in notices
2010-10-18 11:29:52 -04:00
Evan Prodromou
e4422f9e48
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-18 10:15:27 -04:00
Brion Vibber
eb93bdbb03
some more tweaking to do the mappings during filterDef; not totally sure I like it
2010-10-15 16:32:37 -07:00
Brion Vibber
e0cb6d6f7f
fix notice on non-https views
2010-10-15 15:03:54 -07:00
Brion Vibber
fa50ab2a94
fix notice on non-https views
2010-10-15 15:01:55 -07:00
Brion Vibber
1a2170914e
woops wrong path
2010-10-15 15:01:43 -07:00
Brion Vibber
3dd4157f26
tweak copyright headers on installer
2010-10-15 14:49:05 -07:00
Brion Vibber
90c35dc541
Cleanup on making the schema work for installer (not quite there yet)
2010-10-15 13:47:38 -07:00
Brion Vibber
77300f94a3
fix typo on params on Schema->createTable()
2010-10-15 13:34:54 -07:00
Brion Vibber
dcf0acd503
Make StatusNet::initDefaults() public so we can call it from the installer.
2010-10-15 13:34:35 -07:00
Brion Vibber
201efe6b62
Split the core-setup bits of common.php out to framework.php (better ideas?) so we can easily set up our framework to run Schema setup before we have a core database to load a live config from.
2010-10-15 13:33:26 -07:00
Brion Vibber
a335dcbcbb
Update installer to use new Schema code to create the core tables instead of db/statusnet.sql or db/statusnet_pg.sql
2010-10-15 12:20:10 -07:00
Brion Vibber
4c3aebd396
Merge branch '1.0.x' into schema-x
2010-10-15 11:40:40 -07:00
Evan Prodromou
9abe6fa666
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-15 13:46:44 -04:00
Brion Vibber
a2090ecc97
Merge branch '2828' into 0.9.x
2010-10-14 16:52:01 -07:00
Brion Vibber
3f74f44603
Fix for ticket #2828 : apostrophe in site name set in installer created a broken config.php.
...
Now running values through var_export() before putting them into the config.php, ensuring strings will be properly quoted.
2010-10-14 16:25:43 -07:00
Craig Andrews
0721d8d3e2
Merge remote branch 'statusnet/0.9.x' into 1.0.x
2010-10-14 15:27:17 -04:00
Evan Prodromou
1a4dc03bfe
document and default for site|ssllogo
2010-10-14 14:56:38 -04:00
Evan Prodromou
8f3b18f27f
fix copy-and-paste error in javascript url creation
2010-10-14 14:53:20 -04:00
Evan Prodromou
72454db118
make the logo be compatible with HTTPS pages, if possible
2010-10-14 14:22:49 -04:00
Evan Prodromou
b31c49c5d4
Make HTTPS urls in File::url() if necessary
2010-10-14 14:22:17 -04:00
Evan Prodromou
97a7fb246c
correctly use sslserver if it is set
2010-10-14 01:35:11 -04:00
Evan Prodromou
7436e5d13e
use HTTPS for scripts and stylesheets if the current page is HTTPS
2010-10-14 01:09:02 -04:00
Evan Prodromou
ac63f8baae
show HTTPS urls for JavaScript if HTTPS used for page
2010-10-14 01:00:13 -04:00
Evan Prodromou
74c5aa8f9a
consolidate some theme path code between ssl and non-ssl
2010-10-14 00:59:53 -04:00
Evan Prodromou
ca0323d01b
use HTTPS for favicon.ico if page is HTTPS
2010-10-14 00:50:26 -04:00
Evan Prodromou
d91f894ccb
try to show HTTPS-encrypted theme files for HTTPS-encrypted pages
2010-10-14 00:46:32 -04:00
Evan Prodromou
40c64388e6
try and show an SSL image for the creative commons image
2010-10-14 00:31:13 -04:00
Evan Prodromou
cef10c7167
add static method StatusNet::isHTTPS()
2010-10-14 00:16:23 -04:00
Brion Vibber
4f4b0a2612
logic fix in diffing :D
2010-10-13 16:56:49 -07:00
Brion Vibber
0de3661d57
Fix for PG filtering
2010-10-13 16:21:24 -07:00
Brion Vibber
c0bb3062f6
suppress notices for non-present sections
2010-10-13 16:11:02 -07:00
Brion Vibber
229c772634
Filter table definitions to scrub out unsupported features before trying to alter a table. This lets us skip those where we end up trying to change unsupported features.
2010-10-13 16:04:28 -07:00
Brion Vibber
4101de7dd7
Merge branch '1.0.x' into schema-x
2010-10-13 15:46:45 -07:00
Evan Prodromou
07963a2a10
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-13 15:18:33 -04:00
Evan Prodromou
ddb60a8191
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-13 15:18:32 -04:00
Brion Vibber
bca215563f
Clean up remote avatar temporary files if we fail before saving them into avatars directory (OMB core, OStatus, WikiHowProfile, YammerImport)
2010-10-13 11:10:04 -07:00
Craig Andrews
f79dbaf9a7
Add a doc page that links to the StatusNet wiki API page
...
Add a redirect action that merely redirects to another action
Redirect /api to /doc/api so users don't get the "lame" "No such user" error message
2010-10-12 23:38:16 -04:00
Brion Vibber
621233e1ad
some of the ensureTable stuff partially working
2010-10-12 17:58:26 -07:00
Zach Copley
04f3f57e2e
Merge branch 'oauth-1.0a' into 0.9.x
2010-10-12 17:52:04 -07:00
Brion Vibber
5f81f6119b
Merge branch '0.9.x' into 1.0.x
2010-10-12 16:33:36 -07:00
Zach Copley
5270e93131
Spelling - OAuth not Oath
2010-10-12 16:20:09 -07:00
Brion Vibber
f4f16af8ac
Add a basic group deletion for moderator users.
2010-10-12 15:49:20 -07:00
Brion Vibber
9d9e80ea21
Followup to IIS installer tweaks in [ 9bb48c36
]:
...
* skip 0-byte config files when initializing, go ahead and redirect to installer if no non-0-byte files
* tweak warning on installer.php to let you know if you have a 0-byte config.php that's not writable, as opposed to generally already having a config.php with data in it
2010-10-12 13:00:03 -07:00
Evan Prodromou
4580d6065c
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-12 11:16:32 -04:00
Evan Prodromou
f11c1c77ca
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-12 11:16:14 -04:00
Brion Vibber
72cba88650
fix for column prefixes in table/index building
2010-10-11 19:28:02 -07:00
Brion Vibber
2c9f877ab5
fix for index gen
2010-10-11 19:18:47 -07:00
Brion Vibber
9cb42c8e45
tweak for strings
2010-10-11 19:17:21 -07:00
Brion Vibber
7723d15cd0
tweak for mysql
2010-10-11 19:14:33 -07:00
Brion Vibber
9364e446b1
Start reworking things to build create table stuff (can view via dumpschema.php --build)
2010-10-11 19:10:51 -07:00
Brion Vibber
d0dbedf3bb
PgsqlSchema can now pull primary, unique, mutli-value, *and* foreign keys :D
2010-10-11 15:55:45 -07:00
Brion Vibber
5434f43176
Now pulling non-primary/unique index data for PG as well... need to sort out conflicts with the other data and make foreign references work right :D
2010-10-11 14:15:02 -07:00
Brion Vibber
f85511c28f
quick syntax fix
2010-10-11 13:05:44 -07:00
Brion Vibber
7f674cc957
Merge branch 'schema-x' of /Users/brion/pages/mublog into schema-x
2010-10-08 16:38:18 -07:00
Brion Vibber
2d0807bc1c
Starting on adapting postgresql schema class to look stuff up in the new drupalish format...
...
Fetching basic column data and unique indexes. Still needs detail work, multi-value indexes, foreign keys, and distinguishing the primary key.
Since we don't get comments and such, for cleaner comparisons we should probably do a filtering on supported features.
2010-10-08 16:36:32 -07:00
Brion Vibber
2e475ceab0
Some more poking at schema stuff, on the road towards a more portable table-modification with the new schema bits
2010-10-07 18:33:02 -07:00
Zach Copley
459727bd61
Update ApiOauthAccessTokenAction to OAuth 1.0a
2010-10-07 18:32:27 -07:00
Brion Vibber
efa8ff82f4
fix up some more 'not null's and such
2010-10-07 17:31:56 -07:00
Brion Vibber
85156fcbed
Fix detection of auto_increment fields in MySQL (sets them as 'serial' type)
2010-10-07 17:22:36 -07:00
Brion Vibber
14e4f50f29
Some cleanup on detecting types
2010-10-07 16:49:49 -07:00
Brion Vibber
63c4cb3f36
Finish patching up the index fetching in new schema stuff for mysql
2010-10-07 15:14:10 -07:00
Brion Vibber
6c959c83ce
Merge branch '0.9.x' into 1.0.x
2010-10-07 13:32:26 -07:00
Brion Vibber
5e0f3e7bd4
Workaround for regression in input validation due to more PCRE oddities. Recommend redoing common_validate_utf8() using something more reliable, perhaps. :P
2010-10-07 12:32:10 -07:00
Zach Copley
8658e4f8c4
Use 7 digits for oob OAuth pin instead of 6
2010-10-07 11:01:17 -07:00
Evan Prodromou
fa45805d6d
Events for showing the notice form
2010-10-07 10:22:57 -04:00
Zach Copley
69e621a3e8
- Update ApiOauthAuthorizeAction to 1.0a
...
- Fix enumerable bugs
- New page for displaying 1.0a verifier (still needs work)
2010-10-06 19:20:47 -07:00
Zach Copley
f71912440a
- New base InfoAction for dialog box like msgs
...
- Fix titles on error pages
2010-10-06 19:06:57 -07:00
Brion Vibber
a680e1798c
Work in progress on fetching table defs from existing tables in new format -- unfinished
2010-10-06 18:28:32 -07:00
Brion Vibber
99194e03fa
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
2010-10-06 17:16:13 -07:00
Zach Copley
f97b863fd7
Update ApiOauthRequestTokenAction to support OAuth 1.0a
2010-10-06 13:40:03 -07:00
Zach Copley
f4f56eea3a
Override new_request_token() to store OAuth 1.0a verified callback URL
2010-10-06 13:40:03 -07:00
Zach Copley
63663dbd0e
Stab that 'p' parameter!
2010-10-06 13:40:02 -07:00
Zach Copley
4247be5116
Add plain text error format to clientError()
2010-10-06 13:40:01 -07:00
Zach Copley
83566f014c
Fix bad reference
2010-10-06 13:40:01 -07:00
Zach Copley
06d918d575
Strip out the special 'p' paramter added by index.php from
...
$_SERVER['QUERY_STRING'] before doing OAuth requests. Required by the
latest version of the OAuth lib.
2010-10-06 13:39:58 -07:00
Brion Vibber
71176b9a98
Merge branch '0.9.x' into 1.0.x
2010-10-06 13:07:29 -07:00
Brion Vibber
ebfa8bce27
Basic validation of UTF-8 input via GET/POST vars: invalid UTF-8 sequences will cause the string to drop. Not necessarily super-thorough; should be improved in future to drop individual bad sequences, do normalization of combining forms, etc. General input validation (for ints, types of strings, etc) still would be good to have!
2010-10-06 13:00:30 -07:00
Brion Vibber
8ff45823ba
Merge branch '0.9.x' into 1.0.x
2010-10-05 11:40:49 -07:00
Evan Prodromou
8aa9c271df
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-05 14:09:17 -04:00
Brion Vibber
d946c82740
Urgh... fix for fix for horrific $ escaping problems (some awful mix of single and double-quoted strings in the terror that is mail.php)
2010-10-04 15:29:30 -07:00
Brion Vibber
d6b3d7fb1a
Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc)
2010-10-04 14:24:04 -07:00
Brion Vibber
59119482ca
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
2010-10-04 12:54:36 -07:00
Brion Vibber
ad7623a87f
Add a $config['plugins']['locale_path'] which can be set to override the individual plugins' locale subdirectories.
...
This will apply to *ALL* plugins in *ALL* languages, so should probably only be used when doing site customization...
You'd probably do:
$config['site']['locale_path'] = '/srv/awesome/data/locale';
$config['plugins']['locale_path'] = '/srv/awesome/data/locale';
with a structure like:
srv/
awesome/
data/
locale/
en/
LC_MESSAGES/
statusnet.po
OpenID.po
AnonymousFave.po
etc, all alongside each other. You could separate plugins from the core if you like.
Where locale files have not already been generated, you can build one for a plugin like so:
php scripts/update_po_templates.php --plugin=MyPlugin
and pull out the template file:
plugins/MyPlugin/locale/MyPlugin.pot
Edit that (make sure you at least set the CHARSET, probably to UTF-8) and save your customized .po
files into the structure as above, and use msgfmt to generate .mo files for final output.
2010-09-30 19:23:42 -07:00
Brion Vibber
54c88cba57
Add a $config['plugins']['locale_path'] which can be set to override the individual plugins' locale subdirectories.
...
This will apply to *ALL* plugins in *ALL* languages, so should probably only be used when doing site customization...
You'd probably do:
$config['site']['locale_path'] = '/srv/awesome/data/locale';
$config['plugins']['locale_path'] = '/srv/awesome/data/locale';
with a structure like:
srv/
awesome/
data/
locale/
en/
LC_MESSAGES/
statusnet.po
OpenID.po
AnonymousFave.po
etc, all alongside each other. You could separate plugins from the core if you like.
Where locale files have not already been generated, you can build one for a plugin like so:
php scripts/update_po_templates.php --plugin=MyPlugin
and pull out the template file:
plugins/MyPlugin/locale/MyPlugin.pot
Edit that (make sure you at least set the CHARSET, probably to UTF-8) and save your customized .po
files into the structure as above, and use msgfmt to generate .mo files for final output.
2010-09-30 19:18:46 -07:00
Brion Vibber
6e58a926e3
ForceGroup plugin: optionally force new users to join a particular group or set of groups on registration; and/or to force posts by members of particular groups to be posted into those groups even if not explicitly mentioned. The posting feature requires a couple quick hook additions in core.
2010-09-30 18:05:44 -07:00
Brion Vibber
55a080ea4e
ForceGroup plugin: optionally force new users to join a particular group or set of groups on registration; and/or to force posts by members of particular groups to be posted into those groups even if not explicitly mentioned. The posting feature requires a couple quick hook additions in core.
2010-09-30 16:25:15 -07:00
Zach Copley
23c45d6c49
Merge branch 'anon-fave-plugin' into 0.9.x
2010-09-30 13:59:02 -07:00
Zach Copley
8a28d9cc4d
Merge branch 'anon-fave-plugin'
2010-09-30 13:57:39 -07:00
Brion Vibber
20f2167425
Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix
2010-09-30 11:31:29 -07:00
Brion Vibber
1acc7d66c6
Always specify UTF-8 targt charset for html_entity_decode(); default is 8-bit ISO-8859-1 which causes things to break when we later pass them through things that expect to work with UTF-8. For instance, running through preg_replace() with the /u option results in NULL, leading to problems with OStatus and SubMirror generating their plaintext versions and doing length-cropping.
2010-09-30 11:29:31 -07:00
Zach Copley
0ac333ec80
Add Start/EndFavorNoticeForm and Start/EndDisFavorNoticeForm hooks
2010-09-29 16:35:14 -07:00
Zach Copley
331502a979
Add Start/EndShowNoticeInfo events
2010-09-29 16:35:13 -07:00
Zach Copley
21759c3132
New eventsi: Start/EndShowNoticeOptions and Start/EndShowFaveForm
2010-09-29 16:35:12 -07:00
Evan Prodromou
d2ef0cf233
add hooks to the feedlist widget to give fine-grained control over feed links
2010-09-29 19:23:46 +02:00
Siebrand Mazeland
b9177f5e2e
* i18n/L10n and translator documentation updates.
...
* whitespace and indentation updates
2010-09-29 00:39:45 +02:00
Siebrand Mazeland
2d08750c47
Localisation updates from http://translatewiki.net
...
* add support for Hungarian (hu)
2010-09-28 01:02:08 +02:00
Zach Copley
84331ca7bd
Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
...
login page when a site is in private mode
2010-09-22 23:33:06 +00:00
Evan Prodromou
b5cfcba471
Merge branch '0.9.x' into activityexport
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-09-22 10:45:34 -04:00
Brion Vibber
42dd460d3b
Merge branch 'master' into 0.9.x
2010-09-21 12:48:16 -07:00
Brion Vibber
1bc45e191d
Merge branch 'twitter-avatar'
2010-09-21 12:46:16 -07:00
Brion Vibber
94de78fa0f
Workaround for #2485 : in profile output on feeds, fall back to the Twitter 73x73 avatar instead of going straight to the 96x96 default image on twitter-import profiles.
2010-09-21 12:38:04 -07:00
Evan Prodromou
28fdc733a7
change the location and title of the feeds section
2010-09-21 14:09:46 -04:00
Brion Vibber
aef42e2f65
Don't spew a notice warning to output while processing logging for PEAR DB errors
2010-09-20 16:52:22 -07:00
Brion Vibber
24bb6feba7
Clean up notice spew from accessing member variables of null when opening the add/edit oauth application form
2010-09-20 16:39:51 -07:00
Brion Vibber
64cdbe6c55
Ticket #2750 : fixes to HTTP caching behavior across login/logout boundaries
...
* now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec
* now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout
For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed)
There'll still be some last-modified stamps that aren't including user info properly, probably.
2010-09-20 13:42:58 -07:00
Brion Vibber
2f38c9c99c
Fix bug in db queue manager: when receiving an invalid or deleted notice, we were running it through the 'temporary fail, release it to try again' path instead of the 'done, discard item' path. Should fix some infinite-loop-of-doom-in-queue cases.
2010-09-20 13:19:58 -07:00
Zach Copley
55ad954b15
Basic license admin panel (maybe we can make it fancier later)
2010-09-17 16:38:12 -07:00
Brion Vibber
20a0a4acff
Explicitly mark a translator note on the command list help message that the command names must not be translated
2010-09-16 11:05:31 -07:00
Evan Prodromou
670ad53215
Merge branch '0.9.x' into activityexport
2010-09-15 23:31:20 -04:00
Siebrand Mazeland
85154a49d0
Add plural support for minutes/hours/days/months ago.
...
Reapply of revised b27882c916
that was reverted by Brion Vibber in 2d4c0f9a47
.
2010-09-16 00:07:47 +02:00
Brion Vibber
2d4c0f9a47
Revert "Add plural support for minutes/hours/days/months ago." -- currently doesn't work and spews error messages
...
This reverts commit b27882c916
.
2010-09-15 14:10:18 -07:00
Evan Prodromou
1ceb93cce4
move useractivitystream class to its own module
2010-09-15 15:18:01 -04:00
Evan Prodromou
0a5aa95746
flag to leave out author information in activity output
2010-09-15 07:11:50 -04:00
Evan Prodromou
d2877f4c3d
change user attribute from private to protected so subclasses can use it
2010-09-15 07:08:28 -04:00
Siebrand Mazeland
c218eb5077
L10n: Fix punctuation.
2010-09-14 22:30:55 +02:00
Evan Prodromou
a2fe29388d
Activity::asString() should format numerical not string time
2010-09-13 17:05:02 -04:00
Evan Prodromou
d207f19d22
accept null constructor for ActivityContext
2010-09-13 16:23:10 -04:00
Siebrand Mazeland
39802077a8
* update/add translator documentation
...
* remove superfluous whitespace
2010-09-13 21:10:55 +02:00
Siebrand Mazeland
8c94ebf537
* update/add translator documentation
...
* remove superfluous whitespace
2010-09-13 21:10:54 +02:00
Siebrand Mazeland
d6be5be548
Move translator hint to where gettext will actually see it and replace tab by spaces.
2010-09-13 21:10:53 +02:00
Siebrand Mazeland
a590f2cb0f
Fix typos in translator comments.
2010-09-13 21:10:53 +02:00
Siebrand Mazeland
6817420e6c
Remove trailing whitespace and update comment consistency on methods.
2010-09-13 21:10:52 +02:00
Siebrand Mazeland
b27882c916
Add plural support for minutes/hours/days/months ago.
2010-09-13 21:10:51 +02:00
Siebrand Mazeland
0d1b60b11d
Update translator documentation.
2010-09-12 18:34:33 +02:00
Siebrand Mazeland
128607a270
Update translator documentation and add punctuation where missing to exception messages.
2010-09-12 18:24:44 +02:00
Siebrand Mazeland
e88ee4ec46
Fix i18n issue and add translator documentation.
2010-09-12 18:11:28 +02:00
Siebrand Mazeland
8adef3127c
Update translator documentation.
2010-09-12 17:49:56 +02:00
Siebrand Mazeland
99f6a70937
* add two FIXMEs for gettext messages not being processed.
...
* update translator documentation.
2010-09-12 17:44:28 +02:00
Siebrand Mazeland
6b010ac79c
Update/add translator documentation.
2010-09-12 17:27:38 +02:00
Siebrand Mazeland
9bc4aaeca3
Update incomplete documentation.
2010-09-12 17:17:43 +02:00
Evan Prodromou
76c0e3169b
move othersettings to urlsettings
2010-09-11 16:22:03 -04:00
Evan Prodromou
fca7ea664b
move view designs setting to user design tab
2010-09-11 16:16:38 -04:00
Evan Prodromou
12eee30586
Merge branch '1.0.x' into shortcontrol10x
2010-09-10 22:20:52 -04:00
Evan Prodromou
4419e43f7f
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.php
2010-09-09 15:01:03 -04:00
Brion Vibber
cb1d5049b8
Bump version to 0.9.5
2010-09-08 15:35:23 -07:00
Evan Prodromou
e6c84dec19
Pragma was accidentally triggering some underwear-catapult-connected hardware
2010-09-08 15:41:39 -04:00
Evan Prodromou
338aa4bf1d
Merge branch 'apinamespace' into 0.9.x
2010-09-07 16:39:43 -04:00
Craig Andrews
8d54809c35
move xrd and hostmeta out of the OStatus plugin and into core
...
add event for setting up hostmeta, and use them in the OStatus plugin
2010-09-07 13:45:52 -04:00
Evan Prodromou
86a702953a
Merge branch '0.9.x' into 1.0.x
2010-09-06 10:12:17 -04:00
Evan Prodromou
a319b40c97
common_cache_key() -> Cache::key()
2010-09-06 10:07:43 -04:00
Evan Prodromou
e42d2124a3
common_keyize() -> Cache::keyize()
2010-09-06 10:03:51 -04:00
Evan Prodromou
c2de44a530
remove NOOP function common_broadcast_notice()
2010-09-06 09:59:08 -04:00
Evan Prodromou
8f81762d68
common_memcache() => Cache::instance()
2010-09-06 09:56:45 -04:00
Siebrand Mazeland
f2d6e1e375
Add basic support for Georgian (ka)
2010-09-05 10:45:03 +02:00
Craig Andrews
f7c46effa2
set_notify -> setNotify
2010-09-03 17:50:29 -04:00
Craig Andrews
44f1b94301
get_screenname -> getScreenname
2010-09-03 17:50:29 -04:00
Craig Andrews
c54ef9b8b6
is_otr -> isOtr
2010-09-03 17:50:29 -04:00
Craig Andrews
d68914e4f3
is_autoreply -> isAutoreply
2010-09-03 17:50:29 -04:00
Craig Andrews
cce92e394b
public_notice -> publicNotice
2010-09-03 17:50:29 -04:00
Craig Andrews
00e21d4a6f
broadcast_notice -> broadcastNotice
2010-09-03 17:50:29 -04:00
Craig Andrews
9ccf65a311
get_user -> getUser
2010-09-03 17:50:29 -04:00
Craig Andrews
054111bb54
add_notice -> addNotice
2010-09-03 17:50:29 -04:00
Craig Andrews
a3725de47b
handle_incoming -> handleIncoming
2010-09-03 17:50:29 -04:00
Craig Andrews
463e9c10d1
handle_command -> handleCommand
2010-09-03 17:50:29 -04:00
Craig Andrews
671b0f4cd9
format_notice -> formatNotice
2010-09-03 17:50:29 -04:00
Craig Andrews
a70cceaddd
send_confirmation_code -> sendConfirmationCode
2010-09-03 17:50:28 -04:00
Craig Andrews
1eccd2a4bd
send_from_site -> sendFromSite
2010-09-03 17:50:28 -04:00
Craig Andrews
b4d02650df
get_user_im_prefs_from_user -> getUserImPrefsFromUser
2010-09-03 17:50:28 -04:00
Craig Andrews
8263ae601b
get_user_im_prefs_from_screenname -> getUserImPrefsFromScreenname
2010-09-03 17:50:28 -04:00
Craig Andrews
f038eacca4
enqueue_incoming_raw -> enqueueIncomingRaw
2010-09-03 17:50:28 -04:00
Craig Andrews
e7a026091c
enqueue_outgoing_raw -> enqueueOutgoingRaw
2010-09-03 17:50:28 -04:00
Craig Andrews
b05ab5fc85
daemon_screenname -> daemonScreenname
2010-09-03 17:50:28 -04:00
Craig Andrews
764e0ab962
receive_raw_message -> receiveRawMessage
2010-09-03 17:50:28 -04:00
Craig Andrews
80176b0b2c
send_notice -> sendNotice
2010-09-03 17:50:28 -04:00
Craig Andrews
6a848bcc8a
send_message -> sendMessage
2010-09-03 17:50:28 -04:00
Evan Prodromou
326258bfef
Merge branch '0.9.x' into 1.0.x
2010-09-02 22:57:37 -04:00
Evan Prodromou
6c14235d6c
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-09-02 22:56:18 -04:00
Evan Prodromou
388495f6b1
use etag preferably for caching
2010-09-02 22:26:20 -04:00
Evan Prodromou
c8a69f433c
add some caching headers
2010-09-02 22:26:19 -04:00
Evan Prodromou
0c5ca46ba3
combine our standard scripts into one big script
2010-09-02 22:21:07 -04:00
Brion Vibber
2196d00b1b
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/command.php
2010-09-02 15:04:25 -07:00
Brion Vibber
e365e709c5
Merge branch 'master' into testing
2010-09-02 14:58:11 -07:00
Brion Vibber
cbcb9b0080
Fixes for Mac metadata files mucking up theme zip files
2010-09-02 14:24:46 -07:00
Brion Vibber
c24458a9f0
Ticket #2638 : allow themes to specify a base theme to load with 'include' setting in a theme.ini file
2010-09-02 14:11:52 -07:00
Evan Prodromou
c7d81f2d9d
hooks for showing <title> and <h1> elements
2010-09-02 17:10:25 -04:00
Evan Prodromou
7517409bf1
Merge branch 'testing' into 0.9.x
2010-09-02 16:56:52 -04:00
Brion Vibber
11f7fce3bb
Fixes for custom theme upload:
...
* skip more files (.xcf image sources, .html docs)
* skip files before rejecting them for funky filenames!
* allow period in filenames (eg foo-1.4.ttf) but blacklist some unsafe extensions-within-extensions
2010-09-02 12:11:45 -07:00
Brion Vibber
4cbbfdab84
Fix for #2635 : use ssl-sometimes settings for Twitter settings & auth pages
2010-09-02 10:55:26 -07:00
Siebrand Mazeland
f64fff379c
* when using multiple parameters, number them
...
* fix double space to single space
* use consistent punctuation in messages
* complete translation hints for all commands
* add an i18n fixme for missing plural support
* trailing whitespace removed
2010-08-28 16:51:49 +02:00
Siebrand Mazeland
2eb894e535
Document UI text and number parameters.
2010-08-28 16:28:23 +02:00
Brion Vibber
0cfaae48a3
Merge branch '0.9.x' into 1.0.x
2010-08-16 16:56:27 -07:00
Brion Vibber
a68c10280f
Merge branch 'master' into 0.9.x
2010-08-16 16:56:15 -07:00
Brion Vibber
033a757013
More schema work in progress... removing duped code from schema child classes, rebuilding things a bit more (incomplete; non-working state)
2010-08-16 16:31:18 -07:00
Brion Vibber
eaa4ded053
first pass at columndef->drupal-style array converter (need to handle some more things probably; untested)
2010-08-16 15:14:16 -07:00
Brion Vibber
b2a5e0d09b
StatusNet 0.9.4 "Orange Crush"
2010-08-16 10:09:33 -07:00
Brenda Wallace
7f9ab683b2
fixed a %d that should be a %s in an error message
2010-08-16 10:03:58 -07:00
Brenda Wallace
e687862ca1
fixed a %d that should be a %s in an error message
2010-08-16 13:26:27 +12:00
Ian Denhardt
70c3532996
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
2010-08-13 18:01:33 -04:00
Evan Prodromou
7183175429
Merge branch 'master' into 1.0.x
2010-08-13 14:33:41 -07:00
Evan Prodromou
9b7536351b
hide the Whats Up Nickname if notice title enabled
2010-08-13 12:22:58 -07:00
Ian Denhardt
b1c5cb9db9
Merge branch '1.0.x' of /home/ian/public_html/statusnet-enhancements
2010-08-13 14:48:58 -04:00
Evan Prodromou
ed8d8eb5ee
hooks to allow changing RSS content
2010-08-13 11:44:26 -07:00
Brion Vibber
f7d599f8ea
Fix for ticket 2513: "Can't linkify" error when some links are shortened
...
When bogus SSL sites etc were hit through a shortening redirect, sometimes link resolution kinda blew up and the user would get a "Can't linkify" error, aborting their post.
Now catching this case and just passing through the URL without attempting to resolve it. Could benefit from an overall scrubbing of the freaky link/attachment code though...! :)
http://status.net/open-source/issues/2513
2010-08-12 15:25:32 -07:00
Brion Vibber
ae696728f5
Merge branch '0.9.x' into 1.0.x
2010-08-12 12:56:23 -07:00
Ian Denhardt
df562a1d8f
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
2010-08-12 12:22:10 -04:00
Brion Vibber
111fc33e1a
Output "web" instead of gettext translation file metadata when notice.source is empty
2010-08-11 18:53:34 -07:00
Brion Vibber
d15a41c96e
0.9.4beta2 update some notes in README, note the fix from beta1
2010-08-11 10:32:52 -07:00
Siebrand Mazeland
db46d73a5f
Add dummy support for Esperanto.
2010-08-11 12:46:54 +02:00
Brion Vibber
19e6b84050
StatusNet_network staticGet lookup fix
2010-08-10 17:22:26 -07:00
Brion Vibber
5c210f724a
update version for 0.9.4beta1
2010-08-10 16:28:33 -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
6a2659ed67
Workaround for index setup on SubMirror until I'm done w/ arbitrary index support for Schema setup.
2010-08-10 11:45:34 -07:00
Matt Lee
05e4e711af
remove microblogging messages
2010-08-09 18:54:40 -04:00
Matt Lee
fdd5ec2a14
remove microblogging messages
2010-08-09 18:53:55 -04:00
Matt Lee
988cb46fa3
remove microblogging messages
2010-08-09 18:40:04 -04: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
Ian Denhardt
e0da393800
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
2010-08-09 15:06:26 -04:00
Siebrand Mazeland
09dee24cbe
Add two i18n related FIXMEs.
2010-08-08 21:13:21 +02:00
Brion Vibber
ebd2fc2f7c
Partial fix for ticket #2489 -- problems with SNI SSL virtual host certificate validation.
...
Two prongs here:
* We attempt to enable SNI on the SSL stream context with the appropriate hostname... This requires PHP 5.3.2 and OpenSSL that supports the TLS extensions. Unfortunately this doesn't seem to be working in my testing.
* If set $config['http']['curl'] = true, we'll use the CURL backend if available. In my testing on Ubuntu 10.04, this works. No guarantees on other systems.
I'm not enabling CURL mode by default just yet; want to make sure there's no other surprises.
2010-08-06 10:14:07 -07:00
Brion Vibber
433c43c999
Merge branch 'testing' into 0.9.x
2010-08-05 11:02:53 -07:00
Brion Vibber
77a96e3d7c
Merge branch 'master' into testing
2010-08-05 10:56:49 -07:00
Zach Copley
fd530a892f
Fix for source attribution on notices; it was displaying the code instead of the source name sometimes.
2010-08-04 12:31:31 -07:00
Evan Prodromou
9f0715a993
Merge branch '0.9.x' into 1.0.x
2010-08-03 16:05:03 -07:00
Evan Prodromou
004e42e3e0
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-08-03 16:04:54 -07:00
James Walker
eaef724c49
urgh. typo
2010-08-02 14:24:50 -04:00
James Walker
e603632f13
add support for Salmon's new "mentioned" rel value
2010-08-02 14:06:14 -04:00
Brion Vibber
a1aea74fe2
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-08-02 09:43:58 -07:00
Siebrand Mazeland
44d01f70a6
Localisation updates from http://translatewiki.net
...
* add support for Danish
2010-07-31 23:59:22 +02:00
Brion Vibber
1bb18e9bab
Merge branch '2471' into 0.9.x
2010-07-30 17:52:12 -07:00
Brion Vibber
0caebc9308
Fix for ticket #2471 : install.php returns unsuccessfully but doesn't display error message if PHP < 5.2.6 is used
...
http://status.net/open-source/issues/2471
Old bit of code didn't get updated for new installer
2010-07-30 13:16:47 -07:00
James Walker
47f19988d1
allow schema to work on more than one connection (namely, the Status_network DB)
2010-07-29 21:04:28 -04:00
James Walker
c2a26ba653
removing redundant constructor
2010-07-29 21:03:48 -04:00
Zach Copley
fb2e00eacc
Merge branch 'master' into 0.9.x
...
Conflicts:
classes/Notice.php
2010-07-29 20:44:11 +00:00
Zach Copley
0faa988e91
Fix for issue ID 2290: make sure errors are returned in the right
...
format, and use callback for errors when the request is JSONP
2010-07-29 20:31:22 +00:00
Evan Prodromou
e10621a52a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-07-28 17:51:07 -04:00
Evan Prodromou
a01bc6b575
Merge branch 'googleadsadminpanel' into testing
2010-07-28 17:50:49 -04:00
Brion Vibber
ab2c3686b7
Merge branch 'testing' into 0.9.x
2010-07-28 11:59:42 -07:00
Evan Prodromou
dbb5e9e191
accept mailto: URIs as OStatus identifiers
2010-07-22 16:00:26 -07:00
Zach Copley
65862d8f7f
Suppress HTTP error headers for JSONP API output
2010-07-16 14:40:22 -07:00
Evan Prodromou
453a06fff4
Exceptions are caught and continued on JSON, XML, Atom and RSS output in API
2010-07-13 11:11:29 -04:00
Evan Prodromou
1044f27e47
handle missing profile for notices better in Rss10Action
2010-07-13 10:59:15 -04:00
Evan Prodromou
d706a3e21b
handle missing profile for notices better in NoticeList
2010-07-13 10:59:01 -04:00
Evan Prodromou
6968c96b44
log exceptions in atom feeds, but don't let them kill the output
2010-07-13 10:53:47 -04:00
Evan Prodromou
dfd65a4290
push exception on missing profile down to Notice::getProfile()
2010-07-13 10:51:25 -04:00
Evan Prodromou
ab149755b6
handle notices without profiles better in RSS output
2010-07-13 10:42:06 -04:00
Brion Vibber
1b3b7f9a42
Ticket 2427: fix regression in plugin i18n
2010-07-12 10:27:23 -07:00
Brion Vibber
974c4df029
Ticket 2433: Skip locale fallback list check on Windows ('locale -a' shell-out doesn't work there)
2010-07-12 09:56:32 -07:00
Zach Copley
923d9ef71c
- Fix bugs with block and friendship API methods
...
- Friendship API methods now use a Profile instead of User for target
2010-06-28 16:54:39 -07:00
Brion Vibber
c9863bb864
Update version and code name: 0.9.3 Half a World Away
2010-06-28 15:08:01 -04:00
Brion Vibber
b2ad8ec571
Fix for PHP notice when given an integer degrees in decimalDegreesToDMS(); using math instead of string manipulation to split integer portion from decimal remainder.
2010-06-28 14:41:33 -04:00
Brion Vibber
fdd9aa58e3
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-28 13:41:04 -04:00
Brion Vibber
53f14ddde6
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-28 13:39:52 -04:00
Brion Vibber
9c7b66984c
Enhanced upload file type detection. If given an original filename, we'll attempt to detect type from the extension if we were unable to make a definitive match from content. Generic octet-stream, zip, and MS Office type are explicitly singled out for re-checks, which fixes OpenOffice and MS Office documents to come up with the proper types when misdetected.
...
File extensions can also be added to the upload type whitelist; they'll be normalized to types for the actual comparison, so only known extensions will work.
2010-06-28 08:59:47 -07: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
9eb5a976b0
Have API methods for search subclass ApiPrivateAuthAction
2010-06-24 18:11:50 -07:00
Craig Andrews
dad0b06a38
Throw an error if queueing is disable when using an IM plugin
2010-06-22 22:01:13 -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
Siebrand Mazeland
87125a1395
Improve error message per discussion on http://translatewiki.net/wiki/Thread:Support/Unclear_message .
...
Spotted by Peter17 and changed per suggestion of McDutchie with approval of Brion.
2010-06-21 20:15:26 +02:00
Zach Copley
a6ce4eef0d
Fix problem with AvatarLink in which it was sometimes leaving the width attribute empty
2010-06-16 18:27:51 -07: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
Craig Andrews
1a62d1b493
Use presence of IM plugins to decide if "IM" options should be available
2010-06-16 16:00:54 -04:00
Brion Vibber
d65d982681
Merge branch 'master' into testing
2010-06-16 12:37:14 -07:00
Craig Andrews
4ee2c12507
Use presence of IM plugins to decide if "IM" menu option should be shown in Connect
2010-06-15 17:04:15 -04:00
Evan Prodromou
327ed5b87e
fix URL regex for tags to use UTF-8
2010-06-14 15:51:49 -04:00
Brion Vibber
a1b25b46bc
Merge branch 'master' into testing
2010-06-14 10:53:22 -07:00
Brion Vibber
3da8914edb
Fix for DB error reporting in installer (MySQL path)
2010-06-11 12:38:22 -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
47665e845a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-06-11 12:04:03 -07:00
Brion Vibber
ec15546476
Fix a couple bad format entries in router setup (format param had 'xmljson' instead of 'xml|json').
...
Warning: the format strings aren't actually being enforced here which is probably why they weren't caught earlier. Not quite sure why, it should be looked at!
2010-06-11 11:52:06 -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
Brenda Wallace
e121d472e7
Revert "added notice.location to group by"
...
This reverts commit 48dc899acb
.
2010-06-09 16:30:50 +12:00
Brion Vibber
054ac909bf
Merge branch 'integration' into testing
2010-06-07 18:19:12 -07:00
Brion Vibber
09208f8d65
Basic custom CSS and theme uploading features. 'local' subdir can now be customized to a distinct directory and URL path to make it easier to separate custom themes for a multi-site farm running a common code base.
...
Currently only one custom theme may be uploaded per site, saved with the name 'custom' and stored into the local/themes subdirectory.
Administrators can upload a .ZIP archive containing a theme through the design admin panel; its contents are validated to ensure that only legit files are saved, and a 5M size quota is enforced.
Theme upload requires the zip extension for PHP; if not present, theme uploading is disabled by default.
Uploading and the custom CSS can be controlled via $config['theme_upload']['enabled'] and $config['custom_css']['enabled'].
Configurable directory/path/server for 'local' subdirectory (currently only as used for themes; local plugins not yet switched over)
Can set $config['local']['dir'] etc; not currently exposed in the admin panels.
Per-site directories on a separate themes server could be set up such as:
$config['local']['dir'] = '/path/to/themes/local/' . $_nickname;
$config['local']['server'] = 'themes.example.com';
$config['local']['path'] = '/local/' . $_nickname;
$config['local']['ssl'] = 'never';
2010-06-07 18:14:16 -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
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
Brion Vibber
791b98046d
Stomp blocking writes fix
2010-06-03 16:09:47 -07:00
Evan Prodromou
135b398d4b
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-03 14:50:52 -04:00
Brion Vibber
9bb48c36ea
Installer tweak to aid with IIS setup: if config.php exists, but is both empty and writable, let the installer proceed and overwrite it.
2010-06-03 10:13:28 -07:00
Evan Prodromou
a5de215267
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-01 13:51:41 -07:00
Evan Prodromou
ed5549bd13
move long sets of controls to their own functions in designform
2010-05-31 09:04:29 -07:00
Evan Prodromou
d223458035
Widgetize the design form
...
Squashed commit of the following:
commit a4610db66974866fdeb98184ce7e2be1470fb4d7
Author: Evan Prodromou <evan@status.net>
Date: Mon May 31 08:48:35 2010 -0700
use selfUrl for designform action
commit fd9f46ab33caa2c2d0df90d1d596c7b8c6453ce3
Author: Evan Prodromou <evan@status.net>
Date: Mon May 31 08:29:43 2010 -0700
fix design settings syntax
commit d1797ef9f90bf038665463424ad962bfe039c9f0
Author: Evan Prodromou <evan@status.net>
Date: Mon Nov 9 23:23:53 2009 -0500
widgetizing design form
2010-05-31 08:49:14 -07:00
Brion Vibber
f4539b52ad
Ticket 2329 followup: my clever 'let it use the default' was foiled by PHP gettext module not quite exposing a compatible interface as the backend gettext library. (Most funcs squash null domain parameter into '' empty string, which isn't interpreted as 'use the current default'.)
2010-05-28 16:03:09 -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
Brion Vibber
2b318a3420
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-27 14:22:24 -07:00
Brion Vibber
697a9948df
Ticket #2329 : fix for use of _m() translation functions from outside of plugin directories
2010-05-27 14:18:08 -07:00
Zach Copley
c5b61078e1
Pass auth user into Atom feed generators (needed for outputting favorited status in statusnet:notice_info tag)
2010-05-27 13:49:23 -07:00
Brion Vibber
2062298755
Add $config['queue']['stomp_enqueue_to'] override for which queue server to send to.
...
Must be set to a value that matches one of the entries in $config['queue']['stomp_server'] array, otherwise ignored.
2010-05-21 14:07:59 -07:00
Evan Prodromou
6d8e01ad13
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-21 16:47:57 -04:00
Brion Vibber
6eae5d6a7e
Merge branch 'testing' into 0.9.x
2010-05-21 13:15:08 -07:00
Brion Vibber
2c12d837c6
Disable SSL peer/hostname verification for HTTPClient unless we've configured a trusted CA bundle like this: $config['http']['ssl_cafile'] = '/usr/lib/ssl/certs/ca-certificates.crt';
...
The previous state was failing on all HTTPS hits due to HTTP_Request2 library turning on the validation check but not specifying a CA file.
2010-05-21 10:12:39 -07:00
Brion Vibber
68305d4b68
Added block link to subscription notification emails; block action can now take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger.
...
Fixed typo in RedirectingAction when no return-to data provided in form submission.
RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated.
More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc.
2010-05-20 14:24:44 -07:00
Brion Vibber
708d22848e
Quick fix for creating OpenID accounts authenticating against a MediaWiki site; trim the 'User:' etc from the final path segment before generating a nickname from it. Avoids ending up with nicks like 'userbrion' on your first OpenID login!
2010-05-19 16:19:06 -07:00
Brion Vibber
c4203be9a4
Merge branch '0.9.x' into 1.0.x
2010-05-19 12:52:23 -07:00
Brion Vibber
7005ef6661
Merge branch 'testing' into 0.9.x
...
Conflicts:
plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
Brion Vibber
74a89b1fc3
Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back.
...
Should help with problems where xmppdaemon would get stuck in wrong locale.
2010-05-19 10:10:55 -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
3708341857
Allow OStatusPlugin to set the source attribution title
2010-05-18 15:16:13 -07:00
Zach Copley
6187266205
- OStatusPlugin should return true if it doesn't need to handle source
...
attribution
- Remove stray break statement from NoticeList
2010-05-18 15:16:03 -07:00
Zach Copley
0dfef88cac
HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them
2010-05-18 15:15:52 -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
Brenda Wallace
48dc899acb
added notice.location to group by
2010-05-17 14:17:49 +12:00
Brenda Wallace
6f19830c9a
fix the column modify on stuff for postgres. change serial to bigserial
2010-05-17 13:50:37 +12:00
Brenda Wallace
9bb18541df
added missing field to the group by. this makes postgres happy
2010-05-15 15:33:55 +12:00
Brenda Wallace
7bd6b62461
comment out the extra bit, cos there's always mysql-only stuff in therre.
...
this isn't a very good idea
2010-05-15 15:32:22 +12:00
Brenda Wallace
a467c0ebba
caitalise the sql keywords
2010-05-15 15:31:54 +12:00
Brenda Wallace
191752138a
indexes now working in postgres schemas
2010-05-15 15:14:11 +12:00
Brenda Wallace
7cf250ff18
removed sneaky debug echo that shouldn't be there
2010-05-15 15:08:22 +12:00
Brenda Wallace
599942f58a
sorted enums and auto_increments on postgres.
...
Still needs inline indexes on table creation
2010-05-15 14:56:40 +12:00
Brion Vibber
91367dbc21
Merge branch '0.9.x' into 1.0.x
2010-05-14 12:15:13 -07:00
Brion Vibber
065ecc5573
Merge branch 'testing' into 0.9.x
2010-05-14 12:14:02 -07:00
Brion Vibber
3d00cfd47f
Windows server fix: Use platform EOL in debug log file
2010-05-11 12:22:14 -07:00
Brion Vibber
45392bef33
Installer tweak for Windows: normalize line endings to platform standard in generated config.php
...
Added a comment that the writable directory checks are insufficient to catch ACL problems on Windows; need a better check for that.
2010-05-11 12:16:13 -07:00
Zach Copley
da18701394
Fix for repeats from the API having null source attribution
2010-05-07 17:22:16 -07:00
Zach Copley
fba140f4e0
Fix for repeats from the API having null source attribution
2010-05-08 00:07:42 +00:00
Zach Copley
3c9686e80f
Fix for repeats from the API having null source attribution
2010-05-07 16:32:24 -07:00
Zach Copley
06a63b0404
Finish api/statusnet/groups/update
2010-05-07 10:10:30 -07:00
Zachary Copley
b407665b98
Initial work on API method for updating a group's profile info
2010-05-07 10:10:30 -07:00
Craig Andrews
4b0458801a
Ignore PEAR errors with code DB_DATAOBJECT_ERROR_NODATA
2010-05-06 23:40:07 -04:00
Craig Andrews
30328fc166
Enable ClientSideShorten plugin by default
2010-05-06 23:33:27 -04: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
ee8c9d1422
Allow OStatusPlugin to set the source attribution title
2010-05-06 21:48:12 +00:00
Zach Copley
ce177400f8
- OStatusPlugin should return true if it doesn't need to handle source
...
attribution
- Remove stray break statement from NoticeList
2010-05-06 21:48:12 +00:00
Zach Copley
209fd12cd0
HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them
2010-05-06 21:48:12 +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
3e8af172d6
Add ?uselang=xx language override option (only valid, locally-enabled languages supported, just as with headers and user settings).
...
Great aid for debugging & translation testing
2010-05-05 17:30:42 -07: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
Brion Vibber
c2bda7726c
XMPP debugging: log the message source when discarding empty or unrecognized messages.
2010-05-05 13:11:36 -07:00
Brion Vibber
bb94b78e89
Handle timeout more gracefully in background pings
...
Added a 2-second default timeout for XMLRPC/extended pings, configurable as [ping,timeout].
No longer repeating the entire ping section if we had an HTTP error during a submission.
For now, dropping the bad item and continuing on with others. (Todo: individual retry and cleaner discards of blacklisted broken-for-now sites.)
2010-05-04 18:43:32 -07:00
Craig Andrews
4fe00a3075
When handling incoming mail, skip everything after a blank line if we already have content
2010-05-03 23:02:25 -04: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
Evan Prodromou
3f2c805652
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-04-30 15:00:55 -04:00
Brion Vibber
f888336718
Merge branch 'testing' into 0.9.x
2010-04-29 16:10:16 -07:00
Brion Vibber
ecfe6b8944
Update codename in common.php
2010-04-29 16:08:20 -07:00
Zachary Copley
a5761dd814
Update release notes and version number for 0.9.2
2010-04-29 16:06:04 -07:00
Brion Vibber
2260d6ec7c
Merge branch 'testing' into 0.9.x
...
Conflicts:
index.php
2010-04-29 15:14:51 -07:00
Brion Vibber
50d5f5e04c
Merge branch 'master' into testing
2010-04-29 15:12:02 -07:00
Brion Vibber
cb5d6d5c30
Fix charset setting for plugin localizations; default setting was blanking out non-ASCII chars. Needed for eg Bulgarian translation of Facebook plugin, was previously showing all as ???s. Now works yay!
2010-04-28 23:06:08 +00:00
Evan Prodromou
50bfa21814
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-04-26 02:53:24 -04: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
Evan Prodromou
93e76f3b83
use statusnet_ as namespace prefix for JSON
2010-04-24 12:14:12 -04:00
Brion Vibber
8fd0059bf6
Test cases and fixes for Atom and RSS content decoding.
...
Fix extraction of Atom <content type="text"> and <content type="html">; we were failing to escape plaintext source data to HTML, and doing an extraneous double-deescape on HTML source resulting in breakage of notices containing text that looks like HTML. Only <content type="xhtml"> was working correctly previously.
Fixes for RSS2 content processing: we were failing to load <content:encoded> at all due to using wrong element name, and were applying an extraneous de-escape for <description> rather than the escaping that is required to turn plaintext into HTML. (Per spec, <description> must be plaintext.)
2010-04-23 15:40:48 -07:00
Zach Copley
f852a1931b
Add docs for public_timeline
2010-04-22 15:48:58 -07:00
Zach Copley
1b561065b0
Some initial Doxygen-based documentation for the API
2010-04-22 13:11:49 -07:00
Evan Prodromou
beaecb18d5
Add statusnet: prefix for API to JSON and XML output
...
I added the statusnet: prefix to the xml output. This prefix should
be declared on the root element of all relevant XML output.
I also added two StatusNet-specific fields:
* statusnet:html - rendered HTML. Clients shouldn't have to guess
at the correct HTML rendering for notices, especially since some
of the links depend on context.
* statusnet:profile_url - profile URL for a user. You can't count
on a user being a local user in a distributed microblogging world.
So, this shows the explicit profile_url.
2010-04-22 08:49:33 -07:00
Craig Andrews
c78a10b476
add 'always' parameter to common_shorten_links
2010-04-21 17:14:25 -04:00
Brion Vibber
1d94b08efc
Revert "Update release notes and version number for 0.9.2"
...
This reverts commit 98f0d970da
.
Per xopher we're not yet ready to push 0.9.2 theme directories live; we also haven't merged down various things from testing that need to be in the release such as installer fixes.
2010-04-21 16:24:15 +02:00
Zachary Copley
98f0d970da
Update release notes and version number for 0.9.2
2010-04-20 15:01:23 -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
Brion Vibber
32918bb7c1
Test for and use mysqli in installer, since that's what we use later, rather than mysql.
2010-04-19 20:57:12 +02:00
Brion Vibber
fee6b78e28
Merge branch 'testing' into 0.9.x
2010-04-19 18:47:56 +02:00
Brion Vibber
369885f04f
Merge branch 'master' into testing
2010-04-19 18:47:11 +02:00
Brion Vibber
e547a2f54c
Fix ticket #2289 : registration links were showing in top nav bar, login page message when site set to invite-only or closed registration, when the 'register' action can't be used.
2010-04-19 18:45:50 +02:00
Craig Andrews
9398c61ed3
Use PHP exceptions for PEAR error handling.
...
Allows for the common try/catch construct, which makes error handling cleaner and easier.
2010-04-18 19:28:41 -04: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
Craig Andrews
ffd688b8ef
json_encode strings put out as javascript
2010-04-17 14:36:11 -04:00
Craig Andrews
1081b06bbe
Allow cross-site ajax with CORS.
...
Only allows un-credentialed (as in, no cookies or basic auth), no custom headers, and get (no post, put, delete, etc) requests.
2010-04-15 12:52:59 -04:00
Brion Vibber
f789928942
Merge branch 'testing' into 0.9.x
2010-04-14 11:15:48 +02:00
Brion Vibber
9463287710
showplugins.php: dump list of activated plugins and their settings on this site
2010-04-12 11:50:42 -07:00
Brion Vibber
a05e674843
showplugins.php: dump list of activated plugins and their settings on this site
2010-04-12 11:49:59 -07:00
Siebrand Mazeland
c59e90b20b
Number parameters
2010-04-11 23:57:18 +02:00
Siebrand Mazeland
8795b3546d
Add translator documentation and number parameters if multiple are used in a message.
2010-04-11 23:39:24 +02:00
Siebrand Mazeland
ec0fee0f2a
Add translator documentation and FIXMEs that plural support should be added for some messages.
2010-04-11 22:15:41 +02:00
Brion Vibber
7fada4ddcc
Fix syntax errors that snuck in while documenting translations
2010-04-10 19:38:58 -07: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
Siebrand Mazeland
9b788471d4
Add translator documentation.
2010-04-10 22:50:15 +02:00
Siebrand Mazeland
204cf0b96b
Add translator documentation
...
* approved message had not been i18n-ed
* also had to i18n 'read-only' and 'read-write'
2010-04-10 22:49:33 +02:00
Siebrand Mazeland
1661be6851
i18n for low level logging is not needed.
2010-04-10 21:59:17 +02:00
Siebrand Mazeland
ddc116cffe
Add translator documentation for a few files
...
* added a few XXX (that's StatusNet for FIXME, right?)
** proposing de-duplication of a message appearing ~50 times
** marking bad pagination implementation
* moved the TRANS: comments in action.php down to exactly before the line in which the message appears. Otherwise gettext does not put them in the pot file
* fixed a XXX in action.php removing double spaces
2010-04-10 21:12:14 +02:00
Evan Prodromou
5d96cf2eec
catch UserNoProfileException and continue
2010-04-10 11:36:23 -04:00
Siebrand Mazeland
86a3016a6f
Document messages for which clarification was requested.
...
Because N/S/E/W were on the same lines, and the "// TRANS:" comment must be directly above the line in which the message is located to work, I added the messages to a variable first.
2010-04-10 01:49:25 +02:00
Siebrand Mazeland
518832da28
Document messages for which clarification was requested.
2010-04-10 01:48:16 +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
Brion Vibber
d00942cce1
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 11:56:27 -07:00
Brion Vibber
41062d387f
Fix localization for license notice in page footer (for ticket #2274 : i18n cleanup)
2010-04-09 08:58:14 -07:00
Brion Vibber
4a028d5e35
Fix localization for license notice in page footer (for ticket #2274 : i18n cleanup)
2010-04-09 08:58:00 -07:00
Brion Vibber
a5cfc3954f
Fix localization for license notice in page footer (for ticket #2274 : i18n cleanup)
2010-04-09 08:56:43 -07:00
Brion Vibber
1f8451f4aa
Merge branch 'testing' into 0.9.x
2010-04-09 08:40:15 -07:00
Brion Vibber
5dbaaed4e6
Maintain 'page' parameter for block from subscribers list, block & make-admin from group members list.
...
Refactored some of the returnto handling code. It looks like we have several different ways of handling this in the software, icky!
Marked the session-based functions with fixmes (they'll stomp on other forms when multiple tabs/windows are used) and combined some commonish bits of code between ProfileFormAction and the group block & makeadmin actions where they're using hidden form parameters. Extended that to allow passing dynamic parameters (eg 'page') as well as static ones (action, target user/group).
2010-04-08 19:06:55 -07:00
Brion Vibber
6274c3977d
In single-user mode, link #hashtags to the user's tagged stream rather than the global tag action, which isn't registered.
...
Previously they would end up pointing to the home URL.
2010-04-08 17:06:25 -07:00
Brion Vibber
0e0927985c
Revert "scripts/strip_geo.php to remove geodata from notices by a given user/profile."
...
This reverts commit ab20e75ff8
.
Accidentally removed another commit; clearing up...
2010-04-08 17:04:10 -07:00
Brion Vibber
ab20e75ff8
scripts/strip_geo.php to remove geodata from notices by a given user/profile.
...
May be slow or run out of memory if run on particularly prolific posters -- not yet optimized for that case.
Note that geodata that has already been sent out to other services (via ostatus, omb, twitter, etc) will not be removed from them.
2010-04-08 16:58:54 -07:00
Siebrand Mazeland
cb38163e8d
Update supported languages:
...
* fix name for Irish/ga
* add Galician/gl
2010-04-09 01:16:41 +02:00
Brion Vibber
88678eadfa
In single-user mode, link #hashtags to the user's tagged stream rather than the global tag action, which isn't registered.
...
Previously they would end up pointing to the home URL.
2010-04-08 13:12:14 -07:00
Brion Vibber
f255b368ed
Refactor installer into base class plus web and CLI installers.
...
scripts/install_cli.php is a bit experimental at present but works.
2010-04-07 17:47:08 -07:00
Evan Prodromou
727ea5a516
Merge branch '0.9.x' into 1.0.x
2010-04-07 10:47:29 -04:00
Siebrand Mazeland
ae139c4ddf
Localisation updates for !StatusNet from !translatewiki.net !sntrans
...
* add Afrikaans
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-07 01:14:31 +02:00
Brion Vibber
5dc169260d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-04-06 15:22:23 -07:00
Brion Vibber
b71f276ed5
Merge branch 'master' into testing
2010-04-05 10:42:41 -07:00
Evan Prodromou
98905de69d
make profilelist homepage link attributes overrideable
2010-04-05 11:17:06 -04:00
Evan Prodromou
0b30230b5a
Merge branch 'nofollow'
2010-04-05 11:04:47 -04:00
Evan Prodromou
2e51d33145
override linkAttributes() method for subscribersminilist
2010-04-05 10:46:55 -04:00
Evan Prodromou
dd053aa349
override linkAttributes() method for profileminilist
2010-04-05 10:46:38 -04:00
Evan Prodromou
19401f6530
add linkAttributes() method for profilelist
2010-04-05 10:46:26 -04:00
Evan Prodromou
a313aeab9c
lib/default.php has nofollow group
2010-04-05 10:24:22 -04:00
Evan Prodromou
7fb8d0c471
breakout subscribers minilist
2010-04-05 10:22:54 -04:00
Evan Prodromou
8d335f0c86
balance brackets on profileminilist
2010-04-05 10:14:45 -04:00
Evan Prodromou
5414096c44
add an event for subscribers minilist
2010-04-05 10:12:40 -04:00
Brion Vibber
2f4438fe24
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/imsettings.php
lib/jabber.php
Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet.
Should also move over the test cases.
2010-04-02 15:56:25 -07:00
Brion Vibber
e4d934827b
Merge branch 'testing' into 0.9.x
2010-04-02 15:48:39 -07:00
Brion Vibber
6cd0637e55
Ticket 2271: extra whitespace in underlined link for username in notice lists
...
Switching to a raw() output for the <span> of the nickname removes the extra whitespace and fixes display.
2010-04-02 09:34:42 -07:00
Brion Vibber
b10ff031d9
Ticket 2271: extra whitespace in underlined link for username in notice lists
...
Switching to a raw() output for the <span> of the nickname removes the extra whitespace and fixes display.
2010-04-02 09:32:03 -07:00
Evan Prodromou
ac9fda4bc0
ProfileMiniListItem does same events as ProfileListItem
2010-04-01 15:53:17 -04:00
Brion Vibber
df9eb4164a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-31 12:48:24 -07:00
Sarven Capadisli
89bb053116
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-31 11:00:22 +02:00
Sarven Capadisli
534c12e540
Revert "Multiple file upload handling."
...
This reverts commit 260f00d60b
.
As mentioned in
260f00d60b (comment_8367)
Reverting this merge until the bugs are fixed and there is a general
agreement on the need for this enhancement.
2010-03-31 10:57:20 +02:00
Brion Vibber
0841fa712e
Ticket #1281 : JID validation now more or less follows spec instead of calling e-mail validator
...
Basic splitting/validation code submitted via http://status.net/wiki/XMPP/JID_validation -- Copyright 2009 Patrick Georgi <patrick@georgi-clan.de> Licensed under ISC-L, which is compatible with everything else that keeps the copyright notice intact.
Added PEAR Net_IDNA package to extlib to handle IDN normalization (also used by Validate's email verifier if present).
* added test suite, supplemented my own test cases with JID validation and normalization test cases from libpurple
* follows XMPP rules for validation of name part
* fixes for normalization with non-ASCII names
* will do domain checks if $config['email']['check_domain'] is on, checking for an XMPP-server SRV record or any lookup. (We don't actually need to ping those direct though.)
* some more obscure stringprep validation rules aren't quite followed yet, but we err on the side of permissiveness.
* we still don't actually let you save your address with a resource on it, as we strip resources when looking up users who've sent us presence or message updates. I would recommend saving the outgoing resource as a separate field if/when we add that..?
2010-03-30 17:35:27 -07:00
Brion Vibber
0284e1315c
Quick fixes for grouplistall:
...
* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it)
2010-03-30 11:45:35 -07:00
Brion Vibber
ca897ef346
Quick fixes for grouplistall:
...
* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it)
2010-03-30 11:10:29 -07:00
Brion Vibber
faa14b64ab
Tweak to Eugene Crosser's patch to make transactions and acks configurable; disabling them gets basic message delivery working under MorbidQ, and may help with RabbitMQ etc.
...
I swapped the settings from negative to positive ($config['queue']['stomp_transactions'] = false rather than $config['queue']['stomp_no_transactions'] = true), gave them defaults (both on for best ActiveMQ experience), and added notes to the README about configuring them.
2010-03-29 15:46:41 -07:00
Eugene Crosser
bd1363c17a
Make stomp queue manager work with basic servers
...
Signed-off-by: Eugene Crosser <crosser@average.org>
2010-03-29 15:31:43 -07:00
Brion Vibber
01a03e34c8
Merge branch '0.9.x' into 1.0.x
2010-03-29 15:15:51 -07:00
Brion Vibber
cfeb1bfa41
Merge branch 'testing' into 0.9.x
2010-03-29 15:15:11 -07:00
Brion Vibber
873b832827
Merge branch 'master' into testing
...
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
2010-03-29 15:14:25 -07:00
Brion Vibber
a8d92dad5e
Renamed HTTPResponse class to StatusNet_HTTPResponse to avoid conflict with PECL HTTP extension.
...
The class isn't referenced by name by any other code I can see so this should have no side effects.
2010-03-29 15:07:15 -07:00
Brion Vibber
d44e5ac935
Add $config['db']['annotate_queries'] option to include caller ID comments into queries. Comment can then be seen in process list, slow query logs on the server, aiding in tracking down unexpected slow queries.
...
SELECT /* queuedaemon.php Ostatus_profile->processPost */ * FROM notice WHERE ( notice.uri = 'http://stormcloud.local/mublog2/notice/479 ' )
INSERT /* POST Notice::saveNew */ INTO notice (profile_id , content ....
2010-03-29 13:14:11 -07:00
Evan Prodromou
f0d905112e
Merge branch 'master' into 0.9.x
...
Conflicts:
lib/attachmentlist.php
2010-03-28 15:25:02 -04:00
Evan Prodromou
ddc71b6637
update README and version number
2010-03-28 11:39:56 -04:00
Evan Prodromou
29566c5d4b
move check for bad IDs from activityobject to activity and make simpler
2010-03-27 22:44:10 -04:00
Nick Holliday
260f00d60b
Multiple file upload handling.
2010-03-26 18:28:54 -04:00
Craig Andrews
1bf27de9b9
if there is oembed data for a file/link, consider that link to have an attachment
2010-03-26 18:13:45 -04:00
Zach Copley
60009227f7
Return an http auth error, when a client sends in an invalid auth user, even when http auth is not required.
2010-03-26 19:58:59 +00:00
Zach Copley
b82e55356d
Return an http auth error, when a client sends in an invalid auth user, even when http auth is not required.
2010-03-26 19:58:15 +00:00
Zach Copley
379df1ce3e
Return an http auth error, when a client sends in an invalid auth user, even when http auth is not required.
2010-03-26 18:51:01 +00:00
Brion Vibber
511a164c99
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-03-25 14:32:28 -07:00
Brion Vibber
e174a7211d
Restore lost addition of inline HTML attachment display.
2010-03-25 14:31:22 -07:00
Evan Prodromou
46655eb3ca
version number and codename
2010-03-25 17:25:26 -04:00
Sarven Capadisli
5e79ef58e4
Using hCard label instead of location. Matches userprofile.
2010-03-25 22:20:14 +01:00
Sarven Capadisli
2b3a2e6b6d
Updated tag list output in subscriptions list. Matches userprofile.
2010-03-25 22:20:06 +01:00
Sarven Capadisli
41c8048efd
Moved print inside base stylesheet using media rules. One less HTTP GET.
2010-03-25 22:19:50 +01:00
Brion Vibber
c11064a539
Updated 'more' anchor for attachments to do an XHR GET
...
Conflicts:
lib/attachmentlist.php
plugins/OStatus/classes/Ostatus_profile.php
Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
2010-03-25 14:15:54 -07:00
Sarven Capadisli
3c5586d4bd
Using rel=external instead of class=external for jOverlay title link
2010-03-25 21:33:38 +01:00
Sarven Capadisli
53bed00f90
Added rel=external to geo location link
2010-03-25 21:33:26 +01:00
Sarven Capadisli
321093886f
Assigned an identifier for the representative user and group profile
2010-03-25 21:32:28 +01:00
Brion Vibber
040b4b74ef
Merge commit 'origin'; branch '0.9.x' into 1.0.x
2010-03-25 13:05:02 -07:00
Brion Vibber
29a25848de
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-25 13:04:09 -07:00
Evan Prodromou
920acf8d96
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-25 13:50:49 -04:00
Brion Vibber
c3ceaa893f
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
2010-03-24 14:11:01 -07:00
Brion Vibber
ecb009bcf5
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-24 13:57:20 -07:00
Brion Vibber
a954fd65ba
Fix for API group methods, caused failure or output corruption when pulling up local groups by name in api/statusnet/groups/is_member.json/xml
2010-03-24 13:36:57 -07:00
Sarven Capadisli
09ff213d1c
Using hCard label instead of location. Matches userprofile.
2010-03-24 20:58:13 +01:00
Sarven Capadisli
e7ae36b52a
Updated tag list output in subscriptions list. Matches userprofile.
2010-03-24 20:50:07 +01:00
Sarven Capadisli
647b3a1f6b
Moved print inside base stylesheet using media rules. One less HTTP GET.
2010-03-24 14:50:12 +01:00
Craig Andrews
abe4be5438
Use $param instead of hardcoded 'attach' name.
2010-03-23 22:42:30 -04:00
Brion Vibber
7277b59734
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-23 12:13:32 -07:00
Brion Vibber
16fa03212b
Ticket 2188: add a daily average post count to profile statistics sidebar.
...
When we have more detailed history stats, this'd be a good place to link to details/graphs.
2010-03-23 11:25:36 -07:00
Brion Vibber
44caa3a93f
Consistently send Profiles into Fave::addNew()
2010-03-23 11:08:30 -07:00
Brion Vibber
533a3bf6a3
Consistently send Profiles into Fave::addNew()
2010-03-23 11:06:37 -07:00
Brion Vibber
80b16c8499
Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override.
...
This was being triggered by welcomebot messages created at account creation time, then propagated through replies.
2010-03-23 09:56:05 -07:00
Brion Vibber
2d79455a1f
Don't add PHPSESSID parameter onto notice and conversation URIs if we save a notice during a session override.
...
This was being triggered by welcomebot messages created at account creation time, then propagated through replies.
2010-03-23 09:54:24 -07:00
Evan Prodromou
dd115fcb08
change router to allow hooking path connections
2010-03-23 12:33:41 -04:00
Brion Vibber
a5c78a6f1a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-23 08:21:32 -07:00
Zach Copley
b8e97ac709
Some initial media parsing
...
- Activity now returns a list of activity objects
- Processing of photo objects
2010-03-22 18:55:17 -07:00
Brion Vibber
886e28aaa9
Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list.
2010-03-22 13:58:27 -07:00
Brion Vibber
e89908f261
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/channel.php
scripts/imdaemon.php
2010-03-22 13:56:16 -07:00
Brion Vibber
26f49de0dd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
lib/attachmentlist.php
2010-03-22 12:37:45 -07:00
Brion Vibber
4168b9cec1
Log backtraces for non-ClientException exceptions caught at the top-level handler.
2010-03-22 11:33:56 -07:00
Brion Vibber
5697e4edb0
Replace the "give up and dump object" attachment view fallback with a client-side redirect to the target URL, which will at least be useful.
2010-03-22 10:51:01 -07:00
Brion Vibber
7aee7670c7
Replace the "give up and dump object" attachment view fallback with a client-side redirect to the target URL, which will at least be useful.
2010-03-22 10:35:54 -07:00
Brion Vibber
be7efe7504
Merge branch 'testing' into 0.9.x
2010-03-21 16:28:56 -07:00
Brion Vibber
fcb614d0eb
Pull <atom:author> info as well as <activity:actor> when we have an old-style ActivityStreams feed. This fixes subscription setup for Cliqset feeds, which currently have a bogus activity:actor/atom:id but a good atom:author/atom:uri
2010-03-21 16:25:12 -07:00
Evan Prodromou
97bd7e22da
correct creation of avatar links for RSS and Posterous elements
2010-03-20 17:18:24 -05:00
Evan Prodromou
11a86d046e
move atom category to its own file, too
2010-03-20 16:55:36 -05:00
Evan Prodromou
323ff31fbd
special-case Posterous author element for activity actor
2010-03-20 16:53:30 -05:00
Evan Prodromou
e458e9fe63
Merge branch 'testing' into 0.9.x
...
Conflicts:
lib/activity.php
2010-03-20 16:11:42 -05:00
Evan Prodromou
99454be38c
Move activity classes to their own files
...
Moved the various classes used by the Activity class to their own
files. There were >10 classes in the same file, with around 1500 lines
in the file. Just too big.
This change makes autoloading work for these classes, so also removed
the hard require in lib/common.php.
2010-03-20 16:06:22 -05:00
Craig Andrews
aa6e198c12
Remove deprecated call-time pass-by-reference
2010-03-20 12:04:46 -04:00
Evan Prodromou
2fc0f0433e
allow html content in summary and clean it out of title
2010-03-20 09:30:28 -05:00
Evan Prodromou
65c8dc313c
rename $rss to $channel to prevent misunderstanding
...
RSS feeds have the format
<rss><channel><item/><item/><item/></channel></rss>. The element named
$rss was actually the <channel> element, so I renamed the variable so
I wouldn't hurt my head.
2010-03-20 07:19:54 -05:00
Brion Vibber
7e2af3dcae
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
2010-03-19 15:51:22 -07:00
Evan Prodromou
022c13418d
make deriving a subject from an RSS channel work
2010-03-19 15:49:38 -05:00
Evan Prodromou
1292230e38
move ActivityObject constructors from Activity to ActivityObject
2010-03-19 15:41:48 -05:00
Evan Prodromou
13b1acdd08
only search elements for links
2010-03-19 15:28:25 -05:00
Evan Prodromou
05e3768e6a
Parse RSS items as activities
...
First steps to parsing RSS items as activities. RSS feeds don't seem
to have enough data to make good remote profiles, but this may work
with some "hints".
2010-03-19 09:48:39 -05:00
Brion Vibber
3e2e88b0df
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-18 17:19:28 -07:00
Brion Vibber
1301877dfe
OStatus discover fixes:
...
* Subscription::start was sometimes passing users instead of profiles to hooks, which broke OStatus subscription notifications; now normalizing to profiles for processing.
* H-card parsing would trigger a lot of PHP warnings and notices in hKit. Now suppressing warnings and notices for the duration of the call to keep them out of output when display_errors is on.
* H-card parsing would trigger a PHP fatal error if the source page was not well-formed XML and Tidy was not present on the system. Switched normalization to use the PHP DOM module which is always present, as we have no need for Tidy's extra features here.
* Trying to fetch avatars from Google profiles failed and triggered a PHP warning due to the relative URL not being resolved during h-card parsing. Now passing profile page URL into hKit by sneaking a <base> tag in while we normalize the HTML source.
* Profile pages without a "Link" header could trigger PHP notices due to a bad NULL -> array(NULL) conversion in LinkHeader::getLink(). Now checking that there was a return value before converting single return value into array.
2010-03-18 17:08:19 -07:00
Craig Andrews
26ba430ae8
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
...
Remove erroneous call to unlink in the constructor
2010-03-18 15:39:06 -07:00
Craig Andrews
9c5af9a38f
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
...
Remove erroneous call to unlink in the constructor
2010-03-18 18:13:54 -04:00
Brion Vibber
1de7badd78
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 10:55:20 -07:00
Brion Vibber
d115932466
Sigh... somehow left a stray bit of test code and broke activity.php.
2010-03-18 09:10:44 -07:00
Evan Prodromou
0a1b10114b
new exception class for when a user has no profile
2010-03-18 08:32:17 -05:00
Brion Vibber
55a54d6f6a
Ticket #2244 : fix to interpretation of escaped HTML and plaintext Atom content on incoming OStatus messages.
...
We were double-unescaping for <content type="html">, turning <b> escaped chars into literal tags (which then may get removed entirely by the HTML scrubber).
2010-03-17 17:35:27 -07:00
Sarven Capadisli
d8a533274f
Updated 'more' anchor for attachments to do an XHR GET
2010-03-18 00:19:32 +01:00
Brion Vibber
f797a10256
Display scrubbed HTML attachments inline on attachment view page.
2010-03-17 13:58:25 -07:00
Brion Vibber
67f2f01c5e
Merge branch 'testing' into 0.9.x
2010-03-17 12:15:40 -07:00
Brion Vibber
22f827134c
Workaround for HTTP authentication in the API when running PHP as CGI/FastCGI. Example rewrite lines added as comments in htaccess.sample, API tweaked to accept alternate environment var form.
2010-03-17 11:04:41 -07:00
Brion Vibber
1c942afa60
Workaround for HTTP authentication in the API when running PHP as CGI/FastCGI. Example rewrite lines added as comments in htaccess.sample, API tweaked to accept alternate environment var form.
2010-03-17 10:52:11 -07:00
Brion Vibber
b9fc4c24b4
Pulling the stub plugin panel back out; we'll flesh it out more for 1.0.x and see if we can make it easier to disable through the config file for now.
...
Revert "Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list."
This reverts commit d9a9fd3779
.
2010-03-17 08:55:16 -07:00
Brion Vibber
f62b8a80cf
Pull back for now on switch of PEAR error mode to exceptions; seems to trigger out exceptions at various times we don't want them.
...
For instance this was throwing an exception for DB_DataObject::staticGet when there's no match... definitely not what we want when all our code expects to get a nice null.
Example of this causing trouble: http://gitorious.org/statusnet/mainline/merge_requests/131
Revert "Don't attempt to retrieve the current user from the DB while processing a DB error"
This reverts commit 68347691b0
.
Revert "Use PHP exceptions for PEAR error handling."
This reverts commit d8212977ce
.
2010-03-16 16:32:25 -07:00
Brion Vibber
88f66131a1
Pull back for now on switch of PEAR error mode to exceptions; seems to trigger out exceptions at various times we don't want them.
...
For instance this was throwing an exception for DB_DataObject::staticGet when there's no match... definitely not what we want when all our code expects to get a nice null.
Example of this causing trouble: http://gitorious.org/statusnet/mainline/merge_requests/131
Revert "Don't attempt to retrieve the current user from the DB while processing a DB error"
This reverts commit 68347691b0
.
Revert "Use PHP exceptions for PEAR error handling."
This reverts commit d8212977ce
.
2010-03-16 16:24:31 -07:00
Brion Vibber
d9a9fd3779
Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list.
2010-03-16 16:01:00 -07:00
Zach Copley
b994d529f4
Throw an exception if we receive a document instead of a feed's root element
2010-03-15 19:06:06 -07:00
Brion Vibber
441e52718e
Background deletion of user accounts. Notices are deleted in chunks, then the user itself when they're all gone.
...
While deletion is in progress, the account is locked with the 'deleted' role, which disables all actions with rights control.
Todo:
* Pretty up the notice on the profile page about the pending delete. Show status?
* Possibly more thorough account disabling, such as disallowing all use for login and access.
* Improve error recovery; worst case is that an account gets left locked in 'deleted' state but the queue jobs have gotten dropped out. This would leave the username in use and any undeleted notices in place.
2010-03-15 16:08:00 -07:00
Zach Copley
40cde2f710
Initial Twitpic-like media upload endpoint /api/statusnet/media/upload
2010-03-15 22:16:33 +00:00
Brion Vibber
2b684f6954
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-15 14:39:14 -07:00
Brion Vibber
c9232d8f26
Ticket #2242 : fix reading of inline XHTML content in Atom feeds for OStatus input.
...
Lookup of the <div> needed to check for the XHTML namespace.
2010-03-15 20:21:55 +00:00
Brion Vibber
c89e1865f7
Merge branch 'testing' into 0.9.x
2010-03-15 12:45:38 -07:00
Sarven Capadisli
2f380f6a9a
Using rel=external instead of class=external for jOverlay title link
2010-03-14 15:01:24 -04:00
Sarven Capadisli
00cac4c8b1
Added rel=external to geo location link
2010-03-14 14:11:21 -04:00
James Walker
c4f89b06f1
give preference to rel="photo" (per latest ActivityStreams spec), but still support rel="avatar" for compat
2010-03-14 12:57:24 -04:00
Sarven Capadisli
5b078eadd9
Assigned an identifier for the representative user and group profile
2010-03-13 16:48:21 -05:00
Brion Vibber
14c488ebb0
Fix for _m() usage with context in StatusNet main code.
2010-03-13 12:12:06 -08:00
James Walker
a9dabbe77e
* wrong param order to in_array
...
* in getContent() if "type" isn't set, assume text (per atom spec)
2010-03-13 10:37:08 -05:00
Brion Vibber
9e9ab23e1f
Fixes for updating indices, charset/collation and engine type on plugin-created tables.
...
Under MySQL, new tables will be created as InnoDB with UTF-8 (utf8/utf8_bin) same as core tables.
Existing plugin tables will have table engine and default charset/collation updated, and string columns will have charset updated, at checkschema time.
Switched from 'DESCRIBE' to INFORMATION_SCHEMA for pulling column information in order to get charset. A second hit to INFORMATION_SCHEMA is also needed to get table properties.
Indices were only being created at table creation time, which ain't so hot. Now also adding/dropping indices when they change.
Fixed up some schema defs in OStatus plugin that were a bit flaky, causing extra alter tables to be run.
TODO: Generalize this infrastructure a bit more up to base schema & pg schema classes.
2010-03-12 13:16:32 -08:00
Brion Vibber
f72eb17304
Merge commit 'origin/testing' into 0.9.x
2010-03-12 09:41:49 -08:00
Brion Vibber
f3066c80d3
Merge commit 'origin/0.9.x' into 0.9.x
2010-03-12 09:41:45 -08:00
Zach Copley
3dc84dd02d
Output enclosing geo elements and GeoRSS xmlns in XML timelines
2010-03-12 05:39:36 +00:00
Zach Copley
13556e7ba9
Add Atom self link to tag timeline
2010-03-12 04:08:31 +00:00
Brion Vibber
b1d90a835f
Don't switch people from the Memcache to Memcached plugin without their knowledge when using back-compatibility $config['memcached']['enabled']. Performance characteristics for Memcached version on large-scale sites not tested yet.
...
New installations should be using addPlugin explicitly.
2010-03-11 18:10:41 -08:00
Brion Vibber
fe7b063b85
Remove stray whitespace at file start that snuck into last update
2010-03-11 18:07:00 -08:00
Craig Andrews
2179aae758
fubared a715271f84
- this is the fix
2010-03-11 21:02:41 -05:00
Zach Copley
e1537d8387
More generalized method for calculating Atom rel="self" links
2010-03-12 01:40:52 +00:00
Craig Andrews
a715271f84
reuse Subscription::cancel instead of reimplementing it.
...
I didn't know this method existed before... pretty neat.
2010-03-11 20:40:25 -05:00
Craig Andrews
d6e0640251
move image type checking to constructor, so checking will be done in all cases
...
check if the relevant image handling function exists when deciding if the image type is supported
2010-03-11 20:12:32 -05:00
Zach Copley
78f0d6bbd2
Scrub all atom output with common_xml_safe_str()
2010-03-12 01:12:30 +00:00
Zach Copley
b12c344930
Generator tag should have 'uri' attr not 'url'
2010-03-11 23:44:50 +00:00
Zach Copley
7e1a1506f5
Output self link in rss2 feeds, if available
2010-03-11 23:28:41 +00:00
Zach Copley
023f258b63
- Output georss xmlns in rss element
...
- Only output geopoint in rss if one is set
2010-03-11 23:05:56 +00:00
Sarven Capadisli
ded26ae8f5
Fixes the indenting bug for geo anchor. Also mention in trac ticket 2235
2010-03-11 16:40:16 -05:00
Brion Vibber
c6f09306b1
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-10 17:04:51 -08:00
Brion Vibber
5cd020bf29
Workaround intermittent bugs with HEAD requests by disabling keepalive in HTTPClient.
...
I think this is a bug in Youtube's web server (sending chunked encoding of an empty body with a HEAD response, leaving the connection out of sync when it doesn't attempt to read a body) but the HTTP_Request2 library may need to be adjusted to watch out for that.
2010-03-10 15:13:16 -08:00
Brion Vibber
6d73fc1d54
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-10 11:57:38 -08:00
Brion Vibber
54ff17010b
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-10 11:56:51 -08:00
Brion Vibber
532e486a93
Detect when queuedaemon/xmppdaemon parent processes die and kill the child processes.
...
Keeps stray daemon subprocesses from floating around when we kill the parents via a signal!
Accomplished by opening a bidirectional pipe in the parent process; the children close out the writer end and keep the reader in their open sockets list. When the parent dies, the children see that the socket's been closed out and can perform an orderly shutdown.
2010-03-10 11:54:00 -08:00
Zach Copley
55e8473a7a
A blank username should never be allowed.
2010-03-10 09:57:00 -08:00
Brion Vibber
ddb656fcd2
Merge branch 'testing' into 0.9.x
...
Conflicts:
actions/apistatusnetconfig.php
2010-03-10 09:55:14 -08:00
Brion Vibber
58fcb5ac6f
Merge branch 'master' into testing
2010-03-10 09:53:55 -08:00
Brion Vibber
8ee8b89dd8
Ticket #2221 : fix for missing whitespace between messages in en-gb.
...
The final whitespace should be dropped from the source messages after we've stabilized; trailing space is pretty unreliable to keep through translation tools and should be avoided. Use separator strings outside the messages!
2010-03-10 09:36:00 -08:00
Brenda Wallace
49f1b1e8b2
removed a stay bit of debug
2010-03-10 22:03:36 +13:00
Brenda Wallace
75e2be3b71
map the mysql-ish column types to ones postgres likes
2010-03-10 22:02:56 +13:00
Brenda Wallace
7398353c44
primary keys and unique indexes working in postgres
2010-03-10 21:54:30 +13:00
Brenda Wallace
c4ee2b20be
throw an error that looks like mysql errors.. :-S
2010-03-10 21:25:44 +13:00
Zach Copley
7f2253759c
A blank username should never be allowed.
2010-03-10 03:39:05 +00:00
Brion Vibber
6ea7e1c06e
Merge branch 'testing' into 0.9.x
2010-03-09 14:20:50 -08:00
Brion Vibber
971f1f64f1
Added scripts/command.php, can be used to run commands such as subscription on behalf of users.
...
This includes whatever support for extended command parsing plugins may have added.
Example:
./scripts/command.php -nbrionv sub update@status.net
2010-03-09 13:41:05 -08:00
Brion Vibber
8bf1b54abd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-09 13:07:52 -08:00
Brion Vibber
32532c7c42
Merge branch 'commands' into testing
2010-03-09 13:05:51 -08:00
Brion Vibber
80a17387bf
Command input processing now has centralized places for looking up notice, user/profile, and group arguments.
...
OStatus plugin overrides these to allow using webfinger (user@example.com ), profile URL (http://example.com/user ) and bare profile URL (example.com/user) as arguments.
2010-03-09 13:03:32 -08:00
Brion Vibber
6c4ade4251
Merge branch 'testing' into 0.9.x
2010-03-09 11:27:53 -08:00
Brion Vibber
4caf0d2e73
Merge commit 'origin/master' into testing
2010-03-09 11:27:30 -08:00
Brion Vibber
60e0f04261
Ticket #2210 : adjust locale setup fallback to try more locales on the system if en_US isn't available. We just need *something* other than C or POSIX to let gettext initialize itself, apparently...
...
Gets Spanish, French, Russian etc UI localization working on Debian Lenny fresh installation set up in Spanish (so es_ES.UTF-8 is available but en_US.UTF-8 isn't).
2010-03-09 17:38:16 +01:00
Craig Andrews
689e2e112b
make common_copy_args() work when the post/get request includes arrays (form elements with names ending in [] having multiple values)
2010-03-08 21:43:34 -05:00
Craig Andrews
714d920fae
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
Craig Andrews
51a245f18c
Added Memcached plugin (using pecl/memcached versus pecl/memcache)
2010-03-08 17:17:37 -05:00
Brion Vibber
42463e160d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-08 13:37:45 -08:00
Brion Vibber
217ad420ac
Fix ticket #2208 : regression in XMPP sending when server != host
...
The upstream class sets $this->basejid with host unconditionally, which wasn't previously an issue as the fulljid would always be filled in by the server at connect time before sending messages. With the new queued messaging, we need to make sure we've filled out $this->fulljid correctly without making a connection.
Now using $server if provided to build $this->basejid and $this->fulljid in the queued XMPP proxy class, so queued messages are sent correctly.
2010-03-08 12:19:06 -08:00
Brion Vibber
a77efb2447
XMPP cleanup: fix outgoing XMPP when queuing is disabled; fix notice for first access to undefined member variable
2010-03-08 10:32:40 -08:00
Evan Prodromou
5f7aa6f2e3
make API realm configurable
2010-03-08 12:36:03 -05:00
Dave Hall
dbe6b979d7
implement mail headers
2010-03-04 23:10:27 -05:00
Brion Vibber
2f41e93339
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-04 14:44:38 -08:00
Siebrand Mazeland
5dbcc184c9
Add Breton to language.php
2010-03-04 20:04:44 +01:00
Evan Prodromou
f7f7f167d6
update version number
2010-03-04 13:18:41 -05:00
Brion Vibber
f969d6349c
Merge branch 'testing' into 0.9.x
...
Conflicts:
db/08to09.sql
2010-03-04 10:16:59 -08:00
Sarven Capadisli
bc6a77f334
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 12:51:18 -05:00
Sarven Capadisli
74dbd37e9a
Bringing aside back because it is needed for Design values. Will hide
...
from CSS instead.
2010-03-04 12:49:42 -05:00
Brion Vibber
0ddd1ef191
Ignore API 'since' silently as Twitter does instead of throwing a 403 error. Getting extra results is less disruptive than total failure.
...
Threw in an X-StatusNet-Warning header on the off chance some API client developer notices it. :)
2010-03-04 08:55:36 -08:00
Evan Prodromou
fd4eefe6b4
OStatus enabled by default
2010-03-04 11:43:31 -05:00
Brion Vibber
62d5f1addb
Merge branch 'testing'
2010-03-04 07:00:45 -08:00
Brion Vibber
b218aee94e
Merge commit 'origin/testing' into 0.9.x
...
Conflicts:
lib/action.php
lib/adminpanelaction.php
2010-03-04 06:07:28 -08:00
Zach Copley
14d7f4a598
Removed unused stub class
2010-03-04 01:23:02 -08:00
Zach Copley
79b392a39e
Add generator tag into Atom feeds.
2010-03-04 01:16:25 -08:00
Zach Copley
37b106d49c
Fix variable name in NoConfigException
2010-03-04 00:00:46 -08:00
Zach Copley
8ffb34a90c
Temp fix for problem getting actor from PuSH updates where actor is only specified in subject
2010-03-03 20:58:34 -08:00
Zach Copley
f210cadfec
Revert "Revert "Show <activity:subject> and no activity actors for user feed""
...
This reverts commit e2578cfad6
.
2010-03-03 20:58:34 -08:00
Zach Copley
61de37ec7b
Move snapshot configuration to its own admin panel
...
Turn on with: $config['admin']['panels'][] = 'snapshot';
2010-03-03 16:49:14 -08:00
Brion Vibber
9fadf8da11
Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.)
...
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
2010-03-03 16:33:20 -08:00
Brion Vibber
4a2511139e
Initial user role controls on profile pages, for owner to add/remove administrator and moderator options.
...
Buttons need to be themed.
2010-03-03 15:43:49 -08:00
Evan Prodromou
0f1c6e239a
Merge branch 'testing'
2010-03-03 18:20:45 -05:00
Zach Copley
337b1aaaa1
Site-wide notice text admin panel
2010-03-03 14:37:30 -08:00
Sarven Capadisli
ef6bf8f331
Removed aside container from output for the admin panel sections
2010-03-03 15:42:34 -05:00
Zach Copley
c7d390e494
Add class="admin" to the content div of admin panels for styling
2010-03-03 12:18:20 -08:00
Brion Vibber
0881eba80e
Language setting fixes:
...
- switch 'en_US' to 'en', fixes the "admin panel switches to Arabic" bug
- tweak setting descriptions to clarify that most of the time we'll be using browser language
- add a backend switch to disable language detection (should this be exposed to ui?)
2010-03-03 12:10:43 -08:00
Brion Vibber
13521cb510
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
2010-03-03 11:42:02 -08:00
Brion Vibber
33af29b47c
Fix for 4113f2884113f288: show regular subscribe form for all non-OMB profiles. We can't initiate remote sub for an OMB from our end, so dropping there.
2010-03-03 19:22:22 +00:00
Brion Vibber
3bb42d1170
Use poster's subscribed groups to disambiguate group linking when a remote group and a local group exist with the same name. (If you're a member of two groups with the same name though, there's not a defined winner.)
2010-03-03 19:00:02 +00:00
Zach Copley
a82cd89a97
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Using position relative only for the remote subscription in section
Added group subscription button to groups mini list
Added event hooks at the start and end of groups mini list
2010-03-03 10:28:45 -08:00
Zach Copley
61ada4558d
Fix for disappearing 'connect' menu if xmpp and sms are disabled.
...
All 'connect' menu panels used to be optional, so Action tried to
figure out what the first item on the 'connect' menu should be.
This is no longer necessary because we have the non-optional OAuth
client connections panel now, which is not optional and can't be
turned off.
2010-03-03 10:19:14 -08:00
Sarven Capadisli
15574c59de
Added event hooks at the start and end of groups mini list
2010-03-03 12:55:01 -05:00
Brion Vibber
7313cd9094
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-03-03 09:53:38 -08:00
Sarven Capadisli
06fb1124f5
Added event hooks for start and end of subscriptions mini list
2010-03-03 11:14:39 -05:00
Brion Vibber
79ffebb51b
OStatus: save file records for enclosures
...
Also stripping id from foreign HTML messages (could interfere with UI) and disabled failing attachment popup for a.attachment links that don't have a proper id, so you can click through instead of getting an error.
Issues:
* any other links aren't marked and saved
* inconsistent behavior between local and remote attachments (local displays in lightbox, remote doesn't)
* if the enclosure'd object isn't referenced in the content, you won't be offered a link to it in our UI
2010-03-02 16:36:08 -08:00
Brion Vibber
7175e7c7a1
OStatus fix: look for <link>s in the current element's children, not in all its descendants. Was breaking notice URL transfer, pulling a profile link by mistake.
2010-03-02 15:38:52 -08:00
Craig Andrews
09705a1e98
stupid mistake... let's not talk about this.
2010-03-02 14:25:27 -08:00
Craig Andrews
c30f95c55c
Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure"
2010-03-02 14:25:06 -08:00
Brion Vibber
ddf3614c84
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-02 13:38:10 -08:00
Siebrand Mazeland
878818d2c0
Add translator documentation
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 22:01:18 +01:00
Sarven Capadisli
e9c127ddd8
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 15:26:27 -05:00
Sarven Capadisli
4113f28851
Added Subscribe button to remote user entity actions in profie lists
2010-03-02 15:25:32 -05:00
Brion Vibber
72460091dd
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 12:21:48 -08:00
Brion Vibber
6b134ae4c7
Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing.
...
Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.
2010-03-02 11:54:02 -08:00
Siebrand Mazeland
f65478b624
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-03-02 19:13:51 +01:00
Brion Vibber
f596e072e7
Fix for regression in updated mention checks, sometimes lost links to folks mentioned in the replied message.
2010-03-02 09:53:00 -08:00
Siebrand Mazeland
284b1dc014
* Change translator documentation using _m() as designed together with Brion
...
* Add more translator documentation
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 16:38:36 +01:00
Evan Prodromou
e2578cfad6
Revert "Show <activity:subject> and no activity actors for user feed"
...
This reverts commit c25fc8a4b5
.
2010-03-02 03:40:43 -05:00
Evan Prodromou
2526a5ae94
Merge branch 'master' into testing
2010-03-02 02:57:35 -05:00
Evan Prodromou
f504a9237e
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 02:56:57 -05:00
Evan Prodromou
c25fc8a4b5
Show <activity:subject> and no activity actors for user feed
...
We only need one author for user feeds: the user themselves. So, show
the user as the activity:subject, and don't repeat the same
activity:actor for every notice unnecessarily.
2010-03-02 02:54:52 -05:00
Zach Copley
871b3aa6c0
Remove un-needed config variable for enabling/disabling Twitter integration
2010-03-01 21:52:31 -08:00
Zach Copley
6b2d67216e
Initial Twitter bridge admin panel
2010-03-01 21:35:24 -08:00
Craig Andrews
d8212977ce
Use PHP exceptions for PEAR error handling.
...
Allows for the common try/catch construct, which makes error handling cleaner and easier.
2010-03-01 21:44:41 -05:00
Craig Andrews
f9dd83caa7
Modify configuration to have an option to allow uploads regardless of mime type
2010-03-01 21:44:41 -05:00
Zach Copley
0ca7aa68d3
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline: (25 commits)
Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications
more output in updateostatus.php
lost important fields when switching queries
show service debug info
pass listener URI into consumer for OMB
remove strict check on OMB exception strings
return correct HTTP status code for OMB errors
send smaller error pages for OMB API endpoints
Remove check for secret in token deletion on Subscription::cancel()
Better logging on bad token in subscription
Return empty array when no subscriptions to remote
drop tokens for OMB on unsubscribe
fix path for updateostatus.php
Script to convert OMB subscriptions to OStatus subscriptions
show service debug info
pass listener URI into consumer for OMB
remove strict check on OMB exception strings
return correct HTTP status code for OMB errors
send smaller error pages for OMB API endpoints
Remove check for secret in token deletion on Subscription::cancel()
...
2010-03-01 16:38:56 -08:00
Evan Prodromou
2c677e0f2d
Revert "show service debug info"
...
This reverts commit 19ec0e3a62
.
2010-03-01 18:49:39 -05:00
Evan Prodromou
f7c2c19ce8
lost important fields when switching queries
2010-03-01 18:07:21 -05:00
Evan Prodromou
19ec0e3a62
show service debug info
2010-03-01 18:03:18 -05:00
Evan Prodromou
64918cfd35
pass listener URI into consumer for OMB
2010-03-01 18:03:18 -05:00
Evan Prodromou
c3ba26bb99
Return empty array when no subscriptions to remote
2010-03-01 18:03:17 -05:00
Zach Copley
1b1dab206f
Merge branch 'testing' into 0.9.x
...
* testing:
Upgrade XML output scrubbing to better deal with newline and a few other chars
2010-03-01 15:00:33 -08:00
Zach Copley
a5dc5f9c62
Upgrade XML output scrubbing to better deal with newline and a few other chars
2010-03-01 14:58:06 -08:00
Siebrand Mazeland
bf95fa92b5
Fix forgotten "m" in 8e102da76c
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-01 22:35:27 +01:00
Siebrand Mazeland
8e102da76c
Add contextual documentation to allow better localisation.
2010-03-01 22:28:38 +01:00
Craig Andrews
5a14264f0c
Change 'Home' to 'Personal' in the header.
...
csarven indicated he accepted this change.
2010-03-01 14:16:44 -05:00
Craig Andrews
3bfe3345df
Use common_nicknamize() in better places.
2010-03-01 11:56:07 -05:00
Siebrand Mazeland
63ff9d86b8
Add content for all 3 Send buttons (2 are the same as far as I can tell)
2010-03-01 15:57:27 +01:00
Evan Prodromou
f00e8bbf47
Merge branch 'testing' into 0.9.x
2010-02-27 17:07:57 -05:00
Evan Prodromou
4d9daf2149
Use notice for context when deciding who @nickname refers to
...
In a federated system, "@nickname" is insufficient to uniquely
identify a user. However, it's a very convenient idiom. We need to
guess from context who 'nickname' refers to.
Previously, we were using the sender's profile (or what we knew about
them) as the only context. So, we assumed that they'd be mentioning to
someone they followed, or someone who followed them, or someone on
their own server.
Now, we include the notice information for context. We check to see if
the notice is a reply to another notice, and if the author of the
original notice has the nickname 'nickname', then the mention is
probably for them. Alternately, if the original notice mentions someone
with nickname 'nickname', then this notice is probably referring to
_them_.
Doing this kind of context sleuthing means we have to render the
content very late in the notice-saving process.
2010-02-27 16:06:46 -05:00
Evan Prodromou
babca69f67
add bugfix to version number.
2010-02-27 11:04:24 -05:00
Zach Copley
d3fc8e2219
Pull conversation URL from Conversation instead of assuming it's local
2010-02-26 14:47:38 -08:00
Evan Prodromou
4b696cf51f
add a flag to impede adding sessions to URLs (for permanent stuff)
2010-02-26 17:28:44 -05:00
Craig Andrews
a796a7cdc6
nicknamize the requested nickname during autoregistration
2010-02-26 16:31:38 -05:00
Zach Copley
b0acaeafe3
Check for conversation with unique conversation ID
2010-02-26 13:06:06 -08:00
Brion Vibber
9b366547d7
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:50 -08:00
Brion Vibber
517fd54b65
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:36 -08:00
Evan Prodromou
fc576562a3
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 12:40:59 -05:00
Evan Prodromou
6781f95c73
Merge branch 'blacklistplus' into testing
...
Conflicts:
EVENTS.txt
2010-02-26 12:40:30 -05:00
Brion Vibber
8dfc8f1635
Merge branch 'testing' into 0.9.x
2010-02-26 09:35:28 -08:00
Evan Prodromou
ea044722e0
'on' is what checkboxes use for boolean true
2010-02-26 12:28:58 -05:00
Evan Prodromou
d9d1a77bb0
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 11:40:12 -05:00
Zach Copley
6cc26a613b
Remove unnecessary requires
2010-02-25 22:08:25 -08:00
Zach Copley
eabae96fb4
Get ApiAction autoloading properly
2010-02-25 22:08:17 -08:00
Zach Copley
e650794300
Remove unnecessary requires
2010-02-25 22:06:31 -08:00
Zach Copley
3daf17d935
Get ApiAction autoloading properly
2010-02-25 22:02:40 -08:00
Brion Vibber
b573c5e260
Fix for group timeline feeds by name
2010-02-25 21:27:59 -08:00
Brion Vibber
08c17bfcaa
try/catch on omb profile pings
2010-02-25 21:06:53 -08:00
Brion Vibber
da4b21d3a9
try/catch on omb profile pings
2010-02-25 21:06:16 -08:00
Evan Prodromou
417f5d653f
update to beta6
2010-02-25 23:27:20 -05:00
Evan Prodromou
254e210763
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 21:53:50 -05:00
Evan Prodromou
f9e5acbfa7
remove linkback from default plugins
2010-02-25 21:53:18 -05:00
Brion Vibber
2fa953da22
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-25 18:52:26 -08:00
Brion Vibber
2feb09f434
OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first)
2010-02-25 18:51:44 -08:00
Zach Copley
c49fbb63c5
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
init_conversation.php script to copy old notice conversations into the conversation table
cache results of webfinger lookups
Parse an hcard for hints, if available
use new hcard method for webfinger
add hkit for hCard parsing
use new dedicated hcard method for Webfinger profile
Add an hcard action
2010-02-25 18:13:34 -08:00
Zach Copley
207cc89074
Set avatar height correctly
2010-02-25 18:06:03 -08:00
Evan Prodromou
1cae324555
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 19:59:01 -05:00
Zach Copley
82cac2be59
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts.
Tweak common_url_to_nickname to take the last path component; fixes pulling nicks from Google profile pages (path is "/profile/<nickname>")
Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject
2010-02-25 16:07:32 -08:00
Zach Copley
7922edb5b6
Add lots of fun avatars to our Atom output
2010-02-25 16:06:49 -08:00
Brion Vibber
593885f98c
Tweak common_url_to_nickname to take the last path component; fixes pulling nicks from Google profile pages (path is "/profile/<nickname>")
2010-02-25 23:52:34 +00:00
Evan Prodromou
4aa82f75ed
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 18:45:32 -05:00
Evan Prodromou
76216af806
Add an hcard action
...
A dedicated hcard action for users. Our profile page includes
an hcard, but it's so full of other hcards that it's ambiguous which
one is the "real" one. So, this one make sense for meaning, "This is
my hcard."
2010-02-25 18:39:55 -05:00
Zach Copley
bac959ad46
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Not sure how this ended up in wrong-cased dir...
OStatus: fix remote groups to work with new user_groups/local_groups split.
Conflicts:
classes/User_group.php
2010-02-25 13:40:14 -08:00
Zach Copley
e61edb55d9
Rationalize group activity stuff
2010-02-25 13:34:43 -08:00
Brion Vibber
b5b5184c88
OStatus: fix remote groups to work with new user_groups/local_groups split.
...
- fix <activity:subject> generation so we get the profile info (what's available so far)
- use id instead of nickname for group join/leave forms so we can join/leave remote groups
while the rest of the groups UI remains limited to local groups
(plugins are responsible for making sure remote notifications and permission checks are done)
- fix remote notification when joining group through OStatus's remote subscribe form
2010-02-25 13:02:08 -08:00
Brion Vibber
b7037a49af
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-25 11:57:21 -08:00
Brion Vibber
a8d0c8d8ef
Normalize nickname case on login; fixes failed logins where people were typing MixedCase nicknames (if browser saved this form, it would never work again until clearing the saved form data; very icky.)
2010-02-25 11:56:48 -08:00
Brion Vibber
79c0d52daa
OStatus: save categories from the Atom entry as hashtags.
2010-02-25 11:26:33 -08:00
Brion Vibber
39a8e9d8e6
Ensure that shortened URLs haven't accumulated whitespace when fetched by a plugin. Some shorteners have ended up inserting extra newlines when the string gets extracted from tidied HTML.
2010-02-25 10:30:37 -08:00
Evan Prodromou
e6858d7203
modify group actions so they use Local_group to look up by nickname
2010-02-25 08:44:15 -05:00
Craig Andrews
beb776cfd6
fix "PHP Warning: Call-time pass-by-reference has been deprecated"
2010-02-24 22:35:22 -05:00
Craig Andrews
d72c357750
add image support for xbm, xpm, wbmp, and bmp image formats
2010-02-24 22:24:11 -05:00
Craig Andrews
c187bf5597
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
2010-02-24 20:52:45 -05:00
Zach Copley
10884dcd49
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Merge StatusNet core localization updates from 0.9.x branch
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
OStatus: handle update-profile Salmon pings
Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
2010-02-24 16:52:16 -08:00
Zach Copley
543ff40ef6
Populate more profile information when doing a remote subscribe
2010-02-24 16:51:24 -08:00
Brion Vibber
3194a86caa
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-24 15:48:27 -08:00
Brion Vibber
59be4b8cae
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-24 15:47:51 -08:00