Commit Graph

1580 Commits

Author SHA1 Message Date
Ian Denhardt
e0da393800 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 2010-08-09 15:06:26 -04:00
Eric Helgeson
edb62db613 Locale error message, clean up {}, Verified under 1.0.x && php 5.3 2010-08-06 23:07:34 -05:00
Eric Helgeson
422a6ef518 Fixed PHP 5.3 by & value
Cleaned up {}'s
2010-08-06 22:48:00 -05:00
Ian Denhardt
dd17e32c85 Got database inserts for photos working. 2010-08-06 10:26:28 -04:00
Ian Denhardt
43454eba36 got uploads sortof working - database portion doesn't work though. 2010-08-05 13:11:34 -04:00
Ian Denhardt
16ad70e16f Started working on proper photo upload. not fully functional yet. 2010-08-04 17:26:55 -04:00
Ian Denhardt
33bce7227f slight cleanup, we now get the image type from getimagesize(), rather than finding it ourselves. 2010-08-04 12:03:34 -04:00
Ian Denhardt
78d9edd431 Photos are cropped now. 2010-08-04 11:52:54 -04:00
Ian Denhardt
727758d275 Fixed scaling. thumbnails are bigger now, too. 2010-08-03 19:24:19 -04:00
Evan Prodromou
9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
Evan Prodromou
2ba36fc242 Merge branch 'activityhooks' into 0.9.x
Conflicts:
	classes/Notice.php
2010-08-03 16:01:18 -07:00
Evan Prodromou
f9a4728fcc Merge branch 'testing' into 0.9.x 2010-08-03 15:57:05 -07:00
Evan Prodromou
f83171824f correctly show <source> for atom feeds 2010-08-03 15:50:21 -07:00
Ian Denhardt
ab46007709 Thumbnails in the photo plugins. 2010-08-03 17:07:07 -04:00
Ian Denhardt
fe5f55cc24 rudementary photo albums. going to /username/photos displays all the images username has attached. 2010-08-03 13:21:11 -04:00
Ian Denhardt
eebc37604a Started work on photos plugin. not much yet. 2010-08-02 19:22:55 -04:00
James Walker
5fa19a0384 Merge branch '2429' into 0.9.x 2010-08-02 16:45:23 -04:00
James Walker
8120842780 Fix for #2429 - move OStatus XML writing to XMLStringer 2010-08-02 16:42:28 -04:00
Ian Denhardt
81a0611cd8 renamed GN{u,U}socialPhotos.php 2010-08-02 16:05:29 -04:00
Brion Vibber
c56939d596 Remove the 'Enable Twitter import' checkbox from Twitter admin panel by default; can be re-added with setting:
addPlugin('TwitterBridge', array('adminImportControl' => true, ....));

Added a note on the label that it requires manual daemon setup. (Note that by default the admin panel won't be shown, so it's no biggie to be hiding this for now.)
2010-08-02 13:00:50 -07:00
Ian Denhardt
af2158b8b4 GNUsocialTemplatePlugin.php doesn't need to be executable. 2010-08-02 15:22:17 -04:00
James Walker
56294016a7 fix #2478 - ensure all XRD documents get proper content-type headers 2010-08-02 14:47:13 -04:00
James Walker
517c7483d1 move to rel="salmon" (per latest spec) 2010-08-02 13:24:38 -04:00
Ian Denhardt
5d7dff100f Got rid of old duplicate files. 2010-08-02 12:09:44 -04:00
Ian Denhardt
762731d8ee Merge branch 'master' of git://gitorious.org/statusnet/mainline 2010-08-02 11:10:19 -04:00
Mike Sheldon
a31d977b43 Make TemplatePlugin compatible with PHP 5.3 2010-07-31 23:10:22 +01:00
Brion Vibber
84726791d3 Fix for ticket #2286: [mobile] Text extends beyond border of repeat confirmation dialog floater box on iPhone
http://status.net/open-source/issues/2286

This bit of CSS was constricting the vertical size of the popup form for repeats:

.notice-options form {
 width:16px;
 height:16px;
}

I can only assume this was originally meant to constrain the mini inline AJAX forms to the size of the clickable buttons, but it doesn't make a difference to how those are displayed on iPhone, Android, or Opera Mini.
Removing the statement lets the popup form go to its natural size, covering the button.
2010-07-30 14:12:37 -07:00
Evan Prodromou
a01bc6b575 Merge branch 'googleadsadminpanel' into testing 2010-07-28 17:50:49 -04:00
Evan Prodromou
659e8b26ac add admin panel for Adsense 2010-07-28 17:50:36 -04:00
Matt Lee
163d7d60f8 updated copyright notice 2010-07-26 22:24:12 -04:00
Matt Lee
6b34a2111d GNU social plugin (for look/feel), theme, template 2010-07-26 22:05:33 -04:00
Evan Prodromou
d73feb82d8 cache sitemap notice and user counts for 4h 2010-07-14 10:38:34 -04:00
Brion Vibber
1339f1f908 Commit hubprepqueuehandler.php -- fix for OStatus bulk output. 2010-07-12 14:24:43 -07:00
Brion Vibber
d645b342ac Commit hubprepqueuehandler.php -- fix for OStatus bulk output. 2010-07-12 14:22:36 -07:00
Evan Prodromou
bb2f5defd5 remove debugging statement and add a bit of output to updatecounts 2010-07-10 09:58:27 -04:00
Evan Prodromou
d53d0f7908 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-07-10 09:51:49 -04:00
Evan Prodromou
869ebb7dc7 script to fill counts table from command line 2010-07-09 17:50:14 -04:00
Zach Copley
4c5098cd32 Handle the case where a screen name has shifted from one Twitter ID to another 2010-07-08 21:17:11 +00:00
Evan Prodromou
7746611f20 create an index on user.created so sitemap generation is faster 2010-07-05 14:12:14 -04:00
Brion Vibber
21f253c584 Fix regression in OStatus remote group subscribe -- a bug was previously masked silently (call to nonexistent getProfileUrl() method on User_group -- now replaced with homeUrl() which does the thing we wanted here) 2010-06-29 10:31:30 -04:00
Brion Vibber
00e129b013 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-26 10:18:03 -04:00
Brion Vibber
696e4ba393 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OpenID/openidserver.php (cleaned up mismatched comment)
2010-06-26 10:17:36 -04:00
Brion Vibber
d9e56e15cc Merge branch 'master' into testing 2010-06-26 10:16:27 -04:00
Brion Vibber
a6408be566 Regression fix for Recaptcha on SSL registration page; their API is served on a different hostname for SSL. 2010-06-24 15:21:04 +00:00
Brion Vibber
2e98a48f2b RecaptchaPlugin: fix for missing captcha on iPhone/Android.
MobileProfile serves pages out to iPhone and Android as application/xhtml+xml, which doesn't work with the default we we were loading recaptcha (as it used document.write). Switched to filling out a <div> from the AJAX API, which doesn't use document.write in the XHTML context.

Tested that view & submission works ok in following browsers:
Mobile: iPhone 3.1, Android 2.1, iPad 3.2 (this last doesn't trigger mobile theme tweaks)
Ubuntu 10.04: Firefox 3.6.3, Chrome 6
Mac 10.6: Safari 5/OS X 10.6.4
Windows 7: IE 8, Opera 10.56
2010-06-20 19:30:12 +00:00
Brion Vibber
d65d982681 Merge branch 'master' into testing 2010-06-16 12:37:14 -07:00
Brion Vibber
ce7176d987 Switch OpenID server's redirects from 307 to 303 to avoid prompt for form data resubmission if we were sent here from a POST request, such as when verifying the site for the first time doing an OpenID login from Drupal. 2010-06-16 12:30:37 -07:00
Brion Vibber
a1b25b46bc Merge branch 'master' into testing 2010-06-14 10:53:22 -07:00
Evan Prodromou
bfbebe5977 admin panel for setting site-claim metadata 2010-06-13 15:23:23 -04:00
Evan Prodromou
4b750b75da show site claim keys on top page 2010-06-13 14:58:06 -04:00