Commit Graph

2006 Commits

Author SHA1 Message Date
Siebrand Mazeland
2b16baa76a Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-11-08 23:36:53 +01:00
Brion Vibber
2917fad209 Revert "More precise field label"
This reverts commit 6483fbd8fa.

"SMS address" header here makes no sense; it would be inconsistent with the other tabs and headings on the same and related pages, and would look very awkward with another giant "SMS" right above it
2009-11-08 23:35:12 +01: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
Brion Vibber
c7961fe6dc Revert "More specifics on 'address'"
This reverts commit 1872d07602.

"instant messages address" is very awkward phrasing; prefer not to be changing UI in such ways while updating localisations.
2009-11-08 23:26:16 +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
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
43132eb55e Several updates to UI messages 2009-11-08 22:45:18 +01:00
Siebrand Mazeland
1872d07602 More specifics on 'address' 2009-11-08 22:37:09 +01:00
Siebrand Mazeland
6483fbd8fa More precise field label 2009-11-08 22:34:52 +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
1de9496c7f fix constant for deleteothersnotice 2009-11-07 22:26:03 -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
Craig Andrews
d6ddb84132 Add ChangePassword event 2009-11-05 23:27:18 -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
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
f28795656f Remove ugly debugging statements 2009-11-04 21:08:47 -08:00
Zach Copley
527427d3e0 Implement update avatar via API (/api/account/update_profile_image.format) 2009-11-04 21:00:26 -08:00
Shashi
b12caedb88 Widgetized user profile rendering. 2009-11-04 18:41:17 +05:30
Brion Vibber
70a950c79f Bug 1817: undefined property in registration form
http://status.net/trac/ticket/1817
2009-11-03 15:23:28 -08:00
Zach Copley
1e6aff69d6 Fix reference to sources class variable 2009-11-03 09:41:36 -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
Sarven Capadisli
f3287bd113 Updated XHR output to match newnotice 2009-11-01 10:42:28 +00: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
d7da76ab6d Revert "Revert "Actually commit the file this time""
This reverts commit ba89c89176.
2009-10-31 14:43:13 -04:00
Evan Prodromou
4e9ec0d0e1 merge from testing 2009-10-31 14:36:04 -04:00
Evan Prodromou
ba89c89176 Revert "Actually commit the file this time"
This reverts commit 3f06bfc042.
2009-10-31 14:32:15 -04:00
Sarven Capadisli
f9bb95174b Added XHR for direct messages. 2009-10-31 16:14:38 +01:00
Sarven Capadisli
a2302e5b76 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-30 21:45:22 +00:00
Sarven Capadisli
dcca9fbec0 IE has some issue with notices that are sent with file attachments. It
doesn't like the XHR response with XHTML DTD. New notices without the
file attachment work fine.

The rendered content (the anchor for the file attachment link) doesn't
appear to be the issue.

To fix this problem, I removed the XHTML DTD line from newnotice's XHR
response. This is unnecessary for text/xml outputs that's intended
for XHR responses any way. It just happens to fix an IE issue.

Still a mystery to me as to why it is particular to notices with file
attachments.
2009-10-30 21:44:31 +00:00
Sarven Capadisli
db9aef9f67 IE has some issue with notices that are sent with file attachments. It
doesn't like the XHR response with XHTML DTD. New notices without the
file attachment work fine.

The rendered content (the anchor for the file attachment link) doesn't
appear to be the issue.

To fix this problem, I removed the XHTML DTD line from newnotice's XHR
response. This is unnecessary for text/xml outputs that's intended
for XHR responses any way. It just happens to fix an IE issue.

Still a mystery to me as to why it is particular to notices with file
attachments.
2009-10-30 21:31:11 +00:00
Brion Vibber
b7ed31c27b Use nickname from profile, not user object, to avoid barfing warnings on Twitter messages imported into the timeline. 2009-10-30 16:55:47 -04:00
Craig Andrews
fc22bde67c Redirect to login when trying to send a direct message while not logged in.
http://status.net/trac/ticket/1359
2009-10-30 16:01:20 -04:00
Craig Andrews
35ace5562d Fix feed links which were broken when the API was restructured 2009-10-29 19:09:42 -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
Evan Prodromou
c911c66fe1 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-29 14:34:33 -04:00
Evan Prodromou
e88dd2d087 fix uninitialized variables in showstream.php 2009-10-29 14:34:08 -04:00
Brion Vibber
201cbb56b6 Don't spew warnings for URL shortener plugins that don't declare if they're free services. 2009-10-29 14:29:52 -04:00
Sarven Capadisli
968389fb45 Don't include site in gettext 2009-10-29 13:24:06 +01: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
03a1436a1c Trap ClientExceptions from media upload process and hand them off to API error handler 2009-10-28 17:29:21 -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