Evan Prodromou
a1e5996404
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
scripts/setconfig.php
2009-12-28 15:50:41 -08:00
Evan Prodromou
e119362fde
Merge branch 'locshunt' into 0.9.x
2009-12-28 15:49:27 -08:00
Evan Prodromou
98a579fedf
Merge branch 'master' into 0.9.x
2009-12-28 15:49:14 -08:00
Evan Prodromou
ca6669538a
Move location-argument-handling code into a single function
...
Moved the important parts of the location-argument-handling stuff
to a single function. Handles defaults and overrides correctly, and
easy to use. Changed Web and API channels to use it.
2009-12-28 15:13:15 -08:00
Evan Prodromou
e009f613d3
let users set location prefs from profile form
2009-12-28 14:44:05 -08:00
Evan Prodromou
39bdda9c7e
More configuration options for location sharing
2009-12-28 14:43:34 -08:00
Evan Prodromou
29a1669c01
user_id is primary key for user_location_prefs
2009-12-28 14:43:14 -08:00
Evan Prodromou
bb93d6b1c7
remove namespace setting from location; it's unused
2009-12-28 14:21:07 -08:00
Evan Prodromou
bbf516b965
turn off exe bits
2009-12-28 13:59:31 -08:00
Evan Prodromou
c326824135
add user-location-prefs data objects
2009-12-28 13:59:03 -08:00
Evan Prodromou
b141f7aea5
Add user_location_prefs to upgrade script
2009-12-28 13:54:09 -08:00
Evan Prodromou
8d4e617d4e
add table user_location_prefs
2009-12-28 13:53:28 -08:00
Evan Prodromou
fa3301cf84
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2009-12-28 12:45:22 -08:00
Evan Prodromou
dd0aaac70e
First version of blacklist plugin
...
First version of blacklist plugin. Replaces custom code in identi.ca's
config.php, which was getting scary and long. Also correctly handles
changed nicknames or URLs in profile settings and using 'forbidden'
URLs in notice text.
2009-12-28 12:42:22 -08:00
Brion Vibber
749b8b5b8c
Drop the Google Client API-based AJAX geolocation lookup shim -- it fails to ask for user permission, causing us quite a bit of difficulty.
2009-12-28 12:29:01 -08:00
Brion Vibber
b5be659af0
Drop the Google Client API-based AJAX geolocation lookup shim -- it fails to ask for user permission, causing us quite a bit of difficulty.
2009-12-28 12:27:28 -08:00
Evan Prodromou
d9efeb6ac3
optionally flag a profile for review when blocked
2009-12-28 11:02:44 -08:00
Evan Prodromou
6d3e6b4284
move flag creation to a method of data object
2009-12-28 10:58:49 -08:00
Evan Prodromou
2ae04bb6d5
add events for unblocking a profile
2009-12-28 10:50:12 -08:00
Evan Prodromou
c5de326231
events for blocking a user
2009-12-28 10:42:55 -08:00
Evan Prodromou
c07f221040
check if other user exists before unsub
2009-12-28 10:42:31 -08:00
Evan Prodromou
a80fa17872
phpcs-clean User_flag_profile as best as possible
2009-12-28 09:15:07 -08:00
Evan Prodromou
4a5bac43c3
phpcs-clean flagprofile.php
2009-12-28 09:08:28 -08:00
Evan Prodromou
df98ddff0c
phpcs-clean clearflag.php
2009-12-28 09:06:38 -08:00
Evan Prodromou
c8fd5403e5
PHPCS-clean adminprofileflags.php
2009-12-28 08:45:21 -08:00
Evan Prodromou
ea23111a56
PHPCS-clean UserFlagPlugin
2009-12-28 08:37:30 -08:00
Evan Prodromou
85b8b35f53
clear flags and show flaggers in adminflagprofile
2009-12-28 08:19:56 -08:00
Evan Prodromou
2c2a82fda0
add stuff for clearing flags to UserFlagPlugin
2009-12-28 08:19:22 -08:00
Evan Prodromou
75fbec2fa3
Add tools to clear flags
...
Added a form to clear all flags for a profile, when showed on
adminprofileflags list. Add an action to handle the form, and a right
for the action.
2009-12-28 07:58:33 -08:00
Siebrand Mazeland
7ef5dd344c
Localisation updates for !StatusNet from !translatewiki.net !sntrans
2009-12-28 09:15:35 +01:00
Sarven Capadisli
ce8c69a49f
Adjusted showstream , shownotice notice max width
2009-12-27 16:50:48 -05:00
Evan Prodromou
4b7835caa5
pagination works for flagged profiles
2009-12-27 11:47:54 -08:00
Evan Prodromou
5d6b6bfd34
admin page checks for right to review flags
2009-12-27 11:04:53 -08:00
Siebrand Mazeland
f8764c02c9
Localisation updates for !StatusNet from !translatewiki.net !sntrans
2009-12-25 10:49:32 +01:00
Brion Vibber
99958de69d
chmod a+x setconfig.php
2009-12-24 16:53:44 -08:00
Evan Prodromou
78941f1161
add setconfig.php script to set configuration options
2009-12-24 16:53:29 -08:00
Zach Copley
1a462b04d7
Paths admin panel should not insist on an ssl server being specified,
...
ever.
2009-12-24 15:15:37 -08:00
Zach Copley
7f9b07d8c9
Move ssl settings from site admin panel to paths admin panel
2009-12-24 15:15:19 -08:00
Evan Prodromou
7160e11395
add setconfig.php script to set configuration options
2009-12-24 15:13:30 -08:00
Zach Copley
5f6df8c0c4
Paths admin panel should not insist on an ssl server being specified,
...
ever.
2009-12-24 16:50:28 -06:00
Zach Copley
4ed969a8ac
Move ssl settings from site admin panel to paths admin panel
2009-12-24 15:25:59 -06:00
Evan Prodromou
0bb65f8739
Merge branch 'geonamesxml' into 0.9.x
2009-12-23 15:53:58 -08:00
Evan Prodromou
3e9cc76da5
Merge branch 'master' into 0.9.x
2009-12-23 15:53:55 -08:00
Evan Prodromou
da5db060e8
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-12-23 14:31:56 -08:00
Sarven Capadisli
9c1103703f
Updated default theme to match identica theme's Repeat notice option styles
2009-12-23 16:01:43 -05:00
Sarven Capadisli
05c1ad8b32
Updated Repeat notice option submit button style
2009-12-23 15:59:31 -05:00
Sarven Capadisli
bc4f1824ea
Init UI for Repeat notice option confirmation dialog.
2009-12-23 15:42:37 -05:00
Evan Prodromou
c0f444f564
make sure Geonames API queries use correct arg separator
2009-12-23 12:16:22 -08:00
Evan Prodromou
cdc5052683
Convert Geonames plugin to use XML API instead of JSON
...
The XML API for Geonames contains much more detailed error information
than the JSON one. So, I've converted this plugin to use it instead.
It seems to be the preferred format for Geonames, so biting the bullet
on this makes sense.
2009-12-23 12:09:11 -08:00
Evan Prodromou
3262930ed4
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-12-23 10:31:27 -08:00
