eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,201 Commits 8 Branches 0 Tags 309 MiB
Commit Graph

4201 Commits

Author SHA1 Message Date
Zach Copley 90344e55d4 Add background dir 2009-06-16 19:23:06 -07:00
Zach Copley bc1f877f6e Design settings now save and displays backgrounds 2009-06-16 19:17:37 -07:00
Zach Copley ab10db9bd1 Merge branch '0.8.x' into userdesign 
* 0.8.x:
  Revert "Using neutral colour for notice hover"
  Using neutral colour for notice hover
  forgot to disinherit Memcached_DataObject in Status_network
  Add some basic memcached handling to status_network
 2009-06-16 00:59:57 -07:00
Zach Copley 2ccf43d656 Merge branch 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design into userdesign 
* 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design:
  Connects html, body and content, navigation background colors
 2009-06-16 00:57:38 -07:00
Zach Copley 6d5d0b3472 Update wasn't ever getting called 2009-06-16 00:56:32 -07:00
Sarven Capadisli c98179378b Revert "Using neutral colour for notice hover" 
This reverts commit 5daa0e358f.
 2009-06-16 07:45:19 +00:00
Sarven Capadisli a09c32aa3c Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-16 06:32:50 +00:00
Sarven Capadisli 5daa0e358f Using neutral colour for notice hover 2009-06-16 06:32:17 +00:00
Sarven Capadisli 93205cac09 Connects html, body and content, navigation background colors 2009-06-16 06:24:29 +00:00
Zach Copley c3c30aa0ea Check to make sure a design exists before trying to display it 2009-06-15 23:18:54 -07:00
Zach Copley 37cafad2e0 Another minor tweak to showCSS() CSS output 2009-06-15 22:43:06 -07:00
Zach Copley f3199c1369 Some fixups to the CSS output of showCSS() 2009-06-15 22:39:53 -07:00
Zach Copley 4652f316cf Design class now uses WebColor class for outputting hex colors 2009-06-15 22:27:59 -07:00
Zach Copley ef99f83963 Output custom stylesheets on design sub-Actions 2009-06-15 22:13:35 -07:00
Evan Prodromou 39117bf88c forgot to disinherit Memcached_DataObject in Status_network 2009-06-15 21:55:56 -07:00
Evan Prodromou 0a886868fb Add some basic memcached handling to status_network 
Status_network can't be a subclass of Memcached_DataObject -- the
latter is too entrenched in Laconica's memc handling functions, which
aren't loaded when Status_network is running! But the importance of
caching these values can't be overstated. So, a considerably
slimmed-down version of the Memcached_DataObject code is transcribed
into Status_network.
 2009-06-15 21:33:56 -07:00
Zach Copley 44343986c3 Merge branch '0.8.x' into userdesign 
* 0.8.x:
  a little better query handling in redirect code
  a little better query handling in redirect code
  forgot some functions aren't available at status time
  redirect on non-canonical server name
  don't show create-a-group link if not logged in
  allow a configured base for cache keys
  Missing call to getProfile() caused verify_credentials to fail.
  change mods for setup script
  Script to set up new status networks
  strncmp -> strcasecmp
  Return network from network setup function
  Configurable avatar directory
 2009-06-15 21:24:22 -07:00
Zach Copley e7e3709ae0 Throw an WebColorException if wrong # of hex chars 2009-06-15 21:21:33 -07:00
Sarven Capadisli 2c7f0534ca Typo/lowercased WebColor to webcolor in required_once 2009-06-16 04:03:08 +00:00
Zach Copley 94fec28610 User design setting save 2009-06-15 20:29:30 -07:00
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