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

636 Commits

Author SHA1 Message Date
Zach Copley 0bbc05c1d5 Merge branch '0.9.x' into TwitterBridgePlugin 2009-10-16 23:42:02 +00:00
Zach Copley 0fd8e758ad Make queuing and daemons work via events 2009-10-14 04:50:16 +00:00
Evan Prodromou 4f5badda94 remove inboxes option 2009-10-13 17:38:27 -04:00
Craig Andrews f719720e8a Merge remote branch 'statusnet/0.8.x' into 0.9.x 
Conflicts:
	lib/common.php
 2009-10-11 13:39:10 -04:00
Evan Prodromou bf1c662990 Merge branch '0.8.x' into 0.9.x 2009-10-09 14:07:45 -04:00
Evan Prodromou 88e7092d23 don't write session if it's unchanged 2009-10-09 10:39:56 -04:00
Evan Prodromou c5047fd90a Merge branch '0.8.x' into 0.9.x 
Conflicts:
	classes/Profile.php
 2009-10-04 03:07:37 -04:00
Evan Prodromou 18f4a7eaea reformat Notice.php 2009-10-03 20:34:40 -04:00
Brenda Wallace bcdf31c639 added all them doxygens 2009-10-04 11:14:26 +13:00
Evan Prodromou be513db013 copy-and-paste typo in profile deletion 2009-10-02 15:42:34 -04:00
Evan Prodromou 94e3f6bb09 also delete blocks 2009-10-02 15:29:57 -04:00
Evan Prodromou b3b3af9a2e Merge branch '0.8.x' into deleteuser 2009-10-02 15:27:55 -04:00
Evan Prodromou 0a57d1ccee change string return from Notice::saveNew to exceptions 2009-09-29 17:16:07 -04:00
Evan Prodromou 3afcdc18f7 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-09-27 21:15:14 -04:00
Evan Prodromou 38345d0783 let hooks override standard user rights 2009-09-27 21:11:45 -04:00
Evan Prodromou 6c069312e2 user rights 2009-09-27 21:11:45 -04:00
Craig Andrews fc2426d7ce Fix some bugs in the URL linkification, and fixed the unit test. 2009-09-27 16:52:15 -04:00
Evan Prodromou 93b7e60115 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	EVENTS.txt
 2009-09-24 17:24:15 -04:00
Evan Prodromou b5b3690eef Merge branch 'master' into 0.8.x 2009-09-24 17:15:36 -04:00
Evan Prodromou 8284b3cb82 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/noticeform.php
 2009-09-23 09:45:22 -04:00
Craig Andrews 15f9c80c28 Blacklist all files and directories in the web root (INSTALLDIR). Much more elegant than manually keep tracking of these invalid usernames. 2009-09-18 17:53:06 -04:00
Evan Prodromou 46ece1178c check correct define (not backwards compatible) 2009-09-15 21:12:44 -04:00
Evan Prodromou 13147143fc Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-09-15 17:16:35 -04:00
Craig Andrews 4a97ad9efe Remove unnecessary Profile::pkeyGet 
Thanks for the info, Evan.
 2009-09-15 17:08:26 -04:00
Craig Andrews bb48698416 Add missing pkeyGet override to the Profile class 2009-09-13 21:43:29 -04:00
Craig Andrews 2a06f2ac5b If there is no mimetype set, the file shouldn't be considered an enclosure 2009-09-10 21:21:01 -04:00
Evan Prodromou e559f82e86 flip exe bit on statusnet.ini 2009-09-08 13:07:21 -07:00
Evan Prodromou 1e707008c2 flip exe bit on Deleted_notice.php 2009-09-08 13:06:46 -07:00
Evan Prodromou 3e1dc0e0b9 flip exe bit on Config.php 2009-09-08 13:06:13 -07:00
Craig Andrews a535ccdc4e Merge remote branch 'laconica/0.8.x' into 0.9.x 
Conflicts:
	lib/common.php
	lib/twitter.php
 2009-09-02 16:42:15 -04:00
Craig Andrews efcfd209ef Check "Files" of type 'application/xhtml+xml' for oEmbed in addition to just text/html 2009-09-01 23:18:39 -04:00
Evan Prodromou 55972f59f6 remove Notice::gc() for now 2009-08-29 11:59:54 -07:00
Evan Prodromou 59f47fab4a Status_network had wrong ini file 2009-08-28 10:42:49 -07:00
Evan Prodromou c628029ef1 Status_network had wrong ini file 2009-08-28 10:42:34 -07:00
Brenda Wallace 815630fe63 used standard SQL that mysql and pgsql both like 2009-08-28 20:45:12 +12:00
Brenda Wallace b9ea2bf1bc used standard SQL that mysql and pgsql both like 2009-08-28 20:44:11 +12:00
Brenda Wallace b833b725a8 make use of common_database_tablename() 2009-08-28 20:42:13 +12:00
Brenda Wallace 06514aa001 fix for SQL error: ERROR: syntax error at or near ")" at character 45 
http://laconi.ca/trac/ticket/1735
 2009-08-28 20:05:19 +12:00
Brenda Wallace e277c856d6 fix for SQL error: ERROR: syntax error at or near ")" at character 45 
http://laconi.ca/trac/ticket/1735
 2009-08-28 20:00:55 +12:00
Evan Prodromou c0d03fc279 make URL analyzer save new info on URLs 2009-08-27 20:23:31 -07:00
Evan Prodromou 34ce75c71d remove duplicate save of Notice and streamline attachment detection 2009-08-27 20:09:07 -07:00
Evan Prodromou 35a78de93b changes to File 2009-08-27 14:53:16 -07:00
Evan Prodromou a08c76a434 Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x 
Conflicts:
	classes/laconica.ini
 2009-08-27 14:52:32 -07:00
Evan Prodromou 522008dee5 methods on User to grant, check, and revoke roles 2009-08-27 11:38:31 -07:00
Evan Prodromou 41ee56f770 flip executable bit on User_role.php 2009-08-27 11:22:24 -07:00
Evan Prodromou f8afad03ad add data object class for user_role 2009-08-27 11:21:57 -07:00
Evan Prodromou 5d09b6b3f0 Merge branch '0.8.x' into 0.9.x 
Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php
 2009-08-27 11:16:45 -07:00
Evan Prodromou f1fda6c050 Merge branch '0.8.x' into 0.9.x 2009-08-27 07:56:19 -07:00
Craig Andrews 3e362233ee Merge commit 'laconica/0.8.x' into 0.9.x 2009-08-26 21:56:59 -04:00
Craig Andrews 504c42aa7d Fix some stupid bugs, such as a mispelling of oembed 2009-08-26 21:51:54 -04:00