Commit Graph

3033 Commits

Author SHA1 Message Date
Zach Copley
f25b6e6116 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Correct fieldset ID for Event form.
  Update Event plugin datepicker function for new unique input IDs.
2011-04-17 20:34:55 -07:00
Zach Copley
b422a0d21a spelling 2011-04-17 20:34:05 -07:00
Samantha Doherty
34b6038b83 Correct fieldset ID for Event form. 2011-04-17 21:40:15 -04:00
Samantha Doherty
c2038e796b Update Event plugin datepicker function for new unique input IDs. 2011-04-17 21:40:15 -04:00
Zach Copley
f3e0cd0b30 Some special .js for the bookmark plugin, so we can control the form in the second step 2011-04-17 18:37:51 -07:00
Zach Copley
8cfb81deac Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Remove empty locale files.
  Localisation updates from http://translatewiki.net.
2011-04-17 16:33:25 -07:00
Zach Copley
d9cf0280d2 Give microapp form elements unique ids 2011-04-17 16:32:52 -07:00
Evan Prodromou
dbb9f66982 get email for code 2011-04-17 19:29:55 -04:00
Evan Prodromou
a564af4948 get email for code 2011-04-17 19:28:22 -04:00
Evan Prodromou
6a329f4397 complete registration form 2011-04-17 19:24:33 -04:00
Siebrand Mazeland
4afe9c5885 Remove empty locale files. 2011-04-18 00:50:07 +02:00
Evan Prodromou
383b4cae76 Missed an argument to a function 2011-04-17 18:48:58 -04:00
Siebrand Mazeland
0d431cd6ee Localisation updates from http://translatewiki.net. 2011-04-18 00:38:35 +02:00
Zach Copley
5f81f4c701 Fix form elements in bookmark plugin 2011-04-17 15:34:50 -07:00
Evan Prodromou
3996199c6a some better breaks on error entry 2011-04-17 18:30:25 -04:00
Evan Prodromou
e119b295c0 email register is a login action 2011-04-17 18:29:10 -04:00
Evan Prodromou
45b0c5ef10 Yoink the registration action 2011-04-17 18:27:25 -04:00
Evan Prodromou
064ed69446 Revert "some debugging for email registration routes"
This reverts commit 165d9fd9de.
2011-04-17 18:22:59 -04:00
Evan Prodromou
b5dfceb59c Revert "bad variable in debugging"
This reverts commit 87330bf977.
2011-04-17 18:22:46 -04:00
Evan Prodromou
96d735baf4 Revert "additional debugging in router"
This reverts commit daadb7905b.
2011-04-17 18:22:35 -04:00
Evan Prodromou
daadb7905b additional debugging in router 2011-04-17 18:19:47 -04:00
Evan Prodromou
35361656d5 reverse order of register connects 2011-04-17 18:12:12 -04:00
Evan Prodromou
87330bf977 bad variable in debugging 2011-04-17 18:10:30 -04:00
Zach Copley
007d1be06d Give bookmark form elements unique ids 2011-04-17 15:09:56 -07:00
Evan Prodromou
165d9fd9de some debugging for email registration routes 2011-04-17 18:09:26 -04:00
Evan Prodromou
7cc4c97aa9 add our routes at the begnning, not the end. 2011-04-17 18:05:18 -04:00
Evan Prodromou
b9eee437dd Merge branch '1.0.x' into emailregistration 2011-04-17 17:48:15 -04:00
Evan Prodromou
b86bb0335c action for registering by email 2011-04-17 17:48:09 -04:00
Evan Prodromou
3ae972906f customize the EmailRegistration plugin 2011-04-17 17:47:37 -04:00
Siebrand Mazeland
5f3dbc3e98 Localisation updates http://translatewiki.net. 2011-04-17 20:30:47 +02:00
Siebrand Mazeland
4ab995dd1e Complete "people tag" to "list" in UI messages.
Update translator documentation accordingly.

Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
2011-04-17 20:08:03 +02:00
Evan Prodromou
d4e25ea2cc Copy Sample plugin to EmailRegistration 2011-04-17 13:22:21 -04:00
Siebrand Mazeland
4c00b830bf Localisation updates from http://translatewiki.net. 2011-04-17 01:15:30 +02:00
Evan Prodromou
6d5b6d98b5 Merge branch '1.0.x' into testing 2011-04-15 14:57:41 -04:00
Siebrand Mazeland
c27b9c0722 Update translator documentation.
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
Siebrand Mazeland
abcfde4d7d i18n fixes for xgettext issue with contructions like "<<< END_OF_INSTRUCTIONS".
Update translator documentation.
FIXMEs added. Asking Zach on IRC to have a look at them.
2011-04-15 09:55:09 +02:00
Evan Prodromou
1c2d4de469 scale down the thumbnail image if necessary 2011-04-14 23:57:30 -04:00
Evan Prodromou
2df98fc240 auto-fill bookmark data 2011-04-14 23:44:01 -04:00
Evan Prodromou
41a883aeab Merge branch '1.0.x' of gitorious.org:statusnet/mainline into prefillbookmark 2011-04-14 21:55:16 -04:00
Evan Prodromou
2581e46a25 hide tagsub from stats 2011-04-14 17:03:32 -04:00
Evan Prodromou
6e5e486dc8 hide searchsub from stats 2011-04-14 17:03:23 -04:00
Shashi Gowda
53af608ef8 People tags -> Lists (only UI changes, for experimentation) 2011-04-14 19:49:42 +00:00
Evan Prodromou
75f0429961 Revert "Use gravatar as a fallback for missing files"
This reverts commit 52493a9a2b.
2011-04-14 13:06:23 -04:00
Evan Prodromou
52493a9a2b Use gravatar as a fallback for missing files 2011-04-14 13:05:11 -04:00
Evan Prodromou
a62e9fec65 remove avatar saving from GravatarPlugin 2011-04-14 11:47:20 -04:00
Evan Prodromou
458871705a Grossly simplify Gravatar plugin 2011-04-14 11:38:41 -04:00
Samantha Doherty
cb379a7a33 Remove duplicate noticeforms from realtime popup. 2011-04-14 02:57:34 -04:00
Zach Copley
c5849e1de2 Group directory - reword instructions 2011-04-13 18:37:43 -07:00
Zach Copley
fff83723ff Group directory - nuke admins column (not that useful) 2011-04-13 18:29:55 -07:00
Zach Copley
ddc42b1baf Groups directory - fix missing closing list item tag - was making the layout wonky 2011-04-13 18:17:04 -07:00
Zach Copley
b959147ada Group directory - add in asides 2011-04-13 17:46:35 -07:00
Zach Copley
88bcc7728c Add "create a new group" button to group directory 2011-04-13 16:43:28 -07:00
Zach Copley
e188a11ef6 Fix public group nav to highlight properly when our group directory is selected 2011-04-13 16:11:34 -07:00
Zach Copley
3a3a53dfcc Group directory - fix group logo display 2011-04-13 15:52:44 -07:00
Evan Prodromou
3bea1b5371 initial bookmark form 2011-04-13 18:37:14 -04:00
Zach Copley
055d61ef79 Group directory - use correct constant 2011-04-13 15:36:27 -07:00
Zach Copley
4f60c43d32 Better instructions for group directory 2011-04-13 15:31:51 -07:00
Zach Copley
42e945a42d Style group directory output 2011-04-13 15:09:46 -07:00
Zach Copley
b6b9baa9a2 DirectoryPlugin - Group directory mostly working. HTML markup for results needs fixing. 2011-04-13 15:09:45 -07:00
Zach Copley
0f9d6f4c82 DirectoryPlugin - Hijack router mapping for normal groups page to substitute a directory page 2011-04-13 15:09:45 -07:00
Evan Prodromou
66dee8a966 Merge branch '1.0.x' into prefillbookmark 2011-04-13 15:38:39 -04:00
Evan Prodromou
1434099ed8 better versions for BookmarkPlugin 2011-04-13 15:27:30 -04:00
Siebrand Mazeland
409550e1dc Localisation updates from http://translatewiki.net. 2011-04-13 15:48:18 +02:00
Siebrand Mazeland
ab52460691 Update translator documentation.
Number parameters.
2011-04-13 15:43:05 +02:00
Siebrand Mazeland
124070e63d Update punctuation for exceptions. 2011-04-13 15:13:14 +02:00
Siebrand Mazeland
57c28ba4d0 Update translator documentation and whitespace.
Update file header comment.
2011-04-13 13:22:50 +02:00
Siebrand Mazeland
e53e60f782 Update translator documentation and whitespace. 2011-04-12 18:40:25 +02:00
Zach Copley
43f542c3a2 Script to delete bad OStatus hub URIs (until we have better error handling for broken hubs) 2011-04-12 02:29:02 -07:00
Evan Prodromou
c0c5235080 only allow a whitelist of email domains for the site 2011-04-11 16:49:50 -04:00
Evan Prodromou
820e19e197 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-11 11:20:27 -04:00
Siebrand Mazeland
0644cdb6d0 Localisation updates from http://translatewiki.net. 2011-04-11 15:10:09 +02:00
Evan Prodromou
a665d1f772 more information for bookmark without attachment 2011-04-10 19:27:09 -04:00
Siebrand Mazeland
b83e0fd0e8 Update translator documentation.
i18n fixes (gettext domain).
L10n updates.
Whitespace updates.
Some tabs to spaces.
2011-04-11 00:39:51 +02:00
Evan Prodromou
d375317c7f Better SQLStats output with 0 queries 2011-04-10 18:32:09 -04:00
Siebrand Mazeland
8c63d6ead4 Localisation updates from http://translatewiki.net. 2011-04-10 10:44:39 +02:00
Zach Copley
e75c9988eb Merge branch 'people_tags_rebase' into 1.0.x
Conflicts:
	EVENTS.txt
2011-04-10 08:10:01 +00:00
Siebrand Mazeland
396005ecf6 Fix incorrect parameter notation. 2011-04-10 01:32:57 +02:00
Siebrand Mazeland
d6aea8e39e Update translator documentation. 2011-04-10 01:24:15 +02:00
Evan Prodromou
638d29a820 Hide RSVPs from threaded notice output 2011-04-09 17:11:38 -04:00
Evan Prodromou
b80ece1691 hide poll response notices from threaded view 2011-04-09 17:07:03 -04:00
Siebrand Mazeland
396a0c08b3 Localisation updates from http://translatewiki.net. 2011-04-09 20:53:29 +02: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
Shashi Gowda
a0ac51c22f use notifyDeferred for tag/untag so that it gets queued offline 2011-04-09 17:18:33 +05:30
Zach Copley
e3789488c6 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  use conversationnoticestream in conversationrepliesaction
  use conversationnoticestream in conversationaction
  make ConversationNoticeStream accept a profile parameter
  enable user directory and extended profile by default
  Remove incompatible theme victorian
  Remove incompatible theme shiny
  Remove incompatible theme pigeonthoughts
  Remove incompatible theme mnml
  Remove incompatible theme identica
  Remove incompatible theme h4ck3r
  Remove incompatible theme default
  Remove incompatible theme cloudy
  Remove incompatible theme cleaner
  Remove incompatible theme clean
  Remove incompatible theme biz
  correctly return for deleted items
  show event as deleted
  Use pkeyGet() instead of idStream() for fave caching
  store oft-requested stuff in the data object
2011-04-08 15:47:18 -07:00
Zach Copley
3022d711e3 Add some more events to aside profile blocks and rework a bit 2011-04-08 15:45:49 -07:00
Evan Prodromou
8cb0d7e708 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-08 17:09:15 -04:00
Zach Copley
8335d234f7 Don't try to show search and tag subs unless a user is logged in 2011-04-08 13:56:08 -07:00
Evan Prodromou
bfc33f3999 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-08 16:14:09 -04:00
Siebrand Mazeland
ea82086297 Update translator documentation.
Whitespace updates.
Header updates.
Break long lines in README.
Indentation updates.
2011-04-08 18:47:07 +02:00
Siebrand Mazeland
b77531897a Fixed incorrect single quotes with newlines from Commit:3e8bf13aab25050cce09a3180ea7b56c41ed40e3. 2011-04-08 18:47:04 +02:00
Evan Prodromou
997babfea3 correctly return for deleted items 2011-04-08 12:15:32 -04:00
Evan Prodromou
50c4731d20 show event as deleted 2011-04-08 12:14:05 -04:00
Shashi Gowda
4d61760154 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-08 17:16:20 +05:30
Siebrand Mazeland
3e8bf13aab Update translator documentation.
L10n/i18n updates.
2011-04-08 10:59:10 +02:00
Siebrand Mazeland
a9eaaf6341 Update translator documentation.
Whitespace updates.
L10n/i18n updates.
2011-04-08 01:22:04 +02:00
Siebrand Mazeland
2640232c68 Update translator documentation.
L10n and i18n updates.
Break long lines in README before or at 80 characters.
Superfluous whitespace removed.
2011-04-08 01:22:02 +02:00
Siebrand Mazeland
a5aade0a3b Update maintainer e-mail address.
Update translator documentation.
2011-04-08 01:21:58 +02:00
Evan Prodromou
45ba33e2ac use InboxNoticeStream in AllmapAction in Mapstraction 2011-04-07 15:41:34 -04:00
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
Siebrand Mazeland
6806a42e2c Update translator documentation. 2011-04-07 10:06:46 +02:00