James Walker
5cb6e54bed
call-time pass by reference
2010-02-25 17:09:54 -05:00
James Walker
e62e49ed3b
adding some exception handling for magicenv parsing
2010-02-25 17:09:54 -05:00
Zach Copley
bac959ad46
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Not sure how this ended up in wrong-cased dir...
OStatus: fix remote groups to work with new user_groups/local_groups split.
Conflicts:
classes/User_group.php
2010-02-25 13:40:14 -08:00
Zach Copley
e61edb55d9
Rationalize group activity stuff
2010-02-25 13:34:43 -08:00
Brion Vibber
8278eca7ff
Not sure how this ended up in wrong-cased dir...
2010-02-25 21:15:20 +00:00
Brion Vibber
b5b5184c88
OStatus: fix remote groups to work with new user_groups/local_groups split.
...
- fix <activity:subject> generation so we get the profile info (what's available so far)
- use id instead of nickname for group join/leave forms so we can join/leave remote groups
while the rest of the groups UI remains limited to local groups
(plugins are responsible for making sure remote notifications and permission checks are done)
- fix remote notification when joining group through OStatus's remote subscribe form
2010-02-25 13:02:08 -08:00
Brion Vibber
7e0872c7ca
Add local_group.sql with DB changes to user_group, setup and populate local_group.
2010-02-25 12:08:23 -08:00
Brion Vibber
b7037a49af
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-25 11:57:21 -08:00
Brion Vibber
a8d0c8d8ef
Normalize nickname case on login; fixes failed logins where people were typing MixedCase nicknames (if browser saved this form, it would never work again until clearing the saved form data; very icky.)
2010-02-25 11:56:48 -08:00
Brion Vibber
fb8b8615b0
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-25 11:27:21 -08:00
Brion Vibber
79c0d52daa
OStatus: save categories from the Atom entry as hashtags.
2010-02-25 11:26:33 -08:00
Evan Prodromou
5ea01435c1
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 13:33:08 -05:00
Brion Vibber
39a8e9d8e6
Ensure that shortened URLs haven't accumulated whitespace when fetched by a plugin. Some shorteners have ended up inserting extra newlines when the string gets extracted from tidied HTML.
2010-02-25 10:30:37 -08:00
Evan Prodromou
85b5f01729
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 13:18:37 -05:00
Brion Vibber
4a71753f20
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-25 09:28:19 -08:00
Evan Prodromou
2f03b2cc45
method for getting a group's URI
2010-02-25 12:15:26 -05:00
Brion Vibber
84fa3776e2
Merge commit 'refs/merge-requests/122' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:14:42 -08:00
Brion Vibber
99c0e16844
Merge commit 'refs/merge-requests/121' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:12:45 -08:00
Brion Vibber
66373f8e5a
Merge commit 'refs/merge-requests/2220' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:11:07 -08:00
Evan Prodromou
22255da735
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 12:10:57 -05:00
Evan Prodromou
d53b4b9b84
save mainpage element for groups
2010-02-25 12:05:22 -05:00
Evan Prodromou
8f42d37593
Add 'mainpage' to User_group
...
Add the mainpage attribute to user_group objects.
2010-02-25 09:24:29 -05:00
Sarven Capadisli
ffdcdbc198
Removed dangling icons in Realtime plugin
2010-02-25 13:55:06 +00:00
Sarven Capadisli
a0f6977baa
Fixes replyto JS after the upgrade from jQuery 1.4.2
2010-02-25 14:51:23 +01:00
Sarven Capadisli
b54480247a
Updated jQuery JavaScript Library from v1.4.1 to v1.4.2
2010-02-25 14:50:40 +01:00
Evan Prodromou
e6858d7203
modify group actions so they use Local_group to look up by nickname
2010-02-25 08:44:15 -05:00
Sarven Capadisli
90d396a123
Moved otalk theme out of core. It will be updated separately and may
...
be reintruced back to core when appropriate.
2010-02-25 12:36:22 +01:00
Sarven Capadisli
3299078e33
Updated pigeonthoughts theme
2010-02-25 12:35:15 +01:00
Sarven Capadisli
5061fb7cc4
Updated cloudy theme
2010-02-25 12:08:49 +01:00
Sarven Capadisli
58d8b258cf
Removed dangling geo icon
2010-02-25 11:43:14 +01:00
Sarven Capadisli
b33f9a2d13
Added author, license information for the icons that are in base theme
2010-02-25 11:42:25 +01:00
Sarven Capadisli
9ef7eb036c
Moved common icons from Realtime plugin to core icons file
2010-02-25 10:38:55 +00:00
Sarven Capadisli
44cb354698
Added external, play, pause icons to main icons file
2010-02-25 11:20:36 +01:00
Evan Prodromou
ddc3671b6a
recover user_openid tables, which got lost in generation
2010-02-24 23:32:20 -05:00
Evan Prodromou
68a10970f9
fixup exe bits
2010-02-24 23:30:14 -05:00
Evan Prodromou
bd68154772
Make user_group able to handle remote groups
...
We add a local_group table to store data about local groups. It has
the unique key for nickname, so /group/<nickname> looks up here.
Updated DB data object classes and data files.
2010-02-24 23:28:41 -05:00
Evan Prodromou
374c488cf1
return attachement from saveHTMLFile()
2010-02-24 22:26:40 -05:00
Evan Prodromou
b08a527139
content_* to common_*
2010-02-24 22:22:42 -05:00
Evan Prodromou
75cf4d4312
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 22:03:01 -05:00
Evan Prodromou
942521ef30
if OStatus post is too long, show the summary and save it as an HTML attachment
2010-02-24 22:02:43 -05:00
Brion Vibber
58e232a10a
OStatus: when finding webfinger @-replies, override a local profile match if found at the same location (eg @someguy vs @someguy@example.org)
...
Fixes inconsistent application of webfinger @-mentions in OStatus; once a local profile is set up the local name would often match first and ended up overriding in output.
2010-02-25 02:56:56 +00:00
Brion Vibber
b798faf9ea
OStatus: abort processing of this PuSH in item if we got an exception, rather than letting it be re-run.
2010-02-25 02:43:20 +00:00
Zach Copley
10884dcd49
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Merge StatusNet core localization updates from 0.9.x branch
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
OStatus: handle update-profile Salmon pings
Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
2010-02-24 16:52:16 -08:00
Zach Copley
543ff40ef6
Populate more profile information when doing a remote subscribe
2010-02-24 16:51:24 -08:00
Brion Vibber
5173d92895
Merge StatusNet core localization updates from 0.9.x branch
2010-02-24 16:47:00 -08:00
Brion Vibber
3b7084c6dd
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
2010-02-24 16:34:45 -08:00
Brion Vibber
e04f556304
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 23:40:28 +00:00
Brion Vibber
e18e659ca3
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
2010-02-24 23:39:40 +00:00
Brion Vibber
93507a1927
OStatus: handle update-profile Salmon pings
2010-02-24 23:28:01 +00:00
Sarven Capadisli
b782225ade
Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
...
This reverts commit 72037d6143
2010-02-25 00:10:36 +01:00
