Commit Graph

15415 Commits

Author SHA1 Message Date
Samantha Doherty
b37c33dea2 Whole bunch of style-related changes, including some tasty hackery for the experience and education fields. 2011-03-15 13:08:41 -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
Zach Copley
4f217a3133 Merge branch '1.0.x' into profile-fixups
* 1.0.x:
  For good measure; trip short error mode in earlier on ajax shownotice
  Realtime plugin: fix i18n, thumbnails, location display, OStatus server display, micro-apps display.
  'ajax' param on shownotice action so we can pull items in full html version for realtime
  Whoops, need to reset the background color on the aside.
  Realtime work in progress: switch makeNoticeData to async -- next we'll load fresh copies from server, maintaining proper language and plugin enhancements.
  Check the site minifications etting for realtime plugin; debugging aid.
2011-03-15 09:11:31 -07:00
Zach Copley
7a7e0a2b69 Extended profile - change the name of divs used for sort order 2011-03-14 22:47:20 -07:00
Zach Copley
cd82ff2dcf Extended profile - make IMs display and save 2011-03-14 22:38:34 -07:00
Zach Copley
6d34818b5d Extended profile - make education entries save 2011-03-14 22:02:24 -07:00
Zach Copley
8559fbb2ca Extended profile - intialize controls for multiple education entries 2011-03-14 21:09:03 -07:00
Zach Copley
79c4af6073 Add in missing </li> 2011-03-14 21:07:14 -07:00
Zach Copley
bd238e9a4d Extended profile - HTML layout for education entries 2011-03-14 20:58:35 -07:00
Samantha Doherty
0ff7bf77e4 Couple quick fixes for profile view. 2011-03-14 22:40:31 -04:00
Zach Copley
c6a6d41dab Extended profile - change HTML output for displaying work experience 2011-03-15 02:09:22 +00:00
Zach Copley
0fd4b84eb8 Extended profile - better error handling for bad dates 2011-03-14 17:53:54 -07:00
Zach Copley
07ccb6a9f8 Extended profile - make experience save and display 2011-03-14 17:27:50 -07:00
Zach Copley
27c75dd4bb Extended profile - show and edit experience 2011-03-14 15:29:11 -07:00
Brion Vibber
7f4a9c4145 Merge branch 'realtime' into 1.0.x 2011-03-14 13:46:15 -07:00
Brion Vibber
34e7d8ddf2 For good measure; trip short error mode in earlier on ajax shownotice 2011-03-14 13:44:39 -07:00
Brion Vibber
90d35885ae Realtime plugin: fix i18n, thumbnails, location display, OStatus server display, micro-apps display.
Switch from manual local formatting of notices (which lacks all the server-side goodness) to calling into the server-side with an AJAX variant of shownotice.
2011-03-14 13:29:35 -07:00
Brion Vibber
c7e7cc79da 'ajax' param on shownotice action so we can pull items in full html version for realtime 2011-03-14 13:05:30 -07:00
Zach Copley
f11b788b5a Extended profile - add a date value for fields 2011-03-14 12:53:49 -07:00
Samantha Doherty
894bcd3bcd Whoops, need to reset the background color on the aside. 2011-03-14 15:36:00 -04:00
Zach Copley
4cdb3e64cc Merge branch '1.0.x' into profile-fixups
* 1.0.x:
  Style changes for equal column heights.
  Adding wrapper divs for equal height columns.
  Fix incorrect parameter documentation. Spotted by Nikerabbit.
2011-03-14 12:34:19 -07:00
Brion Vibber
1e36593a23 Realtime work in progress: switch makeNoticeData to async -- next we'll load fresh copies from server, maintaining proper language and plugin enhancements. 2011-03-14 12:32:39 -07:00
Samantha Doherty
640a033f8b Style changes for equal column heights. 2011-03-14 15:31:19 -04:00
Samantha Doherty
4334bb7132 Adding wrapper divs for equal height columns. 2011-03-14 15:30:51 -04:00
Brion Vibber
ed2d224df5 Check the site minifications etting for realtime plugin; debugging aid. 2011-03-14 12:22:49 -07:00
Siebrand Mazeland
eaef01233a Fix incorrect parameter documentation. Spotted by Nikerabbit. 2011-03-14 18:01:22 +01:00
Zach Copley
2f8b7f3dea Merge branch '1.0.x' into profile-fixups
* 1.0.x: (26 commits)
  (update util.min.js for recent changes)
  JS optimization: move creation of inline reply placeholders to server-side so we don't have to create them client-side (which causes reflows and takes about 25-30ms on my test system) Using live instead of bind for the event handling, we don't have to play any games on the ones that we do add at runtime. Yay!
  JS performance: speeding up initialization by consolidating event handlers for reply buttons
  Use non-minified jQuery when $config['site']['minify'] is off; aids in debugging when something fails deep in jQuery-land.
  Update PersonalGroupNav with fixed highlighting checks.
  remove stray close div from empty search results doc bits
  durrrr s/textValue/textContent/
  Update PollPlugin Atom input
  Poll plugin: switching Atom & JSON output to use new hooks & methods, much nicer output. Also switched types, which may break old entries. Beware! Input not yet updated.
  Add event hooks for customizing ActivityObject output to Atom and JSON, and helpers for MicroAppPlugin.
  Localisation updates from http://translatewiki.net.
  Move translator documentation one line lower. Otherwise it will not be added to the POT file.
  i18n/L10n updates Translator documentation added
  i18n fixes: plugins should use _m(), not _().
  * Superfluous whitespace removed * Small L10n updates
  * update/add translator documentation. * remove superfluous whitespace. * minor updates to L10n/i18n.
  Couple of tiny theme changes for inline replies.
  Removing currently unused webfonts from theme.ini.
  New interim default avatar images.
  Updating favicon.
  ...
2011-03-14 01:57:04 -07:00
Zach Copley
04c8bf2743 Extended profile - finished basic pattern for adding/removing/saving multiple complex fields 2011-03-14 01:49:46 -07:00
Zach Copley
deb40602d2 Extended profile - more work on getting complex fields to save 2011-03-13 16:32:13 -07:00
Evan Prodromou
a63e1418a8 Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-13 11:49:31 -05:00
Brion Vibber
096f99be16 (update util.min.js for recent changes) 2011-03-11 15:31:58 -08:00
Brion Vibber
2bccd18d9a JS optimization: move creation of inline reply placeholders to server-side so we don't have to create them client-side (which causes reflows and takes about 25-30ms on my test system)
Using live instead of bind for the event handling, we don't have to play any games on the ones that we do add at runtime. Yay!
2011-03-11 15:20:20 -08:00
Brion Vibber
10e5cb482e JS performance: speeding up initialization by consolidating event handlers for reply buttons
Saved about 60ms on my test system during page setup by using a single global 'live' click handler for reply links.
No longer need to seek out and attach event handlers on every notice, yay!
2011-03-11 15:03:15 -08:00
Brion Vibber
4e2a0e2fd0 Use non-minified jQuery when $config['site']['minify'] is off; aids in debugging when something fails deep in jQuery-land. 2011-03-11 14:48:47 -08:00
Brion Vibber
717fed785e Update PersonalGroupNav with fixed highlighting checks.
Couldn't use Menu::item() as its checks are only for the action name, so would have highlighted stuff for other users though it always links to self.
2011-03-11 14:25:57 -08:00
Brion Vibber
d393ac4bbb remove stray close div from empty search results doc bits 2011-03-11 14:08:48 -08:00
Brion Vibber
3c9561b3f0 Merge branch 'atomic-json' into 1.0.x 2011-03-11 12:47:11 -08:00
Brion Vibber
d5f5f76947 durrrr s/textValue/textContent/ 2011-03-11 12:45:55 -08:00
Brion Vibber
e1136bacae Update PollPlugin Atom input 2011-03-11 12:41:11 -08:00
Brion Vibber
a9d589dbdc Poll plugin: switching Atom & JSON output to use new hooks & methods, much nicer output. Also switched types, which may break old entries. Beware!
Input not yet updated.
2011-03-11 12:28:15 -08:00
Brion Vibber
3146c9fae8 Add event hooks for customizing ActivityObject output to Atom and JSON, and helpers for MicroAppPlugin.
New hooks:
* StartActivityObjectOutputAtom
* EndActivityObjectOutputAtom
	$obj ActivityObject
	$out XMLOutputter

* StartActivityObjectOutputJson
* EndActivityObjectOutputJson
	$obj ActivityObject
	&$out array
2011-03-11 11:58:53 -08:00
Evan Prodromou
487b3be198 Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-11 13:27:11 -06:00
Siebrand Mazeland
69e11bb45e Localisation updates from http://translatewiki.net. 2011-03-11 19:33:52 +01:00
Siebrand Mazeland
eff26421ab Move translator documentation one line lower. Otherwise it will not be added to the POT file. 2011-03-11 19:32:35 +01:00
Siebrand Mazeland
843ace580d i18n/L10n updates
Translator documentation added
2011-03-11 19:05:28 +01:00
Siebrand Mazeland
a70914cd57 i18n fixes: plugins should use _m(), not _(). 2011-03-11 18:33:19 +01:00
Siebrand Mazeland
76bffe1a64 * Superfluous whitespace removed
* Small L10n updates
2011-03-11 18:31:22 +01:00
Luke Fitzgerald
43db20ca98 Merge in upstream protocol change
"passport response message changed, it might return Compact2 instead of PPToken2 since 2011/2/14."
2011-03-11 17:23:14 +00:00
Siebrand Mazeland
e2defc1f7c * update/add translator documentation.
* remove superfluous whitespace.
* minor updates to L10n/i18n.
2011-03-11 17:07:27 +01:00
Evan Prodromou
5976a8542b Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-11 08:37:05 -06:00