Commit graph

2047 commits

Author SHA1 Message Date
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
fermionic
d3290f314f Merge pull request #521 from fermionic/20121101-updates
Various updates
2012-11-02 12:26:49 -07:00
friendica
e8fa4279fa no profile pic on photos page if no photos have been uploaded 2012-11-02 04:20:12 -07:00
Zach Prezkuta
c6a3b87359 update_display for display live updates 2012-11-01 18:36:11 -06:00
Zach Prezkuta
c9248b66db display live update; don't collapse comments on live update 2012-11-01 18:31:50 -06:00
Zach Prezkuta
e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
Fabrixxm
1a3a5ee8d9 moveme: first successful relocated user 2012-10-31 17:13:45 +01:00
friendica
e2ca9e9db5 poco - ignore archived contacts 2012-10-30 14:25:33 -07:00
Fabrixxm
c51e057fe6 Merge remote branch 'friendica/master' into moveme 2012-10-29 05:57:58 -04:00
friendica
88c8387c44 revive "mark everything seen" on main network page - see comments 2012-10-26 14:29:42 -07:00
friendica
2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -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
3af16ff92a Merge https://github.com/friendica/friendica into pull 2012-10-14 17:16:41 -07:00
friendica
dec5298248 rev update 2012-10-14 17:16:25 -07:00
Michael Johnston
939227e820 Moved comment box on photos to be after the last comment, added text for the Preview link 2012-10-14 14:41:31 -04: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
friendica
816db4396a better fix for threads with no parent showing up as unseen 2012-10-10 16:17:40 -07:00
friendica
8a1f9d32ab Merge https://github.com/friendica/friendica into pull 2012-10-10 15:59:05 -07:00
friendica
675aa56b02 rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared 2012-10-10 15:57:40 -07:00
fermionic
14d8033e54 Merge pull request #510 from fermionic/lockview-plugin-support
allow changing the lockview content with a plugin
2012-10-10 07:04:08 -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
86d6f380dc add home_init hook to manage to call startpage plugin 2012-10-09 09:47:14 -06:00
Zach Prezkuta
96a245409b allow changing the lockview content with a plugin 2012-10-09 09:45:54 -06:00
Zach Prezkuta
0ea89852d2 allow themes to decide where live updates appear 2012-10-09 09:41:33 -06:00
Domovoy
8e50b3f9ce Use saved_searches_aside.tpl in search.php 2012-10-02 16:03:20 +02:00
fermionic
9daafe7489 Merge pull request #501 from fermionic/network-remember-filters
don't set a date as a group
2012-10-01 13:08:48 -07:00
Zach Prezkuta
c6061d598f don't set a date as a group 2012-10-01 14:07:32 -06:00
fabrixxm
9d4fdee65d Merge pull request #500 from fabrixxm/quattro-fontsoptions
Quattro fixes
2012-10-01 07:05:58 -07:00
Fabrixxm
864d022468 editpost: add short jot action text to edit post form 2012-10-01 10:00:25 -04:00
friendica
112fafcc81 consistent handling of scaled images when using imagick 2012-09-30 03:25:20 -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
c9536ac056 Merge pull request #498 from fermionic/more-robust-tag-conversion
allow tagging of people by name or nickname
2012-09-30 01:55:23 -07:00
Zach Prezkuta
421c72d10f remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters 2012-09-29 17:56:50 -06:00
Zach Prezkuta
ce73cd560f allow tagging of people by name or nickname 2012-09-29 17:55:40 -06:00
Zach Prezkuta
f4f3c8375f send less messages to server; remove delete option 2012-09-29 17:50:34 -06:00
friendica
ebabd25717 order photo album list in blog (reverse date) order 2012-09-29 06:08:44 -07:00
friendica
c357fddea7 photo "conversation streams" need work - quite a bit of it 2012-09-29 06:04:01 -07:00
friendica
260b0f7fe8 rev update 2012-09-27 19:53:23 -07:00
friendica
41db3fb983 declare array separately, doesn't work well when defined in hook 2012-09-26 04:50:24 -07:00
friendica
d1d5eca258 network_ping hook for next generation "page"/"forums" plugin 2012-09-26 04:46:54 -07:00
friendica
b6b8f40fa9 Merge https://github.com/friendica/friendica into pull 2012-09-21 18:10:32 -07:00
friendica
c2af97ef61 rev update 2012-09-21 18:04:09 -07:00
Zach Prezkuta
da7c5b19b1 allow hidden comments phrase to be accessed separately as number and text 2012-09-19 21:31:26 -06:00
friendica
490c98b7db fix events 2012-09-19 00:44:37 -07:00
friendica
0b59d30e34 more infrastructure for ignored events 2012-09-18 22:49:05 -07:00
friendica
fa14723ef5 Merge https://github.com/friendica/friendica into pull 2012-09-18 17:44:38 -07:00
friendica
5cad3e114a give themes more control over events/birthdays and provide them as notifications 2012-09-18 17:43:09 -07:00
friendica
6ebd56012a Merge pull request #479 from fermionic/album-image-inserted-too-large
dont insert images larger than scale level 2
2012-09-18 15:46:41 -07:00
Zach Prezkuta
cd25573038 select based on dimensions instead of scale level 2012-09-17 21:46:36 -06:00
Fabrixxm
6aa45fb9cc admin: Don't allow to block or delete site admin in users admin page. fix bug 471 2012-09-17 08:48:43 -04:00
Zach Prezkuta
364f56e8bd dont insert images larger than scale level 2 2012-09-16 19:07:12 -06:00
friendica
ee5ed6b963 Merge https://github.com/friendica/friendica into pull 2012-09-15 15:24:28 -07:00
friendica
669d2b890e rev update - add cancel markup to editor 2012-09-15 15:23:15 -07:00
Zach Prezkuta
8a4dcc28c1 make size search less greedy 2012-09-14 18:33:07 -06:00
Zach Prezkuta
f445ed47df fix permissions for uploaded images with size specified 2012-09-14 18:22:56 -06:00
friendica
39b296a87d ostatus disabled typo 2012-09-14 06:04:25 -07:00
friendica
20938d07cd typo on previous checkin - set max number of images for an inserted link, default 2. 2012-09-13 23:01:10 -07:00
friendica
32d4a359f1 reverse the default newuser privacy setting to public. Sites can over-ride. 2012-09-13 19:11:07 -07:00
Zach Prezkuta
e8acdb31bc add mobile toggle to frost mobile 2012-09-12 21:35:51 -06:00
friendica
a8d12061ca rev update + multiple profile photos 2012-09-11 18:56:38 -07:00
friendica
624fd44502 Merge https://github.com/friendica/friendica into pull 2012-09-08 18:34:32 -07:00
friendica
7bec5778ba provide option to view photo albums in posted order (rather than blog order) 2012-09-08 18:33:28 -07:00
Zach Prezkuta
63d02d98c5 add settings sections and add contacts; other tweaks and fixes 2012-09-07 12:17:03 -06: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
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
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
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
fermionic
9ae5ae6df5 Merge pull request #448 from fermionic/limit-items-on-all-pages
limit number of items on profile page too
2012-08-28 19:03:15 -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
647802f92e get "ago" information into the mail thread view 2012-08-27 19:46:35 +02:00
1e9d35fb0e pass "ago" information to the mail_list template 2012-08-27 19:31:41 +02:00
Zach Prezkuta
c681e69794 limit number of items on profile page too; add show more back to Frost mobile; some show more fixes 2012-08-26 15:21:26 -06:00
Zach Prezkuta
1ffd67f291 hey: you missed a spot 2012-08-25 15:07:39 -06:00
Zach Prezkuta
f062ccbb66 add documentation; add to admin panel; some tweaks and interface stuff 2012-08-25 15:03:16 -06:00
friendica
386b6d081b moods 2012-08-22 21:36:55 -07:00
friendica
bcec1bddc0 put the real post time into the post 2012-08-19 14:39:43 -07:00
Zach Prezkuta
d00c98b8b8 template was loaded in the wrong place 2012-08-18 13:28:49 -06:00
friendica
1e3ebccb97 Merge https://github.com/friendica/friendica into pull 2012-08-15 17:16:24 -07: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
Thomas Willingham
c47e6dca30 Remove Facebook from newmember text. 2012-08-15 22:26:44 +01:00
a09c200799 add selector for mobile theme to admin panel 2012-08-15 10:16:42 +02:00
friendica
962c357ebd common_friends_visitor_widget warning 2012-08-12 15:54:38 -07:00
Zach Prezkuta
d9279da369 - Frost Mobile: redo CSS to adjust automatically to the screen width
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
2012-08-10 08:34:00 -06:00
Domovoy
4b514ea989 Fallback so that we alway have a thr-parent 2012-08-07 10:04:47 +02:00
Domovoy
97285f4811 Preview was not working 2012-08-05 15:35:12 +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
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
621e737826 fix angle char storage and transmission, rev update 2012-08-03 18:33:11 -07:00
Domovoy
ea7db7b7a8 Threaded items in every page concerned. Some code cleanup. 2012-08-03 21:55:17 +02:00
Domovoy
cc6e6e53be Threaded notes 2012-08-03 21:41:26 +02:00
Domovoy
985f16d992 Threaded item when in single post display 2012-08-03 21:34:29 +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
6d0f0e6273 parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content. 2012-08-02 10:25:08 +02:00
friendica
70389c99ea logic was reversed - should work now 2012-07-31 22:25:03 -07:00
friendica
764ee653ba Provide backend ability to poke as a comment rather than top-level post 2012-07-31 20:59:51 -07:00
Zach Prezkuta
885bb50f0d fix /display bug; oembed audio bug; other tweaks 2012-07-31 18:53:18 -06:00
Domovoy
07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02:00
friendica
efded40461 pass deleted flag to display 2012-07-30 00:49:48 -07:00
Zach Prezkuta
067865db9e fix filer bug; some interface tweaks 2012-07-29 14:49:12 -06:00
Domovoy
56f0ee4915 Threaded items on profile page 2012-07-29 20:41:11 +02:00
Domovoy
2fc0fcdc18 Unlimited level threading is now a site option. 2012-07-29 19:53:04 +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
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
a77fdfa6aa remove special case for /.well-known/host-meta and add module for /.well-known 2012-07-27 08:58:27 -04: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
Zach Prezkuta
5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
friendica
0d631cc08c hopefully better update handling - never update the current DB version or continue with other updates if there was a failure of any individual update. 2012-07-23 15:57:40 -07:00
Vasudev Kamath
d3baaadf23 Merge branch 'master' of git://github.com/friendica/friendica 2012-07-22 12:43:32 +05:30
Vasudev Kamath
863617013c Access image part of siteinfo only if $siteinfo["images"] is actually set. The current
code didn't check this so I was getting an error
     Warning: Invalid argument supplied for foreach() in /home/vasudev/Public/friendica/mod/parse_url.php on line 305

Implemented a check before accessing $siteinfo["images"] with this commit and now warning doesn't come when giving URL of a site which doesn't have image from link button of post area
2012-07-22 12:41:07 +05:30
friendica
5255a5c9a9 rev update 2012-07-21 16:44:15 -07:00
friendica
0ff93edeee poke privacy 2012-07-20 04:03:32 -07:00
friendica
9c72b45f36 and the main photo menu 2012-07-19 21:27:22 -07:00
friendica
d1243c9ad7 allow to prefill - url/poke?f=&c=nn - nn is contact id 2012-07-19 20:54:23 -07:00
friendica
1a75507f78 check permission 2012-07-19 20:30:40 -07:00
friendica
a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica
2f641ecdc8 id mismatch 2012-07-19 18:50:33 -07:00
friendica
d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
Michael Vogel
222635d15a parse_url: Just added a comment for future elements that should be added as well. 2012-07-18 21:06:38 +02:00
Michael Vogel
7aa10d1935 Merge remote branch 'upstream/master' 2012-07-15 17:26:00 +02:00
friendica
8767eedaac sql fix - this should work a bit better 2012-07-14 20:38:30 -07:00
friendica
79b5520e77 sql errors on profile page 2012-07-14 20:28:17 -07: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
72f430ae58 parse_url: Problem when resizing images 2012-07-14 13:59:42 +02:00
Michael Johnston
476b86e1a2 fix pagination on community page 2012-07-14 00:46:41 -04: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
Zach Prezkuta
88711deceb allow live updates for unlikes and undislikes 2012-07-13 09:09:01 -06: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
Michael Vogel
09034ce0ee parse_url: Fetch multiple pictures so that the user can decide what to take. 2012-07-12 08:20:27 +02:00
friendica
9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
Michael Vogel
48f67ead9b parse_url: complete new code for fetching website information 2012-07-12 01:17:33 +02:00
Zach Prezkuta
fc6f7daf38 small cleanup 2012-07-10 19:28:38 -06:00
Thomas Willingham
6621de63d9 Better (well, different) reshares. 2012-07-09 19:07:33 +01:00
Zach Prezkuta
9fbe921051 auto-orient uploaded wall photos and profile photos also 2012-07-08 09:18:05 -06:00