Evan Prodromou
409f5f5658
alpha1 version of the software
2011-03-17 09:21:26 -04:00
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
Siebrand Mazeland
b74a7d7a75
Change email to SMS. Spotted by Nikerabbit.
2011-03-17 13:59:22 +01: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
Siebrand Mazeland
726ddf7b42
L10n updates.
...
Translator documentation.
2011-03-17 11:54:18 +01:00
Siebrand Mazeland
9785140da5
Update translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-17 11:46:49 +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
Zach Copley
30cdc6944b
Skeleton / Stub for Question and Answers micro-app plugin
2011-03-16 18:15:45 -07: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
bd12546984
Allow plugins to modify or append command help text; broke the command help down into pieces which also will aid translators in future, as the entire message blob won't change every time something gets fiddled with.
2011-03-16 17:07:06 -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
74387e75cf
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-16 16:17:49 -07:00
Zach Copley
262126bd54
Extended profile - Add sammdy to author credits in version info
2011-03-16 16:17:02 -07:00
Brion Vibber
306639c0f1
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-16 16:12:31 -07:00
Brion Vibber
7d202e9c61
Detect and show AJAX errors on FormXHR submission handling.
...
Previously we threw away errore reported by the actual AJAX submission and only used whatever error the browser reported to us; this didn't help if we reached the server ok but had a problem there.
We now extract the #error if given and use that in the alert().
Also should now show 'Unknown error' instead of a crappy generic 'something died in jQuery' when we get a 200 response but bogus return data.
2011-03-16 16:10:43 -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
2bad1d0cd9
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-16 15:56:32 -07: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
Evan Prodromou
f5bde9b693
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-16 18:54:07 -04:00
Evan Prodromou
0791d0034f
return Ajax-y XML on exceptions
2011-03-16 18:53:46 -04:00
Samantha Doherty
42a4b1d90c
Bit of quick styling for Events.
2011-03-16 18:20:40 -04:00
Brion Vibber
09a4cebd47
fix flushrouter.php -- tried to call Cache::delete statically
2011-03-16 15:01:58 -07:00
Brion Vibber
ed8a1e6fe1
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-16 14:55:54 -07:00
Brion Vibber
0bf40bd748
Output avatar/author along with ProfileNoticeListItem items on ShowProfileAction -- they get hidden in CSS anyway, and we need the author data for the inline reply form if you end up replying to yourself/someone else from a profile stream view.
...
Note that the other modification -- of the repeat line -- is still going to be inconsistent between things originally on the page and anything that comes over Realtime.
2011-03-16 14:54:14 -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
ee9a45d95b
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-16 14:50:03 -07: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
Brion Vibber
d1c778b439
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-16 11:12:29 -07:00
Brion Vibber
a81a599d8a
MESSAGES_PER_PAGE constant missing (merge error?)
2011-03-16 11:11:06 -07:00
Zach Copley
6ec11ed781
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
Fix tag nesting bug on group page
2011-03-16 10:59:16 -07:00
Brion Vibber
5ec018ca19
Fix tag nesting bug on group page
2011-03-16 10:58:18 -07: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
