Samantha Doherty
34d9c35885
Remove duplicate icons from base theme.
2011-08-27 10:49:18 -04:00
Samantha Doherty
c2d5c8cd39
A little more theme cleanup.
2011-08-27 07:58:20 -04:00
Samantha Doherty
41f06d96d4
Quick fix to make custom site logos work better.
2011-08-26 15:35:00 -04:00
Samantha Doherty
37bb0e6d20
Style cleanup for ostatus forms.
2011-08-26 12:51:55 -04:00
Samantha Doherty
a3769e4bf9
A few quick general form fixes.
2011-08-26 10:51:51 -04:00
Samantha Doherty
a0514281a0
Style for header search form.
2011-08-25 22:30:09 -04:00
Samantha Doherty
8ea5cd0cac
Check for existence of RTL stylesheets; placeholder files for base and neo themes.
2011-08-25 17:48:27 -04:00
Samantha Doherty
2dd13b071c
Update DirectionDetector style for 1.0 and move to base stylesheet.
2011-08-25 17:14:13 -04:00
Samantha Doherty
f0443aff1a
Style for Activity notices.
2011-08-25 16:24:54 -04:00
Zach Copley
3bdae5aed4
Link in additional stylesheet for RTL languages
2011-08-25 13:12:44 -07:00
Samantha Doherty
9814de76fe
Mobile Profile CSS for neo-light theme.
2011-08-25 12:30:21 -04:00
Samantha Doherty
c54b3311fd
Style cleanup for QnA.
2011-08-25 12:25:10 -04:00
Samantha Doherty
85aba15830
Style cleanup for Mobile Profile.
2011-08-25 12:24:09 -04:00
Samantha Doherty
c777267f95
Fixes for ajax submit button styles when in processing state.
2011-08-24 19:22:59 -04:00
Samantha Doherty
20f25912d4
A little style fixup for oauth applications.
2011-08-19 15:45:17 -04:00
Samantha Doherty
23e5f25d8d
Couple quick improvements for neo-blue theme.
2011-08-19 13:00:22 -04:00
Zach Copley
60a574ef28
Work improving the interface of the Event micro-app
...
Squashed commit of the following:
commit da50b6b0223fcbc42cf45d01a138f08930917e71
Author: Zach Copley <zach@status.net>
Date: Tue Aug 2 00:35:36 2011 -0700
If end time < start time reset the end time selection
commit 6dfc35579e8e4bd0af9d85fc46799bcc462c68b1
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 23:55:10 2011 -0700
Populate event dates with sensible defaults
commit 0bc8d726706cfdc0830687e7f40e941e61691191
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 23:29:46 2011 -0700
Recalculate times if user changes start or end date
commit 6a92a31429b4eb6f442eaf850d59dcc5b121e57f
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 23:03:46 2011 -0700
* Better date/time display
* Localize date and time display for user
commit 2bf344068a0eb6e3ed90efacbf33c85e7ee5edf7
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 15:56:21 2011 -0700
Reselect the end time after timelist update
commit 62fd0620eb5fcc94c240c0fc0b304aa17509de8d
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 14:40:14 2011 -0700
Fix bug in which end time was not properly in sync with start time + 30mins
commit 3c6bcfb2d962f3677082c468a29480d2a1813d73
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 12:37:00 2011 -0700
Pass exact URL of the timelist action to event.js
commit efc74841c5b588cdae686630a1b4c1448e5d742b
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 11:20:45 2011 -0700
Add Ajax error handling to new event action
commit 3085f4b3ed93bb930bff1bc475309b4d473ffc83
Author: Zach Copley <zach@status.net>
Date: Fri Jul 22 01:18:13 2011 -0700
Ajaxify event end-time selector
commit 8025c1d368d8f862b666702bfab08daf633a34ea
Author: Zach Copley <zach@status.net>
Date: Thu Jul 21 21:58:43 2011 -0700
Remove dead code
commit 5fbfff47297dea609a07d67a81d430f97f6698ef
Merge: bcd845d 3c926af
Author: Zach Copley <zach@status.net>
Date: Thu Jul 21 15:21:58 2011 -0700
Merge branch 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone into eventjs
* 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
Populate timei selection dropdowns and better CSS (thanks Sammy!)
Event start/end as dropdowns
Nothing to see here move along
Don't allow user to set crazy start and end dates
New event dates shouldn't ever be in the past, eh?
Move event microapp JavaScript into included .js file
Conflicts:
plugins/Event/event.js
plugins/Event/eventform.php
commit bcd845dc56c147c4ba10eedd43cc7aa799bc6a9a
Author: Zach Copley <zach@status.net>
Date: Thu Jul 21 15:11:19 2011 -0700
Move the helper functions for filling the start/end times to their own class
commit d246d39c4afbffb1e76cd561ab61f15dafd8a988
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 18:50:38 2011 -0700
Populate time selection dropdowns and better CSS (thanks Sammy!)
commit 0778533fef5500db79e40664c5b56aa7d9cc8357
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 15:54:27 2011 -0700
Event start/end as dropdowns
commit e800053fdf2cb12fc1f2eac72762d07571647aa8
Author: Zach Copley <zach@status.net>
Date: Tue Jul 19 14:12:01 2011 -0700
Nothing to see here move along
commit a85949b9cc4f3b5bb387785d4b7a717e9d952752
Author: Zach Copley <zach@status.net>
Date: Mon Jul 18 17:48:30 2011 -0700
Don't allow user to set crazy start and end dates
commit 87d1301ce8aa8877e753440dd52166bf857b29f3
Author: Zach Copley <zach@status.net>
Date: Sun Jul 17 22:31:24 2011 -0700
New event dates shouldn't ever be in the past, eh?
commit 7e05aa5fdc02bfec6107bcf8c748627216d51405
Author: Zach Copley <zach@status.net>
Date: Fri Jul 15 15:36:17 2011 -0700
Move event microapp JavaScript into included .js file
commit 3c926af287f80ee389b5bc8a4c1dcc5e0904a14c
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 18:50:38 2011 -0700
Populate time selection dropdowns and better CSS (thanks Sammy!)
commit af09c57d5132dba2a6a3e76974e38fdde6422c45
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 15:54:27 2011 -0700
Event start/end as dropdowns
commit b585215ed7deb4dc9d4bbc065d36b6e3f819d710
Author: Zach Copley <zach@status.net>
Date: Tue Jul 19 14:12:01 2011 -0700
Nothing to see here move along
commit e1d30ae9b80eded4ed7ef6bdd7515da64ae344de
Author: Zach Copley <zach@status.net>
Date: Mon Jul 18 17:48:30 2011 -0700
Don't allow user to set crazy start and end dates
commit ad7c99f021980b867f369066b4413bdb1e882986
Author: Zach Copley <zach@status.net>
Date: Sun Jul 17 22:31:24 2011 -0700
New event dates shouldn't ever be in the past, eh?
commit 4741f0a327e10e67fc04e2b816ed56351e38b4fa
Author: Zach Copley <zach@status.net>
Date: Fri Jul 15 15:36:17 2011 -0700
Move event microapp JavaScript into included .js file
2011-08-02 01:17:56 -07:00
Samantha Doherty
baf4102da7
Quick fix for hidden threaded-replies issue in Chrome.
2011-07-26 15:36:20 -04:00
Samantha Doherty
4f50274249
Just a few wee themefixes.
2011-07-26 15:20:51 -04:00
Samantha Doherty
bf2710e721
Couple of quick variations on neo theme.
2011-07-13 18:06:54 -04:00
Samantha Doherty
c4590ed8b4
Just a couple quick neo theme fixes.
2011-07-13 18:06:12 -04:00
Evan Prodromou
feb53619cf
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
js/util.min.js
2011-07-07 10:27:54 -04:00
Evan Prodromou
1c917ac28f
start making more menu work
2011-07-06 18:40:02 -04:00
Samantha Doherty
f0af9f45dd
Big round of fixups for base and neo themes.
2011-07-06 12:50:42 -04:00
Evan Prodromou
e5d8fd6857
Add Activity Streams feeds to export data
2011-06-22 17:09:04 -04:00
Samantha Doherty
87c83de623
Style for SNOD company logo plugin temporarily goes here.
2011-06-09 20:22:18 -04:00
Samantha Doherty
e499939c6c
Bit of style cleanup for design settings fixes.
2011-06-06 17:08:05 -04:00
Samantha Doherty
5791697bb0
Oops; tiny mistake in IE7 addressee stylin.
2011-05-31 12:48:59 -04:00
Samantha Doherty
dddb6185f3
Last bit of style cleanup for addressees and mobile profile.
2011-05-31 12:42:28 -04:00
Samantha Doherty
1264db7f78
A little more style fixing for MobileProfile.
2011-05-27 12:07:24 -04:00
Ian Denhardt
2e4ec0df0e
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
2011-05-27 11:28:47 -04:00
Samantha Doherty
ba55d4d010
First batch of IE fixes.
2011-05-24 12:56:49 -04:00
Ian Denhardt
31b29fde50
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
plugins/OStatus/actions/ostatusinit.php
2011-05-23 21:50:48 -04:00
Samantha Doherty
1a165a5636
Interim style update for mobile profile.
2011-05-18 14:36:05 -04:00
Samantha Doherty
4549d36862
Change addressees arrow from hardcoded to CSS.
2011-05-18 09:49:01 -04:00
Samantha Doherty
f44e0330df
Style for fancy invite form item controls.
2011-05-11 20:12:32 -04:00
Samantha Doherty
37cf7c0e8c
Style for invite forms and width fix for Onboard popup.
2011-05-11 17:07:08 -04:00
Samantha Doherty
07d9832ce9
More stylin for user and group directories.
2011-05-05 15:59:15 -04:00
Samantha Doherty
daf1a4046b
Style for Onboard plugin and a few new graphics.
2011-05-01 14:09:44 -04:00
Samantha Doherty
14389414b6
Fix for long local nav items.
2011-04-25 12:42:17 -04:00
Samantha Doherty
1a86d8dd12
Fix vertical alignment for feed icons.
2011-04-25 12:25:14 -04:00
Samantha Doherty
a2a8f88de1
Style for QnA, plus a bit of general cleanup for notices and threaded-replies.
2011-04-25 11:47:06 -04:00
Samantha Doherty
1870bc0da6
Bit of style cleanup for search.
2011-04-25 10:53:32 -04:00
Evan Prodromou
12723f2dc6
better output for bookmark list item
2011-04-20 06:34:27 -04:00
Samantha Doherty
45a2fdefea
Style updates for notice forms.
2011-04-18 11:51:38 -04:00
Samantha Doherty
9bfb7f0888
Style for invite button.
2011-04-15 02:29:01 -04:00
Samantha Doherty
acaf86c973
Include Lato font in neo theme.
2011-04-14 23:20:49 -04:00
Samantha Doherty
603fc33eb3
Style for reduced avatar lists in aside.
2011-04-14 15:19:18 -04:00
Samantha Doherty
b511b59f15
Quick style fixup for realtime popup.
2011-04-14 02:57:34 -04:00
Samantha Doherty
3638f296a2
Remove privacy marker from non-private replies to private notices.
2011-04-11 13:39:46 -04:00
Samantha Doherty
73c28cc66c
Localnav-type style for object nav.
2011-04-11 10:05:36 -04:00
Samantha Doherty
13e2acaf5c
Formatting for profile/group account blocks and entity action buttons.
2011-04-11 10:05:36 -04:00
Samantha Doherty
2a546e0eeb
Replacing old base theme with rebase theme.
2011-04-11 08:07:37 -04:00
Shashi Gowda
f47027abbe
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
lib/profileblock.php
theme/default/css/display.css
2011-04-09 21:57:45 +05:30
Evan Prodromou
af02de01e5
Remove incompatible theme victorian
2011-04-08 17:08:29 -04:00
Evan Prodromou
53df5470e8
Remove incompatible theme shiny
2011-04-08 17:08:29 -04:00
Evan Prodromou
c0697752d2
Remove incompatible theme pigeonthoughts
2011-04-08 17:08:29 -04:00
Evan Prodromou
86d99f3541
Remove incompatible theme mnml
2011-04-08 17:08:29 -04:00
Evan Prodromou
28d254e130
Remove incompatible theme identica
2011-04-08 17:08:29 -04:00
Evan Prodromou
eb4ec37add
Remove incompatible theme h4ck3r
2011-04-08 17:08:29 -04:00
Evan Prodromou
0079a00042
Remove incompatible theme default
2011-04-08 17:08:29 -04:00
Evan Prodromou
400f5033f9
Remove incompatible theme cloudy
2011-04-08 17:08:29 -04:00
Evan Prodromou
ecf357f469
Remove incompatible theme cleaner
2011-04-08 17:08:28 -04:00
Evan Prodromou
6f8ecc2e7b
Remove incompatible theme clean
2011-04-08 17:08:28 -04:00
Evan Prodromou
7ad0404e42
Remove incompatible theme biz
2011-04-08 17:07:06 -04:00
Samantha Doherty
e0c00449bb
Hide legend and show best marker, for QnA answers when not displayed inline.
2011-04-08 11:10:34 -04:00
Samantha Doherty
43f341b68f
Change feeds in sidebar to a vertical list.
2011-04-08 11:05:19 -04:00
Shashi Gowda
c44a94e8f5
Port autocomplete from tagInput to jQuery UI, send Last-Modified header and look for it in JS.
2011-04-08 14:51:05 +05:30
Shashi Gowda
ad86eb78d3
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
js/util.min.js
lib/default.php
2011-04-07 23:13:45 +05:30
Samantha Doherty
f753258a74
Style for best QnA answer.
2011-04-05 13:23:41 -04:00
Samantha Doherty
5bc6a8c614
Style changes for privacy selectors and markers.
2011-04-05 12:38:15 -04:00
Samantha Doherty
a02da55eac
A little more style for QnA.
2011-04-05 09:10:20 -04:00
Shashi Gowda
ced00cf0bd
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-05 10:28:05 +05:30
Samantha Doherty
a3ba11a8ac
Style for QnA plugin.
2011-04-04 20:29:30 -04:00
Shashi Gowda
5a2bab07b2
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
classes/Profile.php
classes/Profile_tag.php
js/util.min.js
2011-03-30 15:47:42 +05:30
Evan Prodromou
dca5e20b91
Make the to-selector clear left
2011-03-28 16:23:31 -04:00
Ian Denhardt
d36f0707a4
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
2011-03-28 03:25:40 -04:00
Evan Prodromou
53a3fd822d
add indicator for limited-scope notices
2011-03-26 16:47:36 -04:00
Shashi Gowda
f81aaa5375
Blend people tags UI into the new theme!
2011-03-22 12:18:12 +05:30
Shashi Gowda
31c1177970
Merge branch '1.0.x' into people_tags_rebase
...
Conflicts:
EVENTS.txt
actions/peopletag.php
actions/tagother.php
classes/Notice.php
js/util.js
js/util.min.js
lib/accountprofileblock.php
lib/action.php
lib/activityobject.php
lib/command.php
lib/personalgroupnav.php
plugins/OStatus/OStatusPlugin.php
2011-03-22 07:56:25 +05:30
Samantha Doherty
fac0d8496e
Few IE fixes for neo theme.
2011-03-21 09:16:00 -04:00
Brion Vibber
ed6d5c6e7a
Initial inline listing of favoriters
2011-03-17 14:19:03 -07:00
Samantha Doherty
e845d6a8bf
A few general style updates and fixes.
2011-03-17 08:38:25 -04:00
Samantha Doherty
49952b08e1
A little more quick styling for Events.
2011-03-17 08:32:18 -04:00
Samantha Doherty
42a4b1d90c
Bit of quick styling for Events.
2011-03-16 18:20:40 -04:00
Evan Prodromou
29a4bb4d91
better formatting for RSVPs
2011-03-16 17:51:27 -04:00
Samantha Doherty
5e40450efd
Quick style update for profile blocks.
2011-03-16 13:50:24 -04:00
Ian Denhardt
27ef3b1d90
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
actions/public.php
2011-03-15 12:42:58 -04:00
Samantha Doherty
894bcd3bcd
Whoops, need to reset the background color on the aside.
2011-03-14 15:36:00 -04:00
Samantha Doherty
640a033f8b
Style changes for equal column heights.
2011-03-14 15:31:19 -04:00
Samantha Doherty
dccd0ae6e1
Couple of tiny theme changes for inline replies.
2011-03-11 00:00:54 -05:00
Samantha Doherty
3c66275186
Removing currently unused webfonts from theme.ini.
2011-03-10 23:59:45 -05:00
Samantha Doherty
11a183fe33
New interim default avatar images.
2011-03-10 23:58:34 -05:00
Brion Vibber
771682b6eb
Add placeholder status form for the top (needs to hook up to JS)
2011-03-10 17:40:25 -08:00
Samantha Doherty
ac880bd6ea
Stupid tiny typo in neo.
2011-03-10 18:12:14 -05:00
Samantha Doherty
b07227b9d2
Big update for neo theme (and a couple wee fixes for rebase).
2011-03-10 18:05:04 -05:00
Brion Vibber
ec828a094c
Update LinkPreview plugin for multiple notice forms.
...
* main notice form setup now encapsulated into SN.Init.NoticeForm(form) -- this can be monkeypatched by plugins to append their own setup code, as LinkPreview does
* LinkPreview now supports debugging with non-minified JS source when $config['site']['minify'] is false
* tweaked core & neo styles so 'notice-status' class gets same styles as attach-status, so we can more easily add mroe statusy things. (needs more consolidation with geo-status, etc)
* tweaked LinkPreview's preview area to use that style
2011-03-09 17:43:31 -08:00
Brion Vibber
ba1ada2880
de-IDifying labels in notice form to fix issue with geo pin activating the wrong place when cloning the form
...
Note that changes to the attachment from <label for/><input id/> to <label><input></label> affect some of the existing styles which attempt to place them both in the same place based on having a common parent. Only 'neo' has been fully tested and fixed for this case, as the others all fail due to the new layout anyway. :)
2011-03-08 12:14:44 -08:00
Samantha Doherty
15686cdf56
First version of 3cl theme neo.
2011-03-07 14:43:06 -05:00
Evan Prodromou
cf1a4d8292
Input form switcher works
...
This change adds the input form switcher, which adds a navigation menu
across the top of the input form, letting you switch between different kinds of input.
The input menu doesn't yet look like a nice set of tabs; it could use some love.
2011-03-07 04:57:49 -05:00
Shashi Gowda
b372ed721d
styling for people tag UI
2011-03-07 00:44:21 +05:30
Brion Vibber
97532a093d
style fixes for new notice form being reused in reply area
2011-03-04 14:30:30 -08:00
Brion Vibber
5358f78e82
Reusable notice form fixes for geolocation
2011-03-04 14:27:55 -08:00
Brion Vibber
56d5c4a4d1
More hardcoded id cleanup in notice form...
2011-03-04 13:40:33 -08:00
Brion Vibber
cd20190ba5
Remove hardcoded #notice_action-submit from JS/CSS (prep for reusable notice forms)
2011-03-03 17:48:16 -08:00
Brion Vibber
b58aa29168
Notice form cleanup: removing hardcoded id from counter references; prep for reusable notice forms.
2011-03-03 17:15:17 -08:00
Brion Vibber
f94a5e1a6a
Notice form cleanup: drop use of id for #notice_data-text (prep for reusable notice form)
2011-03-03 17:05:19 -08:00
Brion Vibber
1ff17f0ed9
Notice form cleanup: removing hardcoded IDs from attachment handling (prep for reusable notice forms)
2011-03-03 16:56:54 -08:00
Brion Vibber
764d069ccd
Clean up threaded notices vs replies classes, and fixed realtime's threaded behavior to only run on threaded lists
2011-03-01 16:08:37 -08:00
Brion Vibber
35ce314bfb
Hide context entries in threaded lists; it's redundant (and if there's more than a few messages, we have the context link still :D)
...
Also hides them via CSS for new ajax additions
2011-03-01 13:30:38 -08:00
Brion Vibber
407cc851cc
Collapse long threaded displays with a link to the convo view (todo: turn it into an ajax loader for inline expansion)
2011-02-28 17:13:54 -08:00
Brion Vibber
59a0b2a82d
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments
...
Conflicts:
js/util.min.js
2011-02-28 16:18:38 -08:00
Brion Vibber
62712b794a
More interactive magic for inline replies: placeholder at the end of list
2011-02-28 16:13:16 -08:00
Zach Copley
b7d0746694
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/emailsettings.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/profilesettings.php
actions/showgroup.php
actions/smssettings.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
index.php
lib/accountsettingsaction.php
lib/action.php
lib/common.php
lib/connectsettingsaction.php
lib/designsettings.php
lib/personalgroupnav.php
lib/profileaction.php
lib/userprofile.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Facebook/FBConnectSettings.php
plugins/Facebook/FacebookPlugin.php
plugins/NewMenu/NewMenuPlugin.php
plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
Brion Vibber
fb9418b99d
some quick visual tweaks
2011-02-28 12:50:26 -08:00
Brion Vibber
2c03dd569c
visual tweaks for convo view
2011-02-28 12:20:47 -08:00
Samantha Doherty
7f50315168
Quick fix for popular notices in cleaner theme.
2011-02-25 13:43:21 -05:00
Samantha Doherty
09a3db628c
First revision of new theme, cleaner.
2011-02-25 12:00:55 -05:00
Brion Vibber
5b8e74f8d4
normalize line endings in shiny/css/display.css
2011-01-31 11:09:20 -08:00
Samantha Doherty
8bc296bdbb
A few wee fixes for rebase and shiny themes.
2011-01-25 18:32:12 -05:00
Samantha Doherty
0fc46d1629
Rounded corner fixes for base theme.
2011-01-25 18:29:07 -05:00
Evan Prodromou
ba2128f2d1
make nav look right-ish in shiny
2011-01-23 13:07:47 -05:00
Evan Prodromou
592e2be5e1
Make new menu the default menu
...
There's a new menu layout in this version of the software. It was
implemented as a plugin in 0.9.x to avoid clashes with existing themes,
but we're going to break that compatibility in this version, so we're just going for it.
This change involved moving all the changes in NewMenuPlugin into the
default code that was calling it. In addition, since
accountsettingsaction and connectsettingsaction differed only by menu,
I removed them, changed all references to them to the settingsmenu, and moved
the combined nav to its own class.
Let's put that episode behind us.
The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions
was removed.
2011-01-23 12:35:35 -05:00
Evan Prodromou
bbaf9d7f42
some fixes for new no-dl layout
2011-01-14 15:53:02 -05:00
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