tobias/friendica
1
0
Fork 0
Code Pull requests Activity
7822 commits 2 branches 61 tags 203 MiB
Commit graph

2093 commits

Author SHA1 Message Date
friendica f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica b550b1326b Merge https://github.com/friendica/friendica into pull 2012-07-03 16:26:58 -07:00
friendica 7926a0d171 add link to shares 2012-07-03 16:26:14 -07:00
Zach Prezkuta 3fe5bdbd8d add ability to set maximum pixel length of uploaded pictures 2012-07-02 20:01:23 -06:00
friendica 315784444a try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff 2012-07-02 01:11:19 -07:00
friendica a9c65dfe27 "babel" diagnostic - convert bbcode to different formats and back again 2012-07-01 23:00:25 -07:00
friendica e2a725ff98 pagination start off by one 2012-07-01 19:17:21 -07:00
Zvi ben Yaakov (a.k.a rdc) 2214cd74e5 Added more profile data and CSS styling to the /directory page 2012-07-01 14:46:03 +03:00
friendica 78e03abed8 convert ent_quotes for jquery calendar title/summary 2012-06-29 20:11:36 -07:00
friendica 0ecba60503 undefined fn 2012-06-28 21:15:43 -07:00
friendica a3edbf7e5d create third privacy state - public post but not searchable or publicly visible 2012-06-28 17:43:29 -07:00
friendica b02c733967 service class restrict the email connector 2012-06-26 18:30:20 -07:00
friendica 359a98cd22 change event behaviour so that title is required but description is not 2012-06-25 21:20:08 -07:00
friendica fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
Zach Prezkuta 28526dbf21 remove possibly unnecessary checks for likes or comments created by Diaspora users 2012-06-25 19:03:03 -06:00
Zach Prezkuta 9e8573507e store signature info for remote users too 2012-06-25 19:03:03 -06:00
Zach Prezkuta f495ba2bcb was passing the wrong arguments to the signature storage function 2012-06-25 19:03:03 -06:00
Zach Prezkuta 5773241537 add some debug logging 2012-06-25 19:03:03 -06:00
Zach Prezkuta 8bb7ab88fb Clean up the Diaspora connectivity: 
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
 2012-06-25 19:03:03 -06:00
friendica b044cd922d typos in bbcode, add service class restrictions to jot uploads 2012-06-25 16:03:46 -07:00
Zach Prezkuta fa7e803f73 fix check for parent of StatusNet API post 2012-06-25 08:26:12 -06:00
friendica 35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
friendica 9528beac34 sidebar photo album list not visible to anybody if user['hidewall'] set 2012-06-24 16:51:39 -07:00
friendica 7f3813e9b0 service class basics 2012-06-24 00:56:27 -07:00
friendica 22ca358a8c like comments 2012-06-23 05:46:15 -07:00
friendica bf47bf5ba0 cleanup mod/share 2012-06-23 03:25:11 -07:00
friendica 181a17bd05 share RSS items 2012-06-22 15:27:06 -07:00
friendica eeceecc9ba unterminated sql string 2012-06-22 00:25:01 -07:00
friendica 788a6626ef Merge https://github.com/friendica/friendica into pull 2012-06-20 21:11:00 -07:00
friendica 0a302e100d try and eliminate the openssl warnings for forums trying to talk back to fans 2012-06-20 21:09:52 -07:00
Zach Prezkuta 54c76ca822 allow rotation either CW or CCW 2012-06-20 20:51:03 -06:00
friendica f4e434cd46 sort out contact search oddities 2012-06-20 16:20:55 -07:00
friendica 03c05d8a28 missing paren 2012-06-20 16:07:41 -07:00
friendica 0f0e5be549 contact search oddities 2012-06-20 16:05:46 -07:00
Zvi ben Yaakov (a.k.a rdc) a801888b15 Now using App::get_cached_avatar_image for /photos page 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc) d4f4ed730c Now using App::get_cached_avatar_image for /profile/{nickname} page 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc) f8d9f15879 Now using App::get_cached_avatar_image for /directory page 2012-06-19 16:05:38 -07:00
friendica 777830745f missing $submit 2012-06-19 00:50:24 -07:00
Zach Prezkuta 42fa47e8f7 rotate uploaded images if an EXIF rotation is present 2012-06-18 21:02:11 -06:00
friendica 83b9a8eb44 too many profiles 2012-06-17 19:40:16 -07:00
Zvi ben Yaakov (a.k.a rdc) edc68f4876 Enabled Profile photo revisions to be displayed on /photos page 2012-06-17 23:59:29 +03:00
Zvi ben Yaakov (a.k.a rdc) 1ee22a749e Enabled Profile photo revisions to be displayed on /profiles page 2012-06-17 23:24:47 +03:00
Zvi ben Yaakov (a.k.a rdc) 59e0b6a0e3 Enabled Profile photo revisions to be displayed on /directory page 2012-06-17 23:20:14 +03:00
fabrixxm 6416d09c71 the missing mod/network.php 2012-06-15 03:18:42 -04:00
friendica ba0ea1e651 mod/network.php was lost 2012-06-14 17:46:58 -07:00
friendica 8c94fa23bf Merge https://github.com/friendica/friendica into pull 2012-06-14 17:39:17 -07:00
friendica be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
fabrixxm f66ae301b8 network: fix bug #453 2012-06-14 10:04:13 -04:00
friendica f8314d6bea one-click change for manage module 2012-06-12 22:05:35 -07:00
friendica 920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
friendica 832d9eeaaf more fixes 2012-06-12 16:17:34 -07:00
friendica 8eb81a99c6 fix default group for local follows 2012-06-12 01:13:09 -07:00
friendica 6f1efccf1c bug #448 2012-06-12 01:01:35 -07:00
friendica 6c1914e6bc date search backend to mod/network 2012-06-11 21:07:53 -07:00
friendica 30295926b9 make sure default timezone is set in external processes 2012-06-11 19:52:46 -07:00
friendica 24e85c95b6 date based profile wall filter - backend 2012-06-11 19:36:04 -07:00
fabrixxm a21db51a58 network view: rembember last tab selected by user 2012-06-11 05:38:30 -04:00
friendica ea4515aca9 more logging on pubsub callbacks 2012-06-08 01:15:53 -07:00
friendica 0820865265 provide ability to autofriend ostatus accounts 2012-06-07 20:20:13 -07:00
friendica ba2452a076 png support for embedded private photos 2012-06-07 16:02:56 -07:00
Fabio Comuni 2438c6e45d png support: update database.sql, fix some typos, fix tinymce image browser 2012-06-07 20:17:31 +02:00
Fabio Comuni 7cc8c369cb Add support for PNG images with alpha 2012-06-07 17:42:13 +02:00
fabrixxm 757037c3bf events: fix select events query 
select events that starts before display start date and/or ends
after display end date.
 2012-06-07 08:28:10 -04:00
friendica 3b49035636 admin page untranslated strings, remove empty list element for update 2012-06-06 22:28:30 -07:00
friendica 6c3ab225f7 set minchars to 2 for PM lookups too 2012-06-05 20:49:56 -07:00
friendica 6f41594634 set minchars to 2 for contacts search 2012-06-05 20:47:26 -07:00
friendica 49732114d7 contacts search autocomplete 2012-06-05 20:33:11 -07:00
Zach Prezkuta 9920fb39e5 Debugged implementation of Diaspora relayable_retractions 
Diaspora "relayable_retraction" is now supported by Friendica.
The following should now work:

	Friendica top-level post:
	Diaspora comment deleted, disappears in Friendica
	Friendica comment deleted, disappears in Diaspora
	Diaspora like retracted, disappears in Friendica
	Friendica like retracted, disappears in Diaspora

	Diaspora top-level post:
	Same

There are still exceptions, however. First, Friendica and Diaspora
seem to frequently reject comments with an "invalid signature" error.
This can probably be fixed.

Also, some comments/likes/retractions seem to just disappear on the
Diaspora side. In the Diaspora log these seem to be accompanied by a
"not a valid object" error, often preceeded by a "received a comment
but no corresponding post" error. These seem to be purely internal,
since sometimes it works for some Diaspora contacts but not others.
 2012-06-03 14:53:30 -06:00
Zach Prezkuta cde0de965f first shot at getting like/unlike functions to work consistently 2012-06-03 14:53:30 -06:00
Zach Prezkuta c0af6dbb1a Implement relaying of relayable_retractions 
Also: some whitespace cleanup, fix Diaspora parent DB query
 2012-06-03 14:53:29 -06:00
Tobias Diekershoff 6fbeafc843 prv messages: make submit translateable 2012-06-03 17:16:29 +02:00
friendica ee42c3be94 cleanup 2012-06-02 23:17:49 -07:00
friendica 82cf664920 turn "follow" into a function 2012-06-02 23:12:20 -07:00
friendica d27c6de84e add hometown to profiles 2012-06-02 20:58:20 -07:00
friendica 4978ee12d1 webfinger profile linker 2012-06-02 18:05:23 -07:00
friendica 608d424b0b "howlong" added to marital status. 2012-06-02 02:30:26 -07:00
friendica 29bdf432f0 fewer "bob smith to bob smith via wall-to-wall". 2012-06-02 00:40:38 -07:00
friendica 0165d5dd2c registration issue after re-factor 2012-06-01 15:42:13 -07:00
root 1d1c50f6e3 install: fix bug #436 and small typo 
Function check_htaccess() don't perform check if curl is not installed.
This was leading to wsod beacuse check_htaccess() uses fetch_url().
 2012-06-01 03:31:24 -04:00
root bad66a1154 Merge remote branch 'friendica/master' 2012-06-01 03:10:57 -04:00
friendica 93bc29a711 turn registration code into a standalone function for re-use 2012-05-31 19:06:17 -07:00
friendica 1180919c89 some zero theming on settings page 2012-05-30 16:30:51 -07:00
friendica bdcb8d27dd transition to beta for private forums 2012-05-30 15:52:17 -07:00
friendica 069361f946 rev update 2012-05-30 15:50:30 -07:00
friendica 7d77cfef56 Create a "potential default group" called "Friends" on registration. 2012-05-30 04:20:01 -07:00
friendica 88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica b6fe837a64 hide private group if desired 2012-05-29 18:43:56 -07:00
friendica 52995e0b1f private group fix 2012-05-29 18:14:21 -07:00
friendica 514c994e6a possible sql injection in search 2012-05-29 17:14:35 -07:00
friendica 21d79e787e Merge https://github.com/friendica/friendica into pull 
Conflicts:
	mod/search.php
 2012-05-29 16:50:42 -07:00
friendica 419cf91aae bugfixes: private photo embeds and search for strings with % 2012-05-29 16:44:02 -07:00
Michael Vogel 68757f2504 Merge remote branch 'upstream/master' 2012-05-29 16:09:26 +02:00
friendica 2eafa9a475 ability to only expire contacts, not self 2012-05-29 01:14:53 -07:00
friendica 2dc7e53435 more theme cleanup 2012-05-28 19:17:06 -07:00
friendica 2bd1004587 rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. 2012-05-27 21:01:58 -07:00
Michael 817fc37f41 Merge branch 'master' of github.com:annando/friendica 
Conflicts:
	mod/network.php
 2012-05-26 12:06:19 +02:00
Michael Vogel a5dc41ab13 Saved searches now can search for tags as well 2012-05-26 11:51:48 +02:00
friendica f5290a5a10 missing entries on personal tab after sql text search optimise 2012-05-25 18:29:06 -07:00
Michael Vogel 4951210508 Speed optimisation by enabling the posibility of the MySQL fulltext engine 2012-05-26 03:21:07 +02:00
friendica bb4712b171 bug #434 - default group placement not working after accepting dfrn friend request 2012-05-25 18:06:51 -07:00
friendica 0ef8ccf11b fix wall_uploaded photo permissions on group post by member 2012-05-25 17:42:35 -07:00
friendica 27c903a8d0 improve location change notifications 2012-05-25 15:56:18 -07:00
friendica fafd41f4bf keep private FB stuff out of personal notes 2012-05-25 14:36:17 -07:00
Michael Vogel a71e3134bf Merge remote branch 'upstream/master' 2012-05-25 16:19:10 +02:00
friendica d1345e5054 Merge https://github.com/friendica/friendica into pull 2012-05-25 00:43:09 -07:00
friendica abb9fecf09 rev update 2012-05-25 00:42:38 -07:00
root 88d5d9684a admin: remove update link in admin menu 2012-05-25 03:05:07 -04:00
root a5b8339a75 install wizard: fix php executable path 
- php executable not required
- "check again" button submit form instead of reload page via js
- checks form submit to install module without redirect
 2012-05-24 04:21:33 -04:00
root 325343a492 Update install wizard 
- writable .htconfig.php not required
- add test for working .htaccess/mod_rewrite configuration
- fix last pass: create tables, eventually show config text and print a "What next" section
 2012-05-23 07:38:31 -04:00
friendica 61dba985c1 photo rotation 2012-05-23 01:01:04 -07:00
friendica 3ac7c4e859 keep FB out of private notes 2012-05-22 21:20:31 -07:00
friendica e70573f34c if identity (uid) changes - reload any other open browser windows on next ping. 2012-05-22 16:01:07 -07:00
friendica f29f861d25 add queue totals to admin summary page 2012-05-22 03:44:03 -07:00
friendica a163825291 redir links for permission controlled attachments 2012-05-21 22:54:39 -07:00
friendica 54e2c1ca81 rev update, bug 428, 429, and ability to block globaldir submissions from demo sites 2012-05-21 16:40:11 -07:00
friendica afaf9ec74f rev update 2012-05-20 18:30:02 -07:00
friendica f16a119940 search with leading @ performs directory search (# for tag search), nothing for text search 2012-05-19 21:53:27 -07:00
friendica dd86f40f96 set comment permissions explicitly to parent permissions 2012-05-19 16:42:24 -07:00
Michael Vogel 8c80fe0bf5 Performance tests 2012-05-20 00:11:32 +02:00
friendica 513ef2410d backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @ 2012-05-19 02:42:11 -07:00
friendica 4133df6223 profile change activity link bug 2012-05-18 17:55:11 -07:00
friendica 34b79b4f2b theming for default group selector 2012-05-18 01:38:11 -07:00
friendica 5ecaeb8e5c catch more places to apply default group 2012-05-18 01:03:46 -07:00
friendica 1d157fc747 make it difficult to setup a private forum with no privacy 2012-05-17 23:05:41 -07:00
friendica 7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica 7cfa7a7671 tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work 2012-05-17 19:59:46 -07:00
friendica 8a5dcf64d8 fix PM replies after autocomplete changes 2012-05-10 20:01:13 -07:00
friendica 547007e199 add photos to PM autocomplete, improved appearance 2012-05-10 19:29:01 -07:00
friendica 774c51cc19 email autocomplete 2012-05-10 01:45:51 -07:00
friendica 70a07086ad slight improvement in a couple of queries 2012-05-08 22:46:40 -07:00
friendica c141909f33 wrap private message autocomplete in an ifdef to make it easier to test/develop 2012-05-08 01:14:24 -07:00
friendica df35746639 make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation 2012-05-07 23:09:57 -07:00
friendica e8b9b8a403 separate poll_interval from delivery_interval - default is the same. 2012-05-07 04:21:54 -07:00
friendica 8c26640835 reset permissions to forum default when adding forum delivery chain 2012-05-06 23:06:21 -07:00
friendica b74a776162 I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off. 2012-05-06 20:06:39 -07:00
friendica 851264161f mail autcomplete testing 2012-05-06 19:55:39 -07:00
friendica 57920849c4 email recip autocomplete 2012-05-06 19:53:34 -07:00
friendica 49ccefd6c7 bad sql left after the mailbox in/out merge 2012-05-05 17:53:23 -07:00
friendica 10754ced3e category removal 2012-05-04 06:42:56 -07:00
friendica 9ecd128e5e "show more" friends in common 2012-05-04 01:46:36 -07:00
friendica 421acee65b implement max load average before queuing/deferring delivery and poller processes 2012-05-03 21:50:48 -07:00
friendica 2818cb28e9 use html symbols for double quotes 2012-05-03 17:19:53 -07:00
friendica f3e18df55d string update 2012-05-03 16:55:03 -07:00
friendica e7ff35f27d Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely. 2012-05-02 22:33:51 -07:00
friendica e7580b71e1 use cid rather than uid in perms 2012-05-02 21:00:39 -07:00
Zach Prezkuta 5d957c3803 Modify events_post() in mod/events.php to set the private field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others. 2012-05-02 21:12:57 -06:00
friendica 06d6ab4812 delineate the new profile changes from the rest of the text 2012-05-02 01:07:23 -07:00
friendica 91085f0969 really fat fingers today - though none of this has gone further than my own site 2012-05-01 19:24:22 -07:00
friendica 8bd6e1aef9 first try common friends for visitors 2012-05-01 19:16:18 -07:00
friendica d48cd0f9a3 hidden plugins (add .hidden file to dir) 2012-04-30 23:07:52 -07:00
friendica 3c0cf72716 make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it 
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
 2012-04-30 19:01:41 -07:00
friendica 05df5337dd start adding tooltips to tab menus 2012-04-30 05:15:29 -07:00
friendica 5d10672fb8 fix join group notifications 2012-04-30 04:11:42 -07:00
friendica 3ff8fe53a2 provide "xxx joined yyy" notifications 2012-04-30 01:25:25 -07:00
friendica 928faf3b97 typo in profile_selectors, fix remote tagging 2012-04-29 22:34:05 -07:00
friendica 0153d86b7f admin page to manage failed updates 2012-04-29 19:10:07 -07:00
friendica def6f0b408 the heart should really be red. 2012-04-29 02:11:33 -07:00
friendica 735f518fd8 fix location change notification 2012-04-29 01:49:54 -07:00
friendica a9dba2720b enhanced profile reporting for single values 2012-04-29 01:42:48 -07:00
friendica f163aed66d break up poller into separate processes 2012-04-27 23:17:40 -07:00
friendica 39d0926d09 PRIVACY: if wall is blocked, don't provide public keywords in HTML meta 2012-04-27 19:39:19 -07:00
friendica 26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
friendica ecc4962bd1 pass zrl to dfrn_request as fallback 2012-04-27 16:23:25 -07:00
tommy tomson 77a0570162 add link "remove account" to /mod/settings.php 2012-04-26 17:21:27 +02:00
friendica c9e5609cbf bug #307, explaining decentralised private photos is impossible. 2012-04-25 05:41:32 -07:00
friendica 2064d86cb3 separate tag search from body search 2012-04-23 22:41:32 -07:00
friendica 3637534119 move unfriend to standalone function for use in account removal 2012-04-23 19:42:57 -07:00
friendica f265863435 more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips 2012-04-23 18:28:33 -07:00
friendica 8f0f644295 protect jappixmini/proxy from typo check, more work on email2 connector 2012-04-23 05:16:57 -07:00
friendica 724e1d15d0 Merge https://github.com/friendica/friendica into pull 2012-04-22 16:25:02 -07:00
friendica 00cb7f9efb don't allow non-existent themes as choices 2012-04-22 16:24:29 -07:00
friendica c0dffa7442 Merge pull request #258 from unary/api 
api: add support for StatusNet-style media param to API
 2012-04-22 15:43:24 -07:00
Michael Johnston 76aa9b3037 api: add support for StatusNet-style media param to API 2012-04-22 13:37:25 -04:00
Tobias Hößl 27c23229c4 Merge branch 'master' of git://github.com/friendica/friendica 2012-04-22 13:31:07 +00:00
Tobias Hößl 3116db1a74 Add a hook 2012-04-22 13:28:54 +00:00
Fabio Comuni 3bb785fdad Merge remote-tracking branch 'CatoTH/master' into req245 2012-04-20 09:25:51 +02:00
Fabio Comuni fddf21d983 filebrowser: fix style, show 10 recent photos if not in an album 2012-04-18 15:15:52 +02:00
Fabio Comuni 0630120455 filebrowser: more style, load min and max scale photos 2012-04-18 14:56:03 +02:00
Fabio Comuni e2e6b56c44 tinymce: add filebrowser for photos and attached files 2012-04-18 13:23:42 +02:00
Tobias Hößl b885fedee1 XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:36:48 +00:00
Tobias Hößl d7e750ad74 XSRF protection and PHPdoc for mod/admin.php 2012-04-18 07:24:47 +00:00
friendica 8269d6aa19 Merge pull request #240 from CatoTH/master 
Some bugfixes / Notices
 2012-04-17 06:50:09 -07:00
friendica e6330e3b96 naked br appearing when attaching and textplain 2012-04-17 06:11:41 -07:00
Tobias Hößl 720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
friendica 7ebca2b37d rev update 2012-04-16 22:58:52 -07:00
friendica 93df525f5c Merge pull request #238 from annando/master 
API: Support of the statusnet application
 2012-04-15 16:00:07 -07:00
friendica 0a3454c841 function name typo 2012-04-15 05:11:52 -07:00
friendica 0939029b74 track requested profile error msg 2012-04-14 14:45:09 -07:00
friendica 6af4183302 zrl on random profile 2012-04-14 05:07:00 -07:00
Michael Vogel 4e220ec391 Merge commit 'upstream/master' 2012-04-14 13:15:25 +02:00
friendica 0d869ceb65 pass zrl's to/through global directory 2012-04-14 03:51:41 -07:00
friendica bfb821e918 well that was a silly mistake... 2012-04-13 16:12:06 -07:00
friendica d1b57d6e74 setting wasn't being applied 2012-04-13 15:37:25 -07:00
Fabio Comuni f6e1ddf7fb Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
Fabio Comuni 138a0e06b8 admin: change global theme settings 2012-04-13 11:20:05 +02:00
friendica 3c4e6d3461 bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -07:00
friendica af68d033e3 extended the "interesting" profile attributes 2012-04-12 21:58:15 -07:00
friendica 446e962bb8 send link directly to profile tab 2012-04-12 21:38:40 -07:00
friendica 2b339d5a6b stray log statements 2012-04-12 21:21:35 -07:00
friendica 972c01edb3 profile change activities 2012-04-12 21:10:32 -07:00
friendica 32cd62ff0a allow setting default new friend notify 2012-04-12 18:15:46 -07:00
friendica 7e2d4d4026 turn off new friend activity by default 2012-04-12 16:51:57 -07:00
Michael Vogel 572678fef9 Merge commit 'upstream/master' 
Conflicts:

	include/dba.php
 2012-04-13 00:10:41 +02:00
friendica 60871555f5 reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem 2012-04-12 06:50:11 -07:00
Fabio Comuni 18ecac4e93 settings: remove call to profile_load() 2012-04-12 08:42:00 +02:00
Fabio Comuni e992e29685 settings: move tabs to aside. add a new template "generic_links_widget.tpl" 2012-04-12 08:38:55 +02:00
Michael Vogel ee714daf4d Merge commit 'upstream/master' 2012-04-11 19:35:51 +02:00
Michael Vogel c88c2515e4 API: Improved the timeline. Several (disabled) tests with caching of photos. 2012-04-11 19:31:01 +02:00
friendica 967ed8e23f Merge https://github.com/friendica/friendica into pull 2012-04-10 20:51:04 -07:00
friendica b02a671494 visit "random profile" feature 2012-04-10 20:50:31 -07:00
Simon L'nu 75c7877986 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  profile redir - goto correct profile page even if contact blocked, you just can't do anything.

* master:
 2012-04-10 23:34:55 -04:00
Simon L'nu 2af41ee57b [fix] absolute links in docs and newmember.php; breaks sub-dir installs 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-10 23:34:39 -04:00
friendica 0fa932853c profile redir - goto correct profile page even if contact blocked, you just can't do anything. 2012-04-10 20:09:51 -07:00
friendica 19b636e7e8 more backend work on mail2 followers 2012-04-10 19:15:52 -07:00
friendica ed608694ce make editplain work everywhere 2012-04-10 18:08:06 -07:00
friendica 18e225b051 move all fix_mce to one function so it can easily be undone 2012-04-10 17:14:07 -07:00
friendica ab46f95683 duplicate community posts 2012-04-10 16:59:30 -07:00
friendica 8f40e8546e fix_mce_lf contact edit page 2012-04-10 16:32:38 -07:00
friendica 9b1bb53234 fix_mce_lf on profiles 2012-04-10 16:31:49 -07:00
Klaus Weidenbach 1f9fe8b5ee Remove Gravatar from core and add new hook avatar_lookup. 
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
 2012-04-09 21:22:09 +02:00
Klaus Weidenbach 93ffba58cc Rename gravatar_img() more generic to avatar_img(). 
I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service.
First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
 2012-04-09 21:22:09 +02:00
friendica 92c20895e0 use local_user for tag completion if available. See bug #368 2012-04-09 04:55:52 -07:00
friendica de3b9e9584 send zrl after dfrn_request homecoming for manual entries 2012-04-08 17:28:36 -07:00
friendica 977625a53b fix to wall_upload photos default permissions to use cid rather than uid. 2012-04-08 16:19:45 -07:00
friendica cf2d8ef7a6 tag tests cont. 2012-04-07 02:11:56 -07:00
friendica 3a1c78bd75 some work on tests 2012-04-07 01:04:45 -07:00
friendica 4bee1859be Merge branch 'pull' 2012-04-05 21:43:38 -07:00
friendica 6bc7e6e09f add network_tabs hook 2012-04-05 21:42:47 -07:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
friendica 9b6e91086b make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php 2012-04-05 02:15:03 -07:00
friendica b45327b856 let's catch d* disabled at a higher level and not waste any resources on it. 2012-04-04 20:45:48 -07:00
Michael Johnston da0eb2d4c9 correct some filer dialog weirdness caused by introduction of categories 2012-04-04 23:08:16 -04:00
friendica f63636ed14 well that was a stupid mistake... 2012-04-04 17:19:46 -07:00
friendica 60c57704c6 better handling of reshares containing embeds 2012-04-04 02:02:23 -07:00
friendica 8e928d101b display settings hooks 2012-04-03 22:01:52 -07:00
friendica 466188ebd7 re-opened bug #363 2012-04-03 20:14:37 -07:00
friendica 96abee53e4 this is better 2012-04-03 19:20:39 -07:00
friendica dbe16afcd4 include contact_widgets for categories_widget when doing updates 2012-04-03 19:16:02 -07:00
friendica 4b762ff923 suppress duplicates in search 2012-04-03 02:44:29 -07:00
friendica 5d0d9f8772 make contact ssl_policy change a function since it is used in a few places 2012-04-02 23:07:26 -07:00
friendica f4721955db more ssl policy fixes and prevent delivery to soapbox when using local delivery 2012-04-02 21:01:19 -07:00
friendica e1de2e3de0 don't change ssl settings on local photos for remote contact 2012-04-02 19:38:13 -07:00
friendica 9391fc965d bug #363 and a couple of other reported ssl link issues 2012-04-02 17:43:11 -07:00
friendica 2352e6c1cb make the "new calendar" (javascript interactive) the default 2012-04-02 01:46:35 -07:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
Thomas Willingham 210586eaed Merge remote-tracking branch 'upstream/master' 2012-04-02 00:29:27 +01:00
Thomas Willingham 8406803473 modified: mod/newmember.php 
Add a link to the quick start
 2012-04-02 00:27:47 +01:00
friendica f95db4382e check for style.php existence before inclusion 2012-04-01 16:21:55 -07:00
Thomas Willingham d0ddd380e7 Moved Diaspora notes away from top, per user request 2012-04-02 00:18:03 +01:00
friendica 5c2fdc795f send unverified private mail using zrl 2012-04-01 00:59:35 -07:00
friendica ea10bba147 fix "between yourself and You" in mail list 2012-03-31 20:08:32 -07:00
friendica 2147e0a71f ensure all new users get a timezone. We'll use UTC until they choose otherwise. 2012-03-31 16:08:40 -07:00
friendica 53f799f2bc handle escaped file chars in display and search 2012-03-31 15:25:17 -07:00
friendica adebc2793e register hooks for a COPA plugin 2012-03-31 06:15:33 -07:00
friendica b4b1055b50 settings for unknown private mail acceptance 2012-03-31 00:57:59 -07:00
friendica 8c928e67ba warning cleanup 2012-03-30 23:18:46 -07:00
friendica aace55df0a Merge branch 'pull' 2012-03-30 15:12:20 -07:00
friendica cfdfcb37cb don't delete contact from a friend request if friendship was already established 2012-03-30 15:10:50 -07:00
Fabio Comuni 01af7d355a allow themes to use "style.php" instead of "style.css". 
Load style.php trhu mod/view.php to pass it friendica framework.
 2012-03-30 21:18:25 +02:00
Fabio Comuni 054d21a2e8 settings: add "display settings" tab, with UI-related settings. 
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
 2012-03-30 15:45:02 +02:00
friendica bcc5801608 rename "file as" to "save to folder" 2012-03-30 02:42:36 -07:00
friendica d83bfd464b zrl into people searches 2012-03-29 22:20:14 -07:00
friendica bb8beb26b4 use zrl to get home again 2012-03-29 20:58:32 -07:00
friendica 75f778a504 provide a way to specify an admin account for siteinfo if more than one have admin email address 2012-03-29 18:22:20 -07:00
fabrixxm 3ee529d095 Merge pull request #185 from fabrixxm/master 
Updated private message pages
 2012-03-28 23:47:23 -07:00
friendica 3f89adfd62 wrong var for notify total 2012-03-28 17:51:43 -07:00
friendica 77715c0c65 fix notification total 2012-03-28 17:44:24 -07:00
friendica 7956c2d08e improved rw notifications 2012-03-28 17:21:56 -07:00
friendica 4fe0b56d76 bug #349 - email notls setting 2012-03-28 14:54:00 -07:00
Fabio Comuni 50711040cb message: remove tabs, move new message link to aside, all message with gmail-style 2012-03-28 15:31:58 +02:00
friendica e894775a39 Merge branch 'pull' 2012-03-28 05:16:25 -07:00
friendica b58dc43148 Merge branch 'pull' 2012-03-28 03:19:42 -07:00
friendica b18086097e title not updated when editing post 2012-03-28 03:18:26 -07:00
Fabio Comuni 767245e9ff viewsrc: return only body if page is requested via ajax 2012-03-28 11:42:04 +02:00
Fabio Comuni 0a2675d8b6 filer: replace "file as" prompt with combobox opened in fancybox 2012-03-28 10:49:34 +02:00
friendica 117d2165f5 form security error when using existing photo 2012-03-27 04:51:20 -07:00
friendica 7c6c3d36f5 profile wall privacy 2012-03-27 01:31:47 -07:00
friendica daa036e34c @-completion bug 2012-03-26 21:48:04 -07:00
friendica 4c585f759f theme description with preview (non-translatable unfortunately) 2012-03-26 18:15:10 -07:00
friendica b5d0315d55 preparation for some possibly killer features 2012-03-26 17:57:27 -07:00
friendica 1e2e6f5ba9 more wordsmithing of the Friendica invitation email 2012-03-25 20:52:34 -07:00
friendica be52ec6f5a Merge branch 'pull' 2012-03-25 19:48:17 -07:00
Simon 7873347c65 Merge pull request #167 from unary/typo 
typo datarry -> datarray
 2012-03-25 19:47:39 -07:00
friendica c88674aaf2 theme preview for end users 2012-03-25 19:05:14 -07:00
friendica 7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
Michael Johnston ca1e2254c9 typo datarry -> datarray 2012-03-25 16:00:11 -04:00
friendica 6780b76b0c improved the inivitations and added a bit of sales pitch. 2012-03-24 23:04:18 -07:00
friendica f1cb287742 bug #329 - compress the plugin list on the friendica info page 2012-03-24 21:50:04 -07:00
friendica 8c4fbc3b4d add the bang 2012-03-24 03:11:45 -07:00
friendica db5ec58863 network filter is now a permission group 2012-03-24 01:33:50 -07:00
Fabio Comuni 82cc86a41a user settings: don't show emoticons 2012-03-23 12:07:22 +01:00
friendica 528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica 40d19d5b8c normalise comparison link on delegation page 2012-03-22 06:19:27 -07:00
friendica ebdf0ee99e prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms 2012-03-22 01:46:52 -07:00
friendica f1bbe03df1 work around doubled linefeeds in tinymce3.5b2 2012-03-21 21:42:27 -07:00
friendica c1d6ece98e revert permissions relaxation on community 2012-03-21 14:56:06 -07:00
friendica ef33cfcc9a move friend suggestions to top of contact page, add default contact profile photos if missing 2012-03-20 16:05:32 -07:00
friendica a72a23b6d6 missed a default profile photo replacement in notifications 2012-03-20 15:43:34 -07:00
friendica 894278dbcc change default profile photo to something more interesting than a reddish brown square 2012-03-20 15:41:06 -07:00
friendica 92ef36ad61 slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible 2012-03-20 14:55:18 -07:00
friendica 9df7972993 bug #339 - lostpass sending to username, not email 2012-03-20 01:50:20 -07:00
friendica b8f6312408 cleanup after openid refactoring 2012-03-19 15:10:14 -07:00
friendica 9e133d6412 refactor openid logins/registrations 2012-03-19 15:03:09 -07:00
friendica 139a86dbd3 some openid fixes, use identity url from openid server and normalise it. 2012-03-19 06:48:11 -07:00
friendica cf2edb5b9a ctrl + left|right cursor keys to prev/next photos 2012-03-19 01:20:53 -07:00
Simon 283bc51acf Merge pull request #149 from CatoTH/master 
Add a missing security token [Using photos as profile photos]
 2012-03-19 00:40:51 -07:00
Tobias Hößl 0341078a73 Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier 2012-03-19 07:37:09 +00:00
friendica cca524495c community discovery cont., cleanup of DB debugging 2012-03-18 22:12:36 -07:00
Tobias Hößl 453b5b46a3 CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it) 2012-03-18 15:44:33 +00:00
friendica 9e731506c2 remove admin view of local directory 2012-03-17 22:14:17 -07:00
friendica e0e008fb8d template processor broken with foreach k=>v and k is integer 0 2012-03-17 02:26:52 -07:00
friendica 057a142b8c cut/paste error 2012-03-17 00:08:52 -07:00
Simon L'nu 49540fb958 make auto-complete work in more places 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 21:20:23 -04:00
friendica 82f2bfea5b convert boolean or int settings to strings to work around issues with template processing 2012-03-16 16:05:16 -07:00
Simon 1246a40ec2 Merge pull request #141 from CatoTH/master 
Private messages - tabindex
 2012-03-16 10:54:20 -07:00
Tobias Hößl 75823c2353 Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button 2012-03-16 17:45:07 +00:00
friendica 28f941193d syntax error from pasted text, remove ^M's 2012-03-16 06:02:26 -07:00
friendica 224dfa848b bug #335 network search broken after new ssl policy settings 2012-03-16 05:51:04 -07:00
friendica 7684f63ecd track whether contact is a community page or not 2012-03-15 16:38:26 -07:00
friendica f96aff5518 more recycle fixes for plaintext 2012-03-15 03:47:02 -07:00
friendica 9cd1c35c22 fix recycle symbol when using plaintext editor 2012-03-15 03:44:41 -07:00
friendica b06c5983a4 don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts 2012-03-14 21:58:54 -07:00
friendica 110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica f0a62d8908 ssl_policy stuff 2012-03-14 20:36:23 -07:00
friendica 531201f2a1 Merge pull request #132 from campino/master 
Test cases
 2012-03-14 15:16:30 -07:00
friendica dcdfa96a1f Merge branch 'pull' 2012-03-14 14:34:52 -07:00
friendica 2dc527609e Merge https://github.com/friendica/friendica into pull 2012-03-14 14:34:48 -07:00
Simon L'nu 0bf9595ab1 PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-14 11:00:20 -04:00
Alexander Kampmann 70709a8825 Merge branch 'master' of git://github.com/friendica/friendica 
Conflicts:
	view/de/strings.php
 2012-03-14 12:57:35 +01:00
Alexander Kampmann 509532d168 get_tags tests corrected. They test for the right things now. 2012-03-14 12:30:52 +01:00
friendica 7e270b043c addon settings form error 2012-03-13 23:52:13 -07:00
friendica 4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
friendica de017d1ed7 sort inbox by recently replied conversations first 2012-03-13 19:27:52 -07:00
friendica be48fff157 file as widget and basic filing implementation for duepuntozero,slackr 
much more work needed - this is just for test/evaluation currently
 2012-03-13 18:13:03 -07:00
friendica db80ffa0ff don't count self in number of contatcs 2012-03-13 16:02:20 -07:00
friendica 427362c324 Merge branch 'pull' 2012-03-13 15:41:13 -07:00
friendica dc84da520d invite potential connectees to the free social web 2012-03-13 15:40:16 -07:00
Tobias Hößl 59766b944c Some security against XSRF-attacks 2012-03-12 20:17:37 +00:00
Tobias Hößl 9574f7df03 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-12 19:06:45 +00:00
Alexander Kampmann bce3bfff38 get tags test improved 2012-03-12 13:59:00 +01:00
friendica 93058af4fc backend for "save to file" feature 2012-03-11 20:19:56 -07:00
friendica d9bee73edf community meta tag renamed from "ika" 2012-03-11 15:50:23 -07:00
Tobias Hößl 4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
friendica d9c5d9d2eb default the text template var on conversations 2012-03-10 15:53:36 -08:00
friendica 1bddd48661 bug #327 - composed private message is lost if no recip specified. 2012-03-10 15:50:51 -08:00
Michael Johnston fd1f8fb436 allow user to set number of items to show on network page 2012-03-09 21:29:39 -05:00
Alexander Kampmann f8042d0445 splitted test cases. 2012-03-09 12:57:11 +01:00
friendica 42d622d6bf recover contacts total count which got lost 2012-03-09 02:50:57 -08:00
Tobias Hößl 635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00