Commit Graph

745 Commits

Author SHA1 Message Date
Ian Denhardt
e36399974e Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
Conflicts:
	lib/action.php
	plugins/OStatus/actions/ostatusinit.php
2010-12-20 15:19:33 -05:00
Brion Vibber
9df856e667 Merge branch '0.9.x' into merge
Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
Matt Lee
46e5df0996 remove a little more stuff 2010-12-07 10:52:37 -05:00
Matt Lee
857c360e7e remove some stuff for now 2010-12-07 10:49:19 -05:00
Matt Lee
bcb7832fc5 updated CSS, added feedback button 2010-12-06 15:56:26 -05:00
Matt Lee
2be56cf354 don't want to hide that 2010-12-01 11:37:17 -05:00
Matt Lee
59b6d46271 updated 2010-11-29 16:27:54 -05:00
Matt Lee
0fd7b4aa61 updated 2010-11-29 16:24:04 -05:00
Matt Lee
10c9e664f5 updated 2010-11-29 16:03:15 -05:00
Matt Lee
fb2814e449 updated 2010-11-29 15:49:57 -05:00
Matt Lee
6a2d38a0d7 updated 2010-11-29 15:49:07 -05:00
Matt Lee
4fecb9e662 updated 2010-11-29 15:46:13 -05:00
Matt Lee
85c2cf6422 updated 2010-11-29 15:44:42 -05:00
Matt Lee
957973d6f8 updated 2010-11-29 15:43:36 -05:00
Matt Lee
f7ea7f8121 updated 2010-11-29 15:42:23 -05:00
Matt Lee
7c988b51ed updated 2010-11-29 15:41:33 -05:00
Matt Lee
c34038a9ac updated 2010-11-29 15:40:29 -05:00
Matt Lee
51d900e245 updated 2010-11-29 15:39:45 -05:00
Matt Lee
aa20d36c40 updated 2010-11-29 15:37:48 -05:00
Matt Lee
c58e4ea299 updated 2010-11-29 15:36:13 -05:00
Matt Lee
fd8861dc7d updated 2010-11-29 15:34:26 -05:00
Matt Lee
734b8e2c3f updated 2010-11-29 15:33:05 -05:00
Matt Lee
299960a472 updated 2010-11-29 15:31:42 -05:00
Matt Lee
b881cc25cf updated 2010-11-29 15:30:21 -05:00
Matt Lee
7e16376025 updated 2010-11-29 15:27:21 -05:00
Matt Lee
faad577458 updated 2010-11-29 15:25:54 -05:00
Matt Lee
988c1af425 updated 2010-11-29 15:23:51 -05:00
Matt Lee
e62877126f don't float 2010-11-29 15:21:54 -05:00
Matt Lee
d52384119e bring back some stuff 2010-11-29 15:21:04 -05:00
Matt Lee
deb3b1068f remove profile box entirely 2010-11-29 15:18:24 -05:00
Matt Lee
44477a7063 added copyright, updated 2010-11-29 15:08:01 -05:00
Matt Lee
021a403898 updated 2010-11-29 15:03:01 -05:00
Matt Lee
1567879609 more things go away 2010-11-29 14:59:19 -05:00
Matt Lee
75b044faf0 more updates, styling, for single user gnu social instance 2010-11-29 14:57:32 -05:00
Matt Lee
710f2928c1 more updates 2010-11-29 14:52:39 -05:00
Matt Lee
4ee21a5164 hide a little more on the profile 2010-11-29 14:46:16 -05:00
Brion Vibber
5a3d01423d Cleanup on the CSS for inline attachments; removed some unneeded changes since the split of the inline and regular attachment lists. Removing commented-out code that seems to be for some old thumbnailing system where the thumbnails were hidden popups within the core text (wtf!) 2010-11-09 16:28:33 -08:00
Brion Vibber
f25accc43e split out InlineAttachmentList from AttachmentList 2010-11-09 10:45:19 -08:00
Brion Vibber
551b196a35 doomy doom doom 2010-11-08 15:32:41 -08:00
Brion Vibber
ca489631db Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
Samantha Doherty
01637bcd32 Base theme styling for oauth pin and desktop mode. 2010-10-25 16:00:34 -04:00
Samantha Doherty
16aec72984 Wee fixin for overflowing notice content in sidebar. 2010-10-20 19:18:21 -04:00
Samantha Doherty
d464ebfc12 Quick fix for wee regression in entity_action button hover states. 2010-10-19 21:33:56 -04:00
Brion Vibber
3593f3f132 Merge branch '0.9.x' into 1.0.x 2010-10-19 15:18:07 -07:00
Samantha Doherty
fd55eef795 Just a little more mobile stylin. 2010-10-19 14:08:01 -04:00
Samantha Doherty
f6bf804f1a Quick mobile stylesheet for shiny theme. 2010-10-19 12:27:50 -04:00
Samantha Doherty
e5ae754020 Big updates for themes rebase, clean, and shiny. A few more adjustments to come for 0.9.6, time (probably not) permitting. 2010-10-19 11:07:53 -04:00
Brion Vibber
6c959c83ce Merge branch '0.9.x' into 1.0.x 2010-10-07 13:32:26 -07:00
Samantha Doherty
1ad8c67843 A few quick theme fixes, mostly for IE. Full update to follow. 2010-10-06 16:30:43 -04:00
Brion Vibber
8ff45823ba Merge branch '0.9.x' into 1.0.x 2010-10-05 11:40:49 -07:00