01996b1a46
Merge remote-tracking branch 'evan/blogplugin' into newblogplugin
2011-06-20 09:34:32 -04:00
ab98458399
push regex pattern for UUID to that class
2011-06-20 01:11:08 -04:00
26a92b2801
Hopefully fix TRANS message not getting picked up by xgettext.
2011-06-19 11:45:37 +02:00
c2ab4af804
Fix incorrect tag (missing colon).
2011-06-19 11:30:35 +02:00
173d20e1f9
L10n updates.
2011-06-17 22:36:24 +02:00
e1ac64f2cb
Add current class to selected menu items
2011-06-09 19:29:19 -04:00
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
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
895447f3dc
Upgrade anti-framing, anti-clickjacking code
2011-06-06 06:08:17 +00:00
3dcdf2ef03
Update translator documentation.
2011-06-05 11:12:34 +02:00
f4e17c1bdf
Merge branch '1.0.x' into testing
2011-05-31 17:16:45 -04:00
506958f2c8
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-05-31 17:01:11 -04:00
60a1b0a15a
Change 'listening to your notices' to 'following you'
2011-05-31 17:00:23 -04:00
ac55efeecf
Don't show empty addressees in noticelistitem
2011-05-30 16:20:52 -04:00
0dbdcf2936
Merge branch 'master' into 1.0.x
2011-05-30 11:18:34 -04:00
19b965d991
Merge branch 'master' into testing
2011-05-30 11:18:22 -04:00
9167ba8d2d
ActivityImporter catches thrown exceptions by plugins and marks entry done
2011-05-30 09:57:49 -04:00
97debbab68
use integer iterator for childNodes in ActivityUtils::getLinks()
2011-05-30 09:57:11 -04:00
d7a16929b9
Set the current user on API calls
2011-05-25 14:01:22 -04:00
a838891c0e
set the current user in api actions
2011-05-25 13:04:35 -04:00
b34e267e53
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/EmailRegistration/scripts/cancelemailregistration.php
2011-05-23 18:20:18 -04:00
cb090ab48d
increment alpha version revision
2011-05-23 12:37:29 -04:00
e48c26e156
Update translator documentation, i18n and L10n.
2011-05-20 16:57:05 +02:00
5a86900a34
minor alpha version for i18n build errors
2011-05-20 06:09:37 -07:00
c2f735a84e
rev to alpha3
2011-05-20 06:03:36 -07:00
fbc5de3268
Add missing li tags in settings and admin menus.
2011-05-18 12:13:34 -04:00
4549d36862
Change addressees arrow from hardcoded to CSS.
2011-05-18 09:49:01 -04:00
37cf7c0e8c
Style for invite forms and width fix for Onboard popup.
2011-05-11 17:07:08 -04:00
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
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
c97048d01b
merge 0.9.x into 1.0.x
2011-05-04 14:59:39 -07:00
c46406b209
low-level hook for loading templates
2011-05-04 11:28:49 -07:00
6b1732d9a2
remove object nav for search
2011-05-04 10:43:47 -07:00
90eb09624c
let users login with email address
2011-05-02 15:17:08 -07:00
02c5d68bed
Merge branch 'emailsitesetup' into 1.0.x
2011-04-28 12:44:21 -07:00
fad0c875ca
Don't redefine 'STATUSNET' in installer
2011-04-28 12:38:07 -07:00
7c3818c00e
Update translator documentation.
2011-04-27 14:30:58 +02:00
d09df28040
utility functions for setting config options in memory
2011-04-26 16:50:42 -04:00
a2e4a1803c
Harmonize message for 'User has no profile.' and update translator documentation.
2011-04-25 22:44:19 +02:00
413d9e2fd0
Whitespace updates.
2011-04-24 18:50:55 +02:00
8afda686d2
@evan Please check. Doesn't look correct/complete.
2011-04-24 18:50:03 +02:00
f79d59a081
Merge branch '1.0.x' into testing
2011-04-21 16:16:07 -04:00
5fd08b798f
show thumbnails even for links that arent enclosures
2011-04-21 16:13:32 -04:00
963d052653
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-21 15:23:22 -04:00
5e97047f8f
Update translator documentation.
...
i18n fixes.
Whitespace updates.
2011-04-21 20:26:58 +02:00
98cc1da7b5
Update indentation.
2011-04-21 20:19:51 +02:00
63009f1e1b
Merge branch '1.0.x' into testing
2011-04-21 13:37:15 -04:00
36d56232c6
a little better notice hiding
2011-04-21 13:37:05 -04:00
9fcda5b2da
show the full name for likes
2011-04-21 12:00:10 -04:00
34e26b53d5
show list of people who like something in threadednoticelist
2011-04-21 11:58:24 -04:00
Evan Prodromou
Siebrand Mazeland
Zach Copley
Samantha Doherty