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

2251 commits

Author SHA1 Message Date
Michael Vogel
46c5a97a20 New caching system for photos 2012-12-14 22:47:30 +01:00
Fabrixxm
71751ecb8c template_processor: add filter support to variables 2012-12-14 10:10:33 -05:00
friendica
6b36863dd8 prune all dead/blocked contacts from allowed permissions, ok to keep them in "deny" lists - 
Contacts will be pruned when creating the editor. They can't be added with the ACL selector,
but we won't prevent them from being added through other means.
Allowed groups will be pruned on item submit.
 2012-12-13 21:02:14 -08:00
friendica
376bf517a4 bug #516 - set writable on first poll 2012-12-06 13:59:20 -08:00
friendica
8b5288d0f7 Merge pull request #540 from Leberwurscht/master 
Cross site request forgery hole
 2012-12-03 13:40:29 -08:00
tobiasd
23c873fc51 Merge pull request #542 from annando/master 
Some minor changes to "vier"
 2012-12-02 23:49:06 -08:00
Michael Vogel
5635fe250c Merge remote-tracking branch 'upstream/master' 2012-12-03 08:30:49 +01:00
Leberwurscht
945afec656 fix CSRF hole in API 2012-12-01 01:26:54 +01:00
friendica
b130c892b2 features categories were un-translatable 2012-11-28 19:25:09 -08:00
friendica
32868dab79 catch stragglers in "chunked" delivery mode 2012-11-27 15:17:41 -08:00
friendica
5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica
226d1ba7c1 Merge pull request #537 from fermionic/20121121-features 
Port Features from Red
 2012-11-22 20:54:16 -08:00
Zach Prezkuta
a536a4e657 local stuff leaked 2012-11-22 09:21:21 -07:00
Zach Prezkuta
04f5506318 forgot some slightly important files 2012-11-22 09:20:03 -07:00
Zach Prezkuta
94204d9160 implement features 2012-11-22 09:14:22 -07:00
Michael Vogel
e36c30d285 Vier: Margin problems with code fixed. 2012-11-22 15:06:15 +01:00
friendica
9835efc9e4 fix jenkins tests 2012-11-22 05:06:15 -08:00
friendica
868bdc9b6a php warning 2012-11-22 03:19:05 -08:00
friendica
0840c8365a always check for valid dfrn_id before auto_redir 2012-11-21 15:56:00 -08:00
friendica
4d289574ca ensure that auto_redir does not loop 2012-11-21 15:41:14 -08:00
friendica
f1c579e74a Merge https://github.com/friendica/friendica into pull 2012-11-18 23:50:37 -08:00
friendica
70d0ed9402 log directory updates 2012-11-18 22:53:01 -08:00
Michael Vogel
5dbf89be88 Making the new reshare method optional 2012-11-17 16:27:49 +01:00
Michael Vogel
f17377e6de New cache system with subdirectories 2012-11-17 00:50:39 +01:00
Michael Vogel
e67062d9cf Merge remote-tracking branch 'upstream/master' 2012-11-15 21:52:35 +01:00
friendica
ab0dc3131a fix wallmessage 2012-11-14 13:59:31 -08:00
friendica
3dc4c52022 Merge pull request #533 from fabrixxm/moveme 
Fix issue 508
 2012-11-13 14:06:20 -08:00
Fabrixxm
374683503a uimport: check check to ensure the username isn't already taken before import (issue 508) 2012-11-13 04:52:32 -05:00
friendica
009744af50 allow posted ACLs to be comma-delimited string besides the default array 2012-11-11 13:56:21 -08:00
friendica
6e0dd29c1b include some notes on grabbing the tumblr avatar 2012-11-11 00:44:30 -08:00
friendica
de5a21bec4 improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago. 2012-11-11 00:28:21 -08:00
Michael Vogel
b875191237 Diaspora: Avatars of repeated items weren't found 
Vier: Complete redesign of the navigation header
 2012-11-10 23:19:32 +01:00
Michael Vogel
71e43e68d4 Merge remote-tracking branch 'upstream/master' 2012-11-09 23:40:17 +01:00
Zach Prezkuta
ac164cfca8 refresh login time every 12 hours for 'Remember me' 2012-11-08 17:00:37 -07:00
Michael Vogel
5d2d306d9f Make reshared Diaspora postings look lile wall-to-wall postings (preparation for real forwards in friendica) 2012-11-08 21:45:53 +01:00
Michael Vogel
4196b6a96c Merge remote-tracking branch 'upstream/master' 2012-11-08 21:44:17 +01:00
Zach Prezkuta
e116712bf5 add ability to remember logged in user after browser closes 2012-11-07 18:59:30 -07:00
Zach Prezkuta
999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
friendica
776552226b Merge https://github.com/friendica/friendica into pull 2012-11-06 01:10:36 -08:00
friendica
fd4d35b16c set writable for ostatus followers 2012-11-06 01:10:12 -08:00
zzottel
eb3408b574 Merge pull request #526 from zzottel/master 
Forgot to commit the changes(regarding fermionic's comments) in notifier.php
 2012-11-05 23:18:48 -08:00
zottel
b7e121ccf7 Forgot to commit the changes (regarding fermionic's comments) in notifier.php 2012-11-06 08:16:08 +01:00
Fabrixxm
cef5afc53d moveme: remove debug comment 2012-11-05 04:15:09 -05:00
Fabrixxm
5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
Fabrixxm
385ee5a862 pass $argv & $argc as reference to *_run() functions. 2012-11-05 09:28:54 +01:00
Fabrixxm
aa20042bec moveme: fix contact photos 2012-11-05 09:18:55 +01:00
root
fe3f1af92f Merge remote-tracking branch 'upstream/master' 2012-11-04 23:31:05 +01:00
Michael
6afa5d1c48 In the API you now can update not only the body but also the title. In html2plain the function for valid urls was improved. 2012-11-04 23:18:52 +01:00
zottel
dd1e735efb Worked in fermionic's comments (not count($r)). 2012-11-04 11:07:11 +01:00
Michael
2b6498b2a2 Merge remote-tracking branch 'upstream/master' 2012-11-03 22:27:34 +01:00
zottel
2871fd4793 Depublish public posts when archiving a contact 2012-11-02 23:54:03 +01:00
zottel
7de5c7ebe1 Changes to make contacts delete all content from the user when a user is deleted. 
NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't
have a clone of the addons repository. Please someone do that for me. Thanks.

Please check carefully. I tested locally on my server, but not with other
servers.
 2012-11-02 21:43:47 +01:00
Zach Prezkuta
c9248b66db display live update; don't collapse comments on live update 2012-11-01 18:31:50 -06:00
Zach Prezkuta
6effdd570c add a confirm dialog and a busy rotator for delete selected 2012-11-01 17:42:40 -06:00
Zach Prezkuta
e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
Zach Prezkuta
d98974572b fix theme control of allowing threading 2012-11-01 10:33:01 -06:00
Zach Prezkuta
43de9cf904 don't try to auto redir if I'm a blocked or pending contact 2012-11-01 10:32:33 -06:00
Fabrixxm
1a3a5ee8d9 moveme: first successful relocated user 2012-10-31 17:13:45 +01:00
friendica
a41e78a06d Merge pull request #516 from fermionic/20121029-auto-redir-fix 
make sure that the contact is local for auto redir
 2012-10-29 21:00:28 -07:00
friendica
d3682f5d6a Merge pull request #517 from fermionic/20121029-wall-live-commenting 
add live div to wall page
 2012-10-29 20:58:32 -07:00
Zach Prezkuta
200d2030d5 don't combine msg and meta arrays unless they're the same size 2012-10-29 12:47:51 -06:00
Zach Prezkuta
4fd339b216 add live div to wall page 2012-10-29 12:43:52 -06:00
Zach Prezkuta
4990f64927 make sure that the contact is local for auto redir 2012-10-29 12:03:48 -06:00
Fabrixxm
dbc6cbe024 moveme: send and receive DFRN "relocate" message (WIP) 2012-10-29 17:50:55 +01:00
Fabrixxm
c51e057fe6 Merge remote branch 'friendica/master' into moveme 2012-10-29 05:57:58 -04:00
friendica
02251f23df undefined fn: init_groups_visitor in mod_profile, rev update 2012-10-21 14:41:10 -07:00
Michael Vogel
28b085569a Merge remote branch 'upstream/master' 2012-10-19 07:12:15 +02:00
friendica
2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
friendica
f6f3042d00 imagick exception 2012-10-17 15:22:29 -07:00
Fabrixxm
65d235017c move account. first step. 
export basic account data as json
import basic account data in db (dbs must be at same schema version)
 2012-10-17 11:13:01 -04:00
friendica
80513e4332 Trying this fix for endless redirection 2012-10-15 18:51:22 -07:00
friendica
fd6a21f522 oops - missingfile from last checking, the important one 2012-10-15 16:33:00 -07:00
fermionic
ca21f1bbc8 Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts 
for profile and photos, detect contacts from local hub and auto-redir
 2012-10-11 17:24:11 -07:00
fermionic
2f3d118e77 Merge pull request #508 from fermionic/no-theme-control-of-live-update-location 
allow themes to decide where live updates appear
 2012-10-10 17:34:28 -07:00
Zach Prezkuta
b9818185db for profile and photos, detect contacts from local hub and auto-redir 2012-10-09 09:50:24 -06:00
Zach Prezkuta
0ea89852d2 allow themes to decide where live updates appear 2012-10-09 09:41:33 -06:00
Zach Prezkuta
c3cf459b27 use getWidth and getHeight, which are agnostic to Imagick being enabled 2012-10-09 09:35:32 -06:00
friendica
112fafcc81 consistent handling of scaled images when using imagick 2012-09-30 03:25:20 -07:00
friendica
e0dbd2e8e4 Merge pull request #494 from fermionic/diaspora-contact-lookup-fails 
look for DFRN contacts as well
 2012-09-30 01:58:37 -07:00
friendica
e60c729b51 Merge pull request #495 from fermionic/email-optimization 
send less messages to server; remove delete option
 2012-09-30 01:58:07 -07:00
friendica
35905ebf1c Merge pull request #496 from fermionic/deleted-group-stays-in-default-permissions 
remove groups from default permissions when removed; bug in group_add_member
 2012-09-30 01:57:52 -07:00
Zach Prezkuta
34081010ff allow contact if in allowed group, even if not in non-empty allowed contacts 2012-09-29 17:54:37 -06:00
Zach Prezkuta
4af4e9aa9f remove groups from default permissions when removed; bug in group_add_member 2012-09-29 17:53:06 -06:00
Zach Prezkuta
f4f3c8375f send less messages to server; remove delete option 2012-09-29 17:50:34 -06:00
Zach Prezkuta
59ace4f4d7 look for DFRN contacts as well 2012-09-29 17:48:56 -06:00
friendica
8416cff2a5 slight adjustment to Photo scaling - also discovered imagick resize may need some additional work 2012-09-29 05:46:01 -07:00
friendica
0693afd6b7 only constrain horizontal image dimension for scaling very tall photos 2012-09-29 05:20:29 -07:00
Michael Vogel
ea6ced8359 Merge remote branch 'upstream/master' 2012-09-29 08:35:17 +02:00
friendica
cef5169567 subscribe-to/follow threads 2012-09-27 19:53:55 -07:00
friendica
25773b41cb add "tagged" hook (bots and such) 2012-09-26 18:24:19 -07:00
friendica
e433f20cd8 sort out the 'delete selected' mess 2012-09-25 19:10:46 -07:00
friendica
245d9f0aca one template to rule them all 2012-09-25 01:31:48 -07:00
friendica
8184de9c78 remove THISPLUGIN definition - not used and doesn't work 2012-09-24 01:30:18 -07:00
friendica
054f8edb59 zeros - theming for new categories/folder display 2012-09-23 19:22:48 -07:00
friendica
c3b4f9f0d3 support for bringing back cats/folders 2012-09-23 17:16:37 -07:00
Fabrixxm
dd25c7db7e more $item data 
- add $item.categories and $item.folders to object/Item.php
- add $item.hastags and $item.mentions to object/Item.php
- add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments)
- move get_cats_and_terms() to include/text.php
 2012-09-20 09:46:49 +02:00
Fabrixxm
40f2ec189e Merge remote branch 'friendica/master' into blog-like 2012-09-20 02:48:54 -04:00
Michael Vogel
4c389eb73b Merge remote branch 'upstream/master' 2012-09-20 08:32:33 +02:00
Zach Prezkuta
da7c5b19b1 allow hidden comments phrase to be accessed separately as number and text 2012-09-19 21:31:26 -06:00
Zach Prezkuta
1aa111387a -- Fix Diaspora profile update avatar bugs 
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
 2012-09-19 20:35:39 -06:00
Fabrixxm
b400ddd22d conversation: new 'categories' and 'folder' elements to $item 
remove static "Filed under" e "Category" text from message body
both are lists of array whith
'name' : category/folder name
'remove': url to remove
'first': bool first in array
'last' : bool last in array
 2012-09-19 11:38:32 -04:00
friendica
66081201bc allow "subscribe to thread" activities to exist without displaying them. 2012-09-18 20:12:55 -07:00
friendica
2abbd1dc19 permissions selector showing up for guests, testbubble and smoothly 2012-09-15 20:21:17 -07:00
friendica
669d2b890e rev update - add cancel markup to editor 2012-09-15 15:23:15 -07:00
friendica
32d4a359f1 reverse the default newuser privacy setting to public. Sites can over-ride. 2012-09-13 19:11:07 -07:00
friendica
d19a3b8324 provide separate hashtag and mentions for themes in addition to composite tags 2012-09-13 16:59:25 -07:00
friendica
f4e3f335ef don't allow followers to get a post through unless it's a tag deliver 2012-09-12 18:53:20 -07:00
friendica
3d6c49d5b3 Merge https://github.com/friendica/friendica into pull 2012-09-12 17:20:52 -07:00
friendica
db09724aec use local photo for tag notifications if available 2012-09-12 17:19:26 -07:00
Domovoy
67563d5c82 Fallback to gd if Imagick can't load the data 2012-09-12 11:55:09 +02:00
Michael Vogel
5cfb068c25 Merge remote branch 'upstream/master' 2012-09-10 23:28:07 +02:00
Domovoy
16eec24a21 Tabs trouble? What happened? I sure aven't changed anything to my editor... 2012-09-10 10:36:30 +02:00
Domovoy
1b82df60db Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd 2012-09-10 09:50:30 +02:00
Domovoy
bb68461c6d Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-09-10 09:19:08 +02:00
friendica
5c0f0df59a provide local_block - block_public as far as content but can connect with the grid. 2012-09-06 20:17:50 -07:00
Thomas Willingham
d0994fc882 Merge branch 'master' of https://github.com/friendica/friendica 2012-09-07 00:44:01 +01:00
Thomas Willingham
5f970aea72 Typo in notifier. 2012-09-07 00:43:05 +01:00
fermionic
9bf8efc45f Merge pull request #459 from fermionic/individual-choice-of-mobile-theme 
Individual choice of mobile theme
 2012-09-06 16:35:04 -07:00
Zach Prezkuta
a089a89478 small twitter improvements 2012-09-06 17:31:05 -06:00
Zach Prezkuta
77529ccdf1 allow individual choice of mobile themes 2012-09-06 17:24:34 -06:00
friendica
1478229abc allow comments on other folks wall-to-wall postings 2012-09-05 18:24:06 -07:00
friendica
3968dc932f update writable for dfrn contacts when using local delivery 2012-09-05 16:26:11 -07:00
friendica
9e5fa5b9a9 ignore exif orientation if we can't parse the particular flavour of exif 2012-09-05 04:02:30 -07:00
friendica
411b6a71b4 Merge https://github.com/friendica/friendica into pull 2012-09-04 22:53:32 -07:00
friendica
4cd8233f61 remote_user can now support multiple contacts being logged in at once 2012-09-04 22:50:28 -07:00
Zach Prezkuta
79012bf888 conversation needs preview parameter 2012-09-04 18:47:49 -06:00
Michael Vogel
59d378913d Merge remote branch 'upstream/master' 2012-09-04 07:22:59 +02:00
friendica
cdf648c0b4 attachments from non-friendica contacts shouldn't go through redir - it won't work 2012-09-03 21:31:35 -07:00
Michael Vogel
f6818ab243 Merge remote branch 'upstream/master' 2012-09-02 17:50:25 +02:00
Michael Vogel
3c24a7ed3e items: added some logging infos 2012-09-02 17:49:06 +02:00
friendica
39c7b34276 rev update 2012-09-02 01:47:04 -07:00
friendica
2ace7d6646 Merge pull request #451 from fabrixxm/master 
fixes and tweaks
 2012-08-31 01:26:03 -07:00
Domovoy
ef52ff6b01 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-30 07:47:21 +02:00
Fabrixxm
f433158bed config: fix get_config and get_pconfig search for serialized array 
works also if the serialized string contains newlines
 2012-08-29 04:19:15 -04:00
Zach Prezkuta
f7a1999c15 manually fix escaped underscores in links 2012-08-28 20:12:41 -06:00
fermionic
597e96e156 Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags 
regular expressions were grabbing too much
 2012-08-28 19:03:04 -07:00
fermionic
8c064069d9 Merge pull request #443 from fermionic/new-users-privacy-settings 
automatically make posts private for new users
 2012-08-28 19:02:51 -07:00
Fabrixxm
9ecb984285 Merge remote branch 'friendica/master' into bid-prov 2012-08-28 10:38:40 -04:00
Zach Prezkuta
72712175b5 regular expressions were grabbing too much 2012-08-26 14:56:34 -06:00
Zach Prezkuta
193cc2c537 try to get rid of scrollbars in Frost 2012-08-25 22:42:12 -06:00
Zach Prezkuta
f062ccbb66 add documentation; add to admin panel; some tweaks and interface stuff 2012-08-25 15:03:16 -06:00
Zach Prezkuta
bd59f3d152 probably shouldn't require exact match for non-string 2012-08-24 21:46:42 -06:00
Zach Prezkuta
7c5f5f3113 automatically make posts private for new users 2012-08-24 21:28:28 -06:00
Domovoy
9390eda5e6 Revert wall to wall detection based on @ tags (@ can also target a user, not only a forum) 2012-08-24 05:11:39 +02:00
Domovoy
5cd1dde59b Logic error 2012-08-24 05:04:35 +02:00
Domovoy
72f3d628e8 Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-24 04:58:11 +02:00
Domovoy
c9cfc52293 method, not property 2012-08-24 04:57:32 +02:00
Domovoy
71d9c95faf Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-24 04:47:29 +02:00
Domovoy
e3ee997cd3 Fix copy/paste stupidity 2012-08-24 04:45:10 +02:00
Domovoy
8a25c7876c Better wall to wall detection (fallback on checking if we have a @ tag) 2012-08-24 04:36:03 +02:00