Commit Graph

4554 Commits

Author SHA1 Message Date
Zach Copley
4321e02c7b Delete orphaned background imgs. Design settings code now passes
phpcs.
2009-06-29 16:57:36 -07:00
Zach Copley
d19ffc73c2 Merge branch '0.8.x' into design_reset
* 0.8.x:
  Using max-width:480px for settings_design_background-image image
  Using role for admin indicator. Added margin-left.
2009-06-29 15:38:17 -07:00
Zach Copley
a23b612ae9 Small comment change (default is for both users an groups) 2009-06-29 15:37:13 -07:00
Sarven Capadisli
357f3784b5 Using max-width:480px for settings_design_background-image image 2009-06-29 22:30:40 +00:00
Sarven Capadisli
1268be4f82 Using role for admin indicator. Added margin-left. 2009-06-29 22:07:16 +00:00
Zach Copley
135927e42a Allow users and groups to reset their design to system default colors 2009-06-29 14:52:38 -07:00
Zach Copley
dd1fc46f09 Merge branch '0.8.x' into design_reset
* 0.8.x: (32 commits)
  admin indicators in groups
  show section with admins in sidebar of group
  update to latest (r76) version of XMPPHP
  better output for common error handler
  fix logging error
  note when going background
  change name of constructor for xmppdaemon
  add a lot more logging to xmppdaemon
  error in get_option_value wasn't returning a value
  reformat commandline.inc
  if not in daemon mode, xmppdaemon sends log to stdout
  extract log-line formatting to its own function
  got my background/foreground logic backwards
  twitter status fetcher takes an id argument
  more efficient fixup of conversations
  commandline processing handles errors better
  xmppdaemon.php can stay in foreground
  command line arg handling a little more flexible
  Daemon can optionally not go into the background
  don't canonicalize people's text into URLs
  ...

Conflicts:
	theme/base/css/display.css
2009-06-29 13:23:45 -07:00
Evan Prodromou
5b8e40aaa9 admin indicators in groups 2009-06-29 10:29:11 -04:00
Evan Prodromou
d03b8c4276 show section with admins in sidebar of group 2009-06-29 10:22:17 -04:00
Evan Prodromou
ffa40a84ba update to latest (r76) version of XMPPHP 2009-06-28 21:03:21 -04:00
Evan Prodromou
14575fe6fc better output for common error handler 2009-06-28 19:24:14 -04:00
Evan Prodromou
6557a569e5 fix logging error 2009-06-28 17:41:16 -04:00
Evan Prodromou
5cc58f1e01 note when going background 2009-06-28 17:38:02 -04:00
Evan Prodromou
87e3c52fa8 change name of constructor for xmppdaemon 2009-06-28 17:22:44 -04:00
Evan Prodromou
96814f14db add a lot more logging to xmppdaemon 2009-06-28 17:22:11 -04:00
Evan Prodromou
3ac6b7d120 error in get_option_value wasn't returning a value 2009-06-28 17:02:31 -04:00
Evan Prodromou
7a0d33ab5f reformat commandline.inc 2009-06-28 16:55:19 -04:00
Evan Prodromou
25c721f6ff if not in daemon mode, xmppdaemon sends log to stdout 2009-06-28 16:38:59 -04:00
Evan Prodromou
9f079764aa extract log-line formatting to its own function 2009-06-28 16:38:27 -04:00
Evan Prodromou
cfd2548923 got my background/foreground logic backwards 2009-06-28 16:33:08 -04:00
Evan Prodromou
0c3bfc2212 Merge branch '0.8.x' of jill@xmpp001.controlezvous.ca:/opt/local/share/laconica into 0.8.x 2009-06-28 16:20:58 -04:00
Evan Prodromou
a4d0f22b4b twitter status fetcher takes an id argument 2009-06-28 20:16:44 +00:00
Super-User
b06edd1f27 more efficient fixup of conversations 2009-06-28 20:15:45 +00:00
Super-User
c755970141 commandline processing handles errors better 2009-06-28 20:15:17 +00:00
Evan Prodromou
47e1d2adb8 xmppdaemon.php can stay in foreground 2009-06-28 16:13:08 -04:00
Evan Prodromou
2f8c656e1d command line arg handling a little more flexible 2009-06-28 16:12:45 -04:00
Evan Prodromou
6ca4dfa7ef Daemon can optionally not go into the background 2009-06-28 16:12:23 -04:00
Evan Prodromou
495c85544a don't canonicalize people's text into URLs 2009-06-28 15:21:15 -04:00
Evan Prodromou
166e4a4b58 bad string compare in Status_network 2009-06-28 14:48:19 -04:00
Evan Prodromou
d4f1637f8a fallback for www. addresses 2009-06-28 14:45:33 -04:00
Evan Prodromou
871f598dcc debug flag for sessions 2009-06-27 08:11:09 -07:00
Evan Prodromou
fb84c35035 don't need config in main anymore 2009-06-27 07:43:58 -07:00
Evan Prodromou
70521d55a8 log IP for API auth errors 2009-06-27 07:37:58 -07:00
Evan Prodromou
7af94dc125 some debugging code for sessions 2009-06-27 07:09:21 -07:00
Evan Prodromou
addfcc976a remove debugging code from Notice.php 2009-06-27 07:02:36 -07:00
Evan Prodromou
5a600a02d1 fixup perms on auto-generated files 2009-06-27 06:24:06 -07:00
Evan Prodromou
71dad1ff62 use the session class to store sessions 2009-06-27 06:20:24 -07:00
Evan Prodromou
0ca22cf6e2 a memcached_dataobject class for saving sessions 2009-06-27 05:48:22 -07:00
Evan Prodromou
48d671ac39 session storage 2009-06-27 05:15:59 -07:00
Evan Prodromou
ce76d61957 marker in sessions 2009-06-27 05:07:14 -07:00
Sarven Capadisli
f65015b24a Added input submit to let the user to go back to site's default design
settings
2009-06-27 03:21:18 +00:00
Zach Copley
a68722c9c7 Merge branch 'attachment-fixup' into 0.8.x
* attachment-fixup:
  Added readonly flag to FileAction just in case
  Make shorturls in notice content point to AttachmentAction urls
  Add attachment action back into router
2009-06-26 18:32:18 -07:00
Zach Copley
96ba25c34b Added readonly flag to FileAction just in case 2009-06-26 18:31:24 -07:00
Sarven Capadisli
60b47d8797 Added background-attachment:fixed for userdesigns 2009-06-26 15:20:22 +00:00
Sarven Capadisli
9fc8ad4531 Removed redundant selector from JS 2009-06-26 15:10:04 +00:00
Brenda Wallace
3a3614fc55 also check for write permission to background folder 2009-06-26 22:42:52 +12:00
Evan Prodromou
bb04f68e93 boxcar notice inbox requests 2009-06-26 00:47:27 -07:00
Jeffery To
612a107e09 Merge branch '0.8.x' into small-fixes 2009-06-26 15:44:31 +08:00
Jeffery To
71dc910a53 Merge branch '0.8.x' into notice-search-no-results 2009-06-26 15:42:37 +08:00
Jeffery To
925b3f32ea Merge branch 'invite-enabled' of git://gitorious.org/~jeff-themovie/laconica/jeff-themovie-clone into invite-enabled 2009-06-26 15:39:08 +08:00