Commit Graph

2764 Commits

Author SHA1 Message Date
Evan Prodromou 7cf12f093e Merge branch '1.0.x' into testing
Conflicts:
	lib/common.php
2011-03-17 09:20:32 -04:00
Siebrand Mazeland a9f556795b Localisation updates from http://translatewiki.net. 2011-03-17 13:59:24 +01:00
Samantha Doherty 49952b08e1 A little more quick styling for Events. 2011-03-17 08:32:18 -04:00
Siebrand Mazeland 726ddf7b42 L10n updates.
Translator documentation.
2011-03-17 11:54:18 +01:00
Siebrand Mazeland 3d835bb8b5 Translator documentation added/updated.
i18n/L10n updates.
2011-03-17 11:38:18 +01:00
Siebrand Mazeland 199e05f9de Localisation updates from http://translatewiki.net. 2011-03-17 11:17:22 +01:00
Brion Vibber 0754edf9a2 SearchSub plugin: 'track X', 'untrack X', 'tracking', 'track off' commands now overridden :D 2011-03-16 17:22:37 -07:00
Brion Vibber e36959d451 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 16:42:12 -07:00
Brion Vibber 390881e817 SearchSub plugin: add management UI for subscribed searches 2011-03-16 16:41:02 -07:00
Zach Copley 262126bd54 Extended profile - Add sammdy to author credits in version info 2011-03-16 16:17:02 -07:00
Zach Copley e7843dfda2 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 16:09:50 -07:00
Evan Prodromou 0182b96f7c Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 19:08:50 -04:00
Zach Copley 88d31a7933 Extended profile - move some files around and rename stuff to follow plugin conventions 2011-03-16 16:08:49 -07:00
Evan Prodromou 1b82589b8f better date handling in events 2011-03-16 19:08:35 -04:00
Brion Vibber 95942f02ac Merge branch 'subwork' into 1.0.x 2011-03-16 15:56:11 -07:00
Brion Vibber f8859aa3aa Tag subscriptions management UI for TagSub plugin 2011-03-16 15:55:40 -07:00
Zach Copley 2d88e6d07e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 14:53:20 -07:00
Zach Copley 59515d5976 Extended profile - don't show rel for empty phone number 2011-03-16 14:52:42 -07:00
Evan Prodromou 29a4bb4d91 better formatting for RSVPs 2011-03-16 17:51:27 -04:00
Brion Vibber 7785407c65 Work in progress: tagsub editing ui 2011-03-16 14:49:27 -07:00
Evan Prodromou ba2a246951 slightly better formatting on events 2011-03-16 17:13:34 -04:00
Brion Vibber c211b1a38e Work in progress: adding link for managing tag subscriptions. Needs the action still to be functional. 2011-03-16 12:28:26 -07:00
Evan Prodromou 47cd5f311c my code-to-verb logic was ab0rken; fixed 2011-03-16 15:22:15 -04:00
Evan Prodromou f4ff375dbd Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-16 15:00:22 -04:00
Evan Prodromou 9966c51625 use Y,N,? instead of 1,0,null for 3vl in RSVPs 2011-03-16 14:55:19 -04:00
Zach Copley 405dae87b1 Extended profile - fix for unix epoc getting displayed for empty birthday and some validation issues 2011-03-16 10:58:13 -07:00
Samantha Doherty 5e40450efd Quick style update for profile blocks. 2011-03-16 13:50:24 -04:00
Zach Copley 3692a09095 Extended profile - add nav link to new profile block 2011-03-16 10:30:57 -07:00
Samantha Doherty 0666c6f8b2 Fix for education description fields in extended profile. 2011-03-16 13:05:55 -04:00
Evan Prodromou 9b4533058c no profileblock on login actions 2011-03-16 10:05:07 -04:00
Evan Prodromou 41420449f8 Merge branch 'jqueryui' into 1.0.x
Conflicts:
	lib/action.php
2011-03-16 09:56:26 -04:00
Evan Prodromou 3598134330 Merge remote branch 'origin/1.0.x' into 1.0.x 2011-03-16 09:52:35 -04:00
Zach Copley daf73f8231 Merge branch 'profile-fixups' into 1.0.x
* profile-fixups: (46 commits)
  * Extended profile - make cloned datefields work correctly with calendar popup * Validate URLs
  More style for profile edit.
  Extended profile - don't show empty company entry in view
  Extended profile - linkify related URLs added by the user
  Extended profile - fix some issues saving and displaying dates
  Extended profile - don't check end date if experience entry has current checked
  Extended profile - allow adding more than one website
  Small smattering of pixie dust
  Extended profile - fix regression whereby if there was only one item, you could still delete it!
  Remove supersizeme class as appropriate.
  Extended profile - hide add button when not needed (regression)
  Extended profile - add fancy JQuery UI confirm dialog when deleting items
  Extended profile - add fancy datepicker widgets
  Extended profile - prettier date formatting
  Extended profile - fix issue with JavaScript not executing in Firefox
  Extended profile - namespace JavaScript functions
  Extended profile - autocomplete for manager
  Hide all unnecessarylabels from profile edit view.
  Extended profile - make birthday save
  Extended profile - make websites save
  ...
2011-03-16 02:44:36 -07:00
Zach Copley 368cfd8fac * Extended profile - make cloned datefields work correctly with calendar popup
* Validate URLs
2011-03-16 02:41:32 -07:00
Samantha Doherty 365b7ab56e More style for profile edit. 2011-03-16 04:32:33 -04:00
Zach Copley 82023d388a Extended profile - don't show empty company entry in view 2011-03-16 01:27:18 -07:00
Zach Copley 17afe06805 Extended profile - linkify related URLs added by the user 2011-03-16 01:23:47 -07:00
Zach Copley bb087a9650 Extended profile - fix some issues saving and displaying dates 2011-03-16 01:09:38 -07:00
Zach Copley 974d0c48f6 Extended profile - don't check end date if experience entry has current checked 2011-03-16 00:50:43 -07:00
Zach Copley 724dba668a Extended profile - allow adding more than one website 2011-03-16 00:34:00 -07:00
Zach Copley b80b9f31fc Small smattering of pixie dust 2011-03-16 00:25:02 -07:00
Zach Copley 04c2198dc1 Merge branch 'profile-fixups' of gitorious.org:~zcopley/statusnet/zcopleys-clone into profile-fixups
* 'profile-fixups' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
  Remove supersizeme class as appropriate.
2011-03-16 00:24:06 -07:00
Zach Copley a715b133ff Extended profile - fix regression whereby if there was only one item, you could still delete it! 2011-03-16 00:23:34 -07:00
Samantha Doherty 665dd1de78 Remove supersizeme class as appropriate. 2011-03-16 03:09:06 -04:00
Zach Copley d51625ab3d Extended profile - hide add button when not needed (regression) 2011-03-15 23:58:45 -07:00
Zach Copley bda9d43c56 Extended profile - add fancy JQuery UI confirm dialog when deleting items 2011-03-15 23:51:28 -07:00
Zach Copley b9065d7bc1 Extended profile - add fancy datepicker widgets 2011-03-15 23:02:05 -07:00
Zach Copley 40e1fc8246 Extended profile - prettier date formatting 2011-03-15 21:55:47 -07:00
Zach Copley bde85a6685 Extended profile - fix issue with JavaScript not executing in Firefox 2011-03-15 21:23:34 -07:00
Zach Copley b11a2faf54 Extended profile - namespace JavaScript functions 2011-03-15 19:33:05 -07:00