keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
7074 commits 4 branches 0 tags 179 MiB
Commit graph

2100 commits

Author SHA1 Message Date
Domovoy
f1bc2afbfe Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-23 10:25:22 +02:00
friendica
386b6d081b moods 2012-08-22 21:36:55 -07:00
friendica
ff0e0782a5 restore old comment behaviour when threading turned off 2012-08-21 19:41:50 -07:00
friendica
bcec1bddc0 put the real post time into the post 2012-08-19 14:39:43 -07:00
Domovoy
1406480258 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-19 14:14:33 +02:00
friendica
6bc48b58d8 algorithm for crypt tag 2012-08-19 00:35:39 -07:00
Domovoy
51802b0ae8 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-18 17:23:46 +02:00
Domovoy
17f9fcaec9 Checks done on topmost parent in local_delivery, closes #10 2012-08-18 17:17:33 +02:00
friendica
d96b9cda43 wall-to-wall posts not identified correctly after thread mod 2012-08-17 22:06:13 -07:00
Domovoy
429870015f Comments on friends are back (stupid typo) 2012-08-17 16:20:28 +02:00
Domovoy
16260e9fbb Merge branch 'threaded_items' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-17 15:49:23 +02:00
Domovoy
1581e02f8f Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-17 09:46:43 +02:00
friendica
68d7a3ae01 put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do. 2012-08-15 17:14:29 -07:00
friendica
e802c81ec1 fix single quotes 2012-08-15 05:09:44 -07:00
friendica
b8df47e97c bbcode quote display 2012-08-15 04:52:18 -07:00
friendica
bb188cbdf2 extra email enotify logging to help convince dreamhost that they've got breakage in one of their queues. 2012-08-15 02:59:17 -07:00
friendica
4654ebd43b correct the invocation for htmlspecialchars to handle quote display issues with editplain and reshare 2012-08-15 00:02:15 -07:00
friendica
aaadabf7d2 partial fix for D* public key format change 2012-08-14 02:20:48 -07:00
Zach Prezkuta
7d8aee05ef update items seen in DB when using API 2012-08-12 20:29:37 -06:00
friendica
bfec28f1fe threading messed up a bit of cross-site federation code 2012-08-12 18:42:43 -07:00
Domovoy
82d779a33b Conversation and Item now handles (dis)like as they should 2012-08-12 17:46:02 +02:00
Domovoy
04f14d96c6 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-12 17:34:23 +02:00
Domovoy
71f11a9a32 Item: new method get_comment_box 2012-08-12 16:02:47 +02:00
friendica
e81f15b28d crypt bbcode tag 2012-08-12 04:29:26 -07:00
Zach Prezkuta
5e09fc31f5 Threading updates 
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
 2012-08-11 14:36:58 -06:00
Domovoy
d817117f6e Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-08-11 16:42:47 +02:00
friendica
d4b6188356 getting comment counts correct in a threaded world 2012-08-11 01:26:10 -07:00
friendica
95bf9324b4 fix child count 2012-08-10 23:42:45 -07:00
friendica
20be1778db bring likes back - comment ordering is still a bit funky 2012-08-10 16:36:44 -07:00
Domovoy
75d355a2aa Rendering is now done by Item objects 2012-08-10 19:57:39 +02:00
Domovoy
6ef86e1fff New objects: Conversation and Item 2012-08-10 17:46:39 +02:00
Zach Prezkuta
009ebc732a move tag transformation to bb2diaspora; start taking out unnecessary signature stuff 2012-08-10 08:13:17 -06:00
Fabrixxm
fc07f50fd8 conversation: add 'thread_level' to $item array 2012-08-10 05:42:36 -04:00
Fabrixxm
dbbf5b86a2 template processor: trim strings in {{ if str!=str }}, add 'debug' tag: 
{{ debug $var [$var1 [$var2 [...]]] }}{{ enddebug }}

is replaced by

    <pre>var_export($var1)\nvar_export($var2)\n....</pre>
 2012-08-10 04:55:51 -04:00
friendica
4894619d7b bring back "delete selected items" - but need to pass pagedropping to each item 2012-08-09 23:01:37 -07:00
Domovoy
4cc6bf660c The number of comments shown when collapsed is the total of all the descendant items. 2012-08-07 09:53:53 +02:00
Domovoy
f3b1391501 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-07 09:40:21 +02:00
friendica
10b0ce5861 Merge https://github.com/friendica/friendica into pull 2012-08-06 19:52:49 -07:00
friendica
558fbcc69e rev update + don't tag anything in [] brackets 2012-08-06 19:50:57 -07:00
Zach Prezkuta
d8a13d6e8d allow themes to change the size of embedded videos 2012-08-06 09:59:57 -06:00
friendica
5d7f9d3b4b rev update 2012-08-05 21:43:20 -07:00
Domovoy
5b374c4050 Diaspora doesn't support threaded comments (forgot some) 2012-08-05 19:30:21 +02:00
Domovoy
707dd216ce Diaspora doesn't support threaded comments 2012-08-05 19:27:54 +02:00
Domovoy
dac88fce56 Remove database update, use fallback solution instead. 2012-08-05 15:08:31 +02:00
Domovoy
e247915f48 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-08-05 13:43:53 +02:00
Domovoy
5d1eb37b9b Remote items should be threaded now 2012-08-05 13:30:51 +02:00
friendica
9732f1fccf expire issue 2012-08-04 23:29:52 -07:00
friendica
e27395b3d7 Merge pull request #423 from fermionic/frost-updates 
Various updates
 2012-08-04 17:02:57 -07:00
Zach Prezkuta
ba66e17d1d ImageMagick rotates CW while imagerotate() rotates CCW 2012-08-04 17:30:25 -06:00
Domovoy
786e9064f2 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-04 23:33:06 +02:00
Zach Prezkuta
63628910b2 -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) 
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
 2012-08-04 14:02:39 -06:00
friendica
0c67649c08 put back notags 2012-08-03 18:36:45 -07:00
friendica
621e737826 fix angle char storage and transmission, rev update 2012-08-03 18:33:11 -07:00
Domovoy
8742beb772 Flatten children when threads are disabled 2012-08-03 22:28:21 +02:00
Domovoy
ea7db7b7a8 Threaded items in every page concerned. Some code cleanup. 2012-08-03 21:55:17 +02:00
Domovoy
66848b0471 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	update.php
 2012-08-03 18:57:37 +02:00
Michael Vogel
2aa67d67f5 Changed markdown to enable diaspora postings with images that contain links 2012-08-02 01:46:28 +02:00
Michael Vogel
04c31d194f Merge remote branch 'upstream/master' 
Conflicts:
	update.php
 2012-08-02 00:21:14 +02:00
Michael Vogel
bed99674d2 bbcode: two new bbcode elements (style, class) for CSS 2012-08-02 00:13:37 +02:00
friendica
372ad112c9 tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat. 2012-08-01 01:36:39 -07:00
Domovoy
07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02:00
Zach Prezkuta
067865db9e fix filer bug; some interface tweaks 2012-07-29 14:49:12 -06:00
Domovoy
7b2ca538c8 Fallback to the old behavior for unhandled conversations mode. 2012-07-29 21:11:19 +02:00
Domovoy
56f0ee4915 Threaded items on profile page 2012-07-29 20:41:11 +02:00
Domovoy
3b330510ea Fixed misbehaviour in collapsing 2012-07-29 20:09:51 +02:00
Domovoy
2fc0fcdc18 Unlimited level threading is now a site option. 2012-07-29 19:53:04 +02:00
Domovoy
25015d3ab9 Update now handles threaded items. 2012-07-29 18:39:38 +02:00
Domovoy
8ea3087342 Collapsing is back for threaded comments. 
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
 2012-07-29 17:13:21 +02:00
Domovoy
10eb873f7c Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 10:03:17 +02:00
Zach Prezkuta
1f09e7ad23 Modify Javascript to improve page loading times 
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
 2012-07-28 09:57:16 -06:00
Domovoy
d558d25540 CommentBox is now hidden by default, this can be toggled with a fake link 2012-07-27 22:47:18 +02:00
Domovoy
8ecf8167db Threaded comments are starting to work. 
For now, only on normal view, and not during update
 2012-07-27 22:08:57 +02:00
Fabrixxm
672f9fd87f include/plugin: define THISPLUGIN as "addon/$pluginname/$pluginname.php" 
to make life a litte bit easy to lazy plugin devs like me
 2012-07-27 09:02:28 -04:00
Rainulf Pineda
1573c10631 Fixed syntax error in usage of anonymous function. 2012-07-25 21:38:28 -04:00
Michael Vogel
fc27edb6d7 network: Caching of images 2012-07-26 00:23:25 +02:00
Michael Vogel
6456c2484e scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY] 2012-07-25 23:40:23 +02:00
Domovoy
50d1bdd902 Removed useless function 2012-07-24 17:32:13 +02:00
Domovoy
c8f484e4a5 Rplace spaces with undercores in tags 2012-07-24 17:22:56 +02:00
friendica
aa5e60248a Merge pull request #405 from fermionic/support-for-mobile-themes 
changes to support a mobile theme
 2012-07-23 20:18:23 -07:00
friendica
982625db9c update contact photos and names in local delivery - not just polled feeds 2012-07-23 20:00:00 -07:00
Zach Prezkuta
5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
Domovoy
35f1081bfe Removed the debug statement 2012-07-23 20:16:06 +02:00
Domovoy
d6c600ce11 Hooks now have a 'priority' value, default to 0. 
The hooks are retrieved from the database by descending priority.

As a result they are run in the same order.
 2012-07-23 15:35:31 +02:00
Domovoy
ba76af3488 Forgot a ; 2012-07-22 17:50:58 +02:00
Domovoy
36f600aaf2 Moved compression setup in constructor for Imagick 2012-07-22 17:27:09 +02:00
Domovoy
a3df0d9817 get_FormatsMap doesn't need to be static 2012-07-22 17:09:18 +02:00
Domovoy
62cd4dcb77 Set the type to what it will be saved to in the constructor 2012-07-22 17:07:13 +02:00
Domovoy
7a1f15c8da Always coalesce, if it is not a multi-frame image it won't hurt anyway 2012-07-22 16:27:22 +02:00
Domovoy
c0d3d50fb5 Don't forget to clean frames before saving 2012-07-22 16:22:06 +02:00
Domovoy
ab484ebc76 getExt should not use Imagick format, mapping ext and mime type is more accurate. 2012-07-22 16:19:35 +02:00
Domovoy
83075c2f27 Set the Imagick image format in the constructor, so we can uset [get|set](image)XXX methods as intended 2012-07-22 16:12:47 +02:00
Domovoy
689e3028bf Use getImageFormat to know the image format in the constructor. 
Since we don't load the image with Imagick constructor, we need to use the [get|set]imageXXX methods.
We should be able to handle the image as if it was loaded from Imagick constructor, so that we don't get lost between the image and its frames.

Also added a debug log so that we get some info on unhandled mime types.
 2012-07-22 15:24:41 +02:00
Domovoy
0acb983be4 guess_image_type now uses Imagick::getImageMimeType() 2012-07-22 15:17:40 +02:00
Domovoy
5d0bd98d2a Photo::getType() now uses the accurate Imagick::getImageMimeType() 2012-07-22 14:50:19 +02:00
Domovoy
f723f756fd Photo::scaleImageSquare was giving an inexistent variable to scaleImage. 2012-07-22 14:22:47 +02:00
Domovoy
6c2cd91184 gd is back in the game as a fallback: not everybody can have Imagick. 2012-07-22 13:43:46 +02:00
Domovoy
fb2f4b6b35 Photo now uses Imagick instead of gd. 2012-07-21 17:17:19 +02:00
friendica
43d986cab2 one for the ladies who get poked by undesirables. 2012-07-20 00:47:30 -07:00
friendica
700569c7d6 this is the one I'll probably use the most 2012-07-19 22:40:45 -07:00
friendica
9c72b45f36 and the main photo menu 2012-07-19 21:27:22 -07:00
friendica
64bd634582 add poke to contact photo menu 2012-07-19 21:03:31 -07:00
friendica
a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica
d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
Michael Vogel
c8f99a8a66 Merge remote branch 'upstream/master' 2012-07-18 21:03:57 +02:00
friendica
749ae9b297 filter the protocol specifier in bbcode links. 2012-07-17 18:33:04 -07:00
friendica
f440d76200 recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396 2012-07-15 21:00:11 -07:00
friendica
02d88e7cbe name mixup in wall-to-wall hovertips 2012-07-15 20:56:09 -07:00
friendica
210fe188b2 missing param 2012-07-15 17:07:53 -07:00
Michael Vogel
7aa10d1935 Merge remote branch 'upstream/master' 2012-07-15 17:26:00 +02:00
Michael Vogel
335c15ede5 Hopefully the final fix for image links in bb2diaspora 2012-07-15 13:40:01 +02:00
Michael Vogel
8aeb3ec2fb Corrected the fix for images with links 2012-07-15 13:12:24 +02:00
Michael Vogel
4e9086f9b0 Changes in the bbcode to markdown converter to make it more compatible with Diaspora 2012-07-15 12:47:24 +02:00
Michael Johnston
717fd8539b add alt_pager function, add ability to use new pager logic on network, profile, community, and search. 2012-07-14 14:21:58 -04:00
Michael Vogel
8d7d46ae7a Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work 2012-07-14 19:54:27 +02:00
Michael Vogel
72f430ae58 parse_url: Problem when resizing images 2012-07-14 13:59:42 +02:00
friendica
8b6942c572 don't use language detection if < php 5.3 2012-07-13 15:38:02 -07:00
Michael Vogel
bfca7f47ef Merge remote branch 'upstream/master' 
Conflicts:
	include/bb2diaspora.php
 2012-07-13 23:39:51 +02:00
Michael Vogel
5f400c4a97 API: Now returns a real 404 when a function isn't implemented 
parse_url: Image handling improved
 2012-07-13 23:23:31 +02:00
friendica
f30b694ae4 Merge pull request #389 from fermionic/diaspora-likes-on-comments 
make likes on comments work with Diaspora, fix some small bugs
 2012-07-12 22:52:00 -07:00
friendica
7b4accec81 Merge pull request #390 from fermionic/diaspora-fixed-mangled-text 
focus preg_replace to prevent it from catching too much
 2012-07-12 22:51:20 -07:00
Zach Prezkuta
f92338d79b make likes on comments work with Diaspora, some small bugs 2012-07-12 23:14:39 -06:00
Zach Prezkuta
92db5e5ec2 focus preg_replace to prevent it from catching too much 2012-07-12 23:14:29 -06:00
friendica
7f7e2c5de0 add plink to profile notifications 2012-07-12 16:12:37 -07:00
Michael Vogel
02a1fc9cd0 parse_url: Further improvements of the new method to fetch page data 2012-07-12 23:41:04 +02:00
friendica
9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
friendica
085b589468 add some sparkle to plinks 2012-07-11 21:04:08 -07:00
friendica
86cb638637 notification issue on wall-to-wall posts 2012-07-11 02:58:57 -07:00
Zach Prezkuta
fc6f7daf38 small cleanup 2012-07-10 19:28:38 -06:00
Zach Prezkuta
d89b4cea64 missed a couple of variable names when I redid comment and like code 2012-07-09 20:36:25 -06:00
Zach Prezkuta
00eb000e36 don't check for was_recently_delayed in diaspora_transmit during a queue run 2012-07-09 09:39:09 -06:00
friendica
ab710bce3b Merge https://github.com/friendica/friendica into pull 2012-07-08 22:34:21 -07:00
friendica
caabb43326 diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match. 2012-07-08 22:32:04 -07:00
friendica
fcf971fea9 Merge pull request #383 from fermionic/auto-orient-all-uploaded-images 
auto-orient uploaded wall photos and profile photos also
 2012-07-08 15:32:20 -07:00
Michael Vogel
47c48aa438 DBA: Possibility to log the database speed 2012-07-08 21:27:20 +02:00
Zach Prezkuta
fb4295f07f better check for image EXIF support 2012-07-08 11:17:50 -06:00
Michael Vogel
db2f0f7919 Bugfix: API: No extra encoding for the status text - makes it more compatible to statusnet 
Bugfix: BBCode: Fixed charset problems.
 2012-07-08 18:27:11 +02:00
Zach Prezkuta
9fbe921051 auto-orient uploaded wall photos and profile photos also 2012-07-08 09:18:05 -06:00
Zach Prezkuta
c8378260bc check for posted dates based on month only 2012-07-08 08:46:46 -06:00
Zach Prezkuta
6d10374c17 cleanup 2012-07-07 18:50:46 -06:00
Zach Prezkuta
da2ccebed8 fix bugs 2012-07-07 18:50:33 -06:00
Zach Prezkuta
173b3a1b9a allow more than one embedded private photo 2012-07-07 16:24:20 -06:00
Zach Prezkuta
57635e7684 add function to exclude embedded images when checking message length 2012-07-07 16:24:20 -06:00
Michael Vogel
e9d7f85297 network: Small changes 2012-07-07 20:40:15 +02:00
friendica
0c5af9f303 Merge pull request #379 from fermionic/events-display-wrong-in-diaspora 
remove check for event description in bb2diaspora
 2012-07-07 04:19:15 -07:00
Zach Prezkuta
4fb996d9f7 remove check for event description, since it's not required to create an event 2012-07-06 17:11:25 -06:00
Vasudev Kamath
ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica
a6514e81bb remove obsolete zot encapsulation functions 2012-07-05 20:58:45 -07:00
Zach Prezkuta
47c7fd89ba my php thinks this is a typo 2012-07-05 20:39:22 -06:00
Zach Prezkuta
5395cf5bd9 clear title and body of items on local delete 2012-07-05 20:07:01 -06:00
friendica
854abcf612 Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions 
slightly better way of handling last loop
 2012-07-05 18:10:32 -07:00