Siebrand Mazeland
0bb06261d9
Localisation updates for !StatusNet from !translatewiki.net !sntrans
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-04 20:00:40 +01:00
Brion Vibber
f969d6349c
Merge branch 'testing' into 0.9.x
...
Conflicts:
db/08to09.sql
2010-03-04 10:16:59 -08:00
Evan Prodromou
b720c7554b
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 13:05:21 -05:00
Evan Prodromou
26f78f5777
change changelog and version
2010-03-04 13:04:22 -05:00
Brion Vibber
a3cb285da8
Add link to http://status.net/wiki/Getting_started on installer success screen.
2010-03-04 09:51:44 -08:00
Sarven Capadisli
bc6a77f334
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 12:51:18 -05:00
Sarven Capadisli
6b4c3e59fa
Showing a vertical navigation for admin panels.
2010-03-04 12:50:29 -05:00
Sarven Capadisli
74dbd37e9a
Bringing aside back because it is needed for Design values. Will hide
...
from CSS instead.
2010-03-04 12:49:42 -05:00
Brion Vibber
a6a056026d
Dropping the earlier PubSubHubbub plugin; OStatus plugin is taking that portion over (with both internal and external hub options for user and group feeds).
...
Todo: add support for other feeds to OStatus PuSH hub implementation.
2010-03-04 17:33:56 +00:00
Brion Vibber
8f1762cb95
OStatus: fix for remote group join via non-logged-in 'join' button.
...
Bad lookup was sending us to the first group instead of the selected group.
2010-03-04 09:24:47 -08:00
James Walker
45f11d9637
adding plugin version to OStatus
2010-03-04 12:02:44 -05:00
Brion Vibber
e3e3694bd9
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 08:57:51 -08:00
Sarven Capadisli
ef6620e5b2
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 11:57:40 -05:00
Brion Vibber
0ddd1ef191
Ignore API 'since' silently as Twitter does instead of throwing a 403 error. Getting extra results is less disruptive than total failure.
...
Threw in an X-StatusNet-Warning header on the off chance some API client developer notices it. :)
2010-03-04 08:55:36 -08:00
Brion Vibber
6f0fe02473
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 08:50:50 -08:00
James Walker
02f49193d5
adding checkschema to setup script
2010-03-04 11:49:19 -05:00
Brion Vibber
af04973e9e
Roll up some missing items from 08to09.sql; now hits all changed tables/columns/keys in core.
...
Added partial data conversions:
user_groups -> local_user: ids, names filled out; mainpage, uri left null
notice -> conversation: stub entry added to push the autoincrement past existing notice items
2010-03-04 08:49:04 -08:00
Evan Prodromou
fd4eefe6b4
OStatus enabled by default
2010-03-04 11:43:31 -05:00
Sarven Capadisli
1831506885
Moved database hostname in install to db fieldset
2010-03-04 11:35:18 -05:00
Brion Vibber
c5df005662
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 08:33:33 -08:00
Ciaran Gultnieks
3d2bf5ce20
Create new field in consumer table in 08to09.sql
2010-03-04 08:33:07 -08:00
Sarven Capadisli
4a03b66545
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 11:32:59 -05:00
Brion Vibber
67e4c5d43b
Added oauth_appication tables to 08to09.sql
...
Conflicts:
db/08to09.sql
2010-03-04 08:32:45 -08:00
Sarven Capadisli
0cf0a684ce
Updated SN install UI. Using separate fieldsets
2010-03-04 11:32:30 -05:00
Brion Vibber
865b320045
Merge branch 'master' into testing
2010-03-04 07:53:08 -08:00
Brion Vibber
8b3febab55
Installer tweaks: maintain form values when redisplaying form after error, add pass confirmation and optional email forms for administrator.
...
Caveat: fancy URLs value isn't currently maintained; JS needs updating to not overwrite the value or we should kill it entirely.
2010-03-04 07:45:26 -08:00
Brion Vibber
62d5f1addb
Merge branch 'testing'
2010-03-04 07:00:45 -08:00
Brion Vibber
9f861e9d89
Fix on sitenotice admin panel save
2010-03-04 06:39:46 -08:00
Brion Vibber
b218aee94e
Merge commit 'origin/testing' into 0.9.x
...
Conflicts:
lib/action.php
lib/adminpanelaction.php
2010-03-04 06:07:28 -08:00
Zach Copley
14d7f4a598
Removed unused stub class
2010-03-04 01:23:02 -08:00
Zach Copley
79b392a39e
Add generator tag into Atom feeds.
2010-03-04 01:16:25 -08:00
Zach Copley
507454d65d
Couple of tweaks to the HTML to try and make installer look bettter. This still needs some work.
2010-03-04 00:00:46 -08:00
Zach Copley
44462ac617
Create an initial user during install, and grant owner, moderator and administrator roles.
2010-03-04 00:00:46 -08:00
Zach Copley
37b106d49c
Fix variable name in NoConfigException
2010-03-04 00:00:46 -08:00
James Walker
ddc4a7d2ff
Catch a previously uncaught exception and add some additional debug logs for signature verification
2010-03-04 01:46:34 -05:00
James Walker
9cbeac5695
Merge remote branch 'statusnet/testing' into testing
2010-03-04 01:31:19 -05:00
James Walker
849f5783c4
update xrd -> userxrd
2010-03-04 01:30:15 -05:00
Sarven Capadisli
4b99bfce45
Updated styles for unsandbox, unsilence, revoke administrator and
...
moderator icons
2010-03-04 00:48:48 -05:00
Sarven Capadisli
9501882e80
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-04 00:29:56 -05:00
Sarven Capadisli
ce9d161885
Added the inverse icons for badge, sandbox, speech, admin
2010-03-04 00:29:13 -05:00
Zach Copley
8ffb34a90c
Temp fix for problem getting actor from PuSH updates where actor is only specified in subject
2010-03-03 20:58:34 -08:00
Zach Copley
0e360ad23d
Test a small user feed to ensure we're taking the activity actor from the subject
2010-03-03 20:58:34 -08:00
Zach Copley
f210cadfec
Revert "Revert "Show <activity:subject> and no activity actors for user feed""
...
This reverts commit e2578cfad6
.
2010-03-03 20:58:34 -08:00
Sarven Capadisli
b97ac60209
Changed text for authorizing/confirming remote profile
2010-03-03 23:47:27 -05:00
Sarven Capadisli
f54fa6b10b
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 23:36:05 -05:00
Sarven Capadisli
38503096d9
Puts All groups and Remote sub button in the mini list on the same line
2010-03-03 23:34:48 -05:00
James Walker
1c8399fde1
refactor xrd to allow for ownerxrd - xrd document for the site owner.
...
introduced $config['webfinger']['owner'] for a custom xrd subject
2010-03-03 23:20:30 -05:00
Sarven Capadisli
239750aa00
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 22:58:28 -05:00
Sarven Capadisli
de687d00c0
Updated OStatus subscription error messages to be more user friendly.
...
Hopefully.
2010-03-03 22:56:50 -05:00
Brion Vibber
24835c1164
OStatus: catchable exception instead of fatal when parsing valid XML that isn't a valid XRD doc
2010-03-03 18:31:35 -08:00