eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
2,979 Commits 8 Branches 3 Tags 310 MiB
0f12d6135e
Commit Graph

1256 Commits

Author SHA1 Message Date
Sean Murphy
0f12d6135e Fixed #732; Hashtags inside parens and brackets. 2009-02-04 20:02:50 -05:00
Sean Murphy
7e975b17c5 Fixed #1134; Consolidated image scaling functions. 2009-02-04 19:32:15 -05:00
Evan Prodromou
ab16bb876b Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-02 16:46:51 -05:00
Evan Prodromou
daa5797809 Merge branch 'master' of git://gitorious.org/laconica/adrianlang-clone into adrianlang/master 2009-02-02 16:42:27 -05:00
Robin Millette
b6f0f72a09 trac #569 and trac #711 add missing utf-8 headers and removed extraneous argument in startHTML calls 2009-02-02 21:08:33 +00:00
Robin Millette
f9edd1101b trac #1099: main menu should not lead to IM settings when IM is disabled 2009-02-02 20:20:21 +00:00
Robin Millette
d3b30164be added primary menu to error pages 2009-02-02 14:51:23 +00:00
Meitar Moscovitz
a381bff4da Link rtsp, mms & tel URI schemes, correct pseudo-protocol ones. 
This patch builds on the work of user `candrews` at http://laconi.ca/trac/ticket/529#comment:2
 2009-02-02 19:59:48 +11: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
Evan Prodromou
87b99540ef Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into cyi/master 2009-02-01 14:33:18 -05:00
Sarven Capadisli
add0b7f329 Resaved identica logo as transparent PNG24 in order to handle various 
background colours without having to explicitly apply anti-aliasing.

Updated colour information in identica theme.

Removed ie7 base stylesheet that's no longer required.

Added ie identica stylesheet to handle solid background colour for
 2009-02-01 18:04:56 +00:00
Evan Prodromou
74bf2bf672 Enable configuration files in /etc/laconica/ 
Enable storing config files in /etc/laconica/, which makes it much
easier to have a single installation with multiple mublogs supported.
 2009-01-31 09:38:39 -05: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
Zach Copley
c7d06519f0 trac750 update Facebook status when posting to Identi.ca from Facebook 2009-01-29 05:58:27 +00:00
Evan Prodromou
04b3add162 only send group notices through Jabber to users with notices enabled 2009-01-28 23:03:03 -05:00
Greg Grossmeier
62fd9369ec fix email notification link 2009-01-28 09:22:54 -05:00
Evan Prodromou
d86622da33 don't show reply for anon user 2009-01-28 09:17:12 -05:00
Evan Prodromou
f761031d0a Merge branch 'master' of root@laconi.ca:/var/www/laconi.ca/software/laconica 2009-01-28 08:24:29 -05:00
Evan Prodromou
c4097750ad Revert "Fixup already-subscribed string" 
This reverts commit 6055516aaf.
 2009-01-27 20:34:57 -05:00
Sarven Capadisli
f9403ae99a Keeping HTML consistent throughout the site. 2009-01-27 06:21:36 +00:00
Zach Copley
1c60afb940 trac750 140 character countdown for FB app 2009-01-27 01:55:36 +00:00
Zach Copley
26f9bf540e Fixed bad query causing facebook_update to fail 2009-01-26 12:22:52 -08:00
Evan Prodromou
69e7811d01 Add some more useless HTML 2009-01-26 17:30:32 +01:00
Evan Prodromou
91e63866fb move block form 2009-01-26 17:14:08 +01:00
Meitar Moscovitz
44162e07c3 Fix scrolling for groups 2009-01-26 16:16:51 +01:00
Evan Prodromou
f3db32d151 Fix direct addressing of messages 2009-01-26 15:45:54 +01:00
Adrian Lang
6055516aaf Fixup already-subscribed string 2009-01-26 14:21:01 +01:00
Adrian Lang
5b211271f9 Fix pagination on user groups page 2009-01-26 14:19:49 +01:00
Evan Prodromou
0e9cdf5859 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-26 14:14:49 +01:00
Zach Copley
55a4fac6a6 trac750 Better permissions workflow and styling hooks 2009-01-26 06:31:25 +00:00
Evan Prodromou
f06d5eff10 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-25 18:07:55 +01:00
Zach Copley
e2a965c999 Rss10Action::showImage() was trying to call pre-uiredesign XML output functions 2009-01-24 22:08:27 -08: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
db4271692a wrong action for groups 2009-01-24 11:26:28 +01:00
Evan Prodromou
4e44b0b8d7 Fix the group url (Closes #971) 2009-01-24 11:24:37 +01:00
Evan Prodromou
1b07e65277 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-24 10:38:11 +01:00
sarven
18eb40c988 Search form markup and style 2009-01-24 00:58:12 +00:00
Zach Copley
44d1e723df trac750 fixed dumb sql query that was pulling ancient notices 2009-01-23 12:12:51 +00:00
Zach Copley
767c7d293d trac750 Better CSS file organization and linking fore the FB app 2009-01-23 10:51:49 +00:00
Evan Prodromou
447e2b8e35 Bad link for popular notices 2009-01-23 11:51:48 +01:00
Zach Copley
d06a929d70 Merge branch 'master' of /var/www/trunk 2009-01-23 09:47:09 +00:00
Zach Copley
ef3f47b8f5 trac750 Better styling for the Facebook profile box widget 2009-01-23 09:46:29 +00:00
Zach Copley
0ef33663ce Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk 2009-01-23 01:20:00 -08:00
Zach Copley
b13374faa5 Bring the Twitter compatible API inline with new uiredesign stuff 2009-01-23 01:19:19 -08:00
sarven
927576e3f0 Using openidlogin instead of openid in order to show the current local 
nav item
 2009-01-23 08:58:54 +00:00
Evan Prodromou
4e5be119d3 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:17:51 +01:00
Zach Copley
85321cede0 Fix for Twitter bridge bug introduced by uiredesign merge 2009-01-23 00:11:05 -08:00
Evan Prodromou
e7d5310a2f Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:01:06 +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
Robin Millette
aa100884fb Merge branch 'master' of /var/www/trunk 2009-01-23 07:51:02 +00:00