Commit Graph

7044 Commits

Author SHA1 Message Date
Evan Prodromou
bbb830e14c Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-27 14:18:51 -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
9f097913a6 add table for user roles 2009-08-27 11:18:10 -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
82b0927f58 update version in README, add note about status.net 2009-08-27 10:00:45 -07:00
Evan Prodromou
a84c4e3518 add api/laconica for backwards compatibility 2009-08-27 09:34:32 -07:00
Craig Andrews
2dd5a5f86d Do not used named capturing groups
I'm not sure all php 5.2's are compiled with a PCRE library that supported named captures.
2009-08-27 12:06:45 -04:00
Evan Prodromou
a21ca17f68 change default logo from laconica to status.net 2009-08-27 09:04:40 -07:00
Evan Prodromou
dcda2e1f72 show SQL errors in the output 2009-08-27 08:58:03 -07:00
Evan Prodromou
2371fe9092 don't show a warning when dl() disabled 2009-08-27 08:45:53 -07:00
Evan Prodromou
03e0f73002 add changelog to README 2009-08-27 08:39:14 -07:00
Evan Prodromou
089148d286 update version in, and add codename to, lib/common 2009-08-27 08:02:41 -07:00
Evan Prodromou
dffeb0b3b6 Update version number in README
Update version number and add release code name ("Second Guessing").
2009-08-27 08:00:47 -07:00
Evan Prodromou
f1fda6c050 Merge branch '0.8.x' into 0.9.x 2009-08-27 07:56:19 -07:00
Craig Andrews
eb667d09d9 allow oEmbed resources to be facebook attachments 2009-08-26 22:09:46 -04:00
Craig Andrews
3e362233ee Merge commit 'laconica/0.8.x' into 0.9.x 2009-08-26 21:56:59 -04:00
Craig Andrews
b7beac36c2 Support multiple attachments per facebook update 2009-08-26 21:54:57 -04:00
Craig Andrews
504c42aa7d Fix some stupid bugs, such as a mispelling of oembed 2009-08-26 21:51:54 -04:00
Craig Andrews
0b884ed915 Add library checking page 2009-08-26 19:08:30 -04:00
Craig Andrews
6d60d74093 Display linked oembed resources as enclosures if they are of non-html mime types 2009-08-26 15:40:51 -04:00
Craig Andrews
d9e8dabaf4 Save the mimetype for oEmbed linked url 2009-08-26 14:53:52 -04:00
Evan Prodromou
a0b5eb7c03 statusize config.php.sample 2009-08-26 11:31:44 -04:00
Evan Prodromou
b04bc29c3a change hidden label for site content license link 2009-08-26 10:51:44 -04:00
Evan Prodromou
6d0a26a407 define LACONICA_VERSION for backwards compatibility 2009-08-26 10:43:44 -04:00
Evan Prodromou
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Zach Copley
937a05fb5d Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-08-26 14:35:25 +00:00
Evan Prodromou
434abed511 add back in /etc/laconica/* for compatibility 2009-08-26 10:34:50 -04:00
Zach Copley
cbdf8e51aa Facebook app wasn't loading the theme css 2009-08-26 14:34:41 +00:00
Evan Prodromou
379c80e26e add *Laconica* events back in for backwards compatibility 2009-08-26 10:33:04 -04:00
Evan Prodromou
be5d113fc6 Merge branch 'master' into testing 2009-08-26 10:28:10 -04:00
Evan Prodromou
c5cf2c4c94 Merge branch '0.8.x' into testing 2009-08-26 10:27:53 -04:00
Evan Prodromou
6dc89e766f more logging in xmppqueuehandler 2009-08-26 05:50:48 -04:00
Evan Prodromou
be51d5e23a more log output in queue handlers 2009-08-26 05:50:34 -04:00
Evan Prodromou
fd53fba114 more logging in xmppqueuehandler 2009-08-26 05:50:20 -04:00
Evan Prodromou
e1b5ca85f9 more log output in queue handlers 2009-08-26 05:46:41 -04:00
Evan Prodromou
e3a53251c0 last scrub of Laconica -> StatusNet 2009-08-26 03:33:43 -04:00
Evan Prodromou
ff01140d71 accidentally changed the URL for Laconica Tools 2009-08-26 03:13:09 -04:00
Zach Copley
c1c3c60713 Small update to the Facebook app section 2009-08-25 20:58:08 -07:00
Zach Copley
2f1e719cbe Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/mainline:
  Updated rgb2hex() to handle IE. It turns out that jQuery is giving hex
2009-08-25 20:46:14 -07:00
Zach Copley
0e3598cea9 Small update to the Facebook app section 2009-08-25 20:45:09 -07:00
Zach Copley
5efe588174 Moved the rest of the Twitter stuff into the TwitterBridge plugin 2009-08-26 00:59:06 +00:00
Evan Prodromou
3567b9d708 global search and replace for laconica -> statusnet 2009-08-25 18:53:24 -04:00
Sarven Capadisli
70ef9d89fa Updated rgb2hex() to handle IE. It turns out that jQuery is giving hex
to IE and RGB to Firefox, Opera, Safari. Fun.
2009-08-25 22:47:54 +00:00
Evan Prodromou
99e3b1723b update names in shell scripts 2009-08-25 18:43:48 -04:00
Evan Prodromou
865b716f09 change LACONICA to STATUSNET 2009-08-25 18:42:34 -04:00
Evan Prodromou
1ee7d0ab55 update Laconica to StatusNet in js code 2009-08-25 18:40:12 -04:00
Evan Prodromou
9d98768e83 change Laconica and laconi.ca in locale files 2009-08-25 18:37:41 -04:00
Evan Prodromou
5fb94f874d Laconica -> StatusNet in EVENTS.txt 2009-08-25 18:30:48 -04:00