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

10008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Meitar Moscovitz
cca1d77748 Merge branch 'dev-0.7.x' into framebusting 
Conflicts:
	lib/action.php
 2009-02-18 13:01:52 +11:00
Sarven Capadisli
6fb3923cef Merge branch 'ticket-1053' of git://gitorious.org/laconica/meitar into review 2009-02-17 21:24:06 +00:00
Sarven Capadisli
2eb6a6a9b0 Merge branch 'mobile-style' of git://gitorious.org/laconica/meitar into review 
Conflicts:

	lib/action.php
 2009-02-17 20:32:19 +00:00
Evan Prodromou
7bcfc9f643 another system message 2009-02-17 12:08:53 -05:00
Evan Prodromou
dfd08519d6 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-17 10:23:19 -05:00
Evan Prodromou
2e221f5718 Merge branch 'master' into 0.7.x 2009-02-17 10:22:42 -05:00
Evan Prodromou
095aecdd5c Merge branch '0.8.x' of git://gitorious.org/laconica/dev into dev/0.8.x 2009-02-17 15:17:26 +00:00
Sean Murphy
75ebd45ebd Fixed #1170: Auto-linking bug when URL cotains special chars. 2009-02-17 09:43:13 -05:00
Meitar Moscovitz
4327ae19d4 Fixes ticket:1053; removes spacing between hash and tag on profile page. 2009-02-17 18:37:02 +11:00
Zach Copley
ab3c5d6f2d Updated README with section about installing the Facebook app, and added info about twitterqueuehandler.php and facebookqueuehandler.php. 2009-02-16 17:58:24 -08:00
Evan Prodromou
419960fd19 wrong name for attn function 2009-02-16 18:45:59 -05:00
Evan Prodromou
b727e8be33 Set @-message notification options in email settings 
Set the @-message notification options in email settings.
 2009-02-16 18:45:05 -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
9978eadbf2 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-16 18:02:14 -05:00
Evan Prodromou
c8e71d359c error in hashtag link generation 2009-02-16 18:02:04 -05:00
Sarven Capadisli
e8ceb11f2e Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-16 22:40:57 +00:00
Sarven Capadisli
6440f4cecd Removed transformation effects from h1-h6 (except in aside) 2009-02-16 22:39:57 +00:00
Evan Prodromou
7638adf49e Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-16 16:35:16 -05:00
Evan Prodromou
cc38809764 First version of blogspam.net plugin 
Added a plugin for blogspam.net. The service is kind of aggressive,
so by default I turn a lot of the tests off. But worth a look.
 2009-02-16 16:34:07 -05:00
Zach Copley
14e3a2ffb6 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-16 18:58:09 +00:00
Zach Copley
1af6423738 Whoops: forgot to include facebookqueuehandler.php with the my original 
Facebook queue handler patch set!
 2009-02-16 18:55:03 +00:00
Evan Prodromou
05ef06d5f2 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-16 13:34:31 -05:00
Robin Millette
9c9b6790ce trac #201 Add flowplayer to enable multimedia playback capability. 2009-02-16 17:46:24 +00:00
Meitar Moscovitz
9d81cef5cc Add framebusting JavaScript to help avoid clickjacking attacks. 2009-02-16 15:45:18 +11:00
Sarven Capadisli
faf82eebfe Added a mention of config setting to use a custom theme 2009-02-15 22:30:39 +00:00
Evan Prodromou
ed964ea980 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:56:53 -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
32fc71b432 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-14 21:28:45 -05:00
Evan Prodromou
9b31571449 Merge branch 'master' into 0.7.x 2009-02-14 21:28:30 -05:00
Evan Prodromou
3db9c134a0 Fix More... URL for featured user section 2009-02-14 17:53:11 -05:00
Evan Prodromou
b9fc7334a8 Fix the More... link for popular notices section 2009-02-14 17:48:08 -05:00
Zach Copley
02184df7c8 Fixed arguments to syslog (LOG_ERR, not LOG_ERROR) and removed unused function 2009-02-13 10:08:11 -08:00
Evan Prodromou
4ad5d55ecf Add events for filtering and logging new notices 2009-02-13 10:52:26 -05:00
Evan Prodromou
47c5d508b3 remove debugging info from local_url 2009-02-13 10:47:22 -05:00
Zach Copley
c0af950276 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-13 05:45:06 +00:00
Zach Copley
4b7ee5455f We have a FacebookQueueHandler now. The update_facebook.php cron 
script is totally deprecated.
 2009-02-13 05:42:00 +00:00
Sarven Capadisli
070d1a3f24 Hooks for: custom, laconica, UA specific stylesheets 2009-02-13 04:33:43 +00:00
Zach Copley
47e595b092 Merge branch 'queuehandlers' into 0.7.x 2009-02-12 14:41:27 -08:00
Zach Copley
f8e2ad0677 The fabled twitterqueuehandler 2009-02-12 14:39:21 -08:00
Sarven Capadisli
dac8d103e6 Hooks for: header, contentblock, footer 2009-02-12 22:16:48 +00:00
Sarven Capadisli
579f09417b Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-12 22:14:07 +00:00
Evan Prodromou
3b5fd8fb6b Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling" 
This reverts commit 9f035e2847.

It's a lot of complicated stuff, and the global handler probably does
fine.
 2009-02-12 16:05:37 -05:00
Evan Prodromou
b09eb06dae Revert "Just discovered the PEAR_Error handling function in index.php. Duh." 
This reverts commit 616bdd43a9.

Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.
 2009-02-12 16:04:43 -05:00
Evan Prodromou
5c31dcb430 Merge branch 'devevan/master' into 0.7.x 2009-02-12 15:51:34 -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
654a91cc1c Add fixed IDs to SMS carrier list 
Changed the SMS carrier list to use a fixed ID number for each carrier
distributed with the software. We claim IDs > 100000; admins can use
IDs < 100000 for local values. I'd be pretty surprised if there were
more than 100K wireless carriers in the world, but hey.
 2009-02-12 14:03:15 -05:00
Evan Prodromou
5118643695 move carrier.sql to sms_carrier.sql 2009-02-12 13:58:05 -05:00
Sarven Capadisli
033503dc84 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-12 18:30:10 +00:00