Brion Vibber
34e7d8ddf2
For good measure; trip short error mode in earlier on ajax shownotice
2011-03-14 13:44:39 -07:00
Brion Vibber
c7e7cc79da
'ajax' param on shownotice action so we can pull items in full html version for realtime
2011-03-14 13:05:30 -07:00
Siebrand Mazeland
eaef01233a
Fix incorrect parameter documentation. Spotted by Nikerabbit.
2011-03-14 18:01:22 +01:00
Siebrand Mazeland
e2defc1f7c
* update/add translator documentation.
...
* remove superfluous whitespace.
* minor updates to L10n/i18n.
2011-03-11 17:07:27 +01:00
Zach Copley
a984aae564
Show a reasonable error message when an image is bad, instead of
...
letting the exception continue bubbling up.
2011-03-10 15:18:14 -08:00
Zach Copley
b7548fb9e2
Show a reasonable error message when an image is bad, instead of
...
letting the exception continue bubbling up.
2011-03-10 18:14:22 +00:00
Brion Vibber
4d5f8e7876
Ticket #3076 : fix regression in password recovery when email address given that doesn't match
...
Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
2011-03-09 15:48:46 -08:00
Brion Vibber
e74590d414
Ticket #3076 : fix regression in password recovery when email address given that doesn't match
...
Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
2011-03-09 15:46:24 -08:00
Evan Prodromou
a4b3edaf40
Login actions don't show the notice form
2011-03-09 10:11:59 -05:00
Brion Vibber
5b0ca315b4
'note' -> 'notice' in an error message -- thx to AVRS on IRC for the catch on translatewiki.net :D
2011-03-08 10:58:14 -08:00
Evan Prodromou
55b4303ea4
Merge branch '3cl' into 1.0.x
2011-03-07 14:30:30 -05:00
Shashi Gowda
382e4d2cdb
people tag actions
2011-03-07 00:43:31 +05:30
Shashi Gowda
371e923c37
Twitter lists compatible people tags api
2011-03-07 00:36:06 +05:30
Siebrand Mazeland
e9933871e5
* fix i18n and L10n issues.
...
* update translator documentation.
* remove superfluous whitespace.
2011-03-05 17:03:12 +01: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
Siebrand Mazeland
b37e12ed34
* translator documntation updated
...
* superfluous whitespace remove
* minor L10n and i18n updates
2011-03-05 00:13:04 +01:00
Brion Vibber
9689bda21c
Loading the original form instead of faking up our own. Sorta works but not pretty :D
2011-03-04 14:11:11 -08:00
Siebrand Mazeland
d55a831d97
Update translator documentation.
2011-03-03 01:42:54 +01:00
Siebrand Mazeland
399c83db87
Fix typo in documentation. Spotted by Nikerabbit.
2011-03-02 23:06:45 +01:00
Brion Vibber
8cacecb6dc
Use threaded replies in group inbox view
2011-03-01 16:29:11 -08:00
Zach Copley
5bf0c9f610
Fix mising require_once (now required here because of rearranging)
2011-03-01 15:31:06 -08:00
Zach Copley
243b396660
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-01 15:26:02 -08:00
Zach Copley
2fb8148788
Fix missing variable initialization
2011-03-01 15:25:06 -08:00
Brion Vibber
a7005f3975
Alternate Inbox streaming function optimized for threaded paging (for /all stream, while things using the existing API inbox methods won't be affected)
2011-03-01 15:16:39 -08:00
Evan Prodromou
64a1c9e376
object menu for user profile
2011-03-01 16:23:19 -05:00
Evan Prodromou
a1a0382d26
object menu on showgroup
2011-03-01 16:22:19 -05:00
Evan Prodromou
374253f0f7
defaultlocalnav for favorites
2011-03-01 16:21:22 -05:00
Evan Prodromou
55fa14baec
object menu in inviteaction
2011-03-01 16:20:14 -05:00
Evan Prodromou
6ee77f1302
defaultlocalnav in groups
2011-03-01 16:18:33 -05:00
Evan Prodromou
f29274cd0d
show defaultlocalnav in groupmembers
2011-03-01 16:17:42 -05:00
Evan Prodromou
0c877860b5
show defaultlocalnav in grouplogo
2011-03-01 16:17:01 -05:00
Evan Prodromou
4903c92dce
show defaultlocalnav in groupdesignsettings
2011-03-01 16:15:03 -05:00
Evan Prodromou
0850c66a21
default local nav in featured user list
2011-03-01 16:11:59 -05:00
Evan Prodromou
3c683ad7b5
default local nav in popular notices
2011-03-01 16:11:19 -05:00
Evan Prodromou
4561caec10
show default local nav in group edit
2011-03-01 16:10:40 -05:00
Evan Prodromou
737eb371f8
show full local nav in public tag cloud
2011-03-01 16:09:35 -05:00
Evan Prodromou
85320a7561
show object nav for blocked users in a group
2011-03-01 16:08:49 -05:00
Evan Prodromou
efdc85224a
user groups show subgroupnav in object menu area
2011-03-01 16:07:27 -05:00
Evan Prodromou
3377bc2ccf
RepliesAction uses default local nav
2011-03-01 16:06:29 -05:00
Evan Prodromou
64ab7b7d07
use default local nav for public action
2011-03-01 16:00:07 -05:00
Evan Prodromou
8c03e8b0b3
use default local nav for allaction
2011-03-01 15:59:01 -05:00
Brion Vibber
b351fad43a
Merge branch '1.0.x' into inline-comments
2011-02-28 16:48:05 -08:00
Zach Copley
e109b2592f
Merge branch '0.9.x' into 1.0.x
2011-02-28 16:41:24 -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
Zach Copley
f3ffc8bc46
Missed a couple of conflicts
2011-02-28 15:51:46 -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
d806907b81
Initial test threaded convo view inline on public, all timelines
2011-02-28 11:53:48 -08:00
macno
dc41e3dc2d
API group actions join/leave now handle same events of web UI action
2011-02-28 11:56:02 +01:00
macno
c246c17d3e
If there's a DB error, script returns after catching the exception
2011-02-28 11:53:11 +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
59a413cf5e
Merge branch 'master' into 0.9.x
2011-02-25 10:16:00 -08:00
Brion Vibber
f3c822cc15
Ticket #3011 : Add attachments/uploads and attachments/file_quota to api/statusnet/config.(xml|json)
...
file_quota is adjusted from the defined value to take into account the maximum upload size limits in PHP, or cropped to 0 if uploads are disabled.
This can be used by client apps to determine maximum size for an attachment.
2011-02-21 15:52:12 -08:00
Brion Vibber
8e7c279c9e
Fix issue #3035 : search highlighting broke URLs in some imported messages (Twitter)
...
Search highlighting was being done with a regex on raw HTML text, followed by a second regex undoing replacements within double-quoted attribute values.
This broke on imported Twitter messages, as the way we generate the markup uses single quotes on the attributes, which didn't get matched by the second regex.
I've replaced this do-then-undo cycle by dividing up the import HTML into freetext spans and tags; the freetext gets replaced, while the tags are left untouched.
2011-02-21 14:14:32 -08:00
Zach Copley
68017392ff
Make other timeline API endpoints output Activity Streams JSON
2011-02-18 15:43:40 -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
Siebrand Mazeland
6a1b0e2375
* update translator documentation.
...
* remove superfluous whitespace.
* tab to spaces.
* add FIXME for undocumented class.
2011-02-17 21:10:48 +01:00
Siebrand Mazeland
65045a26f3
* update translator documentation.
...
* remove superfluous whitespace.
* L10n updates.
* small refactoring in publicrss.php.
* remove PHP4-isms
2011-02-17 20:58:22 +01:00
Siebrand Mazeland
db4213a9e0
Double quotes to single quotes.
2011-02-17 09:58:07 +01:00
Zach Copley
e4d5c47ebf
Add image to JSON ActivityObject and title + links to the JSON document
2011-02-16 16:21:46 -08:00
Siebrand Mazeland
a159352b65
* 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.
2011-02-17 00:40:47 +01:00
Zach Copley
a1b436a8c6
First cut at some JSON Activity Streams output
2011-02-15 20:25:39 -08:00
Evan Prodromou
2b869fa23f
Merge remote branch 'origin/master'
2011-02-14 12:41:52 -05:00
Evan Prodromou
40533ee851
backup action is read-only
2011-02-14 12:41:20 -05:00
Brion Vibber
30eddaf168
Update translator comment for the url shortener "free service" marker: free as in open
2011-02-11 14:11:37 -08:00
Evan Prodromou
e903ff0525
Make ShowmessageAction not be a subclass of MailboxAction
...
The ShowmessageAction was using the MailboxAction to do its display of
a single direct message. Since we redid the nickname management, this
was breaking (MailboxAction requires a nickname argument,
ShowmessageAction does not, and nickname validation that used to
quietly fail now throws an exception).
I've moved the message list processing to its own widget class, so the
need to subclass MailboxAction has disappeared. I've rewritten this
action to use the MessageListItem widget, and it works fine now.
2011-02-08 11:33:36 -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
Evan Prodromou
b41816fdc1
add hooks for Group profile information
2011-02-07 14:04:58 -05:00
Evan Prodromou
8b20399932
Add a hook for group action list
2011-02-07 10:23:56 -05:00
Evan Prodromou
2cdba23df4
hook for new group through a form, same as editing
2011-02-03 16:19:41 -05:00
Evan Prodromou
99db745f9d
Merge branch 'testing' into privategroup
...
Conflicts:
lib/groupeditform.php
2011-02-03 12:56:55 -05: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
9573f725c1
Merge branch '0.9.x' into testing
2011-01-31 11:08:15 -08:00
Siebrand Mazeland
f41dcb644c
Update translator documentation, remove FIXME and add comment.
2011-01-31 18:43:39 +01:00
Siebrand Mazeland
13991f7eb9
* add/update translator documentation.
...
* remove superfluous whitespace.
* update punctuation on form validation messages.
* L10n tweaks.
* add fixme for missing class documentation.
2011-01-31 18:16:55 +01:00
Siebrand Mazeland
dd5721848f
* tag i18n issue.
...
* add translator documentation.
* remove superfluous whitespace.
2011-01-31 17:12:39 +01:00
Siebrand Mazeland
8f776ec12d
* update/add translator documentation.
...
* fix L10n issues.
* update comments and tag missing documentation on some classes.
* remove superfluous whitespace
*
2011-01-31 16:39:54 +01:00
Siebrand Mazeland
691f374a52
* Add/update translator documentation.
...
* Update punctuation in form validation message for consistency.
* Remove superfluous whitespace.
2011-01-30 19:01:55 +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
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
0a3c05feb0
Fix XML API output for several profile update methods that returned a <user> entry but didn't set namespaces, causing XML parse failures.
2011-01-24 12:41:30 -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
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
Siebrand Mazeland
bcd34a7f3c
Add correct punctuation for client exceptions.
2011-01-21 10:55:10 +01:00
Siebrand Mazeland
ee5479b902
Add correct punctuation for client exception.
2011-01-21 10:55:08 +01:00
Siebrand Mazeland
31895ba33a
Add correct punctuation for client exception.
2011-01-21 10:55:07 +01:00
Brion Vibber
6fa0bea76d
Merge branch '0.9.x' into testing
2011-01-20 15:12:57 -08:00
Siebrand Mazeland
91ee2ea3b1
Translator comments added
...
L10n updates
Remove superfluous whitespace
Number parameters in message when two or more are used
ClientException and ServerException should end with a period
2011-01-20 20:00:45 +01:00
Siebrand Mazeland
6658bd1893
Update translator documentation
...
Remove unneeded i18n for debug message
Remove superfluous whitespace
2011-01-20 18:45:13 +01:00
Siebrand Mazeland
26652d9be6
Update translator documentation
...
Update L10n
Remove superfluous whitespace
2011-01-20 18:40:20 +01: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
28f10ac528
Fix syntax error in error msg
2011-01-19 23:00:10 -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
a79427d86f
Fix syntax error in error msg
2011-01-19 16:13:42 -08:00
Brion Vibber
4026e208c2
Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php
...
As with deleteuser.php, can pass -y to bypass the prompt if you're sure.
2011-01-19 15:13:46 -08:00
Brion Vibber
64844473f8
fix wrong datatypes (saving string instead of array) in AtomPub notice processing
2011-01-19 14:26:31 -08:00
Brion Vibber
963e7576f2
Merge branch 'testing' into moveaccount
2011-01-19 10:41:14 -08:00
Evan Prodromou
aa4a8e5051
wrap account actions in a section
2011-01-17 18:04:10 -05:00
Evan Prodromou
2a59453d4c
Merge branch 'testing' into moveaccount
2011-01-17 17:34:03 -05:00
Evan Prodromou
6d429ce357
return a 409 Conflict when subscription already exists
2011-01-17 15:57:04 -05:00
Siebrand Mazeland
573925c52a
* number parameters in messages
...
* add translator documentation
* remove superfluous whitespace
* small L10n update
2011-01-15 00:24:06 +01:00
Evan Prodromou
5c25364141
remove extraneous <dl> and <dt> tags
2011-01-14 15:36:06 -05:00
Siebrand Mazeland
7903a2504f
* remove i18n for debug message.
...
* add i18n for some server exceptions.
* add translator documentation.
* L10n updates.
* remove superfluous whitespace.
2011-01-14 21:25:46 +01:00
Siebrand Mazeland
6e1dfab1b9
* change i18n for confirmation string to make a bit more certain that the confirmation string is consistent in all messages where it is used.
...
* add translator documentation.
* remove superfluous whitespace.
2011-01-14 20:48:17 +01:00
Brion Vibber
74a1c9def0
Fix error handling for missing group in apigroupmembership -- was trying to call methods on the variable before we checked it, which triggers PHP fatal error
2011-01-07 16:25:58 -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
edf8101b29
allow group join/leave commands in api posting, at least for the moment (no other way to do remote subscribe without a preexisting local id number via api)
2011-01-06 13:46:39 -08:00
Brion Vibber
281076d5f6
Fix for PHP notice spew in group creation via API: set default 'mainpage' in User_group::register() rather than forcing all callers to do it manually.
2011-01-06 13:22:44 -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
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
Evan Prodromou
48edbb3023
add hooks for the account-management tools
2010-12-29 14:02:04 -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
0bcc3ee005
include saved notice in atompub events
2010-12-27 22:11:30 -08:00
Evan Prodromou
a85bbd9088
Add a user parameter to atom pub api events
2010-12-27 20:49:08 -08:00
Evan Prodromou
ab92496ddc
Stop using <activity:subject> for atom feeds
2010-12-27 10:03:34 -08:00
Brion Vibber
26baad63f2
Merge branch '0.9.x' into 1.0.x
2010-12-22 15:25:38 -08:00
Brion Vibber
d5c2b0d216
When queueing is off, restore runs immediately. Indicate that we've already finished processing on the success page in this case; otherwise continue to show the 'will take a few minutes' message.
2010-12-22 14:55:13 -08:00
Brion Vibber
055630516c
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:28:34 -08:00
Evan Prodromou
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:22:51 -08:00
Brion Vibber
754bc1b616
Error handling cleanup on backup/restore:
...
* avoid PHP notice from using wrong variable
* show a visible error instead of blank screen if no file submitted with restore form
* avoid PHP strict warning from using calling "non-static" DOMDocument::loadXML statically
* suppress PHP warning from XML parse errors
2010-12-22 11:13:57 -08:00
Brion Vibber
5abd2b7d0c
fix notice error
2010-12-22 11:06:45 -08: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
Brion Vibber
c0669969f2
fix typo in showstream
2010-12-17 16:21:33 -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
fd22f684bf
syntax error in deleteaccount
2010-12-15 17:39:58 -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
82a9560a2d
AtomPub fix: correct the response URL given from posting a new message (wrong parameter meant we got the main page instead of the message's URL)
2010-12-14 13:19:22 -08:00
Brion Vibber
54a0e801f3
AtomPub fixes: return '201 Created' on POST of new message; better error checking on Atom input
2010-12-14 13:12:24 -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
6a7bf9dbf9
don't show the backup link if the user can't backup
2010-12-13 16:49:01 -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
027c73a4a1
Merge branch 'activityatompub' into 0.9.x
2010-12-13 14:35:42 -05:00
Evan Prodromou
1033e1e519
add the other three feeds to AtomPub service document
2010-12-13 14:35:29 -05:00
Evan Prodromou
c6d6f25b52
Atom pub feed for group memberships
...
Feed for group memberships, in activity streams format.
Shows a feed; has proper pagination; accepts activitystreams "join"
activities to start a new membership.
2010-12-13 13:56:54 -05:00
Evan Prodromou
156bd011af
fix navigation links for favorite feed
2010-12-13 13:08:38 -05:00
Evan Prodromou
c5fee7573e
fix navigation links for subscriptions feed
2010-12-13 13:07:25 -05:00
Evan Prodromou
1a58fdd695
add atompub show membership action
2010-12-13 12:40:22 -05:00
Zach Copley
bb55784e90
Move getConnectedApps() from Profile to User, where it belongs
2010-12-12 17:37:42 -08:00
Evan Prodromou
30f0defcf1
atompub favorite feed
2010-12-12 13:16:34 -05:00
Evan Prodromou
1817aedb5c
fix subtitle in subscriptions feed
2010-12-12 12:13:54 -05:00
Evan Prodromou
d9a614c57e
use new Subscription stream methods for AtomPub
2010-12-11 11:24:07 -05:00
Evan Prodromou
37c447be46
Show a single favorite for AtomPub
2010-12-10 18:50:50 -05:00
Evan Prodromou
5d56dba904
add a new subscription using POST to APP
2010-12-09 16:25:47 -05:00
Evan Prodromou
c619a257fe
Add subscription feed for AtomPub
2010-12-09 16:05:07 -05:00
Evan Prodromou
34b8eb207d
make HEAD work for AtomPubShowSubscription
2010-12-09 14:25:57 -05:00
Evan Prodromou
11a0bde459
AtomPub for single subscription
2010-12-09 13:11:02 -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
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
Siebrand Mazeland
086d6c9f36
* Fix an incorrectly formatted message parameter in line 334.
...
* i18n/L10n updates
* translator documentation updated
2010-12-02 12:33:03 +01:00
Brion Vibber
5d9d0d7349
Ticket #2912 further cleanup: use JS on emailsettings form to help connect the 'I want to post by email' checkbox with the controls for adding or removing a post-by-email alias.
...
Now, when you first come up the checkbox will most likely be off and the button to create an address is grayed out.
Checking the box enables use of the 'new' button to generate an email address -- it's left disabled until you check the box, so you can't accidentally trip it.
Actually adding the address now enables the post-by-mail option, as well, thus ensuring that it's saved. WARNING: OTHER CHANGES ON THE FORM WILL STILL BE LOST.
Removing the address now disables the post-by-mail option, so it's not sitting around confusingly enabled but useless.
You can still disable the checkbox manually without removing the address, in case you want to keep it for later.
It's also still possible to actually save it in the state where the option is enabled, but there's no configured address, but that shouldn't happen too often. Possibly that should be prevented outright though.
2010-12-01 14:23:56 -08:00
Brion Vibber
36d605a1e9
Ticket #2912 tweaks: clean up wording on the incoming email generator box a bit.
2010-12-01 13:10:54 -08:00
Brion Vibber
3048f9100d
Ticket #2912 : move 'I want to post notices by email" checkbox up from the email *output* prefs up into the box for the address to post to, so they're next to each other.
2010-12-01 13:04:18 -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
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
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
fa6c6077d6
Merge branch 'master' into 0.9.x
2010-11-16 11:17:29 -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
Brion Vibber
89d5993674
Include width/height of locally-uploaded images in our oembed provider data for attachment pages.
2010-11-15 12:57:15 -08:00
Evan Prodromou
d038d0fa46
AtomPub-related actions are only read-only on GET
2010-11-15 14:14:09 -05: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
cb371d65c1
add hooks for atom pub posts
2010-11-15 11:54:42 -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
e4913f9722
fix syntax error introduced in i18n tweaks: newgroup action
2010-11-12 13:35:19 -08:00
Brion Vibber
9621904cac
Revert "Missing one close-paren in newgroup.php" - incorrect fix for paren bug
...
This reverts commit 3afb031d92
.
2010-11-12 13:34:04 -08:00
Brion Vibber
5d12ec0532
Merge branch 'oembed-thumbnails' into 0.9.x
2010-11-12 12:28:44 -08:00
Zach Copley
0ed572ff3f
Fix missing close of comment block
2010-11-11 10:39:05 -08:00
Zach Copley
09aaf21e8d
Fix missing close of comment block
2010-11-11 10:33:26 -08:00
Evan Prodromou
3afb031d92
Missing one close-paren in newgroup.php
2010-11-09 17:08:11 -05:00
Evan Prodromou
a988e2e97b
hook points for the email settings form
2010-11-09 15:00:30 -05:00
Brion Vibber
f25accc43e
split out InlineAttachmentList from AttachmentList
2010-11-09 10:45:19 -08:00
Brion Vibber
6d7f02ff31
Pass file attachment thumbnails along with oEmbed data.
2010-11-08 17:22:01 -08:00
Brion Vibber
551b196a35
doomy doom doom
2010-11-08 15:32:41 -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
f5b037c169
Update translator documentation.
2010-11-07 22:32:52 +01:00
Siebrand Mazeland
66e34a28f7
screen_name -> nick names. Spotted by The Evil IP address.
2010-11-07 22:31:02 +01:00
Brion Vibber
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
Brion Vibber
51a756c211
Fix ticket #2860 : clarify API doc comments for 'source' parameter's interaction with OAuth on api/statuses/update
2010-11-03 14:58:33 -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
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
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
81e0653080
Merge branch 'pretty-title2' into 0.9.x
2010-11-02 14:21:23 -07:00
Brion Vibber
6a181bb128
Unrolled tagged vs untagged, page 1 vs page N message variants for showstream title. #2668
2010-11-02 14:20:06 -07:00
Brion Vibber
bc85f6914b
fix syntax error introduced in i18n tweaks: newgroup action
2010-11-02 14:03:50 -07:00
Brion Vibber
426cda5e1f
Alternate pretty-title tweaks for #2668
2010-11-02 13:42:44 -07:00
Siebrand Mazeland
760a1c27bc
Update translator documentation.
2010-11-01 16:49:36 +01:00
Siebrand Mazeland
6ab34fd8e8
* i18n/L10n updates.
...
* translator documentation added.
* superfluous whitespace removed.
2010-11-01 16:49:35 +01:00
Siebrand Mazeland
5c6732c4bb
Update translator documentation.
2010-11-01 16:49:35 +01:00
Siebrand Mazeland
1c0e84f066
Add forgotten translator documentation.
2010-10-31 01:26:39 +02:00
Siebrand Mazeland
5406873007
* translator documentation updated.
...
* superfluous whitespace removed.
* added FIXMEs for missing documentation and un-i18n-able timestamps.
2010-10-31 01:16:59 +02:00
Siebrand Mazeland
08edd1fedf
* i18n/L10n updates.
...
* translator documentation added/updated.
* superfluous whitespace removed.
2010-10-31 00:58:35 +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
Evan Prodromou
c4b8f68a1a
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-29 11:14:02 -04:00
Brion Vibber
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
Brion Vibber
8d0c014ced
Merge branch 'master' into 0.9.x
2010-10-28 13:01:10 -07:00
Brion Vibber
9ea7cafd27
Fix for regression: fatal error on group page display when not logged in.
...
Bug was introduced with group deletion feature.
2010-10-28 12:19:19 -07:00
Siebrand Mazeland
796d7b4939
Update translator documentation.
2010-10-28 01:42:09 +02:00
Siebrand Mazeland
04ae500749
* i18n/L10n fixes.
...
* translator documentation updated.
* superfluous whitespace removed.
2010-10-28 01:21:21 +02:00
Siebrand Mazeland
a12474a99d
* i18n/L10n fixes.
...
* translator documentation updated.
* superfluous whitespace removed.
2010-10-28 01:21:09 +02:00
Zach Copley
b3cd558fe7
Fix OAuth verifier display page title and msgs for i18n
2010-10-26 13:19:23 -07:00
Evan Prodromou
93a8718f97
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-26 09:22:21 -04:00
Zach Copley
1a1ca22aca
Supress header, footer, sidebar on OAuth verifier pin page when in "desktop" mode
2010-10-25 13:30:38 -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
82c280979d
Add special CSS classes to OAuth authorization and pin pages when
...
in desktop mode
2010-10-25 11:25:35 -07:00
Zach Copley
479096c8d7
Less scary OAuth authorization messages when using anonymous consumer
2010-10-25 10:38:40 -07:00
Evan Prodromou
e6ba379c8b
navigation links in user timeline (for AtomPub)
2010-10-25 11:08:10 -04:00
Evan Prodromou
59a7d78acb
Atom Service Document
2010-10-24 23:43:26 -04:00
Evan Prodromou
c0664599aa
allow posting to user timeline using AtomPub
2010-10-24 22:50:13 -04:00
Evan Prodromou
292e789584
delete a notice using AtomPub
2010-10-24 21:24:23 -04:00
Evan Prodromou
43a67b150a
show a single notice in atom entry format
2010-10-24 15:58:53 -04:00
Siebrand Mazeland
0b6cc7c33d
* translator documentation added.
...
* superfluous whitespace removed.
2010-10-23 19:20:51 +02:00
Zach Copley
3913b6a5d8
Updated styling for OAuth authorization page's desktop mode.
...
TODO: move these styles into the main CSS file.
2010-10-22 11:21:44 -07:00
Evan Prodromou
568cb8a205
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-22 09:24:50 -04:00
Zach Copley
131c339c5a
Pass OAuth authorize page's mode paramater to OpenID plugin so it can create a correct
...
returnto URL
2010-10-22 02:08:38 +00:00
Zach Copley
ac45f661f6
Fix regression (whoops!)
2010-10-21 18:38:54 -07:00
Zach Copley
c5a84ef76f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-21 18:16:35 -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
aa6ec40c51
Fix syntax errors
2010-10-22 00:48:26 +00:00
Zach Copley
ce0d81c190
OAuth - inform consumer when user refused to authorize a request token
...
http://status.net/open-source/issues/2848
2010-10-21 17:11:59 -07:00
Zach Copley
94f7bfa50a
Don't show 'anonymous' app in OAuth application list.
2010-10-21 16:42:59 -07:00
Zach Copley
4ab110e071
Fix bad reference.
2010-10-21 14:52:41 -07:00
Zach Copley
a548861dbf
OAuth - proper callback handling and better styling for authorization
...
page when in desktop mode
2010-10-21 14:45:42 -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
bab012bd67
New "desktop" mode for the OAuth authorization page. If mode=deskstop
...
is specified in the request the page is probably meant to be displayed
in a small webview of another application, so suppress header, aside
and footer.
2010-10-21 12:23:04 -07:00
Siebrand Mazeland
cb74822e7a
i18n/L10n consistency updates.
2010-10-21 13:20:21 +02: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
Craig Andrews
90c87553ee
Redirect to https when making an http request for a sensitive action
2010-10-20 20:26:35 -04: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
1603b7afc9
i18n/L10n updates, translator comments added/fixed, superfluous whitespace removed.
2010-10-21 01:53:42 +02:00
Brion Vibber
c24f4ddfdb
Pretty up the OpenID variant of the OAuth login form a bit; change the 'Allow' button to 'Continue' so we're not confused why we get the form again after authenticating.
2010-10-20 16:14:32 -07:00
Brion Vibber
bcc06d05e8
Initial OpenID+OAuth thingy.
2010-10-20 15:59:27 -07:00