Commit Graph

19820 Commits

Author SHA1 Message Date
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
Brenda Wallace
bcdf31c639 added all them doxygens 2009-10-04 11:14:26 +13:00
Sarven Capadisli
d1a5a49875 Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into 0.8.x 2009-10-03 22:07:41 +00:00
Sarven Capadisli
5528c0cd3d Using CDATA for autofocus script 2009-10-03 22:06:51 +00:00
Sarven Capadisli
f344a49b11 Don't show .aside 2009-10-03 21:29:14 +00:00
Sarven Capadisli
12d4ecd73c Merge branch '0.9.x-mobile' of git@gitorious.org:~csarven/statusnet/csarven-clone into 0.9.x-mobile 2009-10-03 22:28:50 +02:00
Sarven Capadisli
63700f7958 Minor correction to public variable name 2009-10-03 20:22:40 +00:00
Sarven Capadisli
604cfd8b11 Updated comment about browser sniffing 2009-10-03 20:17:26 +00:00
Sarven Capadisli
2e8fcd7059 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-03 20:50:21 +02:00
Sarven Capadisli
36744771da Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile 2009-10-03 13:37:53 +00:00
Brenda Wallace
00c0becd56 more doxygen 2009-10-03 17:48:38 +13:00
Brenda Wallace
852f0c59a4 added doxygen 2009-10-03 17:40:53 +13:00
Brenda Wallace
0743ca1259 indent fix 2009-10-03 17:36:53 +13:00