Evan Prodromou
1f5f5474f1
Merge branch '0.9.x' into adminpanel
2009-11-10 16:27:23 -05:00
Evan Prodromou
27e6a3f36f
add lat and long parameters to api/statuses/update
2009-11-10 15:36:55 -05:00
Brion Vibber
333c376c95
Merge remote branch 'statusnet/0.9.x' into 0.9.x
2009-11-10 06:44:53 -08:00
Sarven Capadisli
91da72ede0
Updated block @title text (shouldn't say from group)
2009-11-10 13:09:15 +00:00
Sarven Capadisli
2f3e414cd1
Updated group block markup
2009-11-10 13:08:58 +00: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
badd8cccca
add registration restrictions and privacy to site admin panel
2009-11-08 22:21:28 -05:00
Evan Prodromou
33f931d527
add default language to site admin panel
2009-11-08 22:12:12 -05:00
Evan Prodromou
977d5d6f85
add default timezone to site admin panel
2009-11-08 22:03:34 -05:00
Evan Prodromou
691beefd0f
Merge branch '0.9.x' into adminpanel
2009-11-08 21:41:43 -05:00
Evan Prodromou
76b0e6e6f4
Merge branch '0.9.x' into adminpanel
2009-11-08 21:23:09 -05:00
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
Evan Prodromou
7ee9737ef6
incorrectly saving wrong values in siteadminpanel
2009-11-08 16:27:19 -05: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
2f770cecf9
add some more fields to site admin panel
2009-11-08 15:48:05 -05:00
Evan Prodromou
d0466da80b
add site admin panel
2009-11-07 23:17:52 -05: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