diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-15 11:50:08 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-15 11:50:08 -0700 |
| commit | 92f095f589b3fc4ab40f72f873d6a7a189b63a96 (patch) | |
| tree | ddb98469e596b276219becca33a93b0a454961dd /classes/statusnet.ini | |
| parent | 946d016df2a5e0af5e1b4b983b30c113dd02b4ea (diff) | |
| parent | eb6a60ef8833d0a34768f2717f2a34fdcd52e5ce (diff) | |
Merge branch '0.8.x' into userdesign
* 0.8.x: (32 commits)
updates to Status_network
makeadmin action
make admins of groups
show aliases when showing a group
Link and distribute notices tagged for a group alias
Code for adding and saving group aliases
Styles for group block
add correct li for css magic for block stuff
typo in profileminilist class
return count from show
try to get the right class for profileminilist
fix perms for classes/statusnet.ini
fixup perms for classes
Added Group_alias class
add a table for group aliases
Cross-browser notice_attach
Allow users to be unblocked from a group
Some UI improvements for blocking and unblocking
The rest of the things necessary to make group block work
Make group block work
...
Conflicts:
db/laconica.sql
lib/common.php
Diffstat (limited to 'classes/statusnet.ini')
| -rw-r--r--[-rwxr-xr-x] | classes/statusnet.ini | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/statusnet.ini b/classes/statusnet.ini index a70cd4122..8123265e4 100755..100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -1,13 +1,14 @@ - [status_network] nickname = 130 hostname = 2 pathname = 2 -sitename = 2 dbhost = 2 dbuser = 2 dbpass = 2 dbname = 2 +sitename = 2 +theme = 2 +logo = 2 created = 142 modified = 384 |