85320a7561
show object nav for blocked users in a group
2011-03-01 16:08:49 -05:00
efdc85224a
user groups show subgroupnav in object menu area
2011-03-01 16:07:27 -05:00
3377bc2ccf
RepliesAction uses default local nav
2011-03-01 16:06:29 -05:00
64ab7b7d07
use default local nav for public action
2011-03-01 16:00:07 -05:00
8c03e8b0b3
use default local nav for allaction
2011-03-01 15:59:01 -05:00
b351fad43a
Merge branch '1.0.x' into inline-comments
2011-02-28 16:48:05 -08:00
e109b2592f
Merge branch '0.9.x' into 1.0.x
2011-02-28 16:41:24 -08:00
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
f3ffc8bc46
Missed a couple of conflicts
2011-02-28 15:51:46 -08:00
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
d806907b81
Initial test threaded convo view inline on public, all timelines
2011-02-28 11:53:48 -08:00
dc41e3dc2d
API group actions join/leave now handle same events of web UI action
2011-02-28 11:56:02 +01:00
c246c17d3e
If there's a DB error, script returns after catching the exception
2011-02-28 11:53:11 +01:00
880b1b666e
Merge branch 'master' into 0.9.x
2011-02-25 12:24:18 -08:00
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
59a413cf5e
Merge branch 'master' into 0.9.x
2011-02-25 10:16:00 -08:00
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
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
68017392ff
Make other timeline API endpoints output Activity Streams JSON
2011-02-18 15:43:40 -08:00
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
6a1b0e2375
* update translator documentation.
...
* remove superfluous whitespace.
* tab to spaces.
* add FIXME for undocumented class.
2011-02-17 21:10:48 +01:00
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
db4213a9e0
Double quotes to single quotes.
2011-02-17 09:58:07 +01:00
e4d5c47ebf
Add image to JSON ActivityObject and title + links to the JSON document
2011-02-16 16:21:46 -08:00
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
a1b436a8c6
First cut at some JSON Activity Streams output
2011-02-15 20:25:39 -08:00
2b869fa23f
Merge remote branch 'origin/master'
2011-02-14 12:41:52 -05:00
40533ee851
backup action is read-only
2011-02-14 12:41:20 -05:00
30eddaf168
Update translator comment for the url shortener "free service" marker: free as in open
2011-02-11 14:11:37 -08:00
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
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
b41816fdc1
add hooks for Group profile information
2011-02-07 14:04:58 -05:00
8b20399932
Add a hook for group action list
2011-02-07 10:23:56 -05:00
2cdba23df4
hook for new group through a form, same as editing
2011-02-03 16:19:41 -05:00
99db745f9d
Merge branch 'testing' into privategroup
...
Conflicts:
lib/groupeditform.php
2011-02-03 12:56:55 -05:00
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
9573f725c1
Merge branch '0.9.x' into testing
2011-01-31 11:08:15 -08:00
f41dcb644c
Update translator documentation, remove FIXME and add comment.
2011-01-31 18:43:39 +01:00
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
dd5721848f
* tag i18n issue.
...
* add translator documentation.
* remove superfluous whitespace.
2011-01-31 17:12:39 +01:00
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
691f374a52
* Add/update translator documentation.
...
* Update punctuation in form validation message for consistency.
* Remove superfluous whitespace.
2011-01-30 19:01:55 +01:00
7db24c32d6
* fix some i18n and L10n issues
...
* update/add translator documentation
* remove superfluous whitespace
2011-01-29 00:33:13 +01:00
5fee38b025
events for modifying group edit form
2011-01-26 18:21:43 -07:00
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
621a7cb36d
Merge branch '0.9.x' into testing
2011-01-25 12:57:49 -08:00
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
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
2011-01-24 12:22:47 -08:00
570c7b63a2
Add internal URL shortener
2011-01-23 16:49:12 -05:00
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
6c0e43be9e
L10n consistency updates in wording and punctuation.
...
Translator documentation added/updated.
Superfluous whitespace removed.
2011-01-21 22:45:37 +01:00
08cb576b52
Add translator documentation
...
Fix L10n issues
Remove superfluous whitespace
2011-01-21 16:35:00 +01:00
bcd34a7f3c
Add correct punctuation for client exceptions.
2011-01-21 10:55:10 +01:00
ee5479b902
Add correct punctuation for client exception.
2011-01-21 10:55:08 +01:00
31895ba33a
Add correct punctuation for client exception.
2011-01-21 10:55:07 +01:00
6fa0bea76d
Merge branch '0.9.x' into testing
2011-01-20 15:12:57 -08:00
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
6658bd1893
Update translator documentation
...
Remove unneeded i18n for debug message
Remove superfluous whitespace
2011-01-20 18:45:13 +01:00
26652d9be6
Update translator documentation
...
Update L10n
Remove superfluous whitespace
2011-01-20 18:40:20 +01:00
882b6862a3
OAuth: Fix rare problem in which request tokens were sometimes being
...
returned as access tokens.
2011-01-19 23:00:24 -08:00
28f10ac528
Fix syntax error in error msg
2011-01-19 23:00:10 -08:00
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
e475bdfe77
OAuth: Fix rare problem in which request tokens were sometimes being
...
returned as access tokens.
2011-01-19 22:55:00 -08:00
a79427d86f
Fix syntax error in error msg
2011-01-19 16:13:42 -08:00
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
64844473f8
fix wrong datatypes (saving string instead of array) in AtomPub notice processing
2011-01-19 14:26:31 -08:00
963e7576f2
Merge branch 'testing' into moveaccount
2011-01-19 10:41:14 -08:00
aa4a8e5051
wrap account actions in a section
2011-01-17 18:04:10 -05:00
2a59453d4c
Merge branch 'testing' into moveaccount
2011-01-17 17:34:03 -05:00
6d429ce357
return a 409 Conflict when subscription already exists
2011-01-17 15:57:04 -05:00
573925c52a
* number parameters in messages
...
* add translator documentation
* remove superfluous whitespace
* small L10n update
2011-01-15 00:24:06 +01:00
5c25364141
remove extraneous <dl> and <dt> tags
2011-01-14 15:36:06 -05:00
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
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
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
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
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
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
32eb4c5e2d
Merge remote branch 'gitorious/0.9.x' into 1.0.x
...
Conflicts:
lib/common.php
2010-12-30 15:52:08 -08:00
d3b10959f4
Merge branch '0.9.x' into noactor
2010-12-29 15:29:29 -08:00
26afe79ed9
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-29 14:53:38 -08:00
48edbb3023
add hooks for the account-management tools
2010-12-29 14:02:04 -08:00
e211e6228d
Merge branch '0.9.x' into 1.0.x
2010-12-28 11:38:34 -08:00
90c7ff1983
Merge branch 'master' into 0.9.x
2010-12-28 11:37:38 -08:00
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
0bcc3ee005
include saved notice in atompub events
2010-12-27 22:11:30 -08:00
a85bbd9088
Add a user parameter to atom pub api events
2010-12-27 20:49:08 -08:00
ab92496ddc
Stop using <activity:subject> for atom feeds
2010-12-27 10:03:34 -08:00
26baad63f2
Merge branch '0.9.x' into 1.0.x
2010-12-22 15:25:38 -08:00
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
055630516c
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:28:34 -08:00
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:22:51 -08:00
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
5abd2b7d0c
fix notice error
2010-12-22 11:06:45 -08:00
d8a3a88ec8
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/Memcached_DataObject.php
2010-12-17 17:13:21 -08:00
fb8312ebf4
Ticket #2959 : implement api/users/profile_image endpoint in Twitter-compat API
2010-12-17 17:10:52 -08:00
c0669969f2
fix typo in showstream
2010-12-17 16:21:33 -08:00
573bbeced1
action to restore a user's backup from the Web interface
2010-12-17 18:56:48 -05:00
fd22f684bf
syntax error in deleteaccount
2010-12-15 17:39:58 -05:00
e16cb8c03a
Merge branch '0.9.x' into righttoleave
2010-12-15 16:48:28 -05:00
bf20258f4b
Merge branch '0.9.x' into 1.0.x
2010-12-15 11:59:31 -08:00
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
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
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
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
6a7bf9dbf9
don't show the backup link if the user can't backup
2010-12-13 16:49:01 -05:00
5089d3065c
add an action to backup the current account in ActivityStreams format
2010-12-13 16:32:39 -05:00
027c73a4a1
Merge branch 'activityatompub' into 0.9.x
2010-12-13 14:35:42 -05:00
1033e1e519
add the other three feeds to AtomPub service document
2010-12-13 14:35:29 -05:00
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
156bd011af
fix navigation links for favorite feed
2010-12-13 13:08:38 -05:00
c5fee7573e
fix navigation links for subscriptions feed
2010-12-13 13:07:25 -05:00
1a58fdd695
add atompub show membership action
2010-12-13 12:40:22 -05:00
bb55784e90
Move getConnectedApps() from Profile to User, where it belongs
2010-12-12 17:37:42 -08:00
30f0defcf1
atompub favorite feed
2010-12-12 13:16:34 -05:00
1817aedb5c
fix subtitle in subscriptions feed
2010-12-12 12:13:54 -05:00
d9a614c57e
use new Subscription stream methods for AtomPub
2010-12-11 11:24:07 -05:00
37c447be46
Show a single favorite for AtomPub
2010-12-10 18:50:50 -05:00
5d56dba904
add a new subscription using POST to APP
2010-12-09 16:25:47 -05:00
c619a257fe
Add subscription feed for AtomPub
2010-12-09 16:05:07 -05:00
34b8eb207d
make HEAD work for AtomPubShowSubscription
2010-12-09 14:25:57 -05:00
11a0bde459
AtomPub for single subscription
2010-12-09 13:11:02 -05:00
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
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
086d6c9f36
* Fix an incorrectly formatted message parameter in line 334.
...
* i18n/L10n updates
* translator documentation updated
2010-12-02 12:33:03 +01:00
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
36d605a1e9
Ticket #2912 tweaks: clean up wording on the incoming email generator box a bit.
2010-12-01 13:10:54 -08:00
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
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
edf660c6ff
Make userxrd work without OStatus enabled
2010-11-26 22:09:51 -05:00
fcc0825b14
Make userxrd part of the default hostmeta
2010-11-26 21:46:51 -05:00
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
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
e0e7cb7c53
Merge branch 'master' into 0.9.x
2010-11-19 14:03:59 -08:00
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
fa6c6077d6
Merge branch 'master' into 0.9.x
2010-11-16 11:17:29 -08:00
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
89d5993674
Include width/height of locally-uploaded images in our oembed provider data for attachment pages.
2010-11-15 12:57:15 -08:00
d038d0fa46
AtomPub-related actions are only read-only on GET
2010-11-15 14:14:09 -05:00
8a21b13ee9
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-11-15 11:57:31 -05:00
c1cee3b27f
Merge branch 'atompub' into 0.9.x
...
Conflicts:
actions/apistatusesshow.php
actions/apitimelineuser.php
2010-11-15 11:57:19 -05:00
cb371d65c1
add hooks for atom pub posts
2010-11-15 11:54:42 -05:00
01f32e3998
Merge remote branch 'gitorious/1.0.x' into 1.0.x
...
Conflicts:
actions/urlsettings.php
2010-11-14 06:49:43 -05:00
e4913f9722
fix syntax error introduced in i18n tweaks: newgroup action
2010-11-12 13:35:19 -08:00
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
5d12ec0532
Merge branch 'oembed-thumbnails' into 0.9.x
2010-11-12 12:28:44 -08:00
0ed572ff3f
Fix missing close of comment block
2010-11-11 10:39:05 -08:00
09aaf21e8d
Fix missing close of comment block
2010-11-11 10:33:26 -08:00
3afb031d92
Missing one close-paren in newgroup.php
2010-11-09 17:08:11 -05:00
a988e2e97b
hook points for the email settings form
2010-11-09 15:00:30 -05:00
f25accc43e
split out InlineAttachmentList from AttachmentList
2010-11-09 10:45:19 -08:00
6d7f02ff31
Pass file attachment thumbnails along with oEmbed data.
2010-11-08 17:22:01 -08:00
551b196a35
doomy doom doom
2010-11-08 15:32:41 -08:00
719b480eaa
use subclassing to change notice list output for single notice
2010-11-08 13:08:59 -05:00
f5b037c169
Update translator documentation.
2010-11-07 22:32:52 +01:00
66e34a28f7
screen_name -> nick names. Spotted by The Evil IP address.
2010-11-07 22:31:02 +01:00
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
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
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
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
973a48bded
i18n/L10n fixes and translator documentation addded/updated.
2010-11-02 23:48:36 +01:00
a65362f7fa
Add context for different uses of "%1$s (%2$s)"
2010-11-02 23:08:59 +01:00
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
81e0653080
Merge branch 'pretty-title2' into 0.9.x
2010-11-02 14:21:23 -07:00
6a181bb128
Unrolled tagged vs untagged, page 1 vs page N message variants for showstream title. #2668
2010-11-02 14:20:06 -07:00
bc85f6914b
fix syntax error introduced in i18n tweaks: newgroup action
2010-11-02 14:03:50 -07:00
426cda5e1f
Alternate pretty-title tweaks for #2668
2010-11-02 13:42:44 -07:00
760a1c27bc
Update translator documentation.
2010-11-01 16:49:36 +01:00
6ab34fd8e8
* i18n/L10n updates.
...
* translator documentation added.
* superfluous whitespace removed.
2010-11-01 16:49:35 +01:00
5c6732c4bb
Update translator documentation.
2010-11-01 16:49:35 +01:00
1c0e84f066
Add forgotten translator documentation.
2010-10-31 01:26:39 +02:00
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
08edd1fedf
* i18n/L10n updates.
...
* translator documentation added/updated.
* superfluous whitespace removed.
2010-10-31 00:58:35 +02:00
234b03d945
* translator documentation updates.
...
* added FIXMEs in actions/showgroup.php.
* superfluous whitespace removed.
2010-10-30 14:36:54 +02:00
c4b8f68a1a
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-29 11:14:02 -04:00
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
8d0c014ced
Merge branch 'master' into 0.9.x
2010-10-28 13:01:10 -07:00
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
796d7b4939
Update translator documentation.
2010-10-28 01:42:09 +02:00
04ae500749
* i18n/L10n fixes.
...
* translator documentation updated.
* superfluous whitespace removed.
2010-10-28 01:21:21 +02:00
a12474a99d
* i18n/L10n fixes.
...
* translator documentation updated.
* superfluous whitespace removed.
2010-10-28 01:21:09 +02:00
b3cd558fe7
Fix OAuth verifier display page title and msgs for i18n
2010-10-26 13:19:23 -07:00
93a8718f97
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-26 09:22:21 -04:00
1a1ca22aca
Supress header, footer, sidebar on OAuth verifier pin page when in "desktop" mode
2010-10-25 13:30:38 -07:00
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
82c280979d
Add special CSS classes to OAuth authorization and pin pages when
...
in desktop mode
2010-10-25 11:25:35 -07:00
479096c8d7
Less scary OAuth authorization messages when using anonymous consumer
2010-10-25 10:38:40 -07:00
e6ba379c8b
navigation links in user timeline (for AtomPub)
2010-10-25 11:08:10 -04:00
59a7d78acb
Atom Service Document
2010-10-24 23:43:26 -04:00
c0664599aa
allow posting to user timeline using AtomPub
2010-10-24 22:50:13 -04:00
292e789584
delete a notice using AtomPub
2010-10-24 21:24:23 -04:00
43a67b150a
show a single notice in atom entry format
2010-10-24 15:58:53 -04:00
0b6cc7c33d
* translator documentation added.
...
* superfluous whitespace removed.
2010-10-23 19:20:51 +02:00
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
568cb8a205
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-22 09:24:50 -04:00
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
ac45f661f6
Fix regression (whoops!)
2010-10-21 18:38:54 -07:00
c5a84ef76f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-21 18:16:35 -07:00
0b134d3e69
Re-camelcase ApiOauthAuthorizeAction so it will be accessible when
...
a site is in pivate mode
2010-10-21 18:15:11 -07:00
aa6ec40c51
Fix syntax errors
2010-10-22 00:48:26 +00:00
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
94f7bfa50a
Don't show 'anonymous' app in OAuth application list.
2010-10-21 16:42:59 -07:00
4ab110e071
Fix bad reference.
2010-10-21 14:52:41 -07:00
a548861dbf
OAuth - proper callback handling and better styling for authorization
...
page when in desktop mode
2010-10-21 14:45:42 -07:00
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
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
cb74822e7a
i18n/L10n consistency updates.
2010-10-21 13:20:21 +02:00
fb12094f61
i18n/L10n updates, translator docs updated, superfluous whitespace removed.
2010-10-21 03:10:46 +02:00
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
90c87553ee
Redirect to https when making an http request for a sensitive action
2010-10-20 20:26:35 -04:00
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
1603b7afc9
i18n/L10n updates, translator comments added/fixed, superfluous whitespace removed.
2010-10-21 01:53:42 +02:00
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
bcc06d05e8
Initial OpenID+OAuth thingy.
2010-10-20 15:59:27 -07:00
ac4afb31e8
Consistent punctuation.
2010-10-20 20:29:59 +02:00
59d0be4761
* i18n for many missing messages (???)
...
* add translator documentation.
2010-10-20 20:28:04 +02:00
dc62cf1c0b
* i18n/L10n fixes.
...
* translator documentation updated/added.
* superfluous whitespace removed.
2010-10-20 19:34:27 +02:00
2760ef07f5
Stick OAuth developer help info in a section
2010-10-19 21:24:19 -07:00
5ca29ab0de
Merge branch 'anon-consumer' into 0.9.x
2010-10-19 21:01:53 -07:00
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
0157df7396
Add missing "address"
2010-10-20 00:49:12 +02:00
4b4894b121
Many i18n/L10n updates and lots of descriptions for translators added.
2010-10-20 00:35:39 +02:00
3593f3f132
Merge branch '0.9.x' into 1.0.x
2010-10-19 15:18:07 -07:00
d358c88f94
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-19 15:10:47 -07:00
e13eb797c7
Fix PHP notice when submitting 'design' admin panel on a browser that doesn't support file uploads such as Mobile Safari
2010-10-19 15:09:45 -07:00
d48f4a81d6
Relax restrictions on URL validation for oauth_callback. We need to
...
allow custom schemes like mustard:// etc.
2010-10-19 19:29:21 +00:00
5ac694c74f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-19 12:08:48 -07:00
5866493cae
OAuth - better log messages
2010-10-19 12:07:59 -07:00
53d45d7ffb
Merge branch '0.9.x'
2010-10-18 15:21:02 -07:00
24b94ebb2c
* fix bugs in parameter numbering for two messages
...
* add translator documentation
2010-10-18 22:47:50 +02:00
3a36714847
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-18 15:42:21 -04:00
7765ddae81
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
README
lib/default.php
2010-10-18 12:17:11 -07:00
7c05b0dafc
options to nofollow external links in notices
2010-10-18 11:29:52 -04:00
505ac6eba0
* add plural support where missing
...
* update translator documentation.
2010-10-16 14:38:12 +02:00
31415b5853
Update translator documentation.
2010-10-16 14:31:41 +02:00
9a35e48ee2
Fix for ticket #2837 : white screen when hitting 'make admin' button on group members list.
...
RedirectingAction->returnToArgs() has been renamed to returnToPrevious() to avoid confusion with the existing Action->returnToArgs which gives the arguments that would be used to pass to one of those. :)
Switching to the correct function call gets it working.
Thanks to Siebrand for catching it when I could debug it live!
2010-10-15 15:33:54 -07:00
9abe6fa666
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-15 13:46:44 -04:00
9b9ba29791
add SSL servers and paths to pathadminpanel.php
2010-10-15 13:46:21 -04:00
0721d8d3e2
Merge remote branch 'statusnet/0.9.x' into 1.0.x
2010-10-14 15:27:17 -04:00
fc6711327b
let users set their SSL logo through the admin panel
2010-10-14 15:06:11 -04:00
07963a2a10
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-13 15:18:33 -04:00
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
04f3f57e2e
Merge branch 'oauth-1.0a' into 0.9.x
2010-10-12 17:52:04 -07:00
5f81f6119b
Merge branch '0.9.x' into 1.0.x
2010-10-12 16:33:36 -07:00
d8e06e66e9
Print a proper error message
2010-10-12 16:19:53 -07:00
f4f16af8ac
Add a basic group deletion for moderator users.
2010-10-12 15:49:20 -07:00
a77bc11326
Output a log message when issuing a request token
2010-10-12 12:25:34 -07:00
4580d6065c
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-12 11:16:32 -04:00
aa02f6020e
Merge branch '0.9.x' into 1.0.x
2010-10-08 11:47:50 -07:00
f62e7c461f
Fix PHP fatal error in DeletenoticeAction: died when we had a valid notice, but weren't logged in due to accessing $this->user before the login check. Moved check up to prepare() from handle() so it's done before usage
2010-10-08 10:33:43 -07:00
459727bd61
Update ApiOauthAccessTokenAction to OAuth 1.0a
2010-10-07 18:32:27 -07:00
f8808b0761
Added a comment about an open question: Should we allow pin-based
...
workflow for clients registered as web applications?
2010-10-07 14:19:42 -07:00
b8f2cc4e6f
Make the verifier pin display a little nicer
2010-10-07 13:51:47 -07:00
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
f97b863fd7
Update ApiOauthRequestTokenAction to support OAuth 1.0a
2010-10-06 13:40:03 -07:00
8aa9c271df
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-05 14:09:17 -04:00
5c4723919f
Merge branch '0.9.x' into 1.0.x
2010-10-04 13:06:40 -07:00
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
5c19d33b27
Bugfix in FB-sharing header for empty profile avatar
2010-10-01 14:42:12 -07:00
12f68c4ff2
Throw in a quick event hook to override the profile list type on showstream (should be made more general in future).
...
Replace with a NoticeList to have output include avatar and username -- but CSS still hides them in default theme.
Event::addHandler('ShowStreamNoticeList', 'awesome');
function awesome($notice, $action, &$pnl)
{
$pnl = new NoticeList($notice, $action);
return false;
}
2010-10-01 11:05:15 -07:00
8b8450f9ad
Add helper metadata on individual notice pages to aid sharing to Facebook (use poster's avatar as image, indicate the text content)
2010-09-30 18:21:38 -07:00
fd779009b8
Add Start/EndShowNoticeItem event hooks to single notice page
2010-09-29 16:35:12 -07:00
a6469aeed8
Fix PHP syntax errors introduced during localization fixups in a few files.
2010-09-25 12:10:36 -07:00
da04858902
Update OAuth actions in show application page so it will display the right endpoint URLs
2010-09-23 16:16:32 -07:00
0f1fc36a05
Merge branch '0.9.x'
2010-09-23 09:50:46 -04:00
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
77609e0c4a
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:30:50 +00:00
da4463cb76
License admin panel should allow empty or valid URLs for (license
...
URL and license image URL) when selecting private or allrightsreserved
licenses.
2010-09-21 13:06:23 -07:00
42dd460d3b
Merge branch 'master' into 0.9.x
2010-09-21 12:48:16 -07:00
d342899677
Fix #2323 : typo on oauth connections page
2010-09-20 18:07:19 -07:00
85bf20d95a
Fix error when editing OAuth app registration and only changing the icon.
2010-09-20 16:57:07 -07:00
a47e664094
Fix for #2419 : There is no function maxDescription in Oauth_application class (broke the 'description too long' error message when editing oauth app registrations)
2010-09-20 16:43:00 -07:00
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
55ad954b15
Basic license admin panel (maybe we can make it fancier later)
2010-09-17 16:38:12 -07:00
afc799ddf8
Removed periods from instructions on some admin panels for consistency
2010-09-17 14:32:18 -07:00
f4a1858b33
Fixed typo, and updated copyright dates while I was there
2010-09-17 14:20:05 -07:00
ead2f3375a
Ticket #2701 : old color settings now get reset when changing themes, so you don't end up with the previous theme's colors.
2010-09-13 13:37:13 -07:00
bb2a4e7aac
Update translator documentation.
2010-09-12 17:43:43 +02:00
6b010ac79c
Update/add translator documentation.
2010-09-12 17:27:38 +02:00
a9fad9a7ac
Add translator hint.
2010-09-12 17:08:49 +02:00
76788d9790
note what 0 means for shorteners
2010-09-11 16:23:41 -04:00
76c0e3169b
move othersettings to urlsettings
2010-09-11 16:22:03 -04:00
fca7ea664b
move view designs setting to user design tab
2010-09-11 16:16:38 -04:00
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
255e96d3b5
add a hook for when someone deletes their own notice
2010-09-08 16:37:12 -04:00
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
3dd734b2c3
Remove CSRF protection from username/password login and from OpenID login.
2010-09-07 13:45:52 -04:00
a319b40c97
common_cache_key() -> Cache::key()
2010-09-06 10:07:43 -04:00
8f81762d68
common_memcache() => Cache::instance()
2010-09-06 09:56:45 -04:00
b05ab5fc85
daemon_screenname -> daemonScreenname
2010-09-03 17:50:28 -04:00
0cfaae48a3
Merge branch '0.9.x' into 1.0.x
2010-08-16 16:56:27 -07:00
21bf50bad6
Merge branch 'noticetitle' into 0.9.x
2010-08-14 12:03:25 -07:00
1dadb8efc0
Merge branch '0.9.x' into 1.0.x
2010-08-13 14:51:51 -07:00
7dd46222a8
add StartNoticeSaveWeb and EndNoticeSaveWeb to hook web-based UI for notices
2010-08-13 11:21:07 -07:00
d9942a558a
Fix regression in replies made from web (was saving reply_to value in wrong array key)
2010-08-12 15:18:16 -07:00
6ee3f35302
work in progress: prettier attachment mode for tinymce?
2010-08-11 15:56:40 -07:00
527561cd93
TinyMCE: core tweak; switching order of input processing so length limit is applied to stripped version of the text
2010-08-11 14:41:31 -07:00
3a85318bd0
First stab redoing argument loading for TinyMCE (to avoid hacking checks for all notice saves everywhere)
2010-08-10 16:55:03 -07:00
9f0715a993
Merge branch '0.9.x' into 1.0.x
2010-08-03 16:05:03 -07:00
46bffe3d69
Tweak message per suggestion of The Evil IP Address[1].
...
[1] http://translatewiki.net/w/i.php?title=Thread:Translating_talk:StatusNet/to_their_attention%3F&oldid=2220913
2010-08-01 00:16:39 +02:00
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
4e8e77f6b0
Return HTTP 403 instead of 400 when silenced users try to post via API
2010-07-29 18:47:28 +00:00
9b899eea75
Make some messages gender neutral.
2010-07-19 21:09:09 -05:00
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
00e129b013
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-26 10:18:03 -04:00
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
d9e56e15cc
Merge branch 'master' into testing
2010-06-26 10:16:27 -04:00
9eb5a976b0
Have API methods for search subclass ApiPrivateAuthAction
2010-06-24 18:11:50 -07:00
9d890e2be0
Catch a couple of missing XML namespace declarations on API XML output. Missing NS declarations were breaking XML parsing for some clients since beaecb18d5
2010-06-18 09:59:11 -07:00
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
1a62d1b493
Use presence of IM plugins to decide if "IM" options should be available
2010-06-16 16:00:54 -04:00
004200f958
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-11 12:09:55 -07:00
7f3b3620af
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-11 12:05:53 -07:00
47665e845a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-06-11 12:04:03 -07:00
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
352a3edfb3
Ticket #2350 : fix for incorrect FOAF sioc:follows entries for users who are followed by, but don't themselves follow the user whose FOAF we're displaying.
2010-06-10 11:42:58 -07:00
5afd07e5e8
added missing author
2010-06-08 16:46:32 +12:00
4617545ece
added missing authors
2010-06-08 16:34:16 +12:00
dc0f7189f2
added missing authors
2010-06-08 16:32:53 +12:00
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
8e33cdd36a
break up the giant form function in design admin panel into individual sections to make it a little more manageable
2010-06-07 18:14:15 -07:00
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
135b398d4b
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-03 14:50:52 -04:00
4bbb259baf
- Fix bad argument being passed (error code) when invalid format specified
...
- Reformat whitespace
2010-06-03 10:52:16 -07:00
a5de215267
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-01 13:51:41 -07:00
3ba165cfab
Merge branch 'master' into testing
2010-05-28 16:18:40 -07:00
cef302cacd
Bugfix: api/statuses/destroy.:format was outputting deleted notice
...
twice, causing parsers to fail.
2010-05-28 06:24:10 +00:00
6317f7d92b
Assigning my copyrights to the Free Software Foundation
2010-05-27 18:27:33 -04:00
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
2f2fa10071
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-05-27 14:54:43 -07:00
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
6d8e01ad13
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-21 16:47:57 -04:00
6eae5d6a7e
Merge branch 'testing' into 0.9.x
2010-05-21 13:15:08 -07:00
87b8a89aa7
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-05-21 13:12:25 -07:00
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
c4203be9a4
Merge branch '0.9.x' into 1.0.x
2010-05-19 12:52:23 -07:00
7005ef6661
Merge branch 'testing' into 0.9.x
...
Conflicts:
plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
a39a934dd4
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-05-19 10:59:14 -07:00
5ea019c41a
Remove errant double HTML entity encoding in API source attribution
2010-05-18 15:16:23 -07:00
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
c78f67aa73
Refactor and centralize notice source link calculation
2010-05-18 15:15:27 -07:00
14a76926a2
Redirect non-SSL hits to login & register actions to SSL if 'always' or 'sometimes' SSL modes are kicked in.
...
The forms would already submit to SSL, but people are happier if they start on a secure page!
Note: this really should be done for sensitive/all URLs in index.php, but it seems a bit awkward to reconstruct the SSL version of the link atm. Cleanup todo!
2010-05-18 21:52:17 +00:00
6da59fab58
invalid mbox_sha1sum in the case where users don't have an email address
...
(reported by pedantic-web.org)
2010-05-18 10:09:16 -04:00
91367dbc21
Merge branch '0.9.x' into 1.0.x
2010-05-14 12:15:13 -07:00
065ecc5573
Merge branch 'testing' into 0.9.x
2010-05-14 12:14:02 -07:00
2e808fdc82
More direct text for registration licensing/tos checkbox for private and all-rights-reserved sites.
2010-05-13 16:47:58 -07:00
da18701394
Fix for repeats from the API having null source attribution
2010-05-07 17:22:16 -07:00
fba140f4e0
Fix for repeats from the API having null source attribution
2010-05-08 00:07:42 +00:00
3c9686e80f
Fix for repeats from the API having null source attribution
2010-05-07 16:32:24 -07:00
06a63b0404
Finish api/statusnet/groups/update
2010-05-07 10:10:30 -07:00
Evan Prodromou
Brion Vibber
Zach Copley
macno
Siebrand Mazeland
Craig Andrews
Brion Vibber
Eric Helgeson
Brenda Wallace
James Walker