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
b407665b98
Initial work on API method for updating a group's profile info
2010-05-07 10:10:30 -07:00
d9c1ac9053
Merge branch '0.9.x' into 1.0.x
2010-05-06 18:49:01 -07:00
869bc32d0d
Remove errant double HTML entity encoding in API source attribution
2010-05-06 21:48:12 +00:00
209fd12cd0
HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them
2010-05-06 21:48:12 +00:00
22fde00def
Refactor and centralize notice source link calculation
2010-05-06 21:48:11 +00:00
173778eab1
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
2010-05-05 17:11:23 -07:00
e05415f621
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
locale/ca/LC_MESSAGES/statusnet.po
locale/de/LC_MESSAGES/statusnet.po
locale/statusnet.pot
2010-05-05 17:07:50 -07:00
b50f300566
Implement since_id and max_id param handling for /api/favorites
2010-05-05 14:46:36 -07:00
5414396a2e
IM cleanup on 1.0.x branch:
...
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them.
* fix fatal error in IM settings while waiting for a Jabber confirmation.
* Caching fix for user_im_prefs
* fix for saving multiple transport settings
* some fixes for AIM & using normalized addresses for lookups
2010-04-30 15:29:05 -07:00
cae1329f3b
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/util.php
2010-04-30 13:16:13 -07:00
3f2c805652
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-04-30 15:00:55 -04:00
5c05cd2b1a
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-04-26 02:43:33 -04:00
14adb7cc41
Give users more control over URL shortening
...
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.
Squashed commit of the following:
commit d136b390111e1c851ff34d29ca0b91a9c6a3bace767ff2f7ec1e21af42a6869a6be0f59c0c9863d57a1dd5798fd259c37ad2
2010-04-26 02:40:36 -04:00
f852a1931b
Add docs for public_timeline
2010-04-22 15:48:58 -07:00
1b561065b0
Some initial Doxygen-based documentation for the API
2010-04-22 13:11:49 -07:00
beaecb18d5
Add statusnet: prefix for API to JSON and XML output
...
I added the statusnet: prefix to the xml output. This prefix should
be declared on the root element of all relevant XML output.
I also added two StatusNet-specific fields:
* statusnet:html - rendered HTML. Clients shouldn't have to guess
at the correct HTML rendering for notices, especially since some
of the links depend on context.
* statusnet:profile_url - profile URL for a user. You can't count
on a user being a local user in a distributed microblogging world.
So, this shows the explicit profile_url.
2010-04-22 08:49:33 -07:00
fee6b78e28
Merge branch 'testing' into 0.9.x
2010-04-19 18:47:56 +02:00
369885f04f
Merge branch 'master' into testing
2010-04-19 18:47:11 +02:00
e547a2f54c
Fix ticket #2289 : registration links were showing in top nav bar, login page message when site set to invite-only or closed registration, when the 'register' action can't be used.
2010-04-19 18:45:50 +02:00
39392e03a7
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/imsettings.php
2010-04-18 19:21:15 -04:00
7ace3156ca
Add translator documentation.
...
Fixed a few inconsistencies in the process. Confused about the e-mail related messages in the code.
2010-04-11 23:24:38 +02:00
97ee2c2f12
Fix a typo and small error in translator documentation
2010-04-11 23:22:36 +02:00
76d3fdacae
Add translator documentation.
...
Fixed a few inconsistencies in the process. Apparently this code has been copied to imsettings.php, and some cases of 'email' had not been changed to 'IM'. Added FIXME for using globals/macros (?) in messages like "%%site.name%%". For easier/more consistent translation, this should preferably be plain %s parameters.
2010-04-11 22:37:03 +02:00
69eebc1ec8
Add translator documentation for uses of 'Yes' and 'No' in the interface.
2010-04-11 21:04:07 +02:00
1eeb23e1e3
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/confirmaddress.php
2010-04-10 17:56:11 -07:00
19b86da426
Lower case "Web"
2010-04-11 01:03:06 +02:00
518832da28
Document messages for which clarification was requested.
2010-04-10 01:48:16 +02:00
c15549ff5a
Fix double space in message
2010-04-10 01:47:27 +02:00
166c1edba9
Fix inconsistencies in clientError() messages
...
* use correct punctuation
* single quotes when replace was possible
* wording updated when needed
2010-04-09 16:11:20 -07:00
8dda28d374
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-04-10 00:59:21 +02:00
3656a2cb13
Fix inconsistencies in clientError() messages
...
* use correct punctuation
* single quotes when replace was possible
* wording updated when needed
2010-04-10 00:58:57 +02:00
5c6c9b6f5f
Update message formatting for serverError to use a starting capital and a leading period.
2010-04-09 15:29:41 -07:00
58d5d7baee
Clean up badly formatted strings in OembedAction
2010-04-09 15:29:25 -07:00
7303acf7ad
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-04-09 15:20:14 -07:00
ae4ade53a8
Fix E_NOTICE and use of limit on userrss
2010-04-09 15:19:04 -07:00
47eed2c999
Update message formatting for serverError to use a starting capital and a leading period.
2010-04-10 00:07:20 +02:00
85fb32a359
Ticket #946 : annotate use of singular 'them' in invite mail messages to aid translators
2010-04-09 14:02:01 -07:00
f4ad0acd84
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-04-09 12:01:53 -07:00
4e3fad4f0d
fix attributes on homepage output
2010-04-09 14:11:18 -04:00
756dd15515
i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form.
...
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
2010-04-09 10:12:23 -07:00
4b20d68c48
i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form.
...
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
2010-04-09 10:11:11 -07:00
f115c52d90
Clean up badly formatted strings in OembedAction
2010-04-09 09:56:19 -07:00
b76b0d3a5f
Cleanup bad i18n format for page title on bookmarklet posting window
2010-04-09 09:44:30 -07:00
f13bf37e11
Cleanup bad i18n format for page title on bookmarklet posting window
2010-04-09 09:43:34 -07:00
1f8451f4aa
Merge branch 'testing' into 0.9.x
2010-04-09 08:40:15 -07:00
Brion Vibber
Zach Copley
Evan Prodromou
Siebrand Mazeland
Brion Vibber
Craig Andrews
Eric Helgeson
Brenda Wallace
James Walker
Zachary Copley