Commit Graph

9191 Commits

Author SHA1 Message Date
Evan Prodromou
90a2563a90 Merge branch 'master' into 0.9.x
Conflicts:
	classes/Memcached_DataObject.php
2010-01-02 19:47:34 -10:00
Evan Prodromou
d32fb7c7c4 return false from Memcached_DataObject::staticGet() on not found, like DB_DataObject 2010-01-02 16:28:46 -10:00
Evan Prodromou
3b912ac97e fixup memcache functions 2010-01-02 16:27:04 -10:00
Evan Prodromou
2bd32dfad7 change harmless check of to check of in Memcached_DataObject 2010-01-02 16:21:19 -10:00
Sarven Capadisli
94af0d1279 Fix end tag 2010-01-03 02:07:55 +00:00
Sarven Capadisli
467ae9d9e7 Button should return false 2010-01-03 02:00:12 +00:00
Sarven Capadisli
aef31280f3 Moved location container's buttons inside enabled state 2010-01-03 01:48:41 +00:00
Sarven Capadisli
4983564949 Reset location icon when container button.close is clicked 2010-01-03 01:17:51 +00:00
Sarven Capadisli
0a07aeb25a Updated pin icon 2010-01-03 01:13:42 +00:00
Sarven Capadisli
503d0acd49 Added minimize functionality to selected location container 2010-01-03 01:02:32 +00:00
Sarven Capadisli
ec5850d26a Changed location share representation to be more like the file
attachment. Init UI. Probably a little buggy.
2010-01-03 00:33:41 +00:00
Evan Prodromou
52fbd10162 incorrectly used empty() instead of isset() for a variable that could be 0 2010-01-02 08:36:47 -10:00
Sarven Capadisli
f990237c03 Don't need margin-bottom for share location option 2010-01-01 22:49:42 +00:00
Evan Prodromou
2851296c8d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-01 11:30:44 -10:00
Evan Prodromou
d2bbf65f19 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-01-01 11:27:28 -10:00
Evan Prodromou
79c2e3f720 Revert "add cleanup method to cleanup a single row"
This reverts commit b0527801d9.
2010-01-01 11:27:13 -10:00
Evan Prodromou
e33b9a8ab8 Merge branch 'master' into batchlocation 2010-01-01 11:26:50 -10:00
Evan Prodromou
a9d8359208 Merge branch 'master' into 0.9.x
Conflicts:
	classes/Memcached_DataObject.php
2010-01-01 11:20:25 -10:00
Sarven Capadisli
1b3917c6a7 Included geotag icon file separately 2010-01-01 21:12:49 +00:00
Sarven Capadisli
e6ea91a84b Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-01 21:12:22 +00:00
Sarven Capadisli
f6ab4ea136 Added geotag icon from http://www.geotagicons.com/ 2010-01-01 21:11:32 +00:00
Evan Prodromou
b0527801d9 add cleanup method to cleanup a single row 2010-01-01 11:02:56 -10:00
Evan Prodromou
727978332a stop using DB_DataObject's staticGet() which caches 2010-01-01 10:57:22 -10:00
Siebrand Mazeland
c11b339dc3 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-01 19:20:12 +01:00
Zach Copley
e6c8f6a8f8 Removed crazy redundant broadcasting of notices by the FB app 2009-12-31 22:53:46 +00:00
Zach Copley
962eed904c - Use a stripped down new notice form for FB app because FB canvas apps
can't support image upload via multipart/form-data (and location sharing
  is iffy).
- Deal with new error code 100 from Facebook, which seem to be for
  inactive accounts.
2009-12-31 22:39:01 +00:00
Zach Copley
5621f85835 Change inline CSS stylesheet to be on a single line so it doens't blow out syntax highlighting in my editor 2009-12-31 22:39:01 +00:00
Zach Copley
450cd6774a Update to external Facebook libs 2009-12-31 22:39:01 +00:00
Evan Prodromou
55ba858e8c Script to update the location ID for users
Since we added locations to the database, some users may have
location strings in their profiles but not structured locations. This
script updates the locations for single users or for all users.
2009-12-31 12:38:58 -10:00
Evan Prodromou
053b8c600d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-31 09:14:55 -10:00
Evan Prodromou
ac7a1387ba some formatting changes to make inblobs work 2009-12-31 09:09:07 -10:00
Sarven Capadisli
01dbee2ba5 Initial UI for geo location share option in notice form 2009-12-31 18:41:10 +00:00
Sarven Capadisli
9496f2735e Moving notice_data-location_wrap after notice form fieldset 2009-12-31 18:27:05 +00:00
Sarven Capadisli
dde6415a6a Moved JavaScript dependant stuff out of noticeform. 2009-12-31 18:08:21 +00:00
Sarven Capadisli
e84bf0aa98 jQuery select SN.C.S.NoticeLocationName once. 2009-12-31 17:02:02 +00:00
Sarven Capadisli
8872d91483 Removed style information out of HTML 2009-12-31 16:44:24 +00:00
Sarven Capadisli
5a66d27637 Using semicolon to seperate lat and long; RFC2426 2009-12-31 16:37:46 +00:00
Sarven Capadisli
ccf78976a5 NoticeLocationAttach() slightly more readable 2009-12-31 16:34:07 +00:00
Sarven Capadisli
58465d74ba Compare by type 2009-12-31 16:25:51 +00:00
Sarven Capadisli
e06292c2a2 If UA doens't support navigation.geolocation or have JavaScript
enabled, the user should still be able to enable/disable their share
location setting per notice.
2009-12-31 16:19:49 +00:00
Sarven Capadisli
5103cb670a length is faster than size() 2009-12-31 16:15:24 +00:00
Sarven Capadisli
0320bf2fb3 Use the location setting profile as secondary 2009-12-31 15:46:43 +00:00
Sarven Capadisli
8e6a8961d9 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-12-31 14:37:23 +00:00
Sarven Capadisli
c986f59143 If user is sharing their location (based on profile setting), then
enable it for form notice by default. This can be overriden by the
cookie to preserve states.
2009-12-31 14:34:07 +00:00
Sarven Capadisli
4efa841ba3 If user doesn't want to share their location (which is globally set
from their profile settings), don't bother to output form data for
lat/long in the notice form.
2009-12-31 14:24:27 +00:00
Sarven Capadisli
923e27b01a Fix to grab and use the actual lat/lon values from the user profile 2009-12-31 14:23:11 +00:00
Sarven Capadisli
5871480844 Moved shareLocation data from formActions() to formData() 2009-12-31 12:52:39 +00:00
Sarven Capadisli
4985582880 Fixed Event end name 2009-12-31 12:43:33 +00:00
Brion Vibber
89cca01259 Take Memcached_DataObject destructor back out to check whether it might be causing some under-the-hood problems. 2009-12-30 16:42:57 -08:00
Brion Vibber
ff50c2b91d Revert debugging code 2009-12-30 16:40:59 -08:00