Commit Graph

13663 Commits

Author SHA1 Message Date
Evan Prodromou
527ed62f3f Merge branch '1.0.x' into testing 2011-06-10 17:46:44 -04:00
Evan Prodromou
f294ed0091 remember to send confirmation email for registration 2011-06-10 17:46:35 -04:00
Evan Prodromou
8b47400183 Merge branch '1.0.x' into testing 2011-06-10 16:51:07 -04:00
Evan Prodromou
c227045975 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-06-10 16:50:33 -04:00
Evan Prodromou
331d8a99ba Merge branch 'statusnetworkapi' into 1.0.x 2011-06-10 16:50:15 -04:00
Evan Prodromou
625e63a303 Make errors work correctly 2011-06-10 16:50:06 -04:00
Evan Prodromou
2d72a64841 First pass at complete global API 2011-06-10 15:51:30 -04:00
Samantha Doherty
d43e977195 Merge remote branch 'origin/1.0.x' into 1.0.x 2011-06-09 20:24:09 -04:00
Samantha Doherty
87c83de623 Style for SNOD company logo plugin temporarily goes here. 2011-06-09 20:22:18 -04:00
Zach Copley
e1ac64f2cb Add current class to selected menu items 2011-06-09 19:29:19 -04:00
Zach Copley
1f1616223a Allow changing the site logo from the site admin panel 2011-06-09 17:05:17 -04:00
Zach Copley
36d619480a Rip out user, group and site design customization code
Squashed commit of the following:

commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:51:47 2011 -0400

    Remove design-related stuff from the API

commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:40:16 2011 -0400

    Mop up misc design related code

commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:21:00 2011 -0400

    Remove Design DB_DataObject class and references to it in schema

commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:15:54 2011 -0400

    Remove design-related actions and widgets

commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:10:57 2011 -0400

    Remove navigation / routing to design settings actions

commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:03:09 2011 -0400

    CurrentUserDesignAction -> Action

commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:54:22 2011 -0400

    * GroupDesignAction -> GroupAction (new base class for group actions)

commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:36:40 2011 -0400

    OwnerDesignAction -> Action
2011-06-09 16:20:19 -04:00
Evan Prodromou
fdee419051 Merge branch '1.0.x' into testing 2011-06-09 10:33:36 -04:00
Evan Prodromou
ed61a217a2 clear up whitespace in sendemailsummary 2011-06-08 16:33:06 -04:00
Samantha Doherty
c6d6749d6f Only unbind privacy checkbox when actually on mobile profile, oops. 2011-06-08 15:59:05 -04:00
Evan Prodromou
c9756872bc Wrap email summary and better subject line 2011-06-08 15:23:41 -04:00
Evan Prodromou
ba219fa805 include a dummy non-empty value for sitesum queue items 2011-06-08 08:46:44 -04:00
Evan Prodromou
65005d35ce correct transport for usersum 2011-06-08 08:46:21 -04:00
Evan Prodromou
40cfc5490a fix the streams for email summary 2011-06-07 17:38:24 -04:00
Evan Prodromou
a10edb3183 Merge branch 'testing' into 1.0.x
Conflicts:
	plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
	plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
2011-06-07 16:04:49 -04:00
Evan Prodromou
59c980cea8 first pass at actions for initializing a network 2011-06-07 12:06:02 -04:00
Evan Prodromou
1b0bafc6cc Move recoverpassword functionality to User 2011-06-07 11:22:19 -04:00
Samantha Doherty
e499939c6c Bit of style cleanup for design settings fixes. 2011-06-06 17:08:05 -04:00
Zach Copley
f3eb83d8a5 Update design settings CSS output 2011-06-06 13:38:28 -07:00
Zach Copley
8b9a5f550b Update design settings CSS output 2011-06-06 13:18:56 -07:00
Evan Prodromou
17294a4627 move email registration code to DomainStatusNetworkPlugin 2011-06-06 12:25:26 -04:00
Zach Copley
895447f3dc Upgrade anti-framing, anti-clickjacking code 2011-06-06 06:08:17 +00:00
Siebrand Mazeland
31a92ede44 Update translator documentation.
i18n/L10n updates.
Whitespace update.
2011-06-06 00:38:38 +02:00
Siebrand Mazeland
f007bcee16 Add translator documentation. 2011-06-06 00:37:10 +02:00
Siebrand Mazeland
9358a34384 Add translator documentation. 2011-06-06 00:36:50 +02:00
Siebrand Mazeland
ff33d0ff35 Add onPluginVersion().
Add translator documentation.
Whitespace update.
Add FIXME for global functions.
2011-06-06 00:36:31 +02:00
Siebrand Mazeland
9a59d44208 Add translator documentation.
L10n update.
Whitespace update.
2011-06-06 00:35:40 +02:00
Siebrand Mazeland
c11a549071 Add translator documentation. 2011-06-06 00:35:12 +02:00
Siebrand Mazeland
2b3b11fca6 Add translator documentation. 2011-06-06 00:34:57 +02:00
Siebrand Mazeland
c3f081c583 Localisation updates from http://translatewiki.net. 2011-06-05 21:15:31 +02:00
Siebrand Mazeland
acc4d8b1c3 Use language specific truncation symbol.
Add translator documentation.
2011-06-05 20:51:50 +02:00
Siebrand Mazeland
49eb66c57e Update translator documentation.
Whitespace updates.
i18n/L10n updates.
2011-06-05 20:42:11 +02:00
Siebrand Mazeland
8807705bb4 Update translator documentation and whitespace. 2011-06-05 20:23:13 +02:00
Siebrand Mazeland
4110266b68 Update translator documentation.
i18n/L10n fixes.
Whitespace updates.
2011-06-05 20:15:01 +02:00
Siebrand Mazeland
8ce0acca33 Add translator documentation. 2011-06-05 19:59:50 +02:00
Siebrand Mazeland
158140a118 Add translator documentation.
Whitespace updates.
i18n fixes.
2011-06-05 19:58:11 +02:00
Siebrand Mazeland
fdca686298 Update translator documentation.
Update whitespace.
2011-06-05 19:46:45 +02:00
Siebrand Mazeland
59006ffee1 Update translator documentation. 2011-06-05 19:40:25 +02:00
Siebrand Mazeland
eb0fb9c2b7 Add todo. URLs are outdated. 2011-06-05 19:39:59 +02:00
Siebrand Mazeland
0cca861ea7 Update translator documentation.
L10n fixes.
Whitespace updates.
2011-06-05 19:33:41 +02:00
Siebrand Mazeland
b4efd97c62 Add translator documentation. 2011-06-05 19:30:04 +02:00
Siebrand Mazeland
b0e80d1e28 Fix xgettext translator comment. 2011-06-05 19:27:42 +02:00
Siebrand Mazeland
9e78c631fb Fix plural issue.
Fix translator documentation.
2011-06-05 19:23:35 +02:00
Siebrand Mazeland
7c5fb37e59 Localisation updates from http://translatewiki.net. 2011-06-05 11:50:05 +02:00
Siebrand Mazeland
834ed4365d Fix i18n.
Update translator documentation.
2011-06-05 11:44:01 +02:00