Evan Prodromou
ad8ea98cd7
Merge branch 'locshunt2' into 0.9.x
...
Conflicts:
classes/User_location_prefs.php
2009-12-30 08:57:39 -10:00
Evan Prodromou
544e884d30
Add magic formula to keep DB_DataObject from treating location prefs pkey as autoincrement
2009-12-30 08:56:43 -10:00
Brion Vibber
96ce2262f8
If we got an identified location at ajax check time, renormalize lat/lon and naming. This'll match other displays of the names more consistently (Opera Plaza, San Francisco, CA, US instead of Opera Plaza, US)
2009-12-29 14:30:15 -08:00
Brion Vibber
45c9d3d729
Add progress output and optional --sleep-time parameter to triminboxes.php
2009-12-29 14:17:03 -08:00
Brion Vibber
e3850e5273
Add progress output and optional --sleep-time parameter to triminboxes.php
2009-12-29 14:16:22 -08:00
Craig Andrews
2cfa90c752
Revert "Revert "Drop the Google Client API-based AJAX geolocation lookup shim -- it fails to ask for user permission, causing us quite a bit of difficulty.""
...
This reverts commit 552de999bf
2009-12-29 17:12:52 -05:00
Craig Andrews
552de999bf
Revert "Drop the Google Client API-based AJAX geolocation lookup shim -- it fails to ask for user permission, causing us quite a bit of difficulty."
...
This reverts commit 749b8b5b8c
2009-12-29 16:19:33 -05:00
Craig Andrews
98ce7daf56
Implement user interface for user to preview what location they are sharing with a notice
2009-12-29 16:18:52 -05:00
Brion Vibber
0fb114c34f
Fix for saving user location preferences -- user_id field was marked as an auto-increment and wasn't getting saved with new inserts.
2009-12-29 12:49:28 -08:00
Evan Prodromou
a1b130541b
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2009-12-29 12:48:59 -08:00
Evan Prodromou
360fdb219d
don't show notices with deleted profiles
2009-12-29 12:25:41 -08:00
Evan Prodromou
05e2b4d92d
Merge branch 'master' into 0.9.x
2009-12-29 12:09:17 -08:00
Brion Vibber
e152bec282
Fix for saving user location preferences -- user_id field was marked as an auto-increment and wasn't getting saved with new inserts.
2009-12-29 11:46:10 -08:00
Evan Prodromou
45c4078ca9
notices are immutable, use created date for updated
2009-12-28 17:51:04 -08:00
Evan Prodromou
1e3fea17af
don't add flag if it's already there at block time
2009-12-28 16:35:29 -08:00
Evan Prodromou
e3789be03f
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:59:24 -08:00
Evan Prodromou
d96d1775d5
let users set location prefs from profile form
2009-12-28 15:59:09 -08:00
Evan Prodromou
97f611107a
More configuration options for location sharing
2009-12-28 15:58:58 -08:00
Evan Prodromou
6a6d88f0f4
user_id is primary key for user_location_prefs
2009-12-28 15:58:47 -08:00
Evan Prodromou
c1e3b2f032
remove namespace setting from location; it's unused
2009-12-28 15:58:05 -08:00
Evan Prodromou
33786b2c4e
turn off exe bits
2009-12-28 15:57:54 -08:00
Evan Prodromou
51a33dc66d
add user-location-prefs data objects
2009-12-28 15:57:38 -08:00
Evan Prodromou
f9ad0f596b
Add user_location_prefs to upgrade script
2009-12-28 15:57:17 -08:00
Evan Prodromou
a9d31da210
add table user_location_prefs
2009-12-28 15:57:04 -08:00
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
