Commit Graph

4696 Commits

Author SHA1 Message Date
Evan Prodromou
4c256a6d7e better hook variables for StartQueueManager 2009-07-01 11:09:58 -04:00
Evan Prodromou
58b427869a compile errors in DBQueueManager 2009-07-01 11:09:42 -04:00
Sarven Capadisli
6c28a07cf5 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-07-01 00:50:19 +00:00
Sarven Capadisli
015492daac Improves the FB user avatar "bounce" in some browsers 2009-07-01 00:49:40 +00:00
Dan Moore
fbb7757c4b Cleaning up comments at top of favor.php. 2009-06-30 17:04:49 -07:00
Zach Copley
ed21af0d1d Merge branch 'mgrdcm-review' into 0.7.x
* mgrdcm-review:
  Cleaning up comments at top of favor.php.
2009-06-30 17:02:51 -07:00
Jeff Mitchell
b416df9312 Add site-wide option to change the length at which URLs are auto-shortened 2009-06-30 16:46:33 -07:00
Zach Copley
e36a0fd619 Merge branch 'jeff' into 0.7.x
* jeff:
  Add site-wide option to change the length at which URLs are auto-shortened
2009-06-30 16:41:17 -07:00
Zach Copley
ccbc5c447d Merge commit 'jeff-themovie/small-fixes' into 0.8.x
* commit 'jeff-themovie/small-fixes':
  Fix missing max_id in API search calls
  Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
  Fix "Trying to get property of non-object" errors when accessing the people search results page
  Fix "Undefined variable: cnt"
  Fix "Trying to get property of non-object" errors in groupeditform.php
  Fix "Undefined property: DisfavorAction::$id"
2009-06-30 16:25:52 -07:00
Zach Copley
b10dba2798 Merge commit 'jeff-themovie/invite-enabled' into 0.8.x
* commit 'jeff-themovie/invite-enabled':
  Adds $config['invite']['enabled'] to enable/disable invites.
2009-06-30 16:10:12 -07:00
Zach Copley
190d45cd05 Merge commit 'jeff-themovie/notice-search-no-results' into 0.8.x
* commit 'jeff-themovie/notice-search-no-results':
  Fixes the notice search RSS feeds / API results for searches that return no matches.
2009-06-30 15:38:14 -07:00
Zach Copley
c2c631d19d Merge commit 'jeff-themovie/group-rss-empty' into 0.8.x
* commit 'jeff-themovie/group-rss-empty':
  Fixes two PHP Warnings ("Invalid argument supplied for foreach() in /var/www/mmmu/lib/rssaction.php") when accessing the RSS feed of a group that has no notices.
2009-06-30 15:12:50 -07:00
Zach Copley
907b5f7b40 Merge commit 'erichelgeson/no-posts-verbage' into 0.8.x
* commit 'erichelgeson/no-posts-verbage':
  Needed the else. Tested logged in/out ; site closed/inviteonly/both
  Verbage of a closed invite only site, it shouldnt ask you to register.
2009-06-30 14:57:19 -07:00
Zach Copley
4405648afb Merge commit 'br3nda/0.8.x-backgroundfix' into 0.8.x
* commit 'br3nda/0.8.x-backgroundfix':
  also check for write permission to background folder
2009-06-30 14:50:28 -07:00
Jeff Mitchell
c3cffaf9c7 Laconica defaults to a locale 'en' which uses language 'en'. Unfortunately, this language doesn't exist -- properly it's en_US. This causes a lot of spammy messages in syslog. This fix simply changes 'en' to have
the same properties as 'en-us', i.e. a language of en_US and a description of 'English (US)'.
2009-06-30 14:36:40 -07:00
Evan Prodromou
fc20da19bb Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-30 16:12:01 -04:00
Evan Prodromou
7ed94b23a2 added Mail/mimeDecode as mime-decode fallback 2009-06-30 16:11:46 -04:00
Zach Copley
c162bf4d22 Forgot to include ImsettingsAction in the list of Actions to override
in order to add a Facebook tab to the Connect menu.
2009-06-30 11:55:34 -07:00
Evan Prodromou
4a926cad4e add showcache.php script for debugging memcached issues 2009-06-30 12:25:18 -04:00
Evan Prodromou
c5ce56b878 calculate date once for SUP 2009-06-30 11:53:50 -04:00
Evan Prodromou
4e6cd42757 conversation code changes 2009-06-30 11:50:16 -04:00
Zach Copley
424dd56b2a Merge branch 'defat-fbconnect' into 0.8.x 2009-06-30 04:59:38 +00:00
Zach Copley
13d5479a11 Only output Facebook namespace, scripts, css, etc. when strictly necessary 2009-06-30 04:57:59 +00:00
Sarven Capadisli
a9fd175994 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-30 03:06:37 +00:00
Sarven Capadisli
ccfe0e018d Updated jOverlay version and set max-width for images 2009-06-30 03:05:45 +00:00
Zach Copley
e00f433314 Only use FB's Javascript logout, not its PHP method too 2009-06-30 01:54:08 +00:00
Zach Copley
dfb4ed5265 Factor out code to tell whether user's logged into FB into its own method 2009-06-30 00:49:59 +00:00
Zach Copley
c01e8c0bd1 Fixed grammar in class comment blocks 2009-06-29 17:04:09 -07:00
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