Commit Graph

2536 Commits

Author SHA1 Message Date
Brenda Wallace
223fee2ad1 just sent a http 200 for the check-fancy from install.php 2009-11-10 15:53:07 +13:00
Craig Andrews
3be1205714 Add a new event: CanUserChangeField 2009-11-09 17:43:37 -05:00
Brion Vibber
088081675f Revert "Remove more contractions"
This reverts commit 5ab709b739.

Missed this one yesterday...
2009-11-09 20:01:46 +01:00
Evan Prodromou
348b155376 add nav menu for admin panel 2009-11-09 13:40:37 -05:00
Evan Prodromou
a4905c03ba add site admin to global primary nav 2009-11-08 22:31:19 -05:00
Evan Prodromou
691beefd0f Merge branch '0.9.x' into adminpanel 2009-11-08 21:41:43 -05:00
Evan Prodromou
aa0d9a8615 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 21:23:25 -05:00
Evan Prodromou
76b0e6e6f4 Merge branch '0.9.x' into adminpanel 2009-11-08 21:23:09 -05:00
Evan Prodromou
f086dddf43 add a method to Theme class to list available themes 2009-11-08 21:18:57 -05:00
Zach Copley
5c091dab9b Implement /api/account/update_profile_background_image.format 2009-11-08 15:29:04 -08:00
Siebrand Mazeland
b10f362ede Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:33:58 +01:00
Siebrand Mazeland
5ab709b739 Remove more contractions
* doesn't
* won't
* isn't
* don't
2009-11-08 23:32:15 +01:00
Brion Vibber
fc5002015b Revert "* [Cc]an't -> [Cc]annot"
This reverts commit 0ab17f382b.
2009-11-08 23:28:51 +01:00
Brion Vibber
ec6a38a627 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 23:27:24 +01:00
Siebrand Mazeland
104a47e4a2 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:22:50 +01:00
Siebrand Mazeland
0ab17f382b * [Cc]an't -> [Cc]annot
* [Cc]ould't -> [Cc]ould not
2009-11-08 23:22:38 +01:00
Brion Vibber
a034fb0b82 Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
This reverts commit 81b4a381d9.
IMO "user" is a bit impersonal and we shouldn't go changing the tone of the UI willy-nilly when we're updating localisations.
2009-11-08 23:22:13 +01:00
Evan Prodromou
cbae1b0c8b add utilities for calculating local and installation theme root dirs 2009-11-08 17:16:50 -05:00
Siebrand Mazeland
221b779e88 Harmonise UI message "No such user." 2009-11-08 23:10:44 +01:00
Evan Prodromou
111f6a775d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-08 17:06:41 -05:00
Evan Prodromou
b7e2e3fd2b Restructure theme.php to define a class Theme
For various reasons, it's nicer to have a class for theme-file paths
and such. So, I've rewritten the code for determining the locations of
theme files to be more OOPy.

I changed all the uses of the two functions in the module (theme_file
and theme_path) to use Theme::file and Theme::path respectively.

I've also removed the code in common.php that require's the module;
using a class means we can autoload it instead.
2009-11-08 17:04:46 -05:00
Siebrand Mazeland
99ebb56529 !. => ! 2009-11-08 22:39:02 +01:00
Siebrand Mazeland
81b4a381d9 * check usage of 'people' in UI and change it to 'users' or something else in most places
* change some contractions to full text in UI messages
2009-11-08 22:26:13 +01:00
Evan Prodromou
d0466da80b add site admin panel 2009-11-07 23:17:52 -05:00
Evan Prodromou
dd9fa0e683 only load user once, reload settings in admin panel 2009-11-07 23:16:34 -05:00
Evan Prodromou
46cd7b9636 Merge branch '0.9.x' into adminpanel 2009-11-07 22:26:14 -05:00
Evan Prodromou
1de9496c7f fix constant for deleteothersnotice 2009-11-07 22:26:03 -05:00
Evan Prodromou
ee99a8ef50 superclass for adminpanel actions 2009-11-07 19:18:22 -05:00
Evan Prodromou
589185ce87 uppercase right constants 2009-11-07 19:16:15 -05:00
Evan Prodromou
31bbdacbf3 add a method to Action to check session token 2009-11-07 18:51:57 -05:00
Evan Prodromou
d10ee1763b ->action -> ->out in UserProfile 2009-11-07 13:18:09 -05:00
Evan Prodromou
742317c0da fix userprofile widget so it correctly provides an action 2009-11-07 13:16:29 -05:00
Zach Copley
b522c401e6 Better workaround for PHP returning empty $_POST and $_FILES when
POST length > post_max_size in php.ini. I also added this check to
avatar upload, which was failing with huge files.
2009-11-06 17:21:08 -08:00
Sarven Capadisli
0994fa31d6 Added missing closing span tag 2009-11-06 15:28:58 +01:00
Sarven Capadisli
87543292d1 Fixed some group list styles 2009-11-06 15:26:13 +01:00
Sarven Capadisli
1c72461394 Removed dl "stuff" 2009-11-06 15:03:35 +01:00
Sarven Capadisli
4eea7f55ef Check if it is empty instead of '' 2009-11-06 13:32:04 +01:00
Sarven Capadisli
6f2aa1394b Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-06 12:54:20 +01:00
Sarven Capadisli
85647719a3 Updated styles for profile list re: commit
3c4ac05cde
2009-11-06 12:51:28 +01:00
Brion Vibber
793a4ef4d5 kill tabs 2009-11-06 12:15:08 +01:00
Brion Vibber
e909d0a639 Add Icelandic to the language support list so the localization can actually be used :) 2009-11-06 11:51:28 +01:00
Sarven Capadisli
7ce49e4bcf Removed .uid from group profiles in a list 2009-11-06 11:30:41 +01:00
Craig Andrews
1845c8c773 Added an AutoRegister event
LDAP plugin can do autoregistration
2009-11-05 16:40:41 -05:00
Eric Helgeson
9f15febf88 Re added NICKNAME_FMT constant to router.php.
Usefull for non-OMB (behind the firewall) users to allow different nicknames.
2009-11-05 16:38:35 -05:00
Brion Vibber
066331bdf7 Merge commit 'refs/merge-requests/2006' of git://gitorious.org/statusnet/mainline into integration 2009-11-05 15:50:29 +01:00
Brion Vibber
2bb93438a1 Error page fix: use class static accessor correctly, suppress notices if we don't have the error code listed 2009-11-05 10:58:38 +01:00
Zach Copley
2fc01dc7d1 Remove debugging statements 2009-11-04 22:12:01 -08:00
Zach Copley
1ef1f59fe8 Fix for Ticket #1957 - API methods are not accessible when site is private (0.8->0.9 regression) 2009-11-04 22:03:41 -08:00
Zach Copley
527427d3e0 Implement update avatar via API (/api/account/update_profile_image.format) 2009-11-04 21:00:26 -08:00
Craig Andrews
a82df5fae8 Added a CheckPassword event 2009-11-04 13:06:55 -05:00
Shashi
b12caedb88 Widgetized user profile rendering. 2009-11-04 18:41:17 +05:30
Zach Copley
d03a57853e Don't try to pull up designs for non-existent users 2009-11-03 09:55:35 -08:00
Craig Andrews
b9d40f723b Added 'login' command that gives you a link that can be used to login to the website 2009-11-02 18:40:49 -05:00
Evan Prodromou
a2b8303925 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	classes/User.php
2009-11-02 18:13:04 -05:00
Brion Vibber
86560eeb3d Merge commit 'refs/merge-requests/1900' of git://gitorious.org/statusnet/mainline into integration 2009-11-02 10:16:06 -08:00
Craig Andrews
1cf67f4f71 allow <> to surround the url (like () or []) 2009-11-02 12:59:11 -05:00
Craig Andrews
8782f5fedf do not allow " in URLs - they are not legal URL characters 2009-11-02 12:53:02 -05:00
Craig Andrews
b179ab650a do not allow [ and ] - they are not legal URL characters 2009-11-02 12:53:02 -05:00
Brion Vibber
5581143bee Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions.
Caching support will be added in future work after unit tests have been added.

* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries
* adapted GeonamesPlugin for new HTTPResponse interface

Note some plugins haven't been fully tested yet.
2009-11-02 09:14:15 -08:00
Brion Vibber
73b9e531bf Detect "no file" upload error and, for now at least, ignore it gracefully.
This was triggering on non-AJAX form submissions for new notices, preventing them from being posted when they contained no attachments.
2009-11-02 09:10:06 -08:00
Evan Prodromou
c991047fc4 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-11-02 11:23:41 -05:00
Evan Prodromou
3c4ac05cde remove <dl> stuff from profile list 2009-11-02 11:23:31 -05:00
Brion Vibber
b22fc5b74a Revert "Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions."
Going to restructure a little more before finalizing this...

This reverts commit fa37967858.
2009-11-02 07:51:29 -08:00
Brion Vibber
fa37967858 Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions.
Caching support will be added in future work after unit tests have been added.

* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries

Note some plugins haven't been tested yet.
2009-11-02 06:31:28 -08:00
Brion Vibber
8e64723813 Make unit tests work again by forcing a 'global' on $_have_a_config...
Fix a typo in the error message when no config file found.
2009-11-02 06:14:08 -08:00
Zach Copley
4abbf44068 Remove stale references to old apiaction parameter 2009-11-01 16:32:45 -08:00
Evan Prodromou
44ce8e2fcd Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-31 14:47:21 -04:00
Evan Prodromou
521bd68d7c revert revert on getfile 2009-10-31 14:43:01 -04:00
Evan Prodromou
4e9ec0d0e1 merge from testing 2009-10-31 14:36:04 -04:00
Evan Prodromou
4056a26017 Revert "Added getfile action"
This reverts commit f58daa873b.
2009-10-31 14:32:12 -04:00
Evan Prodromou
9f7d390ad1 update version to rc2 2009-10-31 12:18:38 -04:00
Sarven Capadisli
48f33f781a Using 'form_notice' class instead of 'form' to group both forms 2009-10-31 17:16:37 +01:00
Evan Prodromou
5e27d53947 Merge branch '0.8.x' into testing 2009-10-31 12:16:30 -04:00
Brenda Wallace
de7c12baef Merge commit 'mainline/0.9.x' into 0.9.x 2009-10-30 10:35:27 +13:00
Brenda Wallace
f1daca16e2 give some suggestions back to the user when no config file found, and a link to the installer 2009-10-30 10:03:25 +13:00
Brenda Wallace
d5951ebce6 Revert "give some suggestions back to the user when no config file found, and a link to the installer"
This reverts commit 7f5fbee2e3.
2009-10-30 10:02:37 +13:00
Brenda Wallace
c0f8c0178a Merge commit 'mainline/0.9.x' into 0.9.x 2009-10-30 09:41:04 +13:00
Craig Andrews
c49564647a whitespace adjustments for doxygen 2009-10-29 16:27:23 -04:00
Craig Andrews
54696f7c46 Moved the public XRDS from the OpenID plugin to core
Added 4 new events involved in XRDS: StartUserXRDS, EndUserXRDS, StartPublicXRDS, EndPublicXRDS
Added OpenID provider functionality (no delegation support [yet])
2009-10-29 16:27:22 -04:00
Brenda Wallace
7f5fbee2e3 give some suggestions back to the user when no config file found, and a link to the installer 2009-10-30 09:17:19 +13:00
Evan Prodromou
49dd54315f show notice location in notice list 2009-10-29 16:16:02 -04:00
Evan Prodromou
5b0809f4a3 fix caching in location.php 2009-10-29 16:15:49 -04:00
Evan Prodromou
a6ed4e5bf7 a location method for getting an URL 2009-10-29 14:49:00 -04:00
Sarven Capadisli
f0abc0fe15 Updated bookmarklet. Created its own action 2009-10-29 13:18:51 +01:00
Evan Prodromou
2b5a5e02a4 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-28 22:58:58 -04:00
Zach Copley
e0dbc47f8e Fixed header comment. 2009-10-28 17:47:14 -07:00
Zach Copley
9ef05030fe Merge branch 'api-media-upload' into 0.9.x
* api-media-upload:
  Rearanged a couple things & removed debugging statements
  Rework MailDaemon to use the MediaFile class for uploads
  Implement media upload in the API
  Extract media upload stuff into its own library class.
2009-10-28 17:18:33 -07:00
Zach Copley
e5a2f895a0 Rearanged a couple things & removed debugging statements 2009-10-28 17:13:06 -07:00
Zach Copley
b9ce23d0c2 Rework MailDaemon to use the MediaFile class for uploads 2009-10-28 22:24:20 +00:00
Evan Prodromou
61ccf450de Merge branch '0.9.x' into location 2009-10-28 17:28:08 -04:00
Evan Prodromou
7647703881 rogue n in curlclient.php 2009-10-28 17:28:00 -04:00
Evan Prodromou
b73d6d18ba Merge branch '0.9.x' into location 2009-10-28 17:24:53 -04:00
Evan Prodromou
10df75f9a0 add StartInitializeRouter event 2009-10-28 16:07:57 -04:00
Zach Copley
2d0aba49d9 Implement media upload in the API 2009-10-27 21:45:56 -07:00
Craig Andrews
5fd7ed5b14 Display user avatar in the XMPP message
Include notice id and conversation link the XMPP message

Thanks to Deepspawn for this idea and initial code
2009-10-27 23:31:49 -04:00
Craig Andrews
5f42023f97 implement the nudge command 2009-10-27 22:45:00 -04:00
Craig Andrews
da16dc05a8 Added a new "reply" command 2009-10-27 22:30:21 -04:00
Zach Copley
93a6e83d5d Extract media upload stuff into its own library class. 2009-10-27 19:11:18 -07:00
Craig Andrews
922ee7b3b2 Implemented reply # command, allowing users to favorite specific notices by the notice id 2009-10-27 21:48:56 -04:00
Craig Andrews
0b4390e7f2 Make email domain checking optional, as some statusnet installations (such as those behind restrictive corporate firewalls, or on home systems on restrictive connections) cannot connect to any mail
systems, and this check will always fail.
2009-10-26 10:31:12 -04:00
Evan Prodromou
3c724ccd0d Merge branch '0.9.x' into location 2009-10-24 19:59:46 -04:00
Stephen Paul Weber
58b9ce5946 Better license check.
Tokenise CC license parts and check for compatability.
Fallback is old directly-equal test.
2009-10-23 21:22:26 -04:00
Zach Copley
6d6de3c1c7 Move Twitter and Facebook-specific mail notifications to their respective plugins 2009-10-23 23:38:45 +00:00
Zach Copley
2544310e73 Remove automatic enqueuing for Facebook 2009-10-23 23:34:48 +00:00
Zach Copley
34a21e7605 Merge branch '0.9.x' into facebook-app-plugin 2009-10-23 23:05:59 +00:00
Zach Copley
45a2253649 Merge branch '0.9.x' into facebook-app-plugin 2009-10-23 22:48:35 +00:00
Brion Vibber
b89878511f Fix three fatal errors when posting from 0.9.x:
* OMB remote updates were trying to load nonexistent Laconica_OMB_Service_Consumer class -- fixed to StatusNet_OMB_Service_Consumer. Regression caused during libomb merge.
* Twitter processing was still being queued from core when no twitter plugin was present, which triggered an exception from UnqueueHandler; leftover code from before the plugin extraction.
* UnqueueHandler's exception caused a fatal error instead because it was missing the "new" keyword. Wouldn't have been seen when testing with the plugin enabled.
2009-10-23 20:31:53 +00:00
Craig Andrews
c93b9b9523 Merge commit 'refs/merge-requests/1815' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-10-23 11:15:25 -04:00
Zach Copley
1b4f9f2c09 Merge branch '0.9.x' into facebook-app-plugin 2009-10-22 21:12:51 +00:00
Evan Prodromou
9608cc6143 Merge branch '0.9.x' into location 2009-10-22 16:23:42 -04:00
Evan Prodromou
e73631f614 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-22 16:21:05 -04:00
Evan Prodromou
65c45986c6 HTTPResponse has default empty headers 2009-10-22 16:20:56 -04:00
Evan Prodromou
69357c4916 error in order of arguments to array_key_exists in location.php 2009-10-22 16:19:56 -04:00
Evan Prodromou
9c983c3830 extract Geonames stuff to a plugin 2009-10-22 15:44:36 -04:00
Brion Vibber
c6d1039901 Add some doc comments to QueueHandler 2009-10-22 10:11:04 -07:00
Jeffery To
f58daa873b Added getfile action 2009-10-22 12:46:54 +08:00
Evan Prodromou
7b227fd1c0 start getting locations from remote services 2009-10-21 22:47:19 -04:00
Evan Prodromou
b6b245dc0b start of a location class 2009-10-21 22:43:41 -04:00
Evan Prodromou
4e639b8769 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-21 22:41:42 -04:00
Evan Prodromou
0df85711d6 reformat default.php 2009-10-21 22:41:23 -04:00
Zach Copley
6199d31acc Remove facebook broadcast from unqueuemanager. That's now
added by an event.
2009-10-21 01:18:36 +00:00
Zach Copley
78e5a5980a Extract out Facebook app stuff into a plugin 2009-10-20 16:32:30 -07:00
Zach Copley
09dfb08a39 Merge branch '0.9.x' into TwitterBridgePlugin 2009-10-20 06:06:10 +00:00
Zach Copley
7539e26951 - Make Twitter bridge work with unqueuemanager
- Add README
2009-10-20 06:05:35 +00:00
Eric Helgeson
490dfc6f5a Better check if site,server is configured. 2009-10-19 20:08:20 -04:00
Evan Prodromou
fc61b71625 merge from testing 2009-10-19 18:12:00 -04:00
Brenda Wallace
66fca9e2a8 some typoes in comments that annoyed me, fixed now 2009-10-19 18:08:44 -04:00
Evan Prodromou
728a146ec0 new codename for 0.8.2 2009-10-19 17:30:08 -04:00
Evan Prodromou
fe1ae3a47e Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2009-10-19 17:00:36 -04:00
Evan Prodromou
035d4cf86e Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-19 15:36:26 -04:00
Eric Helgeson
9d0e37c4e8 Utilize NICKNAME_FMT constant when creating at replies 2009-10-19 13:11:55 -04:00
Brion Vibber
39598582d9 Merge branch 'i18n-work' into i18n-0.9.x 2009-10-19 09:25:05 -07:00
Zach Copley
109a54c4f0 Changed config flag for importing friends' timeline and added some comments 2009-10-17 00:32:02 +00:00
Zach Copley
0bbc05c1d5 Merge branch '0.9.x' into TwitterBridgePlugin 2009-10-16 23:42:02 +00:00
Brion Vibber
e48efd3222 Workaround for Facebook data store API behavior regression, fixes saving
of empty notice prefix text in facebook settings.

Filed bug upstream at http://bugs.developers.facebook.com/show_bug.cgi?id=7110

Per documentation, saving a pref value of "" or "0" will delete the pref key:
http://wiki.developers.facebook.com/index.php/Data.setUserPreference

which used to do what we want... Now Facebook throws back an error
"Parameter value is required" when we do this. Workaround appends a
space to empty string or "0" at save time, then trims the string when
we load it.

The input string was already trimmed at pref save time, so this won't
alter any user-visible behavior.

Thanks to ^demon in #mediawiki for pointing out the behavior regression
after testing the identi.ca Facebook app!
2009-10-16 14:48:56 -07:00
Brion Vibber
4855cb58da Workaround for Facebook data store API behavior regression, fixes saving
of empty notice prefix text in facebook settings.

Filed bug upstream at http://bugs.developers.facebook.com/show_bug.cgi?id=7110

Per documentation, saving a pref value of "" or "0" will delete the pref key:
http://wiki.developers.facebook.com/index.php/Data.setUserPreference

which used to do what we want... Now Facebook throws back an error
"Parameter value is required" when we do this. Workaround appends a
space to empty string or "0" at save time, then trims the string when
we load it.

The input string was already trimmed at pref save time, so this won't
alter any user-visible behavior.

Thanks to ^demon in #mediawiki for pointing out the behavior regression
after testing the identi.ca Facebook app!
2009-10-16 14:46:53 -07:00
Brion Vibber
b3c29800fb Drop a debug info line that isn't really needed 2009-10-16 11:49:27 -07:00
Brion Vibber
c3b1f9e77d Use short language names for locales for now; this seems to be most compatible with both native gettext (tested on Ubuntu 8.10) and php-gettext (tested on Mac OS X 10.6). 2009-10-16 11:23:50 -07:00
Brion Vibber
531c0738da Workaround for not fully natively set up locales with native gettext...
Set "en_US" locale first, then the locale we want for our user.
This seems to initialize gettext properly somehow, which I could see when the languages would come up briefly on settings save when changing from a supported language.
Definitely works for ga_ES on my Ubuntu system (8.10 intrepid), hopefully reasonably consistent.
2009-10-16 17:42:27 +00:00
Brion Vibber
4ef0665408 Galician translation (out of date but functional... unless you have locale issues of course)
.po file from http://status.net/trac/ticket/481 last updated by mvazquez
2009-10-16 16:29:50 +00:00
Evan Prodromou
90de6eae5a add more events to profile list 2009-10-15 06:01:26 -04:00
Trever Fischer
1241e651ae Added support for profile designs to the twitter API 2009-10-15 05:16:37 -04:00
Evan Prodromou
4f5badda94 remove inboxes option 2009-10-13 17:38:27 -04:00
Zach Copley
b4b992bca7 Merge branch '0.9.x' into pluginize-twitter-bridge
* 0.9.x: (247 commits)
  Added in credits.
  Use site's name for basic auth realm
  Make apigroupcreate.php pass phpcs
  Took out some unnecessary intializations
  Implemented create group api
  CamelCase all function names in the API code
  These same params are used in most API actions; moved to base API class
  Missed some of the references to the old TwitterApiAction - removed
  Remove more redundant $formats
  Remove dead code
  Move all basic auth output and processing to base classes
  $format is used by every API action. Set it in the base class.
  Delete action/api.php and rename lib/twitterapi.php to lib/api.php
  New actions for blocks via API
  fix FBConnect so it doesn't muffle EndPrimaryNav
  don't write session if it's unchanged
  Fixed facebook connect primary nav to hide search option when site is private and user is not logged in
  Fixed facebook connect primary nav to obey sms/twitter/openid settings
  Fixed facebook connect login nav to obey openid settings
  Fixed facebook connect nav to obey sms/twitter disabled
  ...
2009-10-13 09:36:26 -07:00
Zach Copley
870b091693 Added in credits. 2009-10-12 16:36:00 -07:00
Zach Copley
4efbe32f6a Use site's name for basic auth realm 2009-10-12 15:12:20 -07:00
Zach Copley
e071a8cbff Moved group create API into its own action
Merge branch '0.9.x' into refactor-api

* 0.9.x:
  Implemented create group api
  fix FBConnect so it doesn't muffle EndPrimaryNav
  don't write session if it's unchanged
  Fixed facebook connect primary nav to hide search option when site is private and user is not logged in
  Fixed facebook connect primary nav to obey sms/twitter/openid settings
  Fixed facebook connect login nav to obey openid settings
  Fixed facebook connect nav to obey sms/twitter disabled
  Fixed twitter defaulting to disabled
  Revert "Open tags should have closing tags"
  Don't show search suggestions for private sites
  Fixed E_NOTICE when returnto isn't set
  Fixed E_NOTICE when the "lite" parameter isn't included in the request
  Fixed E_NOTICE - GroupList expects an owner object in the constructor, not an array of search terms
  Returning false seems to fix IE from reclaiming window focus. I think
  Aligning notice attach label from right instead of left
  Fixed IE background image alignment for attach, favour and disfavour
  Fixed nudge and direct message background image alignment
  Using 'CSS sprites' for common icons for the identica theme. Default
  Open tags should have closing tags

Conflicts:
	actions/twitapigroups.php
	actions/twitapistatuses.php
2009-10-12 12:31:14 -07:00
Craig Andrews
f719720e8a Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts:
	lib/common.php
2009-10-11 13:39:10 -04:00
Craig Andrews
006cfc528e Merge commit 'refs/merge-requests/1723' of git://gitorious.org/statusnet/mainline into 0.8.x 2009-10-11 13:21:18 -04:00
Craig Andrews
6f12ed5f91 Merge commit 'refs/merge-requests/1730' of git://gitorious.org/statusnet/mainline into 0.8.x 2009-10-11 13:20:02 -04:00