Commit Graph

5810 Commits

Author SHA1 Message Date
Zach Copley
2b7d8d0c29 Merge branch '0.9.x' into refactor-api
* 0.9.x: (23 commits)
  Added hook to wrap the notice form data block
  Unnecessary selector bit
  Removed obsolete iphone theme (pre v0.7)
  remove spurious readme from Orbited
  need to show scripts at end of body in RealtimePlugin
  Some changes required from Orbited debugging
  Update OrbitedPlugin to work with RealtimePlugin framework
  updated OrbitedPlugin to use RealtimePlugin
  remove unused files for OrbitedPlugin
  rename plugin
  copy Comet plugin to Orbited
  move scripts to just before </body>, add event for scripts that need to be in <head>
  reformat Notice.php
  added all them doxygens
  Using CDATA for autofocus script
  more doxygen
  added doxygen
  indent fix
  better handling of y response in deleteuser.php
  script to permanently delete a user
  ...
2009-10-05 10:05:43 -07:00
Zach Copley
ee207ffd8b Routes for friendships actions 2009-10-05 10:04:35 -07:00
Zach Copley
4ed8055f86 New actions for managing subscriptions (friendships) 2009-10-05 10:03:12 -07:00
Sarven Capadisli
e224da0bf6 Init styles for form_notice 2009-10-05 16:59:41 +00:00
Eric Helgeson
aeca8807db Open tags should have closing tags 2009-10-05 12:55:55 -04:00
Brion Vibber
c0feb550b0 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-10-05 09:01:51 -07:00
Sarven Capadisli
9898a38b34 No longer need to style 2009-10-05 15:46:32 +00:00
Sarven Capadisli
7b4d138946 Init showNoticeFormData 2009-10-05 14:42:11 +00:00
Sarven Capadisli
d6600b0007 Merge branch '0.9.x' into 0.9.x-mobile 2009-10-05 14:18:29 +00:00
Sarven Capadisli
7a33125a6c Added hook to wrap the notice form data block 2009-10-05 14:17:55 +00:00
Sarven Capadisli
676f681d22 Init mobile profile screen stylesheet. It reuses base and identica
themes. The handheld stylesheet could import this stylesheet as well.
2009-10-05 11:04:32 +00:00
Sarven Capadisli
5c01501f55 Minor correction 2009-10-05 10:29:34 +00:00
Sarven Capadisli
1ccfb5d9d3 Merge branch '0.9.x-mobile' of git@gitorious.org:~csarven/statusnet/csarven-clone into 0.9.x-mobile 2009-10-05 10:28:53 +00:00
Sarven Capadisli
b9622999f8 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-05 10:28:34 +00:00
Brion Vibber
4462a1c636 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-10-04 16:16:52 -07:00
Sarven Capadisli
acda8d4c79 Init showPrimaryNav 2009-10-04 22:16:59 +00:00
Sarven Capadisli
75170b60b6 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-04 21:53:33 +00:00
Sarven Capadisli
2f065d687d Unnecessary selector bit 2009-10-04 23:53:02 +02:00
Sarven Capadisli
a4e972482f Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-04 23:50:55 +02:00
Sarven Capadisli
479a5e74a3 Removed site_notice and anon_notice from output because this
information is not particularly crucial for the mobile user.
2009-10-04 21:42:38 +00:00
Sarven Capadisli
3c9f177c03 Stop output after showing header 2009-10-04 21:37:24 +00:00
Sarven Capadisli
d001c5f4b1 Init showLogo 2009-10-04 21:37:05 +00:00
Sarven Capadisli
5087a24c48 Init showHeader 2009-10-04 21:09:16 +00:00
Sarven Capadisli
fe4a49d4a5 If they are not on the mobile site or not interested in getting the
mobile profile, then give them the regular output.
2009-10-04 20:53:30 +00:00
Sarven Capadisli
3ee1af9aaa Minor adjustment to indenting 2009-10-04 20:43:52 +00:00
Sarven Capadisli
ef7e4cb72d If not meant to serveMobile, show the default styles 2009-10-04 20:42:03 +00:00
Sarven Capadisli
62400b8c89 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-04 16:53:15 +00:00
Sarven Capadisli
df8cce2788 Removed obsolete iphone theme (pre v0.7) 2009-10-04 16:51:43 +00:00
Sarven Capadisli
a7bed6f7d9 Added custom showHead 2009-10-04 16:50:53 +00:00
Sarven Capadisli
de2c4e36bc Mobile Profile plugin will use the identica theme for now 2009-10-04 16:33:52 +00:00
Sarven Capadisli
7addccacaa Added ability to define mobile stylesheets (handheld, screen) at the
theme level. If there are no mobile stylesheets in the theme
directory, it will use the ones that come with the plugin.
2009-10-04 16:26:04 +00:00
Sarven Capadisli
c64e1792bf Fixed redirect. Added common_path for mobileserver 2009-10-04 13:58:29 +00:00
Sarven Capadisli
960207c81e Don't redirect if mobile server is same as site server 2009-10-04 13:27:46 +00:00
Sarven Capadisli
c600d38467 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-04 13:15:36 +02:00
Sarven Capadisli
d13a9ae11c Merge branch '0.9.x-mobile' of git@gitorious.org:~csarven/statusnet/csarven-clone into 0.9.x-mobile 2009-10-04 11:13:08 +00:00
Sarven Capadisli
54e8f583ac Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-04 11:12:42 +00:00
Evan Prodromou
affe00276a remove spurious readme from Orbited 2009-10-04 04:11:10 -04:00
Evan Prodromou
650d2e2f8e Merge branch 'orbited' into 0.9.x 2009-10-04 04:10:24 -04:00
Evan Prodromou
091e7b908b need to show scripts at end of body in RealtimePlugin 2009-10-04 04:10:15 -04:00
Evan Prodromou
27ff66c9de Some changes required from Orbited debugging 2009-10-04 04:05:40 -04:00
Sarven Capadisli
5ebed4d24d Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-04 10:02:03 +02:00
Sarven Capadisli
e87a70e20b Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-04 10:01:53 +02:00
Evan Prodromou
035978270d Update OrbitedPlugin to work with RealtimePlugin framework 2009-10-04 03:15:59 -04:00
Evan Prodromou
9c2d0879e9 updated OrbitedPlugin to use RealtimePlugin 2009-10-04 03:15:59 -04:00
Evan Prodromou
630dcda56f remove unused files for OrbitedPlugin 2009-10-04 03:15:59 -04:00
Evan Prodromou
0d6314052f rename plugin 2009-10-04 03:15:59 -04:00
Evan Prodromou
22b4a66de3 copy Comet plugin to Orbited 2009-10-04 03:15:59 -04:00
Evan Prodromou
9c460d591e move scripts to just before </body>, add event for scripts that need to be in <head> 2009-10-04 03:14:39 -04:00
Evan Prodromou
c5047fd90a Merge branch '0.8.x' into 0.9.x
Conflicts:
	classes/Profile.php
2009-10-04 03:07:37 -04:00
Evan Prodromou
18f4a7eaea reformat Notice.php 2009-10-03 20:34:40 -04:00