GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
5,980 Commits 8 Branches 4 Tags 310 MiB
f3287bd113
Commit Graph

653 Commits

Author SHA1 Message Date
Robin Millette
1505e3a4c3 Fixed recent attachment bug that required URLs to be posted twice to be taken into account. 2009-06-17 16:21:50 -04:00
Evan Prodromou
8384e7c7f6 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-17 08:18:33 -07:00
Zach Copley
76cbeff33c Update background image settings to use bitflags 2009-06-17 02:35:51 -07:00
Zach Copley
3d6e30d205 Merge branch '0.8.x' into userdesign 
* 0.8.x:
  Moved url handling to its proper place, from newnotice to Notice.php
  Removed more dead code.
  Brought back borders for content, navigation, aside_primary but
  Minor margin value change
  More contrast for tabs
  UI updates:
 2009-06-16 22:24:11 -07:00
Zach Copley
d1ae3176b6 Enable tiling of background imgs for Designs 2009-06-16 22:18:25 -07:00
Evan Prodromou
312fd85532 names for Notice_inbox source values 2009-06-16 21:37:19 -07:00
Evan Prodromou
90b2b3f9d1 names for Notice is_local states 2009-06-16 21:37:04 -07:00
Zach Copley
7b7f119428 Added background image tile flag to Design 2009-06-16 21:36:15 -07:00
Robin Millette
befbfc9c73 Moved url handling to its proper place, from newnotice to Notice.php 2009-06-16 23:10:17 -04: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
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
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
6532f0dff6 strncmp -> strcasecmp 2009-06-15 14:29:25 -07: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
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
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
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
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
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
f32799699c fix perms on Group_block classes 2009-06-14 12:07:12 -07:00
Evan Prodromou
85b74d846d create DB_DataObject classes for group block 2009-06-14 12:06:22 -07:00
Evan Prodromou
e0bdaa787d Merge branch '0.7.x' into 0.8.x 2009-06-14 11:27:22 -07:00
Zach Copley
d0eb2058a5 Merge branch '0.8.x' into userdesign 
Conflicts:

	actions/showfavorites.php
	lib/action.php
 2009-06-14 00:23:48 +00:00
Evan Prodromou
ce6285d0fc push length check to Notice class 2009-06-12 09:47:57 -07:00
Evan Prodromou
b4e649fe90 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-10 13:52:32 -07:00
Evan Prodromou
361a52a9c8 some changes based on code review with zach 2009-06-10 13:52:15 -07:00
Robin Millette
4699fa7936 Now correctly identifiying notices with uploaded content. 2009-06-10 15:24:25 -04:00
Robin Millette
ba6beaa310 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-10 14:18:41 -04:00
Robin Millette
e120cb1a53 Uploaded content now displays in overlay (and removed var_dump crap) 2009-06-10 14:17:46 -04:00
Evan Prodromou
4df1ea49ec Merge branch '0.8.x' into userdesign 
Conflicts:
	actions/designsettings.php
 2009-06-09 21:51:24 -07:00
Evan Prodromou
ed627bb4bd Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-09 21:48:56 -07:00
Robin Millette
27af3c67a2 Improve file upload and attachment interface. 2009-06-09 15:18:12 -04:00
Evan Prodromou
adfb79a9bb Merge branch '0.7.x' into 0.8.x 
Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh
 2009-06-08 11:55:32 -07:00
Robin Millette
f8dae2bbc9 Refactored some attachment code and fixed upload bug in interface. 2009-05-31 21:03:55 -04:00
Robin Millette
ebeb5f744c Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload 
Conflicts:

	js/util.js
	lib/attachmentlist.php
 2009-05-31 17:12:04 -04:00
Evan Prodromou
9e16b7d89b Use mysql_set_charset for connection instead of SET NAMES 
PHP doesn't get the info about the charset of the connection if
you use SET NAMES. So, we use the appropriate PHP function instead.
 2009-05-30 13:59:57 -04:00
Evan Prodromou
76ee1fd5da Removing inbox and memcached daemon handling 2009-05-30 04:40:47 -04:00
Evan Prodromou
7656277313 remove debug code from replies 2009-05-30 03:02:26 -04:00
Evan Prodromou
78968a31a7 check for since=0 in Notice::stream() 2009-05-30 00:49:14 -04:00
Zach Copley
425f9d703c Ticket #1567 - Change max_id to return notices <= ID instead of < ID 2009-05-29 16:54:24 -07:00
Zach Copley
eb76a3bbb3 Ticket #1567 - API: Change before_id parameter to max_id 2009-05-29 16:32:55 -07:00
Sarven Capadisli
a456ceb47c Merge branch '0.7.x' into 0.8.x 2009-05-29 00:10:23 +00:00
Evan Prodromou
3532cd0490 Only enqueue inbox-dependent transports after inboxes have been filled 2009-05-28 18:19:22 -04:00
Zach Copley
3d13a44b66 Upgraded foreign_id column to handle new 64-bit Facebook user IDs. 
See: http://developers.facebook.com/news.php?blog=1&story=226
 2009-05-27 17:59:49 -07:00
Evan Prodromou
d068680e19 optionally use SET NAMES for utf8 to DB 2009-05-27 14:57:45 -04:00
Evan Prodromou
b3bb8943f5 Merge branch '0.7.x' into utf8 2009-05-27 14:52:35 -04:00
Robin Millette
ed1e1d9f44 Handles local aliases (redirection) for file uploads attached to notices. 2009-05-27 03:47:45 -04:00
Evan Prodromou
d7e3bab0b8 fix require_once in Design.php 2009-05-23 23:34:05 -04:00
Evan Prodromou
705abf31ee add getDesign to User 2009-05-23 23:27:42 -04:00
Evan Prodromou
91fc1e36bc update User.php with new design-related fields 2009-05-23 23:26:29 -04:00
Evan Prodromou
3f5252c168 add fields to support designs for users 2009-05-22 23:43:08 -04:00
Evan Prodromou
748c744a02 add a method to Design to show custom CSS 2009-05-22 23:13:09 -04:00
Evan Prodromou
95104f38f2 Merge branch '0.8.x' into userdesign 2009-05-22 21:11:54 -04:00
Evan Prodromou
68d90bcab0 some class files had x bit set 2009-05-22 21:11:46 -04:00
Evan Prodromou
21aad16b58 fix x bit on Design.php 2009-05-22 21:10:27 -04:00
Evan Prodromou
c63622f05e add design classes 2009-05-22 21:10:00 -04:00
Evan Prodromou
d216e3bbbb fix x bit on laconica.ini 2009-05-22 21:08:58 -04:00
Evan Prodromou
59340b274a laconica.ini change after automated createTables.php 2009-05-22 21:08:22 -04:00
Robin Millette
9261e48ef0 Removed dead code. 2009-05-18 19:23:18 -04:00
Robin Millette
0271859c24 Added personal tag page: http://example.com/MY_NICK/tag/A_TAG 2009-05-18 17:18:57 -04:00
Robin Millette
5897dfa4c3 Refactored new sections code to proper classes and added notice link to links in notice sections. 2009-05-17 22:06:08 -04:00
Robin Millette
fecb8c706d Attachments and their list now provide "ajax" view. Also added a few sidebars relating tags and attachments. 2009-05-15 15:04:58 -04:00
Robin Millette
3b7ee5a5f9 rewrote short url stuff to handle new file/url classes (redirections, oembed, mimetypes, etc.) 2009-05-13 14:27:32 -04:00
Robin Millette
d010d811ba db stuff for URLs: redirections, oembed, etc. 2009-05-11 13:45:00 -04:00
Zach Copley
3e7b1e69e3 Added dirty dates to Foreign_link 2009-05-07 15:55:04 -07:00
Sarven Capadisli
aaeed091d2 Merge branch '0.7.x' into 0.8.x 2009-05-05 22:54:46 +00:00
Evan Prodromou
5314d9b2cf make faves work with ids 2009-05-01 12:01:28 -07:00
Evan Prodromou
021b520a11 Make user group stream use IDs 2009-05-01 11:38:50 -07:00
Evan Prodromou
3328ec545c make profile notice getting use ids 2009-05-01 11:27:57 -07:00
Sarven Capadisli
d30df07908 Merge branch '0.7.x' into 0.8.x 
Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css
 2009-05-01 00:16:25 +00:00
Evan Prodromou
aee641ee1e make replies use new query format 2009-04-29 20:45:33 -04:00
Evan Prodromou
1e8ea1eb46 Make the tag stream use ID mechanism 2009-04-29 16:09:03 -04:00
Evan Prodromou
a4d959b8a2 Public stream uses IDs method 
Public stream now uses IDs method
 2009-04-29 12:05:31 -04:00
Evan Prodromou
10ef8a2f71 Move algorithm for caching to Notice class 
Moved the algorithm for notice stream caching to the Notice class.
 2009-04-29 11:27:45 -04:00
Zach Copley
f798d1ea43 Added dirty dates to Foreign_link 2009-04-28 17:08:20 -07:00
Evan Prodromou
fe53e780be Remove some debug comments in query-by-id 2009-04-28 13:31:56 -04:00
Evan Prodromou
c7105c2af1 Change to avoid a join in notice inbox 
The join in notice_inbox is causing temp-table sorting on identi.ca,
so I'm trying a finer-tuned approach.
 2009-04-28 13:07:05 -04:00
Evan Prodromou
ce5b98ca01 Merge branch '0.7.x' into querybyid 2009-04-27 16:55:07 -04:00
Evan Prodromou
698228acb9 Revert "Revert "run 'set names' after each connection to deal with UTF8 correctly"" 
This reverts commit 86770ccde7.
 2009-04-26 13:16:59 -04:00
Evan Prodromou
86770ccde7 Revert "run 'set names' after each connection to deal with UTF8 correctly" 
This reverts commit 84072aa5cf.

This commit caused grievous harm to old notices on identi.ca.
Reverting until we figure out how to convert the old notices.
 2009-04-26 12:28:20 -04:00
Evan Prodromou
068f6801cc Revert "run 'set names' after each connection to deal with UTF8 correctly" 
This reverts commit 84072aa5cf.

This commit caused grievous harm to old notices on identi.ca.
Reverting until we figure out how to convert the old notices.
 2009-04-26 12:27:32 -04:00
Evan Prodromou
a7089de228 run 'set names' after each connection to deal with UTF8 correctly 2009-04-26 12:14:04 -04:00
Evan Prodromou
84072aa5cf run 'set names' after each connection to deal with UTF8 correctly 2009-04-26 12:13:49 -04:00
Evan Prodromou
a9df5eab10 insert into user's inbox at Web time 2009-04-23 10:38:51 +00:00
Evan Prodromou
31b04220bd incorrect config setting for queues 2009-04-23 09:34:56 +00:00
Evan Prodromou
aee45ea91d Add an inbox queue handler 
Handle distributing a notice to multiple inboxes in a queue handler
rather than in the Web action.
 2009-04-23 05:08:48 -04:00
Evan Prodromou
640628de2d A queuehandler for blowing caches offline 
We add a queuehandler for blowing the memcached caches off-line. This
should speed up the processing of new notices.
 2009-04-23 05:03:19 -04:00
Evan Prodromou
3081b2e317 start of querybyid 2009-04-16 08:44:48 -04:00
Zach Copley
ad5dd9030b Add option to Twitter settings for importing Friends Timeline 2009-04-13 19:19:26 -07:00
Sarven Capadisli
dcee7f2f62 Merge branch '0.7.x' into 0.8.x 2009-04-08 22:58:21 +00:00
CiaranG
85873b1f2b Merge branch 'master' of git://gitorious.org/laconica/br3nda into review/master 2009-04-08 22:11:58 +01:00
Evan Prodromou
60861760fc Host multiple sites with the same codebase 
This is the beginning of the code for status.net and related status
farms. It will read basic information about a site from a shared,
central database and use the data stored there to switch on the
hostname.
 2009-04-07 17:10:54 -04:00
Sarven Capadisli
27b45eeb48 Merge branch '0.7.x' into 0.8.x 2009-03-30 15:15:40 +00:00
Evan Prodromou
eacdf329b6 some phpcs fixups 2009-03-28 17:42:45 -04:00
Evan Prodromou
fe426a3152 welcome notice, default sub for new users 2009-03-28 17:36:39 -04:00
Evan Prodromou
8c073a34ce Merge branch '0.7.x' into 0.8.x 2009-03-23 15:55:07 -04:00
Evan Prodromou
3ef4f251ac One function for producing Atom entry for a Notice 
Took the various places that we create an atom entry for a notice, and
jammed them together into one function of the notice class, and then
used that function. Also, added Atom threading extension and
categories for hashtags.
 2009-03-22 16:58:38 -04:00
Evan Prodromou
b3a0eea3b6 Merge branch '0.7.x' into 0.8.x 
Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php
 2009-03-12 11:56:23 -04:00
Brenda Wallace
ea5e7ed2ff When deleting a notice, null the reply_to fields that point to notice 2009-03-12 15:21:55 +13:00
CiaranG
c08e4d904e PostgreSQL - a few more query compatibility issues (submitted by oxygene) 2009-03-11 23:46:23 +00:00
CiaranG
b9194e7923 Correction to recently added dupe-checking feature - was using wrong config value 2009-03-11 09:12:39 +00:00
Adrian Lang
bea3fca189 Fix bug in dupe checking on notice post when there is no notice in cache. 2009-03-07 17:45:29 -08:00
Evan Prodromou
1179ecd13d Fix nonce usage in OAuth store 
The OAuth store was failing on getting a request token, because the
token value was forced to be non-null in the DB. Let this value be
null, and use the correct primary key (consumer, timestamp, nonce).
Drop the reference to token table, and don't ever use it.
 2009-03-07 12:55:09 -08:00
Evan Prodromou
0570c16e6c Add local directory for plugins, themes, etc. 
Added a local directory for locally-installed software. This is where
you should put any code you write, themes, plugins, etc. so they don't
get stomped by upgrades.
 2009-03-07 11:56:01 -08:00
Evan Prodromou
986a322231 Limit duplicate notices in a particular time period (default 60s) 
We disallow posting a notice with duplicate content more than once a
minute.

Conflicts:

	config.php.sample
 2009-03-07 09:43:50 -08:00
Evan Prodromou
13c183e2f4 Merge branch '0.7.x' into 0.8.x 2009-03-06 16:17:58 -08:00
CiaranG
e5345d8d7a PostgreSQL - fixed a couple more quoting issues 2009-03-05 16:18:31 +00:00
CiaranG
3fd877c4ce Use single quotes for data literals on inserts to notice_index, so it works on pgsql as well as mysql 2009-03-03 21:32:47 +00:00
Evan Prodromou
fc44c9a7f4 Merge branch '0.7.x' into 0.8.x 2009-02-28 21:11:16 -08:00
Evan Prodromou
0369946b6d fix problem with dupe tags in profile 2009-02-28 15:17:49 -08:00
Evan Prodromou
baf5afb263 save conversation id when saving a notice 2009-02-26 13:45:43 -08:00
Evan Prodromou
d1f46d8552 add conversation to notice class 2009-02-26 13:37:00 -08:00
Leslie Michael Orchard
9a0e71f9bf Fixing a bunch of undefined variable warnings in OpenID signup process 2009-02-20 16:37:59 -05:00
Evan Prodromou
419960fd19 wrong name for attn function 2009-02-16 18:45:59 -05:00
Evan Prodromou
175c4665cc send mail when @-replies are received 2009-02-16 18:26:15 -05:00
Evan Prodromou
affb2f9359 add email notify flag for @-replies 2009-02-16 18:24:43 -05:00
Evan Prodromou
ca90d790aa Automatically add a tag for every group messages 
If you post to a group !foo, it's automatically listed as being tagged
"foo". This is to keep users from having to do !foo #foo in all their
messages.
 2009-02-16 18:02:31 -05:00
Evan Prodromou
da2348fbbe Optionally ignore some notice sources for public page 
We optionally ignore some notice sources from the public page.
Typically these are automatic notice sources like twitterfeed that
don't usually represent the community on the site very well.
 2009-02-14 21:55:25 -05:00
Evan Prodromou
4ad5d55ecf Add events for filtering and logging new notices 2009-02-13 10:52:26 -05:00
Evan Prodromou
e686ef042b Make ID of SMS Carrier not autoincrement 
Since we're doing fixed IDs for SMS Carrier, we change the definition
so it's not auto increment.
 2009-02-12 14:16:58 -05:00
Evan Prodromou
5127396325 Move Commands stuff out of classes 
The classes/ subdir is primarily for the DB_DataObject classes. Stuff
in there can get stomped by various generation scripts.

I've moved the lurkers there -- related to command-handling -- to
lib/. Since auto-loading works fine with lib/, there shouldn't be much
of a visible change here.
 2009-02-11 15:46:29 -05:00
Evan Prodromou
5cdead72cd Fix name of default avatar 2009-02-06 04:03:03 -05:00
Evan Prodromou
343cd6f205 Move common_avatar_* functions to Avatar 
Moved the common_avatar_* functions to the Avatar class. Typically
either as methods on the object or as static methods. Replaced all the
uses of the functions in other modules.
 2009-02-06 03:55:48 -05:00
Evan Prodromou
7ea136ee1b Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x 
Conflicts:

	actions/avatarsettings.php
 2009-02-05 12:04:06 -05:00
Evan Prodromou
7ad3ff4a2c Allow re-authentication with OpenID 
"Rememberme" logins aren't allowed to make changes to an account
(since cookie-stealing is too easy). Users have to re-authenticate.
Previously, it was impossible to do so without having a username and
password; this change lets you do it with OpenID, too.
 2009-02-05 11:46:17 -05:00
Sean Murphy
7e975b17c5 Fixed #1134; Consolidated image scaling functions. 2009-02-04 19:32:15 -05:00
Sean Murphy
5c880bc6cc Fix for #1057; group logo transparecy (and pixilation) 2009-02-04 14:44:12 -05:00
Evan Prodromou
2d063650ef Make WebChannel and AjaxWebChannel work 
These command-output channels were using the old common_element_*
functions. They now take an $out constructor parameter, and use that
for output.

The WebChannel has pretty remedial output; it would be nice if it
output a real formatted page.
 2009-02-04 07:59:30 -05:00
Evan Prodromou
15b96f78ab Revert "Fixed direct messaging: AjaxWebChannel is now using Action's methods." 
This reverts commit 0f2c43bd04.

Making Channel a subclass of Action for no other reason than to let
the AjaxWebChannel do some output is the really, really wrong way to
do this. A Channel is not an Action.

I'll change AjaxWebChannel so it takes an Action as a constructor
paramater and uses that Action for its output. We do this for most
Widget subclasses and it makes sense here, too.
 2009-02-04 07:33:10 -05:00
Evan Prodromou
0356953cf8 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x 2009-02-03 15:12:55 -05:00
Sarven Capadisli
0f2c43bd04 Fixed direct messaging: AjaxWebChannel is now using Action's methods. 2009-02-02 18:53:15 +00:00
Adrian Lang
2f37539967 Fixes #1088: Show number of group members. Unlike the bugreport requested, the stats are displayed similar to userstream stats in a section in the sidebar. Additionaly, I removed a redundant notnull if check in ShowgroupAction->showMembers, fixed a SQL error in User_group->getMembers when no limit is passed, removed return value storing of void function and added an usage of Profile->getBestName. 2009-02-01 22:24:54 +01:00
Ciaran Gultnieks
53274a6d93 PostgreSQL - code changes to avoid problems where user table is referenced in ad-hoc queries 2009-01-30 01:12:58 +00:00
Evan Prodromou
2d6a9b4fbe whitespace in User_group 2009-01-28 22:57:29 -05:00
Adrian Lang
a80a536e41 Fix canonical tags in notice and in URLs 2009-01-26 15:03:38 +01:00
Evan Prodromou
0d34cd24ab Update notice deletion 
Changed the errors in notice deletion so it now works. Also,
consistently delete records from related tables that refer
to the notice.
 2009-01-24 19:38:40 +01:00
Evan Prodromou
a7c85bebd5 Merge branch 'master' of /var/www/mublog 
Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!
 2009-01-23 08:58:31 +01:00
Evan Prodromou
50ec1cc26e Upload logos for groups 2009-01-23 08:15:29 +01:00
Evan Prodromou
6b884d9f86 Remove require_once for Memcached_DBObject from new classes 2009-01-23 02:54:38 +00:00
Evan Prodromou
d6879bfe0c Debug some of the subscriptions+tags problems 2009-01-22 22:38:10 +00:00
Evan Prodromou
96bcfa4981 Was accidentally not saving cached items (doh!) 2009-01-22 20:51:05 +00:00
Evan Prodromou
0642b6aa63 Fixed bug in caching of queries 2009-01-22 20:16:19 +00:00
Evan Prodromou
dde1c00ce7 Return $inst, not $cls, if no cache in Memcached_DataObject 2009-01-22 19:54:05 +00:00
Evan Prodromou
8c79646e53 Add a method the memcached_object that lets it cache query results 2009-01-22 19:13:26 +01:00
Evan Prodromou
e2869fcf0a Move NoticeWrapper to a generalized ArrayWrapper class 
We need to use array wrappers for other kinds of queries, so
I generalized the NoticeWrapper and tested it in the Notice class.
 2009-01-22 18:48:52 +01:00
Evan Prodromou
2f043b74e7 Move common_save_replies to Notice class 2009-01-22 01:53:27 -05:00
Evan Prodromou
17fc0b7880 Add the right inbox source for group notices 2009-01-21 22:40:42 -05:00
Evan Prodromou
fca1ccc351 First pass at delivery of group messages 
A first pass at the delivery of group messages.
 2009-01-21 21:53:02 -05:00
Evan Prodromou
fc90dd44b7 Add pkey query to Group_member 2009-01-21 21:52:33 -05:00
Evan Prodromou
30dadb1ad5 Fix include for group inbox class 2009-01-21 14:21:14 -05:00
Evan Prodromou
8516ccfb9d move membership/adminship tests to profile 2009-01-21 13:57:18 -05:00
Evan Prodromou
00f6f4fb67 user subscriptions methods 2009-01-21 13:00:30 -05:00
Evan Prodromou
64f5c542df Add group and groups to list of forbidden user names 2009-01-21 12:21:16 -05:00
Evan Prodromou
fb6e9dda8e A method on User for getting groups 2009-01-21 12:19:23 -05:00
Evan Prodromou
7fec4ad33b Method for user groups to get a list of members 2009-01-21 09:51:55 -05:00
Evan Prodromou
26652e92f2 First pass at a group home page 
This is the first pass at a group home page.
 2009-01-21 02:22:10 -05:00
Evan Prodromou
4873277b58 Wrap notice-saving code in a transaction 2009-01-20 08:19:32 -05:00
Evan Prodromou
af2fb7dff2 Don't override ORDER for inboxes; it messes up caching 2009-01-19 22:51:03 -05:00
Evan Prodromou
3285e0979d Move add to notice inboxes before cache clearing in hopes they will be 
updated
 2009-01-19 22:21:16 -05:00
Evan Prodromou
bd056218f9 Generate new DB_DataObject classes for group tables 2009-01-13 00:35:41 -05:00
Evan Prodromou
02877224b2 Merge branch 'master' into devel 
Conflicts:

	classes/CommandInterpreter.php
	lib/twitter.php
	lib/util.php
 2009-01-06 17:09:39 -05:00
Evan Prodromou
d3b1c1af16 add 'dm' as a synonym for 'd' command 
darcs-hash:20081231032227-84dde-671346360e569522d5384663d4b808e329d4cf0c.gz
 2008-12-30 22:22:27 -05:00
Zach Copley
5e061d2060 Some fixups of patches not already migrated to trunk to bring inline with PEAR coding stds 
darcs-hash:20081225144601-7b5ce-4846f3d036c36037836d15ed672c10ba33f9f84c.gz
 2008-12-25 09:46:01 -05:00
Sarven Capadisli
946eee4256 Direct message XHR response fix for IE and minor tweaks 
darcs-hash:20081216071818-efd22-d2e59bb60a236538452be356f38d0974f35f0107.gz
 2008-12-16 02:18:18 -05:00
Zach Copley
6b51941056 Actually crop your avatar when hitting 'crop' button on profile 
darcs-hash:20081212043018-7b5ce-bc83b66e19007aa0a04fbb40053217ef92c44779.gz
 2008-12-11 23:30:18 -05:00
Evan Prodromou
c65bc1731f more places where required since param skipped for Notice::getStreamDirect 
darcs-hash:20081211195259-5ed1f-c52136c07bdad5521184bd1990313030a8e1e831.gz
 2008-12-11 14:52:59 -05:00
Evan Prodromou
0f70d496c9 missing argument 
darcs-hash:20081211171353-84dde-31b2858e361f62e13ca8ca8784b1aac4209ef04c.gz
 2008-12-11 12:13:53 -05:00
Evan Prodromou
35bc21d3bb whitespace conflicts in User.php 
darcs-hash:20081211163434-5ed1f-38d9bf093db72d27837cbfe76d46fd518adc3bb6.gz
 2008-12-11 11:34:34 -05:00
Evan Prodromou
e85835d0d3 resolve whitespace changes in Notice.php 
darcs-hash:20081211163150-5ed1f-10ff4c4863145909c1d541e39dc4bf69d945cfd7.gz
 2008-12-11 11:31:50 -05:00
Zach Copley
e0fbf02bbf trac750 configurable sync flags for Facebook app (noticesync, replysync) 
darcs-hash:20090105040212-7b5ce-37f6195649dc673241e4566a93183b13e428d98f.gz
 2009-01-04 23:02:12 -05:00
Zach Copley
fd6f9b9d76 trac750 Automatically update linked Facebook users' statuses 
darcs-hash:20090105010407-7b5ce-559da13720b18e3c570e730326f5e5ef2b2dc1ab.gz
 2009-01-04 20:04:07 -05:00
Evan Prodromou
b264c03d32 move opening brace of class declaration to next line 
Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.

darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
 2008-12-23 14:49:23 -05:00
Evan Prodromou
7ad2f2a371 TRUE 
More PEAR coding standards global changes. Here, I've changed all
instances of TRUE to true and FALSE to false.

darcs-hash:20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gz
 2008-12-23 14:44:28 -05:00
Evan Prodromou
04ef1ba8ee change function headers to K&R style 
Another huge change, for PEAR code standards compliance. Function
headers have to be in K&R style (opening brace on its own line),
instead of having the opening brace on the same line as the function
and parameters. So, a little perl magic found all the function
definitions and move the opening brace to the next line (properly
indented... usually).

darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz
 2008-12-23 14:33:23 -05:00
Evan Prodromou
eb2f9c98ac replace NULL with null 
Another global search-and-replace update. Here, I've replaced the PHP
keyword 'NULL' with its lowercase version. This is another PEAR code
standards change.

darcs-hash:20081223192129-84dde-4a0182e0ec16a01ad88745ad3e08f7cb501aee0b.gz
 2008-12-23 14:21:29 -05:00
Evan Prodromou
edbc0c665c replace all tabs with four spaces 
The PEAR coding standards decree: no tabs, but indent by four spaces.
I've done a global search-and-replace on all tabs, replacing them by
four spaces. This is a huge change, but it will go a long way to
getting us towards phpcs-compliance. And that means better code
readability, and that means more participation.

darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
 2008-12-23 14:19:07 -05:00
Zach Copley
407ce3bd8f New AjaxWebChannel for returning ajaxy responses to notice input box commands 
darcs-hash:20081209210654-7b5ce-2ef432aa8cb7bf5cc1a973a71eb70e6b2aae4ab6.gz
 2008-12-09 16:06:54 -05:00
Zach Copley
792cb7a535 fix registration bug - fatal error when sending email confirmation 
darcs-hash:20081209082750-7b5ce-6d06a7b1cda2a9afb6ce8ea64d65df81cc063139.gz
 2008-12-09 03:27:50 -05:00
Zach Copley
dccf8374cf trac750 - Exoskeleton of a nascent Facebook app 
darcs-hash:20081206030132-7b5ce-96c38ab67edd3d58f8722ef25852a6143f05a86b.gz
 2008-12-05 22:01:32 -05:00
Zach Copley
92ea88fd60 trac540 - Add 'since' param to Twitter-compatible API calls 
darcs-hash:20081209055345-7b5ce-e48fd4c87963b8ae15859fd03d2f1f86a16f3a2b.gz
 2008-12-09 00:53:45 -05:00
Evan Prodromou
8445796908 fix Profile_block::get() again 
darcs-hash:20081209041648-5ed1f-fb6ed96047ebfbbe769a11cc3171ce8a5a1440a7.gz
 2008-12-08 23:16:48 -05:00
Evan Prodromou
facba2566b removed Profile_block::get, changed to use pkeyGet 
darcs-hash:20081209041227-5ed1f-2edefdc79545da646a6fd40b15fd72809c15831c.gz
 2008-12-08 23:12:27 -05:00
Evan Prodromou
a68f513cc8 database changes to say whether to deliver messages for a subscription 
darcs-hash:20081209033637-5ed1f-df5ef40e57cc0e9485e34e2f5e46249dcb0d9130.gz
 2008-12-08 22:36:37 -05:00
Evan Prodromou
ef3d487ae0 enable block API 
darcs-hash:20081208185728-5ed1f-8d5f6be6decfbb50deb4ca50bee13404d0c51b72.gz
 2008-12-08 13:57:28 -05:00
Evan Prodromou
5327d3f7ba copyright block and better load for Memcached_DataObject in profile_block 
darcs-hash:20081208073209-5ed1f-0fca508e15833517f6c61f16d5f9979624c27b40.gz
 2008-12-08 02:32:09 -05:00
Evan Prodromou
62c9a4b81b static to not static 
darcs-hash:20081208072958-5ed1f-3476745ea503bb234d81a7513cd84db789239871.gz
 2008-12-08 02:29:58 -05:00
Evan Prodromou
81a81baf83 low-level management of blocks 
darcs-hash:20081208031008-5ed1f-c96006b5c05fa0e68f9adaacd0518016aedfee2a.gz
 2008-12-07 22:10:08 -05:00
millette
f9c88fe09c trac768 keep transparency of resized avatar images. 
darcs-hash:20081204182953-099f7-b47315607d937da4d648b200a733c715a97d9bc2.gz
 2008-12-04 13:29:53 -05:00
millette
51dda41211 delete user and all traces from the db. 
darcs-hash:20081203164942-099f7-ea511948139c9c18b1c8b7de018aa4f0ee5ff624.gz
 2008-12-03 11:49:42 -05:00
Evan Prodromou
cb93e214f8 add profile block data object 
darcs-hash:20081203222619-5ed1f-b313092893c67a3ec1dc92a79aa7fed4ab583729.gz
 2008-12-03 17:26:19 -05:00
millette
ce08833303 shorten urls for posts > 140 chars only, from anywhere. Only show long urls in title attributes for links we shortened ourselves. 
darcs-hash:20081128210114-099f7-4e4cde0a983c2ac6d41efb59b46cb7dbf45dc7a6.gz
 2008-11-28 16:01:14 -05:00
Evan Prodromou
be2efe254e always return a variable by reference 
darcs-hash:20081210233503-84dde-ae7e4acd0d5e42d6d743b545688ad4ad51bc5014.gz
 2008-12-10 18:35:03 -05:00
Evan Prodromou
7745917305 don't check edit throttle if throttle not enabled 
darcs-hash:20081210194335-84dde-a74fe65acfa707eae5499cdf47850d353562ccb8.gz
 2008-12-10 14:43:35 -05:00
Zach Copley
1e4e6eee32 Ban certain users from posting by nickname and/or ID 
darcs-hash:20081210191337-7b5ce-f9a083596b3f5627405c9e233c1994d8338f5731.gz
 2008-12-10 14:13:37 -05:00
millette
8b15411865 make sure passed profile_id is valid in Notice::saveNew 
darcs-hash:20081210181123-099f7-b13ae11d136512655fc5ba4bb314c80256244593.gz
 2008-12-10 13:11:23 -05:00
Evan Prodromou
a143b64666 edit throttling 
darcs-hash:20081210174722-84dde-4c79d7f73230d008195bd19738bc9a6017b940e9.gz
 2008-12-10 12:47:22 -05:00
Evan Prodromou
0bcfb2e698 change is_local flag for blacklisted users 
Changed the flag on notices that says whether the notice is local, so
that it's -1 for local-but-blacklisted. This should keep blacklisted
users off the public timeline.

darcs-hash:20081202184258-5ed1f-cd87ea5c528ea0c90cb31eeb59d4d1ba4f85e9ad.gz
 2008-12-02 13:42:58 -05:00
Evan Prodromou
f8fa9a942f Make replies to @# 
darcs-hash:20081124034952-84dde-e059f0800780de879ffa922e5ce379682a4f275a.gz
 2008-11-23 22:49:52 -05:00
Evan Prodromou
f80cd3273e only get tags for this profile list type 
darcs-hash:20081124031549-84dde-c537cb25f301ac3368440d4d5f583ea3d713ac2c.gz
 2008-11-23 22:15:49 -05:00
Evan Prodromou
bb5437bd2d don't get self-tags 
darcs-hash:20081124015927-84dde-525625c0341e62d3939879430743d0a976d0d8d2.gz
 2008-11-23 20:59:27 -05:00
Evan Prodromou
82696b150e show dropdown of tags only when tags are available and add tags function to profile 
darcs-hash:20081124015802-84dde-d72651ff0c466d15835fe263e96bdd9b34162849.gz
 2008-11-23 20:58:02 -05:00
millette
4206f4d961 sphinx: fallback if no connection 
darcs-hash:20081123201616-099f7-54ac0134e38e145b99a81336ae0b51a8ecd560a8.gz
 2008-11-23 15:16:16 -05:00
millette
6b29f6ed70 sphinx integration for notices and profiles 
darcs-hash:20081123185136-099f7-ca600dbdfff09762802e1cc58cf8777c45a24402.gz
 2008-11-23 13:51:36 -05:00
millette
bf72cde96f sphinx search for notices 
darcs-hash:20081120215041-099f7-db396a60755d551099122b58634b7550d5606d88.gz
 2008-11-20 16:50:41 -05:00
millette
0bd6f76451 sphinx search of people 
darcs-hash:20081120211347-099f7-d5588788dcd9a16cf72ece59da3d2bf9b8171b85.gz
 2008-11-20 16:13:47 -05:00
Evan Prodromou
1ea47843d2 correct name for param 
darcs-hash:20081120215508-84dde-1f38247dae1b196cbf2c32df4f2733e4cffa3ef6.gz
 2008-11-20 16:55:08 -05:00
Evan Prodromou
13decf4086 fix require in Profile_tag.php 
darcs-hash:20081120214945-84dde-f15f2512f3998e7dd7bf7216ecc9ef0f5f37ea87.gz
 2008-11-20 16:49:45 -05:00
Evan Prodromou
6f31f25105 let users set their own profile tags from profilesettings 
darcs-hash:20081120214821-84dde-c8569ef645b389de545f78bf01a270f28b871f02.gz
 2008-11-20 16:48:21 -05:00
Evan Prodromou
8a0c438aed add profile tags to DB 
darcs-hash:20081120205506-84dde-e9aa0a70d3529f91909dbe29f03a46b40ef18fff.gz
 2008-11-20 15:55:06 -05:00
Evan Prodromou
3b4db8f5e1 whitespace diffs in User.php 
darcs-hash:20081120205421-84dde-b41e50386ce3ec5f887c87cd83258c2e0e86f713.gz
 2008-11-20 15:54:21 -05:00
Evan Prodromou
1d3bb3d433 whitespace diff on Notice_inbox 
darcs-hash:20081120205319-84dde-c8ea8a1ae5e1e22c48fa89bd1b8f486345b3e13b.gz
 2008-11-20 15:53:19 -05:00
Zach Copley
147dd16ab3 trac685 Twitter bridge - Shell script to sync all users' Twitter friends 
darcs-hash:20081119011128-7b5ce-74471277443b44d0075f66131028447cfda3b1e4.gz
 2008-11-18 20:11:28 -05:00
zach
41b8c91c6b trac685 Twitter bridge - Sync Twitter friends 
darcs-hash:20081117024624-462f3-91f148111c2c43ddd302fc63cfa8c8ef14e1f38e.gz
 2008-11-16 21:46:24 -05:00
zach
fed15bd6b7 Twitter bridge - don't delete Twitter users. Update them instead. 
darcs-hash:20081114053044-462f3-30e2d27261bca1977b89dee409383e178f446149.gz
 2008-11-14 00:30:44 -05:00
millette
f71f2d5ba8 emailnotifynudge added to User.php class manually (how to auto-gen?) 
darcs-hash:20081117003010-099f7-dd605b41a28ab99c2fadde38d9c7341bfdae0312.gz
 2008-11-16 19:30:10 -05:00
millette
afe3b1a268 fix nudge typo and add emailnotifynudge to laconica.ini 
darcs-hash:20081117001644-099f7-9b086e032d0bc4d74da426c7dd363bb9a4f9aed4.gz
 2008-11-16 19:16:44 -05:00
Evan Prodromou
577b54c2af blow last caches on notice delete 
We do some extra caching of streams, at ';last'. If a notice is
deleted, we need to blow those caches, too. So, this deletes them.

darcs-hash:20081124003240-84dde-aa4561e5e68b0ccc0598ac86294ea54f9be5775a.gz
 2008-11-23 19:32:40 -05:00
Evan Prodromou
45f5ef8c87 if all faves in cache, skip 
darcs-hash:20081122192857-84dde-c8fcddd794a8339a53e6a0224bd07f6f86ef3896.gz
 2008-11-22 14:28:57 -05:00
Evan Prodromou
24ad0b3c13 blow last cache for faves 
darcs-hash:20081122165234-84dde-d9d6a608434502cb3d5fb09f04d0c641900c3134.gz
 2008-11-22 11:52:34 -05:00
Evan Prodromou
5d161f3d24 messed up logic for passing faves 
darcs-hash:20081122163552-84dde-9171c5e24ae90a430f2abd78437073656af9e5ec.gz
 2008-11-22 11:35:52 -05:00
Evan Prodromou
5632b2e6d5 use cached fave stream to save DB hits for faves 
darcs-hash:20081122163347-84dde-abb0dfc800f65f50951c5517af3bfda48013c6ed.gz
 2008-11-22 11:33:47 -05:00
Evan Prodromou
64101cc579 whitespace cleanup 
darcs-hash:20081122124235-84dde-680b2d2c8caff26d40dec4fe8e926a61668c47a0.gz
 2008-11-22 07:42:35 -05:00
Evan Prodromou
3a82ff2860 double-cache to get newer items 
darcs-hash:20081122124151-84dde-3e942c9ab172444bd28afb84a452b8bfb5e3574a.gz
 2008-11-22 07:41:51 -05:00
Evan Prodromou
a730ad708c notice inbox only when not already exists 
darcs-hash:20081121184132-84dde-39d090e8bf82d10f3aa3a55ada3f4170c01e11d1.gz
 2008-11-21 13:41:32 -05:00
Evan Prodromou
35407614bb hide certain users from the public stream 
On identi.ca, certain users (http://identi.ca/derricklo) publish 5-10
automated notices every half hour or hour. This can flood the public
stream, making it unreadable for casual readers.

We don't want to prevent anyone from using the site for personal use.
However, if their personal use clouds up the public space, we can
gently remove them from that public space without interfering with
their personal activity.

So: this change prevents selected people's notices from appearing in
the public stream. It's hand-configured by an administrator, and
probably doesn't scale beyond 10-20 blacklisted users. It's a stopgap
measure.

darcs-hash:20081120183722-84dde-8a8401fbcbb6abb60a8b36de249323586ea0b22c.gz
 2008-11-20 13:37:22 -05:00
Evan Prodromou
16e3fcf2c2 add inboxes for new users 
darcs-hash:20081116062937-84dde-2c2369d0513dba49514a6800f67324803d0fe335.gz
 2008-11-16 01:29:37 -05:00
Evan Prodromou
6b6c966369 don't write notice to inbox if user isn't inboxed yet 
darcs-hash:20081114074211-84dde-77dbee17b2eb5848a0aa012c6ebe352135f5e7c1.gz
 2008-11-14 02:42:11 -05:00
Evan Prodromou
5409bd6a5d different query based on config var and user inbox status 
darcs-hash:20081113215734-84dde-badae0579fb70a6760dc6fdf0289b76356e479f6.gz
 2008-11-13 16:57:34 -05:00
Evan Prodromou
69a1cea319 add inboxed and regenerate data objects 
darcs-hash:20081113210209-84dde-56052bac5ce490d54f3220baaa13f5bfc0e7618d.gz
 2008-11-13 16:02:09 -05:00
millette
15c1d4f5e4 trac31 url_auto_shortening by sgmurphy 
darcs-hash:20081106205926-099f7-6bcfd7969a159a12b1ba6a9ee254e44a07b94761.gz
 2008-11-06 15:59:26 -05:00
Evan Prodromou
74786b951c add created to notice update 
darcs-hash:20081112185117-5ed1f-3b2373620581d123182dc951c528276541f4ab68.gz
 2008-11-12 13:51:17 -05:00
Evan Prodromou
0625f18c8e notice_inbox.id -> notice_inbox.notice_id 
darcs-hash:20081112173627-5ed1f-7cee5b6f25ab654f066c8902492ed531fb1ea091.gz
 2008-11-12 12:36:27 -05:00
Evan Prodromou
3987de1064 created timestamp on notice_inbox 
darcs-hash:20081112172517-5ed1f-4e8534d7898e2134edf4c0a28417b4a5274617d4.gz
 2008-11-12 12:25:17 -05:00
zach
8deac7248e Twitter-compatible API - since_id and before_id were polluting the cache and generating bad SQL 
(Also cleaned out some extra whitespace.)

darcs-hash:20081104053359-462f3-2f6619bb942aa34b38dd82cb427878f83d4c332c.gz
 2008-11-04 00:33:59 -05:00