Zach Copley
9dce5d00f1
Merge branch 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design into userdesign
...
* 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design:
Converts user entry in the form of '#1B2' into '#11BB22' for user
Updated swatch numbering
Conflicts:
actions/designsettings.php
2009-06-15 20:25:36 -07:00
Zach Copley
20d9350877
User design setting save now
2009-06-15 20:21:33 -07:00
Sarven Capadisli
bd8f9a979a
Converts user entry in the form of '#1B2' into '#11BB22' for user
...
design swatches
2009-06-16 02:33:10 +00:00
Evan Prodromou
8c24a3bc92
a little better query handling in redirect code
2009-06-15 16:55:01 -07:00
Evan Prodromou
f809663245
a little better query handling in redirect code
2009-06-15 16:51:49 -07:00
Evan Prodromou
2f82a3d44c
forgot some functions aren't available at status time
2009-06-15 16:43:39 -07:00
Evan Prodromou
587b7a8b2a
redirect on non-canonical server name
2009-06-15 16:40:53 -07:00
Evan Prodromou
fbed704f3b
don't show create-a-group link if not logged in
2009-06-15 16:22:08 -07:00
Evan Prodromou
2114f7dd6e
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-15 16:11:44 -07:00
Evan Prodromou
fd290fc3f9
allow a configured base for cache keys
2009-06-15 16:09:40 -07:00
Zach Copley
1a51251375
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-06-15 22:52:14 +00:00
Zach Copley
12cd87cd7b
Missing call to getProfile() caused verify_credentials to fail.
2009-06-15 22:50:14 +00:00
Evan Prodromou
177e4adf40
change mods for setup script
2009-06-15 15:13:49 -07:00
Evan Prodromou
01c03223c2
Script to set up new status networks
2009-06-15 15:13:24 -07:00
Evan Prodromou
6532f0dff6
strncmp -> strcasecmp
2009-06-15 14:29:25 -07:00
Sarven Capadisli
2f693c4c94
Updated swatch numbering
2009-06-15 21:02:12 +00:00
Evan Prodromou
d6ff702d7f
Return network from network setup function
...
Return the network from the network setup function. Also, special-case
for when we get a server name the same as the wildcard.
2009-06-15 13:34:52 -07:00
Zach Copley
807d84d448
Small fix to correct the order of defined color prefs
2009-06-15 12:57:08 -07:00
Zach Copley
92f095f589
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
2009-06-15 11:50:08 -07:00
Evan Prodromou
c077ad0775
Configurable avatar directory
...
Avatar directory and path are configurable.
2009-06-15 10:45:50 -07:00
Evan Prodromou
eb6a60ef88
updates to Status_network
2009-06-15 08:54:52 -07:00
Evan Prodromou
528ceec3fe
makeadmin action
2009-06-15 05:44:36 -07:00
Evan Prodromou
2b8a767770
make admins of groups
2009-06-15 00:59:15 -07:00
Evan Prodromou
dda4493af7
show aliases when showing a group
2009-06-14 23:51:38 -07:00
Evan Prodromou
4a0c57f224
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-14 23:48:40 -07:00
Evan Prodromou
4dad3191f6
Merge branch 'groupalias' into 0.8.x
2009-06-14 23:48:24 -07:00
Evan Prodromou
1b6b00a6d0
Link and distribute notices tagged for a group alias
...
Correctly link and distribute notices tagged for a group alias. Added
a helper function, getForNickname(), to User_group, to make it easier
to get a group by its nickname or aliases.
2009-06-14 23:43:47 -07:00
Evan Prodromou
ecbd7718d5
Code for adding and saving group aliases
...
Added code to add and save group aliases. Like tags, aliases are
free-texted in to the group admin page. configurable max number of
aliases, default is three.
2009-06-14 23:37:24 -07:00
Sarven Capadisli
e18504d1d2
Styles for group block
2009-06-15 05:38:18 +00:00
Evan Prodromou
2f3c4f8812
add correct li for css magic for block stuff
2009-06-14 22:16:24 -07:00
Evan Prodromou
c0f3204a10
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-14 22:09:59 -07:00
Evan Prodromou
7097804eeb
typo in profileminilist class
2009-06-14 22:09:17 -07:00
Evan Prodromou
bef643352d
return count from show
2009-06-14 22:09:04 -07:00
Evan Prodromou
ee8dd62038
try to get the right class for profileminilist
2009-06-14 22:07:27 -07:00
Evan Prodromou
09c765f5bb
Merge branch '0.8.x' into groupalias
2009-06-14 21:53:45 -07:00
Evan Prodromou
23fd58b74c
fix perms for classes/statusnet.ini
2009-06-14 21:53:29 -07:00
Evan Prodromou
a4055fc2f9
fixup perms for classes
2009-06-14 21:53:09 -07:00
Evan Prodromou
2d63daa71c
Added Group_alias class
2009-06-14 21:52:31 -07:00
Evan Prodromou
0deb2928e6
add a table for group aliases
2009-06-14 21:40:47 -07:00
Sarven Capadisli
8dd5871d4f
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
2009-06-15 03:26:32 +00:00
Sarven Capadisli
0bc9b2e730
Cross-browser notice_attach
2009-06-15 03:21:15 +00:00
Evan Prodromou
f8da15bf41
Allow users to be unblocked from a group
...
List users who are blocked from joining a group. Add a form to let
them be unblocked. Add an action that removes the block. Includes
changes to group and groupblock classes.
2009-06-14 16:17:44 -07:00
Evan Prodromou
bd26a80d45
Merge branch '0.8.x' into groupblock
...
Conflicts:
lib/router.php
2009-06-14 15:59:35 -07:00
Evan Prodromou
c2ba727d61
Merge branch '0.7.x' into 0.8.x
2009-06-14 15:58:19 -07:00
Evan Prodromou
203a5aba67
Some UI improvements for blocking and unblocking
...
Add unblock to the router table, so unblocking will work at all.
Block form and unblock form return to subscribers list, not
subscriptions list, by default.
showstream action sends its parameters to block and unblock forms to
better return to the right page.
2009-06-14 15:54:22 -07:00
Evan Prodromou
1c87532912
The rest of the things necessary to make group block work
...
Link to the group block form. Hide join button if the current user is
blocked.
2009-06-14 15:47:39 -07:00
Evan Prodromou
d3a0c524cc
Make group block work
2009-06-14 15:40:42 -07:00
Evan Prodromou
b6dee88e5d
add UI for blocking a user from a group
2009-06-14 15:08:00 -07:00
Evan Prodromou
10b7e8ff69
Merge branch '0.8.x' into groupblock
2009-06-14 14:55:08 -07:00
Evan Prodromou
daf2e7ef47
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
2009-06-14 14:54:20 -07:00
