Commit Graph

4527 Commits

Author SHA1 Message Date
Evan Prodromou b34e267e53 Merge branch '1.0.x' into testing
Conflicts:
	plugins/EmailRegistration/scripts/cancelemailregistration.php
2011-05-23 18:20:18 -04:00
Evan Prodromou cb090ab48d increment alpha version revision 2011-05-23 12:37:29 -04:00
Siebrand Mazeland e48c26e156 Update translator documentation, i18n and L10n. 2011-05-20 16:57:05 +02:00
Evan Prodromou 5a86900a34 minor alpha version for i18n build errors 2011-05-20 06:09:37 -07:00
Evan Prodromou c2f735a84e rev to alpha3 2011-05-20 06:03:36 -07:00
Samantha Doherty fbc5de3268 Add missing li tags in settings and admin menus. 2011-05-18 12:13:34 -04:00
Samantha Doherty 4549d36862 Change addressees arrow from hardcoded to CSS. 2011-05-18 09:49:01 -04:00
Samantha Doherty 37cf7c0e8c Style for invite forms and width fix for Onboard popup. 2011-05-11 17:07:08 -04:00
Zach Copley 8597856b56 Fancier invitation form for whitelisted domains
Squashed commit of the following:

commit 1c0766e8f9d9e962ec553e2fb35bd2f944ffb4b0
Author: Zach Copley <zach@status.net>
Date:   Mon May 9 17:00:51 2011 -0700

    Make the invites from the fancier invite form save

commit 9ea45b7cf38eda8dad1d82e87b3400413a532079
Author: Zach Copley <zach@status.net>
Date:   Fri May 6 16:14:40 2011 -0700

    .js to let the user add (and remove) additional invitees from their domain

commit b2a02339bd11d02c7cba24629dde359e22de32b6
Author: Zach Copley <zach@status.net>
Date:   Thu May 5 15:44:49 2011 -0700

    Load special whitelist invite .js when loading the invite page

commit 132fed7550b40cd1d46ee506fd83974a116bce32
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:35:49 2011 -0700

    Remove settings class from whitelist inviter form

commit a38437351b505594aead5da86af9a5ed089666b6
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 18:21:18 2011 -0700

    Make a fancier form for whitelist domain invites

commit 710d4f41edf412871a9c1fbf33af317226485325
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:34:09 2011 -0700

    Add some more events to the invitation page

commit 2449e4e0c1bf11568968cfc3ea2d8e69db2d875e
Author: Zach Copley <zach@status.net>
Date:   Wed May 4 17:12:36 2011 -0700

    Refactor invite action a bit
2011-05-09 17:07:36 -07:00
Siebrand Mazeland 3b3bf74176 Harcode three newlines that lead to issues with translations (as fixed in Commit:5e7e5dd93cd3d73e2f2c93225cf8688844138380 by Evan). 2011-05-05 12:36:56 +02:00
Evan Prodromou c97048d01b merge 0.9.x into 1.0.x 2011-05-04 14:59:39 -07:00
Evan Prodromou c46406b209 low-level hook for loading templates 2011-05-04 11:28:49 -07:00
Evan Prodromou 6b1732d9a2 remove object nav for search 2011-05-04 10:43:47 -07:00
Evan Prodromou 90eb09624c let users login with email address 2011-05-02 15:17:08 -07:00
Evan Prodromou 02c5d68bed Merge branch 'emailsitesetup' into 1.0.x 2011-04-28 12:44:21 -07:00
Evan Prodromou fad0c875ca Don't redefine 'STATUSNET' in installer 2011-04-28 12:38:07 -07:00
Siebrand Mazeland 7c3818c00e Update translator documentation. 2011-04-27 14:30:58 +02:00
Evan Prodromou d09df28040 utility functions for setting config options in memory 2011-04-26 16:50:42 -04:00
Siebrand Mazeland a2e4a1803c Harmonize message for 'User has no profile.' and update translator documentation. 2011-04-25 22:44:19 +02:00
Siebrand Mazeland 413d9e2fd0 Whitespace updates. 2011-04-24 18:50:55 +02:00
Siebrand Mazeland 8afda686d2 @evan Please check. Doesn't look correct/complete. 2011-04-24 18:50:03 +02:00
Evan Prodromou f79d59a081 Merge branch '1.0.x' into testing 2011-04-21 16:16:07 -04:00
Evan Prodromou 5fd08b798f show thumbnails even for links that arent enclosures 2011-04-21 16:13:32 -04:00
Evan Prodromou 963d052653 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-21 15:23:22 -04:00
Siebrand Mazeland 5e97047f8f Update translator documentation.
i18n fixes.
Whitespace updates.
2011-04-21 20:26:58 +02:00
Siebrand Mazeland 98cc1da7b5 Update indentation. 2011-04-21 20:19:51 +02:00
Evan Prodromou 63009f1e1b Merge branch '1.0.x' into testing 2011-04-21 13:37:15 -04:00
Evan Prodromou 36d56232c6 a little better notice hiding 2011-04-21 13:37:05 -04:00
Evan Prodromou 9fcda5b2da show the full name for likes 2011-04-21 12:00:10 -04:00
Evan Prodromou 34e26b53d5 show list of people who like something in threadednoticelist 2011-04-21 11:58:24 -04:00
Evan Prodromou 5899a3f5ee fail gracefully when no IDs for tag cloud 2011-04-20 19:07:07 -04:00
Evan Prodromou 0c0aabeda5 show tag cloud in public stream 2011-04-20 17:17:36 -04:00
Evan Prodromou 4fa7f147b0 Make tag-per-group optional, default false 2011-04-20 16:19:07 -04:00
Evan Prodromou e686199616 accidentally stored wrong personaltagcloudsection 2011-04-20 16:12:49 -04:00
Evan Prodromou 776c2c99ea inbox tag cloud section 2011-04-20 16:11:42 -04:00
Evan Prodromou 3904ab9983 only 10 tags per section 2011-04-20 16:11:04 -04:00
Evan Prodromou cacf627ce3 remove hidden <h2> in notice list 2011-04-20 13:41:50 -04:00
Evan Prodromou 1e2bd48c30 correctly output notice data for nli in microapp 2011-04-19 17:55:57 -04:00
Evan Prodromou 7c31462f86 Let showNotice() go unimplemented
Default implementation of showNotice().
2011-04-19 16:00:31 -04:00
Evan Prodromou efabb002e4 use an adapter pattern to customize notice list item output 2011-04-19 15:43:06 -04:00
Evan Prodromou 1619578818 fix bad variable, show frame length 2011-04-18 19:33:00 -04:00
Evan Prodromou 3fd6b9d474 capture some info if serialization fails on stomp frame 2011-04-18 17:55:38 -04:00
Evan Prodromou 2757bd8428 Revert "put some debugging code into the home and public timelines"
This reverts commit aa7b6447a1.
2011-04-18 16:43:54 -04:00
Evan Prodromou aa7b6447a1 put some debugging code into the home and public timelines 2011-04-18 16:20:51 -04:00
Evan Prodromou b81ddc70df correct category on inboxnoticestream 2011-04-18 16:19:15 -04:00
Evan Prodromou d3215adfa1 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-04-18 12:54:23 -04:00
Evan Prodromou 9e7b880df7 Revert "disable showing tags; it throws a notice for me"
This reverts commit 7d6efbf29e.
2011-04-18 10:08:26 -04:00
Evan Prodromou 7d6efbf29e disable showing tags; it throws a notice for me 2011-04-18 10:03:38 -04:00
Evan Prodromou 28d0d9caad loop through args in common_markup_to_html 2011-04-18 09:51:26 -04:00
Evan Prodromou b72788d9ce pass args from Docfile to renderer 2011-04-18 09:47:08 -04:00
Evan Prodromou 99d538af58 docfiles can take arguments 2011-04-18 09:03:43 -04:00
Evan Prodromou 551a4e8324 mail paths for docfile 2011-04-18 09:03:28 -04:00
Evan Prodromou 4784e3fe36 correctly parse help files 2011-04-18 06:30:33 -04:00
Evan Prodromou e53edc2b6b allow user properties in documentation files 2011-04-18 06:17:28 -04:00
Evan Prodromou ef67262a3f Externalize document-finding code so plugins can use it 2011-04-18 06:16:32 -04:00
Samantha Doherty 368b810a0e Add new Infield Label jQuery plugin files to action.php 2011-04-18 00:27:46 -04:00
Zach Copley 5206ee7f9a Allow setting separate name and id in textare inputs, and cols and rows 2011-04-17 15:09:00 -07:00
Zach Copley 606d7d7185 Allow setting separate name and id on form input elements 2011-04-17 14:29:38 -07:00
Evan Prodromou 5e50acb23b Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-17 17:00:54 -04:00
Evan Prodromou b1cc12af2c use small triangle for notice addressees 2011-04-17 17:00:38 -04: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
Siebrand Mazeland 25e38ebeca Add/update translator documentation. 2011-04-17 13:00:52 +02:00
Siebrand Mazeland d26d408304 Add support for Tagalog. 2011-04-17 10:49:48 +02:00
Siebrand Mazeland 8cfd8450d5 Update/fix translator documentation. 2011-04-17 02:26:53 +02:00
Siebrand Mazeland 858aa37985 i18n fixes.
Translator documentation added.
2011-04-17 00:36:14 +02:00
Evan Prodromou f548831eb1 hide the nickname so it doesn't go into replies 2011-04-16 16:29:09 -04:00
Evan Prodromou 51a7e9961d Merge branch '1.0.x' into testing 2011-04-16 15:58:16 -04:00
Evan Prodromou 53c927ed8e don't show addressee info for root notice of conversation 2011-04-16 15:39:54 -04:00
Evan Prodromou 1c3ce200e7 show addressee arrow if just a notice to a user 2011-04-16 15:39:34 -04:00
Evan Prodromou 83dfe5ed3e show addressees in notice lists 2011-04-16 15:30:50 -04:00
Evan Prodromou b3e7838552 show best name in noticelistitem 2011-04-16 11:22:46 -04:00
Evan Prodromou ff782f1d97 Thread by conversation, not id 2011-04-15 18:28:36 -04:00
Evan Prodromou 2dd81d9a5c add a threading notice stream class 2011-04-15 18:20:54 -04:00
Evan Prodromou 97bae46da1 Revert "Add threading notice stream class to threaded pages"
This reverts commit 97a8bae4a9.
2011-04-15 18:20:06 -04:00
Evan Prodromou 97a8bae4a9 Add threading notice stream class to threaded pages
For those pages where threading is important, we now have an extra filtering stream
class to skip stuff in conversations that have "already" been seen.
2011-04-15 18:17:48 -04:00
Zach Copley da6822c1f0 Merge branch 'lists_fixes' into 1.0.x 2011-04-15 20:50:04 +00:00
Shashi Gowda b78e5de474 Profile::getOwnedTags -> Profile::getLists, first argument is the current user, or the user accessing the lists. 2011-04-16 00:52:58 +05:30
Siebrand Mazeland c27b9c0722 Update translator documentation.
i18n/L10n updates.
Whitespace updates.
2011-04-15 15:07:35 +02:00
Siebrand Mazeland edb467978d Fix incorrect translator documentation. 2011-04-15 09:31:30 +02:00
Zach Copley bef1ed75b5 Merge branch '1.0.x' of git@gitorious.org:statusnet/mainline into 1.0.x 2011-04-14 22:29:11 +00:00
Evan Prodromou 3d9dc111a2 class on the invite link 2011-04-14 18:28:37 -04:00
Shashi Gowda 7224ca571c List timeline cache blowing wasn't working. fixed. 2011-04-14 22:28:25 +00:00
Evan Prodromou 873b1fb186 invite button section 2011-04-14 18:19:09 -04:00
Evan Prodromou f512e3df40 breakup Section::show() 2011-04-14 18:18:39 -04:00
Evan Prodromou 9eba121339 better title for active groups 2011-04-14 18:16:27 -04:00
Evan Prodromou e5a84bfca2 better title for active groups 2011-04-14 18:16:10 -04:00
Evan Prodromou 9208c94b29 don't show private lists; correct link in header 2011-04-14 17:27:26 -04:00
Evan Prodromou edee3995c2 no All groups link 2011-04-14 17:14:57 -04:00
Evan Prodromou c8a58c924b show lists as a comma-separated list in sidebar 2011-04-14 17:03:10 -04:00
Evan Prodromou 90e6eab68e show user's lists in sidebar 2011-04-14 16:57:50 -04:00
Evan Prodromou 14308c21db Don't show featuredusersection by default 2011-04-14 16:25:13 -04:00
Evan Prodromou a2d1eb399f disable sms, email by post by default 2011-04-14 16:24:56 -04:00
Evan Prodromou 9ef13976fc Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-04-14 16:09:18 -04:00
Evan Prodromou 80ba45d665 better title for personal tagcloud section 2011-04-14 16:08:26 -04:00
Evan Prodromou ddb03c9fc6 move follower/following/groups stats to those sections 2011-04-14 16:08:10 -04:00
Evan Prodromou 0c52ed76dd gallery actions use same aside as profile 2011-04-14 15:50:45 -04:00
Zach Copley 7a00be5cc7 Merge branch 'people_tag_fixes' into 1.0.x 2011-04-14 19:50:44 +00:00
Shashi Gowda 45952ff164 "Lists with you" and "List subscriptions" in the right aside, "Lists" in the left aside 2011-04-14 19:49:43 +00:00
Shashi Gowda 53af608ef8 People tags -> Lists (only UI changes, for experimentation) 2011-04-14 19:49:42 +00:00
Shashi Gowda 22f6151a10 Annihilate profile_tag_inbox. 2011-04-14 19:45:31 +00:00