clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
22,360 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

5241 Commits

Author SHA1 Message Date
Michael Vogel 20d7d18379 Bugfix: The "keywords" field in the gcontact table wasn't set correctly 2016-02-10 23:39:18 +01:00
Fabrixxm 04dceb9551 Merge branch 'develop' into api_ping 2016-02-09 14:06:57 +01:00
rabuzarus 743f2e0391 Merge develop into 0602_contact_profile 
Conflicts:
	mod/contacts.php
 2016-02-09 13:44:30 +01:00
Michael Vogel 7b2fadcf43 Get rid of the "guid" table. We don't need it anymore. 2016-02-09 10:21:10 +01:00
Michael Vogel 804c04a06f Merge pull request #2326 from fabrixxm/revert_db949bb8 
Revert "Updated modules to allow for partial overrides without errors"
 2016-02-09 06:55:49 +01:00
rabuzarus c1c21ada0a contactedit-actions-button: remove contact tabs which aren't needed anymore 2016-02-08 23:51:51 +01:00
rabuzarus 0c764684bb Merge develop into 0602_contact_profile 2016-02-08 23:16:02 +01:00
rabuzarus 0b5d7b300e contactedit-actions-button: adjust the themes and template polishing 2016-02-08 23:15:20 +01:00
fabrixxm 0c67c89715 Merge pull request #2323 from annando/1601-dfrn-import 
Complete rewrite of DFRN import
 2016-02-08 15:48:16 +01:00
rabuzarus cc18fd7ad9 contactedit-actions-button: doing some availability checks for the actions 2016-02-08 15:00:53 +01:00
rabuzarus 991cbd604a contact-edit-actions-button: initial commit 2016-02-08 01:56:15 +01:00
fabrixxm b202e02fbf Revert "Updated modules to allow for partial overrides without errors" 
This reverts commit db949bb802.
 2016-02-07 15:11:34 +01:00
fabrixxm 44592611e1 new api for notifications 
/api/friendica/notification
returns first 50 notifications for current user

/api/friendica&notification/<id>
set note <id> as seen and return item object if possible

new class NotificationsManager to query for notifications and set seen
state
 2016-02-07 14:27:13 +01:00
fabrixxm 9330a6994c Merge pull request #2319 from stieben/develop 
Added the possibility for themes to override core module functions
 2016-02-07 09:52:20 +01:00
Andrej Stieben db949bb802 Updated modules to allow for partial overrides without errors 
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
 2016-02-05 21:52:39 +01:00
Michael Vogel d408cea871 DFRN import has now gone live 2016-02-05 21:25:20 +01:00
rabuzarus 30c375d238 rework autocomplete: polishing class and methods naming 2016-02-05 14:26:22 +01:00
rabuzarus 52dbb0b4a2 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:51:54 +01:00
rabuzarus 9a54afa629 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:47:20 +01:00
rabuzarus c1070e4655 forums.php is now forum.php and providing class forum 2016-02-03 18:05:26 +01:00
rabuzarus 5f7c5e6ab6 rework autocomplete: Access list of smilies over JSON 2016-02-01 17:43:12 +01:00
Michael Vogel d04e1bdf69 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import 2016-01-30 16:38:06 +01:00
Michael Vogel 69457a4a5b DFRN import seems to work. Improvements are possible :-) 2016-01-30 02:57:40 +01:00
Michael Vogel 596416defe Profile data from the gcontact should only be taken if there is content 2016-01-29 12:14:04 +01:00
Michael Vogel 845a769dc2 Only check size if needed - should speed up the uploading. 2016-01-28 12:28:04 +01:00
Michael Vogel 04725d1283 Reverted some work ... 2016-01-28 11:14:13 +01:00
Michael Vogel 78e79de7c9 New central function to store avatar data in contacts 2016-01-28 11:09:08 +01:00
Michael Vogel 6f662b8c74 New avatar picture fields to better cope with changing avatars 2016-01-28 01:26:19 +01:00
Michael Vogel d3bf80a1f3 Show contact posts by searching for "contact-id" - not "gcontact-id" 2016-01-27 11:16:56 +01:00
Michael Vogel 4208acf4b6 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-25 23:51:11 +01:00
Michael Vogel 62de6be495 Switched to static methods for DFRN 2016-01-25 15:20:58 +01:00
Matthew Exon 2aa0c6d00d Only proxy URLs using HTTP or HTTPS 2016-01-25 02:50:57 +01:00
Michael Vogel 937196d6ee Poco fields now moved to the header, function to create formatted location string 2016-01-24 14:30:57 +01:00
Michael Vogel 74ed37aa87 Some more removed code 2016-01-24 00:21:58 +01:00
Michael Vogel 7371318376 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-23 18:50:14 +01:00
Tobias Diekershoff 39099b56d1 a total number count would be nice 2016-01-23 08:01:54 +01:00
Michael Vogel 444b417de0 New routines are now enabled 2016-01-23 02:44:30 +01:00
Michael Vogel c66b4387bf dfrn functions could now work/Removed unused code 2016-01-22 20:26:11 +01:00
Tobias Diekershoff 080319d82d issue #2270 2016-01-20 17:52:58 +01:00
Fabrixxm 7e83ba090f Merge branch 'hotfix_diaspora' into develop 2016-01-20 08:50:18 +01:00
Michael Vogel c6b0e57aa4 Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change 2016-01-20 08:40:04 +01:00
Tobias Diekershoff f4a65cf6ca some more doc strings 2016-01-19 09:15:32 +01:00
Michael Vogel 32c7896c5d Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 18:49:04 +01:00
Tobias Diekershoff 2ef63b6593 Merge pull request #2262 from annando/1601-http-timeouts 
Timeout problems while fetching image data
 2016-01-18 18:34:15 +01:00
Michael Vogel 5ec2c7e965 When a server isn't reachable there were timeout problems with fetching image data 2016-01-18 15:38:38 +01:00
Tobias Diekershoff c243087b89 readd plugin features to admin aside 2016-01-18 13:04:25 +01:00
Michael Vogel 6c7cf2a766 Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 00:53:18 +01:00
rabuzarus 78e282734f feature management for admins: delete double entries from merging process 2016-01-17 12:59:06 +01:00
rabuzarus c1ed2bd975 feature management for admins: Merge branch 'devolop' 2016-01-17 03:25:17 +01:00
Michael Vogel 228ce9e27e Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-16 17:39:45 +01:00
Michael Vogel 8b90e5c077 Removed unused functionality 2016-01-16 14:46:00 +01:00
Tobias Diekershoff 1770267934 move @brief to the top of the doc block 2016-01-16 14:12:55 +01:00
Tobias Diekershoff 8730c72156 removed commented out code, beautification of MySQL statements 2016-01-16 13:45:21 +01:00
Tobias Diekershoff 7f80de6db8 removed calls to the remote_update funcions 2016-01-16 12:45:48 +01:00
Tobias Diekershoff 20fe67f378 removed remote update functionality from admin panel 2016-01-16 11:52:21 +01:00
Michael Vogel 90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Tobias Diekershoff 954e4f2754 more docs 2016-01-15 20:40:01 +01:00
Tobias Diekershoff 11aa76c270 Theme listing works again, added some docs for theme and plugin listing funkctions 2016-01-15 20:03:41 +01:00
Tobias Diekershoff 7a7ffb2299 issue 2240 when no addon are installed hint the location of sources in the admin panel 2016-01-15 18:19:22 +01:00
Tobias Diekershoff e3fd0a269b some doc strings, sort platforms for federation stats page 2016-01-15 18:19:22 +01:00
Tobias Diekershoff 1030c5f4b6 some doc texts 2016-01-15 18:19:21 +01:00
Tobias Diekershoff 4d1545a1a9 viewing and configuration of logs are now on separate subpages in the admin panel 2016-01-15 18:19:21 +01:00
Tobias Diekershoff 8b189aca9e some doxygen stuff 2016-01-15 18:19:20 +01:00
Tobias Diekershoff 0905f18c0f allow -rc in friendica version listings 2016-01-15 18:19:20 +01:00
Tobias Diekershoff ce39992875 combine some versions for ~f and D* 2016-01-15 18:19:20 +01:00
Tobias Diekershoff 25bb977b87 better names for some variable to reflect their intention 2016-01-15 18:19:20 +01:00
Tobias Diekershoff a4104d7c17 1st stuff for federation stats in the admin panel 2016-01-15 18:19:19 +01:00
Michael Vogel 268467fe04 Add the creation date to the cache tables 2016-01-15 00:58:57 +01:00
Michael Vogel d5e1f33506 OEmbed and parse_url are now cached in dedicated tables 2016-01-14 23:59:51 +01:00
Michael Vogel 01c2eacd46 Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total 2016-01-11 14:25:48 +01:00
Tobias Diekershoff bfdbc0c818 don't mention FB in newhere tipps 2016-01-11 07:54:52 +01:00
Michael Vogel 6b85fa17bb Added some documentation 2016-01-10 19:06:34 +01:00
Michael Vogel b4631cebed Fixed SQL problems 2016-01-10 17:10:56 +01:00
Michael Vogel 23731fc9aa Bugfix: The display hadn't fetched the correct contact for the uid. 2016-01-10 15:44:23 +01:00
Michael Vogel 2f49e984bd Updated database.sql file, further code cleanup 2016-01-10 14:12:05 +01:00
Michael Vogel 214f381e81 Code cleanup 2016-01-10 12:37:49 +01:00
Michael Vogel 885dc1df81 gcontact update script, rebuilt follow page, query speedup for community and network groups 2016-01-10 09:19:00 +01:00
Michael Vogel 6703ba468a Profile data in gcontact overwrites profile data 2016-01-08 08:02:42 +01:00
Michael Vogel 358a9fd6fd Notify and alias will be fetched via OStatus 2016-01-08 00:35:46 +01:00
Michael Vogel 9521cdc18f notify and alias are now in gcontact as well - the contact expansion in mod/item.php is renewed 2016-01-07 23:43:16 +01:00
Michael Vogel fdb31abdfa Use gcontact when adressing contacts in editor 2016-01-07 08:19:28 +01:00
Michael Vogel 5ab2786c00 Get rid of the table "unique_contacts" 2016-01-06 22:23:12 +01:00
Michael Vogel 2bad2cdd91 More fields in gcontact, contact search respects "hide" setting 2016-01-06 14:13:59 +01:00
Michael Vogel 75e2ec01fe The gcontact will now be connected to the items 2016-01-05 15:34:27 +01:00
fabrixxm fcf7a791f1 Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget" 
This reverts commit 83e54f70d3, reversing
changes made to ecf576bdd0.
 2016-01-04 11:46:19 +01:00
fabrixxm 83e54f70d3 Merge pull request #2223 from rabuzarus/2912_photo_widget 
photo aside widget for profile page
 2016-01-04 10:06:07 +01:00
Tobias Diekershoff 75ed2f830d moved include Scape to top of the file 2016-01-03 19:15:13 +01:00
rabuzarus 29c671bb22 photos aside widget:permissions cleanup 2016-01-03 16:09:05 +01:00
rabuzarus 1ab022f4df photos aside widget: move dependencies to the header 2016-01-03 15:45:02 +01:00
Michael Vogel 2ed3ae1aab Bugfix: The request process from DFRN hadn't worked anymore since the last pull request 2016-01-01 17:49:07 +01:00
rabuzarus 20fbf670db photo aside widget for profile page 2015-12-30 00:26:50 +01:00
Tobias Diekershoff 99861b9fa6 Merge pull request #2216 from fabrixxm/feature-api-like 
Works on API and a small refractor, updated docs
 2015-12-28 18:39:21 +01:00
Tobias Diekershoff 03000beac6 Merge pull request #2219 from fabrixxm/quattro 
Fix video oembed appearance
 2015-12-28 18:39:03 +01:00
fabrixxm a1c1a6cae8 workaround for media.ccc.de oembed with size 0 2015-12-28 18:28:02 +01:00
Michael Vogel 2f13506180 Bugfix: The participants on the mail page were displayed wrong 2015-12-28 18:13:03 +01:00
fabrixxm f579b2af55 Fix TOC links href, no TOC in home 2015-12-28 10:24:47 +01:00
fabrixxm 1776b19dbf Add table of content in aside of help pages 2015-12-28 10:24:47 +01:00
fabrixxm f27fad7b47 Move Like/Dislike/Attend add/remove code to include/like.php 2015-12-28 10:23:06 +01:00
fabrixxm cf86162a08 Merge pull request #2214 from rabuzarus/2612_db_docu 
add db documentation to the help pages
 2015-12-28 10:22:33 +01:00
Tobias Diekershoff 497175c56e Merge pull request #2213 from annando/1512-dfrn-request 
Support for remote subscription in Diaspora
 2015-12-28 05:25:50 +01:00
Tobias Diekershoff b09fd2c39e Merge pull request #2212 from annando/1512-xrd 
XRD now should react more like an OStatus server
 2015-12-28 05:24:36 +01:00
rabuzarus 038611bcb4 add documentation 2015-12-28 03:17:55 +01:00
Michael Vogel 72f7ee7fd3 Support for remote subscription in Diaspora 2015-12-28 03:14:38 +01:00
Michael Vogel 8b25f51116 XRD now should react more like an OStatus server 2015-12-28 01:04:14 +01:00
Michael Vogel 435a29026d Diaspora: The /p/ only should return top level posts - not comments 2015-12-27 21:12:53 +01:00
Tobias Diekershoff bc9c3d80fa typos in OStatus (re)subscribing 2015-12-27 08:44:23 +01:00
rabuzarus 7530c950e3 help - make use of subfolders 2015-12-26 16:06:38 +01:00
rabuzarus 3df5c17124 reformat todo according to doxygen style 2015-12-25 23:17:34 +01:00
rabuzarus 2cf1aaa791 add pager to common friends and allfriends 2015-12-15 14:31:24 +01:00
Michael Vogel d077dbbcde Bugfix: The bbcode conversion of the profile was inconsistent 2015-12-14 23:53:35 +01:00
rabuzarus e61d6e030e fix account_type 2015-12-14 14:12:56 +01:00
Tobias Diekershoff c0c0d62a2e Merge pull request #2173 from annando/1512-optimize-fragmentation 
There is now a fragmentation level for the table optimization
 2015-12-13 08:32:03 +01:00
Michael Vogel 5a1041578c Bugfix: The subscribe process took the own contact by random ... 2015-12-12 17:55:57 +01:00
Michael Vogel ec9b1b7afd There is now a fragmentation level for the table optimisation 2015-12-12 17:46:24 +01:00
Michael Vogel 0869cce45f Code cleaning, real changes will follow 2015-12-12 17:41:25 +01:00
rabuzarus f513b25f6f fix directory search 2015-12-12 01:27:31 +01:00
Michael Vogel 300007a0cf Bugfix: Posts weren't always shown for feeds that start with "www." 2015-12-10 22:47:58 +01:00
Johannes Schwab 2f866fecf9 fix path for photo and proxy 2015-12-08 11:31:50 +01:00
Tobias Diekershoff d944b65253 Merge pull request #2151 from annando/1512-misconfigured-friendica 
Workaround for misconfigured Friendica servers with probe_url
 2015-12-07 06:37:37 +01:00
Michael Vogel bcf7e673c9 Issue 1924: New configuration value for permitting crawler access 2015-12-06 22:01:20 +01:00
Michael Vogel f880bdd33b Workaround for misconfigured Friendica servers 2015-12-06 18:52:19 +01:00
Tobias Diekershoff 6a05112d98 Merge pull request #2149 from annando/issue-1921 
Issue 1921: Disable the auto update
 2015-12-06 07:31:13 +01:00
Michael Vogel f406e5ddbd Issue 1921: Disable the auto update 2015-12-06 00:18:59 +01:00
Michael Vogel 01c9d13927 Issue 1871: Show an information if a group is empty 2015-12-05 23:29:42 +01:00
fabrixxm f44846555a quattro: hide acl button in edit post 
fix #1780
 2015-12-04 19:29:13 +01:00
Tobias Diekershoff eaf975faae Merge pull request #2130 from annando/1512-contact-rework 
Some more contact rework
 2015-12-04 06:53:29 +01:00
rabuzarus 4b7f080c46 ping: further work 2015-12-03 22:42:53 +01:00
rabuzarus c0406918ec ping: cleanup 2015-12-03 17:15:49 +01:00
Michael Vogel 1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework 
Conflicts:
	mod/contacts.php
	mod/crepair.php
 2015-12-03 14:38:04 +01:00
Michael Vogel 1f9644bded Merge pull request #2131 from rabuzarus/3011_hcard_vcard 
unify hcard and vcard
 2015-12-03 14:16:52 +01:00
rabuzarus d963cdfe48 photos-albms widget: add some classes 2015-12-02 20:01:22 +01:00
Michael Vogel 4286225f37 Added/Changed accesskeys for the new tab actions 2015-12-02 07:56:10 +01:00
Michael Vogel 7ed73a06ab Solved a problem with author links that are different from what is provided in the contact 2015-12-01 23:51:34 +01:00
rabuzarus 1d6d9d3d24 photos-albms widget: add some classes 2015-12-01 21:07:05 +01:00
rabuzarus cd7ec72b20 unify hcard and vcard: make $pdesc available in hcard&vcard 2015-12-01 19:47:23 +01:00
Michael Vogel c45b16d2a1 Unifying the texts. 2015-12-01 19:02:03 +01:00
rabuzarus 39b37281a7 Merge develop into 3011_hcard_vcard 2015-12-01 18:34:13 +01:00
rabuzarus 89c5989cfb unify hcard and vcard 2015-12-01 18:31:08 +01:00
Michael Vogel 06a4b0dc5e Header removed in the contact area 2015-12-01 18:21:05 +01:00
Michael Vogel 1c93729c46 Tab is added to "all friends" and "common friends" 2015-12-01 08:12:05 +01:00
Michael Vogel 712b3c7593 Merge pull request #2121 from rabuzarus/3011_viewcontactstitle 
make viewcontacts part of the profile tab
 2015-11-30 23:29:35 +01:00
Michael Vogel 0278e60664 Merge pull request #2104 from rabuzarus/2611_contacts_directory 
display contact information in contact and directory according to the…
 2015-11-30 18:07:35 +01:00
fabrixxm 2753e62483 Merge pull request #2119 from annando/1511-contact-evolution 
Refurbished contact settings/contact posts
 2015-11-30 14:45:23 +01:00
fabrixxm a60b702df1 Merge pull request #2113 from annando/1511-manage-notifications 
The manage page now shows the notifications
 2015-11-30 12:04:53 +01:00
Michael Vogel 4efb6c6f79 Merge pull request #2120 from rabuzarus/2911_network_header 
2911 network header
 2015-11-30 08:30:34 +01:00
Michael Vogel 8c35304013 Some SQL improvements 2015-11-30 08:25:11 +01:00
rabuzarus 45c2a4868e make viewcontacts part of the profile tab 2015-11-30 03:25:23 +01:00
rabuzarus a6aac8f950 networkheader: do css work the other supported themes 2015-11-30 01:24:22 +01:00
Michael Vogel a638417ab5 Show contact comments in the post 2015-11-29 23:46:10 +01:00
Michael Vogel 91011b7190 Removing of useless code 2015-11-29 23:36:19 +01:00
Michael Vogel a7ea6ef096 Use the template for the header. 2015-11-29 23:33:32 +01:00
Michael Vogel 42d903dd68 Redesign of the contact pages, new tab for contact statuses 2015-11-29 23:22:05 +01:00
Tobias Diekershoff f45a8f1a03 Merge pull request #2106 from annando/1511-ostatus-bookmark-design 
Small OStatus changes
 2015-11-29 23:19:12 +01:00
Tobias Diekershoff 93fd6dce84 Merge pull request #2111 from annando/issue-1925 
Issue 1925 - display nickname@hostname.com
 2015-11-29 19:48:08 +01:00
Michael Vogel ca47c1c4df Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution 2015-11-29 17:05:40 +01:00
Michael Vogel 5649e9e193 The contact page now contains more data 2015-11-29 17:04:48 +01:00
Michael Vogel 8b23e77171 Only show supported networks in sidebar and contact list 2015-11-29 13:37:24 +01:00
Michael Vogel 583a2f709b Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design 2015-11-29 10:25:44 +01:00
Michael Vogel c77ef0c493 Viewcontacts now only shows native contacts (no more connector contacts) 2015-11-29 09:56:34 +01:00
Tobias Diekershoff a770be3cb6 Merge pull request #2107 from annando/1511-duplicated-keywords 
Duplicated tags shouldn't happen anymore when parsing a webpage.
 2015-11-29 08:43:19 +01:00
Tobias Diekershoff be40fb8186 Merge pull request #2110 from annando/1511-subscribe-feed 
Issue 1779: Atom feed link under the connect link on the profile page
 2015-11-29 08:40:39 +01:00
rabuzarus 1a0cb99d56 redesign the network page header when cid selected 2015-11-29 04:57:42 +01:00
rabuzarus 73dbd73990 directory - little change in the sql query 2015-11-29 00:09:09 +01:00
rabuzarus f5597da059 forumlist - mark selected forum as selected 2015-11-28 23:52:12 +01:00
Michael Vogel 68916689de Introductions are now added as well 2015-11-28 23:35:02 +01:00
Michael Vogel 3067663909 The manage page now shows the unread notifications 2015-11-28 22:56:48 +01:00
Michael Vogel 6e957c6c91 Merge pull request #2112 from rabuzarus/2811_group_side 
group_side - unify look with forumlist
 2015-11-28 21:12:56 +01:00
rabuzarus aa047e16d7 directory - reduce the number of queries 2015-11-28 21:12:44 +01:00
rabuzarus a3059d02d4 group_side - unify look with forumlist 2015-11-28 20:09:28 +01:00
Michael Vogel 25c0c5d4ad Issue 1925 - display nickname@hostname.com 2015-11-28 18:49:37 +01:00
Michael Vogel 388847e1f3 Issue 1779: There is now an atom feed link under the connect link on the profile page 2015-11-28 18:11:34 +01:00
Michael Vogel b53a2c3122 Changed documentation 2015-11-28 17:43:52 +01:00
Michael Vogel 679ce3243e Admin settings for table optimisation 2015-11-28 16:35:16 +01:00
Michael Vogel 20befee9ed Dupilcated tags shouldn't happen anymore when parsing a webpage. 2015-11-28 13:15:00 +01:00
rabuzarus 226bda9f58 add missing info about if contact is forum to contact related pages 2015-11-28 03:50:45 +01:00
rabuzarus 9189971cb8 display contact information in contact and directory according to the other contact related pages 2015-11-28 02:56:36 +01:00
Michael Vogel 9c37fc320e Merge pull request #2095 from rabuzarus/unread_forums 
count unread forum items for forumlist widget (ping.php)
 2015-11-27 16:28:21 +01:00
Michael Vogel 602821279a scrape_dfrn now scrapes the address as well. 2015-11-25 18:46:02 +01:00
rabuzarus ddf3589fc5 count unread forum items for forumlist widget (ping.php) 2015-11-24 22:14:26 +01:00
Sandro Santilli 573a441d83 Do not notify own posts, closes #1032 2015-11-22 12:28:39 +01:00
fabrixxm d1319d97a2 Merge pull request #2081 from annando/1511-avatar-fix 
The own avatar was (sometimes?) changed back when it was changed
 2015-11-17 09:13:08 +01:00
Michael Vogel e43c7a4447 Merge pull request #2061 from rabuzarus/0711_forumlist 
move forumlist addon to core
 2015-11-17 08:46:15 +01:00
Michael Vogel b53ae0d42a Bugfix: The own avatar was (sometimes?) changed back when it was changed. 2015-11-17 08:39:09 +01:00
Michael Vogel 47d6e43642 Sort the plugin configuration on the admin page by name 2015-11-14 09:27:24 +01:00
Michael Vogel 830870c58e Fix for issue 2060: When password is provided during the register process now the user is redirected correctly. 2015-11-14 08:07:09 +01:00
Tobias Diekershoff 009b3364e5 Merge pull request #2074 from fabrixxm/issue_2071 
Use static css in install procedure
 2015-11-13 12:50:41 +01:00
Fabrixxm 0a9e017d34 Installer use static css, fix #2071 2015-11-13 10:56:06 +01:00
Michael Vogel ab1edca0be Profile photos are now having an extension 2015-11-13 10:15:30 +01:00
Michael Vogel 6ddf62bdf7 Merge remote-tracking branch 'upstream/develop' into 1511-avatar 2015-11-13 09:48:34 +01:00
Michael Vogel 11905c0bec The avatar picture wasn't updated at the contact table 2015-11-13 08:45:14 +01:00
Michael Vogel 5a8d66e2d4 Just removed blanks with tabs 2015-11-12 23:34:33 +01:00
rabuzarus 862ccb95d2 forumlist: doxygen corrections 2015-11-11 22:41:44 +01:00
rabuzarus 988d0327ae forumlist: forgot some required_once for plugin_enabled() 2015-11-11 21:37:16 +01:00
rabuzarus 215205d376 forumlist: nodeinfo_plugin_enabled() is now plugin_enabled() 2015-11-11 21:31:26 +01:00
rabuzarus dac6f39f41 forumlist: use a more unique identifier 2015-11-11 01:29:31 +01:00
rabuzarus 96b764425e move forumlist addon to core 2015-11-09 15:56:20 +01:00
Tobias Diekershoff 69076b9a01 Merge pull request #2053 from annando/1511-only-supported-themes 
Only show supported themes on the admin site.
 2015-11-08 18:39:07 +01:00
Michael Vogel e803e56eea Only show supported themes on the admin site. 2015-11-08 18:35:39 +01:00
Tobias Diekershoff 686ba3fcb0 Merge pull request #2052 from fabrixxm/issue_1718 
duepuntozero, vier: add unread messages per group
 2015-11-08 18:29:15 +01:00
fabrixxm c700a6fb37 duepuntozero, vier: add unread messages per group 2015-11-08 18:02:04 +01:00
Tobias Diekershoff e6202defd1 Merge pull request #2049 from annando/1511-only-valid-contacts 
Only show valid contacts on the group page
 2015-11-08 16:46:45 +01:00
Michael Vogel 1c5eaa646c Only show valid contacts on the group side 2015-11-08 16:41:00 +01:00
Tobias Diekershoff 631afe5810 Merge pull request #2035 from FlxAlbroscheit/develop 
Preview the last 5 conversations in message-sidebar
 2015-11-08 16:03:04 +01:00
fabrixxm e6a8a7c8a9 Merge pull request #2048 from strk/group_post 
Include per-group count of unseen items in /ping output
 2015-11-08 16:01:19 +01:00
Sandro Santilli d31c372376 Revert the rename of <groups> 2015-11-08 15:56:43 +01:00
Sandro Santilli e28072f548 Fix bugs and rename <groups> to <group_posts> 2015-11-08 15:56:08 +01:00
FlxAlbroscheit 613cf41fd6 Preview last five conversations in message-sidebar 2015-11-08 15:45:42 +01:00
Sandro Santilli ba158dfeb1 Include per-group count of unseen items in /ping output 
See #1718
Unfinished work
 2015-11-08 15:33:12 +01:00
Tobias Diekershoff c0e87b2bea Merge pull request #2045 from annando/1511-dirfind-addr 
You can now discover previously unknown users via the dirsearch
 2015-11-08 15:19:11 +01:00
Michael Vogel c2beab0d56 Fixed an undefined variable 2015-11-08 15:17:08 +01:00
Michael Vogel 7de6f23f4a Now it is possible to search for @http://profile... 2015-11-08 15:00:52 +01:00
Michael Vogel e12b0d27bb You can now search for @username@domain.tld in dirfind and the search will resolve that. 2015-11-08 14:48:47 +01:00
fabrixxm ae9c9829fa Remove language selectors from themes 
This is now a user setting
 2015-11-08 14:42:54 +01:00
fabrixxm fb3ac68cc0 Add user language in settings, use that field as language for UI 2015-11-08 14:23:49 +01:00
fabrixxm 24d807221b Image filebrowser dialog links images to image page 
fix #1991
 2015-11-08 12:05:23 +01:00
fabrixxm 28a8c2369a Not current theme settings in admin page 
fix #2022
 2015-11-07 21:22:55 +01:00
FlxAlbroscheit 14dff6b0e0 Preview last five conversations in message-sidebar 2015-11-07 18:53:32 +01:00
Tobias Diekershoff 83c45d8d4b Merge pull request #2029 from tugelbend/develop 
changed syntax to work with PHP 5.3 #2027
 2015-11-07 16:34:13 +01:00
hauke f3eebda4fa changed syntax to work with PHP 5.3 #2027 2015-11-07 16:24:59 +01:00
Michael Vogel 3ccff0c77f Merge pull request #2023 from tobiasd/20151107-registertext 
Following n4rky to resolve #1898
 2015-11-07 16:02:26 +01:00
Tobias Diekershoff 9a1c57f1bc Following n4rky to resolve #1898 2015-11-07 13:19:55 +01:00
Tobias Diekershoff bb5f7c4db7 Merge pull request #2020 from fabrixxm/install_checks 
Install checks
 2015-11-07 11:12:37 +01:00
fabrixxm 6befca288f Check for mcrypt_create_iv() for RINO2, update link to cron documentation 2015-11-07 11:03:08 +01:00
Tobias Diekershoff 4e7bf0028c Merge pull request #2019 from rabuzarus/0611_directory 
simple photo_menu for directory
 2015-11-07 06:54:16 +01:00
fabrixxm 16123f5ad5 Check for ImageMagick and for GIF support 2015-11-07 00:22:26 +01:00
rabuzarus df36ea0d03 simple photo_menu for directory 2015-11-07 00:08:35 +01:00
fabrixxm 5f6ea6357d Add 'Reload active themes' to admin 
It will call 'uninstall()' and 'install()' on every active themes
 2015-11-06 23:53:10 +01:00
Michael Vogel 0f41f35041 The contact template now displays the address if available 2015-11-06 00:47:54 +01:00
rabuzarus a0ae6eb905 template-rework:little cleanup 2015-11-03 14:33:17 +01:00
rabuzarus e785759a8b template-rework:make use of get_contact_details_by_url() 2015-11-03 14:31:15 +01:00
rabuzarus f196389580 Merge develop into allfriends 2015-11-02 14:31:20 +01:00
Michael Vogel 709aac0652 Only offer the choice to activate Diaspora and OStatus if the system is ready for it 2015-11-01 13:55:49 +01:00
Michael Vogel 2f47d63a29 Merge pull request #2000 from tobiasd/20151027-credits 
a credits page
 2015-10-31 22:34:30 +01:00
Tobias Diekershoff cfc9d2b88f Merge pull request #1998 from annando/1510-network-profile2 
New function for fetching contact data
 2015-10-31 19:02:01 +01:00
Tobias Diekershoff 7d0ea70cc1 Merge pull request #2001 from annando/1510-empty-poco 
Bugfix: /poco was always empty
 2015-10-31 12:48:30 +01:00
Michael Vogel 7cf4468353 Bugfix: /poco was always empty 2015-10-31 10:32:01 +01:00
Michael Vogel 09ff2f0dd5 Renamed the function 2015-10-31 00:01:33 +01:00
Tobias Diekershoff c00847a79d use section_title.tpl for page title 2015-10-30 18:05:45 +01:00
rabuzarus fc37f49f23 network.php: add a descriptive comment 2015-10-30 12:47:48 +01:00
rabuzarus 56c9f23e99 prvgroup mentioning in status_editor 2015-10-30 01:59:17 +01:00
Michael Vogel f3ce812a9e New function for fetching contact data 2015-10-30 01:30:42 +01:00
Tobias Diekershoff a48156aab6 display names listed in credits.txt from /credits 2015-10-29 08:48:41 +01:00
fabrixxm fb4adc83dc Merge pull request #1995 from rabuzarus/2810_fbrowser 
fbrowser: exclude Contact Photos
 2015-10-29 08:41:21 +01:00
Tobias Diekershoff 6f601bf47d Merge pull request #1996 from annando/1510-profile-network-page 
Show the profile in the network view when viewing single contacts
 2015-10-29 08:39:56 +01:00
Michael Vogel 2e316b5cf2 Show the profile in the network view when viewing single contacts 2015-10-29 08:10:39 +01:00
rabuzarus e88d9153a1 fbrowser: exclude Contact Photos 2015-10-28 23:22:42 +01:00
Tobias Diekershoff 8eda86d8bf lower number of postings displayed per page for not logged in users 2015-10-28 19:01:45 +01:00
Michael Vogel aee4522ad4 The contact page now shows the connection status. 2015-10-27 23:10:52 +01:00
rabuzarus 299c8b83ac template-rework: let common friends and allfriends use viewcontact_template.tpl 2015-10-27 15:27:26 +01:00
Tobias Diekershoff 367699f785 Merge pull request #1987 from annando/1510-manage-enhancements 
Some small optical and structural changes to the manage template
 2015-10-27 09:01:35 +01:00
Tobias Diekershoff 4079084492 Merge pull request #1975 from rabuzarus/template_rework 
Template rework for contact related pages
 2015-10-27 08:59:03 +01:00
Michael Vogel 99ee45e627 The username is now a link 2015-10-26 23:11:42 +01:00
rabuzarus 7b1a957474 template-rework: try to fix double entries at match.php 2015-10-26 16:15:08 +01:00
rabuzarus 9d720f69aa template-rework: don't show the findpeople_widget on contact edit page 2015-10-26 13:36:01 +01:00
rabuzarus fdda4be452 manage-selector: use an easier sql querry 2015-10-26 00:19:55 +01:00
rabuzarus 87c559d605 manage-selector: sql - check for same baseurl 2015-10-25 18:04:20 +01:00
rabuzarus 4c263aa4ac Merge develop into manage 
Conflicts:
	view/global.css
 2015-10-25 16:57:04 +01:00
Tobias Diekershoff 03ff349a94 Merge pull request #1982 from annando/1510-reduced-profile 
Profile data are now reduced to only the most important fields
 2015-10-25 16:54:24 +01:00
Tobias Diekershoff 12d9c46ec5 Merge pull request #1979 from annando/1510-gnusocial 
Statusnet is now GNU Social
 2015-10-25 16:52:38 +01:00
rabuzarus bac61cf596 manage-selector: some cleanup and css work 2015-10-25 16:49:45 +01:00
Michael Vogel 78a8db55c6 Merge pull request #1981 from rabuzarus/poke 
some work on poke template
 2015-10-25 14:59:39 +01:00
rabuzarus e0e6762ed8 some inital work to have profile pics on manage page 2015-10-25 14:00:08 +01:00
Michael Vogel 65403973c1 Merge pull request #1977 from rabuzarus/crepair 
move html from crepair.php to template
 2015-10-25 09:44:12 +01:00
Michael Vogel 4631c13d08 Profile data are now reduced to only the most important fields 2015-10-25 09:15:36 +01:00
Michael Vogel a11833e248 Statusnet is now GNU Social 2015-10-24 20:44:18 +02:00
rabuzarus 8f92b6eea4 some work on poke template 2015-10-24 19:51:58 +02:00
rabuzarus ea2b3b2f76 move html from crepair.php to template 2015-10-24 15:57:46 +02:00
rabuzarus 87ecd8f658 tabs have now an ID 2015-10-24 15:04:27 +02:00
rabuzarus eaf5d05030 template rework: display more infos for match and dirfind 2015-10-23 16:48:32 +02:00
rabuzarus 0c3979720f template rework: rearrange sidebar widgets for contact related pages 2015-10-23 00:12:00 +02:00
rabuzarus 2aad62190f template rework: use viewcontact_template.tpl also for directory 2015-10-22 22:48:49 +02:00
rabuzarus f9c0c1d696 template rework: use viewcontact_template.tpl for contact dealing pages 2015-10-18 17:12:48 +02:00
rabuzarus 452a3011f7 Merge suggest into template_rework 2015-10-17 22:22:52 +02:00
rabuzarus dbf1f9efcd Merge dirfind into template_rework 2015-10-17 22:22:35 +02:00
rabuzarus e55f9f8f07 Merge dir into template_rework 2015-10-17 22:22:20 +02:00
rabuzarus 4b8ca578d1 dirfind: move pagination into template 2015-10-17 22:09:19 +02:00
rabuzarus b9d9bf8ecd directory: move pagination into template 2015-10-17 21:45:55 +02:00
rabuzarus 9176e739a4 sugest.php: themeable as whole page 2015-10-17 21:25:21 +02:00
rabuzarus 72896b0f6b unify directory page 2015-10-17 19:45:57 +02:00
Michael Vogel 2070c96dd1 Changing the acl does not work when editing posts - so it is disabled for events. 2015-10-17 08:46:45 +02:00
Michael Vogel 316276cb6d Editing an item with an event is now opeing the event edit form. 2015-10-17 08:27:33 +02:00
rabuzarus 67f699403a match.php: restructure acdording to the change of match.tpl 2015-10-17 00:39:50 +02:00
rabuzarus 20bb16859f dirfind.php: move html to templates 2015-10-17 00:19:01 +02:00
rabuzarus 6ebb21a935 directory.php: move html to templates 2015-10-16 21:44:10 +02:00
fabrixxm 5299f25920 default value for firstDay in events page 2015-10-12 20:23:09 +02:00
rabuzarus 649578ae33 Merge develop-new into event-attendance-new 
Conflicts:
	include/conversation.php
 2015-10-11 19:39:55 +02:00
Michael Vogel 48309a25ec Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu 
Conflicts:
	include/conversation.php
 2015-10-11 05:11:46 +02:00
Tobias Diekershoff 27fa20ab22 Merge pull request #1947 from annando/1510-diaspora-follower 
Reworked contact relations between Diaspora and Friendica
 2015-10-10 18:50:20 +02:00
Michael Vogel bb0dff2c75 Improved contact menu 2015-10-10 16:23:20 +02:00
Michael Vogel efbdb57f92 Reworked contact relations between Friendica and Diaspora 2015-10-10 11:06:18 +02:00
Michael Vogel ab0fbc3a65 Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers 2015-10-10 04:56:40 +02:00
rabuzarus 0eae67ea48 update attendance state on profile wall 2015-10-09 14:20:01 +02:00
rabuzarus d85d215bb8 attendance update in network stream 2015-10-09 13:46:08 +02:00
Michael Vogel 16da708e07 Contact names with ">" and "<" are a problem ... 2015-10-09 07:39:38 +02:00
rabuzarus 6a9ec14878 small bugfix in like.php 2015-10-08 20:26:11 +02:00
Michael Vogel 61c3ce7a21 Bugfix: The contact names had to be escaped 2015-10-08 00:25:55 +02:00
Michael Vogel 1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Michael Vogel 14e17b944f Reworked fetching of contact data on "display" page 2015-10-06 18:31:08 +02:00
Michael Vogel eefedc019b Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy 2015-10-06 07:41:09 +02:00
Michael Vogel 901b95e935 Hide some profile data if not connected. 2015-10-06 06:56:31 +02:00
Michael Vogel 7ed61b2edc Removed "proxy_parse_html" since it is now done in the bbcode function. 2015-10-05 22:25:14 +02:00
Michael Vogel d3ac3f8490 Added the contact menu to the search as well. 2015-10-05 08:08:59 +02:00
Michael Vogel 8a2d1fe301 Show RedMatrix and use the proxy for the profile pictures 2015-10-04 22:24:58 +02:00
Michael Vogel 05ae3d528e A contact that couldn't be resolved is know known as "UNKNOWN" 2015-10-04 19:48:29 +02:00
Michael Vogel 72ecb9e67b Bugfix: Repairing a contact was more like killing the contact ... 2015-10-04 19:39:55 +02:00
Michael Vogel 8c514307cf For safety reasons include the include 2015-10-04 17:20:47 +02:00
Michael Vogel 4003b9cc5d Let the notification look more like the follow dialog 2015-10-04 17:18:58 +02:00
Michael Vogel 83ea4f7253 transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues. 2015-10-04 15:55:24 +02:00
Michael Vogel ba41336099 Preparation for a not found contact. 2015-10-04 14:49:12 +02:00
Michael Vogel d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +02:00
Tobias Diekershoff be70dde61f Merge pull request #1928 from annando/issue-1913 
Issue 1913: Report invalid feed
 2015-10-04 08:54:59 +02:00
Tobias Diekershoff 05b2836d66 Merge pull request #1926 from annando/1510-permit-crawler 
New option to permit crawlers
 2015-10-04 08:53:32 +02:00
rabuzarus f93a2242e0 missed one to delete 2015-10-04 01:00:24 +02:00
Michael Vogel c0e277cec8 Issue 1913: Report invalid feed 2015-10-04 00:28:15 +02:00
Michael Vogel 2840bf2293 New option to permit crawlers 2015-10-03 23:16:40 +02:00
rabuzarus c775d6885b port of reds geotag feature 2015-10-03 20:24:35 +02:00
Tobias Diekershoff d6beb7db1f add a header to seperate the beginning of week settings 2015-10-01 06:19:57 +02:00
Michael Vogel 389b7de451 Setting for the first day of the week 2015-09-30 19:18:13 +02:00
Michael Vogel 68a6f0298e The events moved from the profile to the navigation bar - for supported themes 2015-09-30 18:50:44 +02:00
rabuzarus 7cb4ea52fd port of the event attendance feature of red matrix with example implementation for vier theme. 2015-09-30 16:58:02 +02:00
rabuzarus 2ff67ef5ed fixes like/dislike for photos 2015-09-30 14:39:00 +02:00
rabuzarus f5c7006f30 rest of the consensus porting work and integration into friendica 
Credits to Mike Macgirvin for the code
 2015-09-30 14:38:13 +02:00
rabuzarus 0077494396 make event confirmation work 2015-09-30 14:35:17 +02:00
rabuzarus 37fccee503 first work for consensus 2015-09-30 14:34:10 +02:00
fabrixxm 2e8caf7f27 Merge pull request #1915 from rabuzarus/hide_profilepics 
don't show profile photos in albums to others than owner or remote
 2015-09-30 08:57:31 +02:00
rabuzarus 3d7602a5a3 don't show profile photos in albums to others than the owner or remote user 2015-09-29 19:44:26 +02:00
Michael Vogel 6e981ed798 Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events 2015-09-29 10:35:50 +02:00
Fabrixxm 880dda4257 Merge branch 'master' back into develop 2015-09-29 10:00:13 +02:00
Michael Vogel c33957a6e9 Internationalisation of events/Move events to the navigation bar 2015-09-27 14:00:15 +02:00
fabrixxm af5da5bece Merge pull request #1903 from annando/1509-bbcode-notifications 
The "about" field in the introductions should be send through bbcode
 2015-09-25 18:24:48 +02:00
Michael Vogel c7b80b532a Bugfix: The "about" field in the introductions should be send through bbcode 2015-09-25 17:47:37 +02:00
Sandro Santilli 2a2dd6a1b9 Remove duplicated calls to language detection 
Also avoids overriding existing "lang" specification in an item
 2015-09-23 10:47:34 +02:00
Tobias Diekershoff 53719d4ecc Merge pull request #1897 from annando/3.4.2 
Bugfix: Following mail accounts is now possible again
 2015-09-23 06:20:49 +02:00
Michael Vogel 7c8c8b821a Bugfix: Following mail accounts is now possible again 2015-09-22 22:31:22 +02:00
Fabrixxm 554948c22a Adds checks for mcrypt module for RINO2 
- check for module on install
- check for module when RINO2 is enabled in admin
- check for module when RINO2 is used in communications
 2015-09-22 09:50:24 +02:00
Michael Vogel 5ac38b7f99 There is now only one central parameter for the global directory. 2015-09-15 22:29:02 +02:00
Michael Vogel d20dbedddd Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import 2015-09-06 09:15:23 +02:00
Tobias Diekershoff c67fbc89c4 Merge pull request #1879 from annando/1509-fixing-ostatus 
Improvements to OStatus subscriptions
 2015-09-06 09:03:28 +02:00
Tobias Diekershoff 8504cf4f05 Merge pull request #1880 from annando/1509-performance 
Some settings to control the system load
 2015-09-06 09:02:27 +02:00
Michael Vogel f918109351 We forgot to include the title ... 2015-09-06 08:18:55 +02:00
Michael Vogel 6aac9dfc9c Merge branch '1509-diaspora-import' of github.com:annando/friendica into 1509-diaspora-import 2015-09-05 12:13:38 +02:00
Michael Vogel c6d9b2da23 New setting for requery days 2015-09-05 10:54:39 +02:00
Michael Vogel cecbc58729 Mass-subscribing to OStatus contacts is enabled again 2015-09-05 10:32:10 +02:00
Michael Vogel 3cccb5ecb1 The repair option is added to the settings 2015-09-05 04:54:48 +02:00
Michael Vogel 30e7ce2e2a The links for nodeinfo in "well-known" need to be an array of objects. 2015-09-05 04:33:18 +02:00
Michael Vogel d9f23dbb20 New switch that restricts the search only for registered users 2015-09-05 04:29:37 +02:00
Michael Vogel 635e92249a Bugfix: The first contact was never repaired 2015-09-03 22:24:57 +02:00
Michael Vogel fd239ebf7b Try to repair OStatus subscriptions 2015-09-03 22:18:25 +02:00
Tobias Diekershoff 658c99dcf3 Merge pull request #1874 from annando/1509-pubsub 
Bugfix: pubsub tend to unsubscribe subscriptions in the past
 2015-09-01 07:07:22 +02:00
Michael Vogel 389738b1c1 Bugfix: pubsub tend to unsubscribe subscriptions in the past 2015-09-01 00:12:15 +02:00
Michael Vogel 3614df650f Some admin settings hadn't been made translatable. 2015-08-31 19:32:01 +02:00
Michael Vogel d1e3ea7b46 Soapbox-Improvements 2015-08-30 19:07:30 +02:00
Michael Vogel 3246352ba8 More detailled log entries 2015-08-29 16:55:25 +02:00
Michael Vogel 38c8431527 Rino Bugfix: A variable was used that never was fetched 2015-08-29 11:38:40 +02:00
Tobias Diekershoff 5b78353fff Merge pull request #1861 from annando/1508-deactivated-ostatus-contacts 
There seems to be a problem with the function to add all friends of a GNU Social account.
 2015-08-26 22:51:55 +02:00
Michael Vogel 86f2eb005f There seems to be a problem with the function to add all friends of a GNU Social account. So it is deactivated by now. 2015-08-26 22:46:59 +02:00
fabrixxm b988aa7cb4 fix warning in /dfrn_request 2015-08-26 19:17:41 +02:00
Michael Vogel 6942b16ef5 See issue 1855. OOhembed is removed. 2015-08-25 19:50:23 +02:00
Michael Vogel 5c084b754a Don't show the alternate url syntax in searches 2015-08-25 05:31:21 +02:00
Michael Vogel b52bc71c6c Now you can define the duration of the cache entries. 2015-08-24 17:24:14 +02:00
Tobias Diekershoff 26c5c7991a Merge pull request #1849 from fabrixxm/issue-1841 
filebrowser: link image to original picture, show error messages
 2015-08-24 14:26:09 +02:00
fabrixxm cbabac298d filebrowser: link image to original picture, show error messages 2015-08-24 13:54:41 +02:00
Michael Vogel 3bca2db11b Don't show search options in side bar. 2015-08-24 12:12:14 +02:00
Michael Vogel 3ff196f00d Now you can set search options so that searching for contacts or forums isn't occult science anymore. 2015-08-24 11:55:29 +02:00
Michael Vogel cf5fce855e Bugfix: Don't show "appnet" in "inbound" when only "buffer" is enabled. 2015-08-24 08:18:17 +02:00
Michael Vogel 3e08024839 Moved the rss/atom part to the protocols. 2015-08-24 08:15:34 +02:00
Michael Vogel 157c64cac2 The rss/atom feed is added to the inofficial "services" section. 2015-08-24 08:02:46 +02:00
Michael Vogel 2a676ee312 The nodeinfo is changed to the new specifications 2015-08-24 07:47:42 +02:00
Michael Vogel b0ddde22c0 By entering a GNU Social account name, the friends of this contact will be added to the friendica account 2015-08-23 22:21:15 +02:00
Tobias Diekershoff 37ab7ee052 Merge pull request #1842 from annando/1508-directory-configurable 
Make the hardcoded path to dir.friendica.com configurable
 2015-08-23 15:10:34 +02:00
Michael Vogel 123ad84689 Make the hardcoded path to dir.friendica.com configurable 2015-08-23 11:05:10 +02:00
fabrixxm 81d1dfc006 add 'reload active plugins' button in admin/plugins 2015-08-20 15:01:15 +02:00
Tobias Diekershoff 033f89c6fa Merge pull request #1831 from annando/1508-twidere-crash 
New versions of Twidere crashed during posting.
 2015-08-18 07:17:30 +02:00
Michael Vogel 57ebb00a1f New versions of Twidere crashed during posting. 2015-08-17 22:38:05 +02:00
Tobias Diekershoff 86f6532c61 adding the subdir 2015-08-17 08:20:19 +02:00
Tobias Diekershoff 03e81b06d5 we dont need the or anymore 2015-08-17 07:24:48 +02:00
Tobias Diekershoff 621dec1606 reconstruct the description for more flexible translations 2015-08-17 07:20:50 +02:00
Tobias Diekershoff eea258f74c add the profile url to the settings pages as alternative to the webfinger. See issue 1621 2015-08-16 22:39:08 +02:00
Tobias Diekershoff 0f505b92f6 Merge pull request #1827 from annando/1508-only-real-contacts 
In the contact search only suppress the "follow" link if you really d…
 2015-08-16 22:25:32 +02:00
Michael Vogel 32e080933f Improved the settings description 2015-08-16 22:17:36 +02:00
Michael Vogel c2a1cf958d The addon "statistics_json" becomes the system setting "nodeinfo" 2015-08-16 21:45:51 +02:00
Michael Vogel 46ec2638fa In the contact search only suppress the "follow" link if you really don't follow the contact 2015-08-16 15:48:26 +02:00
Michael Vogel bacd71e1c6 Replace random strings with guids where appropriate. 2015-08-14 07:48:28 +02:00
Michael Vogel 43fda0d626 Merge remote-tracking branch 'upstream/develop' into 1508-random-becomes-guid 2015-08-14 07:19:11 +02:00
Michael Vogel a2d742ec91 For unique values we should use our guid function - not the random function 2015-08-14 00:40:36 +02:00
Michael Vogel 0e9b2c132a Bugfix: There are some problems with Friendica installed in subdirectories 2015-08-14 00:13:23 +02:00
Tobias Diekershoff 5013e5daf1 use to link to queue inspector 2015-08-12 19:58:53 +02:00
Tobias Diekershoff f439ac47c4 admin panel: inspect queue 2015-08-12 15:44:59 +02:00
Tobias Diekershoff 9d0786531d Merge pull request #1810 from annando/issue-1739 
Contact requests now contain more information.
 2015-08-12 08:17:27 +02:00
Michael Vogel a0f69dc92c Contact requests now contain more information. 2015-08-12 08:07:21 +02:00
Michael Vogel d5f2d9b39a Bugfix ... 2015-08-11 23:50:31 +02:00
Michael Vogel bf9ab389a2 Just some removed blanks 2015-08-11 20:16:53 +02:00
Michael Vogel c18c598baf Nodeinfo: Include the sitename 2015-08-11 10:23:33 +02:00
Michael Vogel 986eee48ac Some corrections in the addon names 2015-08-11 00:37:27 +02:00
Michael Vogel e60456fb66 Metadata should be an object. 2015-08-10 23:11:07 +02:00
Michael Vogel 6aeb4c0ad7 Corrected the output 2015-08-10 21:54:57 +02:00
Michael Vogel 820ded2c2d Support for the new nodeinfo protocol that will replace statistics.json 2015-08-10 21:33:57 +02:00
Michael Vogel c8e0685788 Merge remote-tracking branch 'upstream/develop' into 1508-public-relay 2015-08-10 10:52:54 +02:00
Tobias Diekershoff 6cfe7b698e Merge pull request #1803 from annando/1508-accessibility 
Improved accessibility
 2015-08-10 08:48:48 +02:00
Michael Vogel b24453f8da Messages are now sent to the relay server - and the options are configurable 2015-08-09 20:39:11 +02:00
Michael Vogel 8974c147e0 First steps for a public relay for posts. 2015-08-09 08:31:42 +02:00
Michael Vogel b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
fabrixxm e94e6d7500 escape user data to sql 2015-08-06 16:08:14 +02:00
Tobias Diekershoff cd8be48ca7 Merge pull request #1791 from annando/1507-new-poco 
Improved Local Directory
 2015-08-02 10:31:34 +02:00
Michael Vogel 2f147451f7 Just some more improved setting descriptions. 2015-08-02 10:08:08 +02:00
Michael Vogel ebae45babc Clarified the settings. 2015-08-02 10:05:50 +02:00
Michael Vogel 0a998f99df Added community search mode 2015-07-30 23:27:50 +02:00
Fabrixxm f5657e283c fix folder links in filebrowser dialog 2015-07-29 11:55:26 +02:00
Fabrixxm 70b7de39a7 Upload/Browse popup for files and images 
Jot buttons to upload images and files show a popup, where the
user can select a previously uploaded item o upload a new one
 2015-07-28 17:20:40 +02:00
Michael Vogel dcfcd6f906 Poco: added caching 2015-07-25 12:05:27 +02:00
Michael Vogel 68e318e316 Don't export contacts with empty network 2015-07-25 10:50:00 +02:00
Michael Vogel e3e9de2e74 Export all federation contacts through poco 2015-07-24 07:23:57 +02:00
Michael Vogel 880f486044 Check not only for the last contact but also for the last update for the sanity check. 2015-07-23 22:21:22 +02:00
Michael Vogel cbd2fc1572 "last_contact" is now set automatically if it is lower than the update value. 2015-07-23 20:57:08 +02:00
Michael Vogel 9717fa82fe New field "created" in gcontacts. New option for timeframe when polling global contacts 2015-07-21 00:05:44 +02:00
Michael Vogel f3c83fb514 Automatically updating the searched contacts while searching it. 2015-07-19 18:02:24 +02:00
Michael Vogel 0bede65a6b Use local search 2015-07-19 13:23:01 +02:00
Michael Vogel 93e93f58bd Query Redmatrix contacts for their contacts as well. 2015-07-19 10:40:33 +02:00
Michael Vogel 2a5fb7b175 Option to discover contacts from remote users (fallback option) 2015-07-19 09:41:36 +02:00
Michael Vogel a0734ceede Merge remote-tracking branch 'upstream/develop' into 1507-new-poco 2015-07-18 22:37:39 +02:00
Michael Vogel cf3214c904 Query other servers periodically for their known contacts 2015-07-18 22:26:06 +02:00
Tobias Diekershoff 9bb805f3dc show profile url in contact-edit overview listing 2015-07-18 10:57:31 +02:00
Michael Vogel f1e7369283 Poco: Option to activate and deactivate detection of last activity. 2015-07-18 00:48:42 +02:00
root 54a5a80b24 Poco: New fields for last contact and last failure of a contact. 2015-07-17 01:08:28 +02:00
Michael Vogel fca8aecc9b Show "Redmatrix" as network name. 2015-07-16 10:09:59 +02:00
Michael Vogel 6800b07fc5 Update the name in the "self" contact when it is changed. 2015-07-14 22:24:43 +02:00
Michael Vogel 0de1926113 removed logger entry 2015-07-14 08:52:54 +02:00
Michael Vogel 2b3ebb9c3e Follow/Unfollow now works from OStatus. 2015-07-13 23:50:33 +02:00
Michael Vogel 3457f85833 Salmon: Don't store contact data before the message was authenticated. 2015-07-13 14:34:28 +02:00
Michael Vogel 0398bb67be Reworked salmon import 2015-07-13 08:06:51 +02:00
Michael Vogel 5f89cb0923 The autofollow option is moved from the addons to the core. 2015-07-12 21:37:49 +02:00
rabuzarus e5809dce79 add jotnets for sharing posts 2015-07-12 17:52:25 +02:00
Tobias Diekershoff 179201d2bf Merge pull request #1750 from annando/1507-contact-update 
Automatic contact update
 2015-07-12 15:32:29 +02:00
Michael Vogel fe137a92ef Automatically update contact data. 2015-07-11 14:36:04 +02:00
Tobias Diekershoff a22581e86c typo 2015-07-08 13:15:14 +02:00
Fabrixxm 95945ecae6 Merge branch 'master' into develop 2015-07-06 16:56:49 +02:00
fabrixxm 75998b62de Merge pull request #1726 from rabuzarus/acl-var 
fix for #1725
 2015-07-02 12:13:14 +02:00
rabuzarus b827c2e805 inlude jotnets for bookmark acl 2015-07-02 12:09:40 +02:00
Tobias Diekershoff 3349bba665 Merge pull request #1722 from annando/1506-password-on-install 
Ability to enter a password when the first user is created
 2015-07-01 07:53:25 +02:00
Michael Vogel 836058c477 Added help text 2015-07-01 00:41:04 +02:00
Michael Vogel 055ee962c9 Ability to enter a password when the first user is created 2015-06-30 23:37:31 +02:00
rabuzarus cf2a90dfa2 system settings is now a variable in settings_display.tpl 2015-06-30 14:51:14 +02:00
fabrixxm 5a23bd400c Merge pull request #1715 from rabuzarus/theme_uid 
use local theme settings for visitors
 2015-06-30 08:41:07 +02:00
Michael Vogel 836432bb9a Removed Google Maps 2015-06-30 07:42:59 +02:00
fabrixxm 28f0e9a2de Merge pull request #1696 from rabuzarus/acl-var 
move jotnets to populate_acl
 2015-06-29 13:53:37 +02:00
fabrixxm 1a1c2d74f6 Merge pull request #1698 from rabuzarus/identity 
move some identity related functions to identity.php
 2015-06-29 13:52:07 +02:00
fabrixxm 17514e0d68 Merge pull request #1703 from rabuzarus/readable_bytes 
show maximagesize warning in a human readable format
 2015-06-29 13:50:55 +02:00
rabuzarus a982320ba9 show maximagesize warning in a human readable format 2015-06-29 02:39:08 +02:00
Michael Vogel b795bf2935 Merge pull request #1683 from fabrixxm/issue-1655 
Deprecate RINO1 function, implements RINO2, remove unused crypro functions
 2015-06-27 17:39:00 +02:00
rabuzarus 8cca849c2e Merge acl-var into develop 
Conflicts:
	mod/settings.php
 2015-06-27 15:23:19 +02:00
rabuzarus 373bb0822b get the themes settings of foreign profiles 2015-06-27 14:10:43 +02:00
rabuzarus 787604026f move some identity based functions to identity.php 2015-06-26 18:57:20 +02:00
rabuzarus 5ce125d6e0 cleanup of some unused code 2015-06-26 15:13:52 +02:00
rabuzarus 65286f79ed respect hidewall 2015-06-25 20:29:09 +02:00
rabuzarus 94b21245bc some more work to get acl data into populate_acl 2015-06-25 18:57:42 +02:00
rabuzarus bfebf9636b acl for events and photos 2015-06-25 12:38:09 +02:00
Fabrixxm 6fc864c947 rework mod/ping and desktop notification logic 
`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
 2015-06-25 10:02:26 +02:00
Fabrixxm e29d05ce4a notifications order, unseen css class 
ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen'
 2015-06-24 16:10:06 +02:00
Fabrixxm 4036ad2554 Fix desktop notification 
use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification
 2015-06-24 09:49:53 +02:00
Fabrixxm 17e8c29768 fix spelling 2015-06-24 08:23:56 +02:00
Fabrixxm 511c2d2c91 rino: settings in admin, choose lowest common on notify 2015-06-23 17:36:26 +02:00
Fabrixxm 6fbb02fb93 RINO 2 based on php-encryption 
reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes.
 2015-06-23 16:13:09 +02:00
Fabrixxm d06beb1431 install: load htconfig template from templates/ 2015-06-23 12:35:51 +02:00
Fabrixxm 7d83a19fd4 Disable RINO 
Comment out functions for RINO crypt and disable RINO request and response.
 2015-06-23 12:02:35 +02:00
Tobias Diekershoff 5549dd1dbe Merge pull request #1682 from fabrixxm/issue-1625 
admin: allow deletion of any users but yourself
 2015-06-23 11:05:16 +02:00
Fabrixxm 3168b44317 admin: allow deletion of any users but yourself 
fix #1625
 2015-06-23 10:39:28 +02:00
Fabrixxm 53e6dd6637 Add contact detail to contact drop confirm 
fix #1629
 2015-06-23 10:09:27 +02:00
Tobias Diekershoff 24c91a4fed Merge pull request #1679 from fabrixxm/smallfixestothemes 
use fields template in photo edit form
 2015-06-23 09:12:25 +02:00
Michael Vogel a7cf3639f0 Just some more fixing for issue 1642 2015-06-22 23:47:08 +02:00
fabrixxm 35e9fc3b02 use fields template in photo edit form 2015-06-22 20:07:19 +02:00
Michael Vogel df7b907bc4 Display: Look for the network name when fetching the contact (important because of the statusnet connector) 2015-06-21 01:34:57 +02:00
Tobias Diekershoff 78321c2a43 Merge pull request #1670 from annando/setup-rewrite-check 
The installation prozess has a problem with self signed certificates
 2015-06-15 13:25:54 +02:00
Michael Vogel 7feda0120f This is working fix for issue 1642 2015-06-15 01:20:04 +02:00
Michael Vogel 0e157b1288 Merge remote-tracking branch 'upstream/develop' into setup-rewrite-check 2015-06-15 00:55:05 +02:00
fabrixxm 42f4f3fce9 Merge pull request #1668 from annando/issue-1642 
Better detection for the mobile client to avoid "{0}" in notifications
 2015-06-14 15:58:52 +02:00
Michael Vogel abc84f96ab The installation prozess has a problem with self signed certificates. 2015-06-13 21:58:40 +02:00
Michael Vogel c89c0916e2 Better detection for the mobile client to avoid "{0}" in notifications. 2015-06-13 20:23:26 +02:00
Michael Vogel 66058c6cf4 Remote subscribe from a GNU Social site is now possible 2015-06-13 19:51:45 +02:00
Tobias Diekershoff e02546880f Merge pull request #1662 from annando/issue-1628 
The values for "sitename" and "register_text" was nedlessly encoded
 2015-06-11 06:33:38 +02:00
Michael Vogel 5907c62851 The values for "sitename" and "register_text" was nedlessly encoded with "htmlentities" 2015-06-11 00:12:16 +02:00
Michael Vogel df3b38679f This fixes issue 1657 2015-06-10 22:54:41 +02:00
Michael Vogel cb0351dba0 Send a salmon notification to every mentioned person. 2015-06-09 08:27:04 +02:00
Michael Vogel 419a3ab2d3 Better behaviour when contact wasn't found. 2015-06-08 01:19:40 +02:00
Michael Vogel a3c497190d Complete new OStatus import. 2015-06-07 23:18:02 +02:00
Michael Vogel ba36910343 Removed bad plink detection. 2015-06-03 21:03:46 +02:00
Michael Vogel c416ce4893 Improved tagging 2015-06-03 11:27:56 +02:00
Michael Vogel b60677ef1b OStatus: New fields in OStatus export/ Auto-tagging of replyed authors. 2015-06-03 01:26:46 +02:00
Michael Vogel 39d4856abb Merge remote-tracking branch 'upstream/develop' into 1506-tag-users 2015-06-02 23:19:00 +02:00
Tobias Diekershoff 7305a27392 Merge pull request #1647 from annando/1506-performance 
Performance improvements when searching for existing GUIDs
 2015-06-02 22:46:07 +02:00
Michael Vogel b5129a3e11 Store the GUID from here as well. 2015-06-02 22:10:28 +02:00
Michael Vogel 1a26d464dd Always add the addressed contacts in a post to the tags. 2015-06-02 20:36:10 +02:00
fabrixxm a36014fb0f Merge pull request #1619 from rabuzarus/block-local-dir 
block local directory for public access
 2015-06-02 17:53:19 +02:00
fabrixxm 46052740be Merge pull request #1632 from annando/1505-ostatus2 
Send a hubsub notification for every comment
 2015-06-01 09:00:17 +02:00
fabrixxm c12a647f13 Merge pull request #1639 from rabuzarus/albums_widget 
fix photo_albums upload
 2015-06-01 08:34:18 +02:00
rabuzarus 8257e7e1e5 block poco if block_local_dir is true 2015-06-01 01:50:27 +02:00
rabuzarus a674e782b2 fix Issue #1638 2015-06-01 01:36:37 +02:00
Michael Vogel fae3592c79 Bugfix: You wasn't able to add an OStatus contact when you are following the same contact via Statusnet connector. 2015-05-31 13:28:16 +02:00
fabrixxm 18e44001e5 Merge pull request #1630 from annando/1505-ostatus 
OStatus communication improvements
 2015-05-31 10:08:24 +02:00
fabrixxm 1cf3e778e8 Merge pull request #1622 from rabuzarus/albums_widget 
move html to photo_albums.tpl
 2015-05-31 10:07:43 +02:00
Michael Vogel d732d9d1a8 OStatus replies should now work even if the thread starter isn't in the mentions. 2015-05-31 00:26:11 +02:00
Michael Vogel 788d3cf1ab Ostatus: The automatical adding of @-replies now uses the correct contact. 2015-05-30 21:45:43 +02:00
rabuzarus 74267310d6 html to section_title.tpl 2015-05-30 02:21:30 +02:00
rabuzarus b61e39a1cb cleaning after local merge 2015-05-29 16:30:42 +02:00
rabuzarus 553a152345 Merge photo-template into develop 2015-05-29 16:24:58 +02:00
rabuzarus a7d417abb2 remove whitespace 2015-05-29 16:18:30 +02:00
rabuzarus 5cbb5b140c css work 2015-05-29 16:08:17 +02:00
Tobias Diekershoff 9a22b4818e Merge pull request #1618 from rabuzarus/vcard 
remove html and make use of vcard-widget.tpl
 2015-05-29 08:52:27 +02:00
rabuzarus 3e0635992f change the conditions 2015-05-29 04:05:41 +02:00
rabuzarus a2a8afa583 block local directory for public access 2015-05-28 19:54:23 +02:00
rabuzarus 5990d62b06 use z_root 2015-05-28 16:15:48 +02:00
rabuzarus 415a606a59 better solution to exclude Contact Photos and include count of Photos 2015-05-28 15:54:53 +02:00
rabuzarus 1067718018 little revision 2015-05-27 12:44:40 +02:00
fabrixxm b3992e1c65 Merge pull request #1599 from fabrixxm/issue-1574 
Issue #1574
 2015-05-27 11:07:30 +02:00
fabrixxm 50b3e49b5d Merge pull request #1601 from rabuzarus/event-warning 
event can not end before it has started warning
 2015-05-27 11:06:47 +02:00
rabuzarus 15499ff1aa first step to get html code from photos.php removed 2015-05-27 03:35:29 +02:00
rabuzarus 46338f5e87 using sprintf 2015-05-26 14:49:53 +02:00
rabuzarus f309f3a681 remove html and use vcard-widget.tpl 2015-05-26 14:32:40 +02:00
rabuzarus 3ad674fa67 better space handling 2015-05-25 16:49:57 +02:00
rabuzarus e040b60f67 make the heading of the search result translatable 2015-05-24 20:46:40 +02:00
rabuzarus b754a79968 event can not end before it has started. 2015-05-24 13:33:07 +02:00
Michael Vogel c6e605992b Events: Query improvement 2015-05-24 11:46:20 +02:00
fabrixxm b29b01fad4 Merge branch 'develop' into issue-1574 2015-05-24 10:26:21 +02:00
fabrixxm 3a71978b0d Merge pull request #1598 from rabuzarus/datepicker 
new datetimepicker for event creation
 2015-05-24 10:16:29 +02:00
fabrixxm 83697cf3e5 Delete attachments on item deletion 
Delete video from videos page
 2015-05-23 22:35:02 +02:00
Michael Vogel ab67788b4e SQL speed increase for query and search. 2015-05-23 01:23:31 +02:00
rabuzarus 2ad8fdc40b port of red matrix datepicker implementation 2015-05-22 18:53:18 +02:00
Tobias Diekershoff 72e3ffbb4d Merge pull request #1563 from annando/1505-no-intelligent-shortening 
Disable intelligent shortening - issue 1540
 2015-05-16 12:04:28 +02:00
Michael Vogel 472a6f1380 Added explanation for shortening. 2015-05-15 21:09:00 +02:00
Michael Vogel d995fc3994 The intelligent shortening for social media systems like Twitter, GNU Social and App.net can now be disabled. 2015-05-15 20:56:05 +02:00
rabuzarus de197405d0 port of red's event editing preview 2015-05-14 13:20:58 +02:00
Tobias Diekershoff 9244e8727d dbesc and normalise_link 2015-05-10 09:10:27 +02:00
Tobias Diekershoff 0b8b1fdef3 add procy_url around the profile images 2015-05-06 16:14:27 +02:00
Tobias Diekershoff fd8c9a9dac avoid some contacts from profile match listing 2015-05-06 13:02:02 +02:00
Michael Vogel 237b5a6e40 New page setting for the maximum frontend load value. 2015-05-02 22:05:04 +02:00
Michael Vogel 100f6343ad Highlighting of user names should now work in every case 2015-04-30 06:11:05 +02:00
Michael Vogel 5368fbba82 Bugfix: The android app will have readable notifications again. 2015-04-26 13:25:04 +02:00
Michael Vogel c348f27e84 Show unread notifications in a different order than read notifications 2015-04-23 08:59:30 +02:00
Michael Vogel 7254f42333 Show unread mails and introductions as well. 2015-04-23 08:37:31 +02:00
Michael Vogel 04cda104ca New function that will prevent notifications from deleted posts 2015-04-22 08:39:27 +02:00
Michael Vogel e2827c0af7 The ID field will be stored with notifications as well. 2015-04-21 10:14:20 +02:00
Michael Vogel 261cd441c7 Merge remote-tracking branch 'upstream/develop' into 1504-condensed-notifications 2015-04-21 10:13:28 +02:00
Michael Vogel 7a1db2e083 Only show one notification per parent 2015-04-16 06:47:09 +02:00
Tobias Diekershoff 8367cadeef dont normalise OpenID URLs and fallback to https if no protocol is specified 2015-04-14 12:27:36 +02:00
Michael Vogel 2285b3b7a7 Storing the parent with every notification 2015-04-14 06:54:41 +02:00
Michael Vogel 64e343ed4b Some refinement to the contact update 2015-04-12 10:32:02 +02:00
Michael Vogel 1058d055d1 Merge remote-tracking branch 'upstream/develop' into 1504-contact-update 
Conflicts:
	mod/contacts.php
 2015-04-12 09:59:28 +02:00
fabrixxm 8b2742dc7d Merge pull request #1505 from annando/1504-unified-follow 
The behaviour when following a new contact is now unified
 2015-04-12 08:48:36 +02:00
Michael Vogel 2c3e2908b2 There is now a new possibility to update contact data. 2015-04-11 23:51:47 +02:00
Michael Vogel 0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. 2015-04-11 22:14:56 +02:00
Michael Vogel 190b7d6070 Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow 2015-04-10 11:34:21 +02:00
Tobias Diekershoff dea1b067bd Merge pull request #1479 from annando/1504-parse_url 
The order for the page parsing is changed
 2015-04-10 10:13:13 +02:00
Michael Vogel 489af0d55d Just added some forgotten escaping. 2015-04-10 00:54:42 +02:00
Michael Vogel 662fd84891 Automention of communities when a single contact is selected on the network page. 2015-04-10 00:42:03 +02:00
Michael Vogel e81f9c91fa Merge remote-tracking branch 'upstream/develop' into 1504-parse_url 2015-04-09 19:49:33 +02:00
Michael Vogel ccbac6874b The "connect" link ar the display page now directs to the new "follow" page as well. 2015-04-09 07:45:48 +02:00
Michael Vogel f6ea872986 The behaviour when following a new contact is now unified. 2015-04-09 00:10:21 +02:00
Michael Vogel 539a93b3f1 The timestamp was at the wrong place 2015-04-06 13:49:57 +02:00
Michael Vogel 3cbd72d907 API: New picture upload function (Enhanced Twidere support) 2015-04-06 03:19:12 +02:00
Tobias Diekershoff 8ae90035f4 Merge pull request #1480 from annando/1504-diaspora-enhancement 
Diaspora uses this to fetch single public items
 2015-04-05 21:24:21 +02:00
Michael Vogel 32206cd681 Diaspora uses this to fetch single public items. 2015-04-05 20:50:15 +02:00
Michael Vogel 57528cb987 New function for building the "share" header 2015-04-05 20:43:06 +02:00
Michael Vogel aea83f0bec The order for the page parsing is changed. 2015-04-05 20:40:31 +02:00
Tobias Diekershoff 106b0b5d23 Merge pull request #1460 from FlxAlbroscheit/develop 
Issue 1163: Feature allowing desktop-notifications
 2015-04-05 11:37:05 +02:00
fabrixxm 2d3437daa3 different help text for different network 2015-04-04 18:02:26 +02:00
Silke Meyer c05f95b54e Improved help text, issue 1349. 2015-04-01 10:10:00 +02:00
fabrixxm 0226258e7b Block settings page for unauthorized users 
fixes issue #1459
 2015-03-31 10:24:23 +02:00
FlxAlbroscheit 001e940c6c Feature for desktop-notifications 
see issue #1163
 2015-03-31 02:06:07 +02:00
Michael Vogel f1c6d6f1ba Merge pull request #1442 from fabrixxm/issue-1362 
Add scheme if missing to url inserted by user in 'insert link' jot button
 2015-03-24 12:34:31 +01:00
fabrixxm 250b466ed3 Fix blank reponse if no siteinfo are fetched 2015-03-22 11:03:46 +01:00
fabrixxm 1cc9e7db0f Add scheme if missing to url inserted by user in 'insert link' jot 
button
 2015-03-22 10:59:00 +01:00
fabrixxm 05d1aaf0ed Use correct class name to send post to email recipients. Fix #1437 2015-03-22 10:12:16 +01:00
fabrixxm c18ace5517 Merge pull request #1436 from annando/1503-global-copy-comments 
The global copy now copies comments as well
 2015-03-22 09:49:49 +01:00
Michael Vogel 81b199cfdc The global copy now copies comments as well. This is important for the search. 2015-03-21 20:23:47 +01:00
fabrixxm 9bdd41b774 Merge pull request #1435 from FlxAlbroscheit/develop 
Access a contact directly from the contact-manager-page [UPDATED]
 2015-03-20 15:13:17 +01:00
FlxAlbroscheit 1e15cba631 Access a contact directly from the contact-manager-page 
Improved my former commit (see: https://github.com/friendica/friendica/pull/1428)
 2015-03-20 15:10:55 +01:00
Tobias Diekershoff dd21750d90 Merge pull request #1428 from FlxAlbroscheit/develop 
Access a contact directly from the contact-manager-page
 2015-03-12 07:13:31 +01:00
FlxAlbroscheit 21237ddba6 Give access to contact's profile-URL 2015-03-10 22:44:57 +01:00
Michael Vogel ea06a1ec45 There is now a "global" field in the item table that tells if this item is present as global copy as well. 2015-03-09 00:45:53 +01:00
Michael Vogel b080eddf8d Improved logging for the search. 2015-03-08 03:24:54 +01:00
Michael Vogel dbe8275ae5 Added some more timestamp measuring 2015-03-07 23:14:26 +01:00
Michael Vogel 1cf3cb493f removed unneeded code. 2015-03-07 21:39:28 +01:00
Michael Vogel 7c4a1a059d New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode. 2015-03-07 21:24:39 +01:00
Michael Vogel 027b11ebb5 Small bugfix for likes 2015-03-02 23:34:59 +01:00
Michael Vogel 3f1d186106 Remove the old hashtag functions, change it to the new functionality. 2015-03-01 20:40:38 +01:00
Tobias Diekershoff 20208acb23 Merge pull request #1417 from annando/1502-improved-markdown 
Updated libraries for Markdown and mobile detection
 2015-02-28 08:17:22 +01:00
Michael Vogel 25eb323d69 Removed the last traces of the old Markdown library 2015-02-23 23:56:44 +01:00
Michael Vogel 440e2d82b1 Global setting for the behaviour of likes. 2015-02-23 12:44:50 +01:00
Michael Vogel 6504568f2e Merge remote-tracking branch 'upstream/develop' into 1502-like-no-update-commented 2015-02-23 12:35:22 +01:00
fabrixxm d4b092cec6 Merge pull request #1356 from silke/develop 
Added help text as requested in #1349.
 2015-02-23 08:51:02 +01:00
Michael Vogel 9eeff0d891 Received "likes" and "dislikes" don't update the "commented" value anymore. 2015-02-22 17:34:04 +01:00
Michael Vogel f3cc065e66 Show the profile visibility only for Friendica contacts. 2015-02-21 20:03:02 +01:00
Michael Vogel 8179f2f65e Only show the relation on native networks. 2015-02-20 23:56:41 +01:00
Michael Vogel 1dc961713d Bugfix: If "all" is selected then no contacts were shown. 2015-02-20 23:33:21 +01:00
Michael Vogel a8a37a35db Only show the options that fit to the current network. 2015-02-20 23:12:04 +01:00
Michael Vogel 4a1105ede6 scrape/noscrape now contains the date the profile was last updated or the last message was sent. 2015-02-18 23:40:46 +01:00
Michael Vogel 219932f692 Removed Statusnet from the counting of contacts for scrape/noscrape 2015-02-17 19:27:13 +01:00
Michael Vogel a26d04574d Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-17 19:18:17 +01:00
Michael Vogel 2dafc9eac1 Merge remote-tracking branch 'upstream/develop' into 1502-poco-generation-counter 2015-02-15 10:54:41 +01:00
Michael Vogel d1d794f1ab The global contacts now contain a "generation" value that defines how we know this contact 2015-02-15 10:52:45 +01:00
Tobias Diekershoff d39612ac25 Merge pull request #1393 from annando/1502-cleaned-item-storage-code 
Additional check for notifications
 2015-02-14 15:40:35 +01:00
Johannes Schwab 12d7ca9b84 improved infinite scrollling 2015-02-13 00:40:59 +01:00
Michael Vogel 1a75503b1c Relocated the cache code. 2015-02-10 08:22:21 +01:00
Michael Vogel 21c63e8b65 Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-09 10:16:48 +01:00
Michael Vogel e7b2c5dbf3 Bugfix: The value for "global community" wasn't read. 2015-02-09 08:25:12 +01:00
Michael Vogel c0411ae25a Enhanced SQL query so that the search is faster. 2015-02-08 23:50:45 +01:00
Michael Vogel 842ac46857 Scrape now contains the number of contacts as well. 2015-02-08 23:35:29 +01:00
Michael Vogel 2a02e1cb9c Just cleaning up the code. 2015-02-08 20:55:48 +01:00
Michael Vogel 7e9ae24511 Moved several settings from .htconfig.php to the admin settings page. 2015-02-08 20:35:40 +01:00
Michael Vogel a97d4383a1 Searching for items now always searches public entries from the central item storage with uid=0. 2015-02-08 15:59:22 +01:00
Michael Vogel 8871591a98 Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default 
Conflicts:
	mod/admin.php
 2015-02-08 13:26:28 +01:00
Michael Vogel f931eba7f2 Noscrape is now enabled all the time. 2015-02-08 12:07:35 +01:00
Michael Vogel 1d48ab0191 "altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version. 2015-02-08 11:54:42 +01:00
Michael Vogel 89f260eb6c The title in the bookmarklet had several asterisk in the title. This had no use for friendica. 2015-02-06 21:10:49 +01:00
Tobias Diekershoff be40d9d265 Merge pull request #1359 from annando/1502-more-detailled-location 
More details in the location field for poco
 2015-02-05 08:31:15 +01:00
Silke Meyer cdd3089444 Help text sounded too complicated 2015-02-04 16:43:31 +01:00
Silke Meyer 6bccf0be79 Added help text as requested in #1349. 2015-02-04 16:13:07 +01:00
Tobias Diekershoff ed280df383 typo in side panel link 2015-02-04 11:27:54 +01:00
Michael Vogel 29f732e811 More details in the location field for poco. 2015-02-04 10:43:30 +01:00
Michael Vogel 8490bedefe Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-02 22:15:39 +01:00
Tobias Diekershoff 677f46c076 Merge pull request #1338 from annando/1501-global-contacts 
Added "about" to noscrape
 2015-02-02 21:52:09 +01:00
Michael Vogel 9c0dc86eea Merge pull request #1342 from tobiasd/20150202_admin 
added diagnostics tools to the admin side panel
 2015-02-02 21:14:41 +01:00
Tobias Diekershoff e5766a4793 make strings translate able 2015-02-02 20:37:05 +01:00
Tobias Diekershoff 8a17c3d348 added diagnostics tools to the admin side panel 2015-02-02 18:26:38 +01:00
Silke Meyer 57a80c3867 Let the browser check if it's a valid email address 2015-02-01 16:25:49 +01:00
Michael Vogel e02b982f77 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-01 13:28:32 +01:00
Michael Vogel e3da549ab5 Reshared diaspora items that aren't on this server are now stored with uid=0 2015-02-01 10:26:35 +01:00
Silke Meyer 8991319d9d Added a description to the help field 2015-01-31 16:09:59 +01:00
Silke Meyer c90e47556a added setting for server's sender email address 2015-01-31 15:54:12 +01:00
Silke Meyer 89946b8660 fixed a typo 2015-01-31 15:23:36 +01:00
Michael Vogel 036ccf84de And yet another two places where pictures have to be sent through the proxy. 2015-01-28 23:34:46 +01:00
Michael Vogel b309187e3d Just two more places where pictures have to be send through the proxy function. 2015-01-28 10:09:16 +01:00
Michael Vogel 04ab875a62 Added "about" to noscrape. 2015-01-27 19:52:54 +01:00
Michael Vogel 848c09935a The contact list in mails now contains not only the name but also the address. 2015-01-27 08:04:24 +01:00
Michael Vogel 583c2ce13e poco can now be used to query the global contacts. 2015-01-27 08:01:37 +01:00
Michael Vogel e8bfa32b37 Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile 2015-01-26 01:07:15 +01:00
Michael Vogel bc2c046446 poco: Only update the global contacts when there is a network value/Export your own contact as well 2015-01-25 16:40:20 +01:00
Michael Vogel 105d6a22a4 gender will be updated in the profiles as well. 2015-01-25 13:22:25 +01:00
Michael Vogel 2f400627c7 Support for keywords and gender in (global) contacts. 2015-01-25 13:19:37 +01:00
Michael Vogel dff2384e82 Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts 2015-01-25 08:44:42 +01:00
Tobias Diekershoff 1c424a5425 Merge pull request #1315 from annando/1501-issue-1283 
issue 1283 - Share-it button support for friendica
 2015-01-25 08:24:21 +01:00
Michael Vogel 344210bd6d Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco. 2015-01-25 00:19:59 +01:00
Michael Vogel 58d814b793 issue 1283 - Share-it button support for friendica 2015-01-25 00:10:58 +01:00
Tobias Diekershoff eaaed02ffd use type email in users settings as well 2015-01-24 09:40:01 +01:00
Tobias Diekershoff 8b558eb7ea type email for email field in add user form 2015-01-24 09:30:44 +01:00
Michael Vogel 1f23d691f3 Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus 2015-01-21 01:30:09 +01:00
Michael Vogel ed037124b3 Merge pull request #1299 from fabrixxm/optional-text-only-email 
Optional text only email
 2015-01-20 23:26:44 +01:00
Michael Vogel 184dcf75a7 Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list. 2015-01-20 22:54:25 +01:00
fabrixxm 816d3f86e7 reword checkbox help text 2015-01-20 22:17:03 +01:00
fabrixxm b2527039b7 add text-only email option 
add a checkbok to notification settings. if checked, html body is not added to email.
 2015-01-20 19:19:58 +01:00
Tobias Diekershoff 3483cd35f8 use HTML5 attributes in the installer wizard 2015-01-16 19:32:31 +01:00
Johannes Schwab 9cb3a4188e fix network tab urls 2015-01-16 02:25:17 +01:00
Michael Vogel beaca70126 OStatus: Replies now arrive their target. 2015-01-12 00:14:51 +01:00
Michael Vogel 94fb0305f7 Poco now shows "about" and the location as well. 2015-01-10 00:34:08 +01:00
Michael Vogel 8f1cfac20a The global contacts now contain the network name so that the suggestions can select between this. 2015-01-08 07:59:20 +01:00
Michael Vogel 46db8575a0 The table "unique_contacts" now has an "about" and "location" field as well. 2015-01-08 01:32:19 +01:00
Michael Vogel 044eaa778f Markdown is now supported in the location field as well. 2015-01-08 00:13:43 +01:00
Michael Vogel e7e3857f5c The "about" section is now run through bbcode. 2015-01-07 18:06:32 +01:00
Michael Vogel b36d799044 Fetching "location" and "about" from diaspora. Displaying them on the "display" page. 2015-01-07 01:46:13 +01:00
Michael Vogel 16e4e61cc5 Only show contacts from open networks 2015-01-05 22:44:55 +01:00
Michael Vogel 011f5b9cae Bugfix: Postings disappeared due to a small variable ... 2015-01-05 14:28:17 +01:00
Michael Vogel 47560fc6c7 Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco 2015-01-04 21:07:45 +01:00
Michael Vogel 47129c01f8 Check for filesize before trying to fetch site infos. 2015-01-04 20:04:59 +01:00
Michael Vogel 11c82816b3 Poco now returns the last update date as well. This date will be stored in the gcontact table. 2015-01-04 19:19:47 +01:00
fabrixxm ecc76c6090 Merge pull request #1254 from annando/1409-shadow-items 
Global Community
 2014-12-31 18:13:58 +01:00
Rabuzarus 5939a8cea5 revert last commit f59e574, remove some html code 2014-12-26 14:44:48 +01:00
Rabuzarus f59e574068 removed Pagination 2014-12-26 12:54:23 +01:00
Rabuzarus cb47fdfcb9 minor change: rel should not be part of the PHP 2014-12-26 03:32:21 +01:00
Rabuzarus 73f9d06e3e move some html code from photos.php to photo_album.tpl 2014-12-25 16:20:55 +01:00
Michael Vogel 043c406091 Update function for creating the shadow entries. 2014-12-21 21:19:37 +01:00
Michael Vogel d054ac8d9c redone the changes I accidentally overwrote ... Me and GIT will never be in love ... 2014-12-21 11:02:31 +01:00
Michael Vogel bc5c470cac Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active 2014-12-14 12:47:16 +01:00
Michael Vogel 086b3e30c6 Clarification for the hidewall property. 2014-12-12 23:03:23 +01:00
Michael Vogel 9124d922e9 In "parse_url" now links with [ or ] are replaced with shortened versions to avoid parsing problems. 2014-12-01 22:54:01 +01:00
Michael Vogel 9a414cc4a0 Bugfix: There was a SQL error when trying to deliver friendica posts because of a parameter mismatch 2014-11-15 19:21:54 +01:00
Fabrixxm 2fee5966f1 fix #1222 2014-11-10 15:37:52 +01:00
Fabrixxm 84e93602de small indentation fix 2014-11-10 15:07:35 +01:00
fabrixxm fd61391e3e Merge pull request #1221 from annando/1411-default-value-type 
Fix: "not null" fields were not set
 2014-11-10 09:57:42 +01:00
Michael Vogel 030784ad35 Fix for issue "Field 'type' doesn't have a default value" in the challenge table. 2014-11-08 20:52:15 +01:00
Michael Vogel 70ba1667e1 It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions. 2014-11-08 00:07:21 +01:00
Michael Vogel 691aa17025 fetch further information: it is now possible to define a blacklist for keywords for "fetch further information" 2014-10-30 00:24:23 +01:00
tobiasd ec4e3d76bc Merge pull request #1212 from annando/1410-remote-self 
Remote-Self is now working for Friendica and Diaspora contacts as well
 2014-10-29 15:06:21 +01:00
Michael Vogel 59517f6e58 Remote self is now working for diaspora contacts as well. 2014-10-29 01:42:43 +01:00
Michael Vogel 3e57954807 remote-self: Moved the code in a single function and cleaned it up. 2014-10-29 01:05:09 +01:00
Michael Vogel b1cdaefcb2 Merge branch 'develop' of github.com:annando/friendica into 1410-remote-self 2014-10-27 11:45:39 +01:00
Michael Vogel 2b5372aebe Forcing all non-SSL requests to SSL requests is now an option. 2014-10-26 22:15:12 +01:00
fabrixxm 4c66a3486a Merge pull request #1207 from annando/1410-remote-self-with-keywords 
remote self: There is now an option if the keyswords should be used as tags or not
 2014-10-24 10:55:22 +02:00
Michael Vogel c77a63fb27 remote self: There is now an option if the keyswords should be used as tags or not. 2014-10-24 01:37:33 +02:00
Michael Vogel 26c82f210e Merge pull request #1198 from fabrixxm/issues/1190 
Issues/1190
 2014-10-23 22:29:50 +02:00
Fabrixxm f7cf72e450 fix use of $->query_string 2014-10-22 09:32:24 +02:00
Fabrixxm 63168905ec Fix #1190 2014-10-22 09:04:32 +02:00
Michael Vogel f6522658f6 Using "remote self" to synchronize Frandiaca accounts 2014-10-22 08:30:16 +02:00
fabrixxm 9d6bcd2572 Merge pull request #1195 from annando/1410-new-hook-getsiteinfo 
New hook "getsiteinfo" and "page_info_data"
 2014-10-22 08:18:42 +02:00
Michael Vogel 97ec2787c6 New feature: Storing the field "extid" is now possible 2014-10-20 08:21:23 +02:00
Michael Vogel 3600289262 New hook "getsiteinfo", separating fetching site info from generating bbcode 2014-10-20 08:03:47 +02:00
Tobias Diekershoff 56cd536652 use noscrape by default, add opt-out option to disable it 2014-10-13 19:19:54 +02:00
fabrixxm bff688ef91 Merge pull request #1175 from fabrixxm/master 
Friendica 'Ginger' 3.3
 2014-10-06 10:18:36 +02:00
Fabrixxm e2dc4f922c Friendica 'Ginger' 3.3 2014-10-06 08:56:55 +02:00
Michael Vogel 759f199b6f Created hashtags from keywords now are links. URL are cleaned from tracking data. 2014-10-03 13:02:15 +02:00
Michael Vogel 904f8ac422 Creating hashtags from keywords of a feed, when additional data should be fetched. 2014-10-03 12:18:33 +02:00
Michael Vogel 459fc2fabd Security issue: Encoding of GUID in itemcache to avoid directory bypassing with a malificious formatted GUID. 2014-09-27 12:49:00 +02:00
Fabrixxm 51e6c30188 add id to album name tag 
this should be in template
 2014-09-17 11:02:18 +02:00
Fabrixxm f971f52482 remove messages link from notification tabs bar 2014-09-17 11:01:47 +02:00
Fabrixxm fbe664cc44 fix settings page aside menu active item 
add aside menu to delegate page
 2014-09-17 11:00:34 +02:00
Michael Vogel f9bec79a2c In the profiles the remote connect field was missing 2014-09-11 23:38:24 +02:00
Michael Vogel c8482ae19e Bugfix: When repairing the url, the nurl wasn't set. 2014-09-11 23:37:55 +02:00
fabrixxm 7687342849 fix email for 
- registration request
- registration approval
- account created by admin

add a reditect after registration approval or deny
 2014-09-09 22:07:47 +02:00
fabrixxm 3ac5e4508b fix email to new registerd users. 
fix notification in case of error sending email.
 2014-09-07 17:46:31 +02:00
fabrixxm 21b1e09fad Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup 2014-09-07 14:28:03 +02:00
fabrixxm a8c90155f8 db update mail via notification() 
remove last template
 2014-09-07 14:23:03 +02:00
fabrixxm 5861bdd6e9 registration request as system notification 
kill the template
send email to all admins
 2014-09-07 13:55:02 +02:00
fabrixxm 5997fb19ee More template gore! 2014-09-07 12:29:13 +02:00
fabrixxm 803854738b another massacre of templates 2014-09-07 11:48:23 +02:00
fabrixxm 36a67158d2 Merge pull request #1119 from annando/1409-issue-881 
The useragent string doesn't contains of the words "Mozilla" anymore
 2014-09-07 11:41:51 +02:00
fabrixxm 89f8341ce8 Merge pull request #1117 from annando/1409-suppress-unsported-themes 
Unsupported themes aren't displayed anymore
 2014-09-07 11:37:25 +02:00
fabrixxm fe02619114 fix indentation 2014-09-07 11:31:42 +02:00
fabrixxm 9a0c37eb47 new password mail via notification() 
new include/text.php::deindent() function
remove unused templates
 2014-09-07 11:20:06 +02:00
Michael Vogel 7af5c3c560 The useragent string doesn't contains of the words "Mozilla" anymore - but the name "Friendica" and the base url 2014-09-07 10:47:37 +02:00
fabrixxm d85bdd8fb0 lost password verification mail via notification() 2014-09-07 10:27:39 +02:00
Michael Vogel 871b425c6e Unsupported themes aren't displayed anymore 2014-09-07 10:06:57 +02:00
fabrixxm 1bdddebd44 connection confirm notification mail via notification() 
remove unused email templates
add a check for unexpected reponse from server
 2014-09-06 17:28:46 +02:00
Michael Vogel 3b6c6d0cd9 Issue 1094: "remote self" is not working on twitter contacts but can be activated. It is now disabled to enable it. 2014-09-06 17:22:59 +02:00
tobiasd 0e9c8f6f1a Merge pull request #1108 from tugelbend/master 
jquery update to version 1.11
 2014-09-06 16:35:24 +02:00
hauke 87fa2ee2af updated jquery to version 1.11, updated themes frost and diabook where necessary 2014-09-06 16:21:03 +02:00
tobiasd ca1f408f9b Merge pull request #1107 from annando/1409-issue-964 
Issue 964 "Image upload from Twidere" is solved now
 2014-09-06 15:57:35 +02:00
Michael Vogel f8845b6014 Issue 964 "Image upload from Twidere" is solved now 2014-09-06 15:47:45 +02:00
Tobias Diekershoff 2312b56947 when editing a posting save it, not edit it to submit the changes 2014-09-06 12:49:34 +02:00
tobiasd 7eef05e4f5 Merge pull request #1098 from Beanow/release/profile-editor-improvements 
Profile editor improvements
 2014-09-05 22:20:31 +02:00
Beanow 992684c362 Merge branch 'feature/edit-profile-improvements' into develop 2014-09-04 23:58:22 +02:00
Michael Vogel e21bcb82d2 Enhance the database structure checks when they failed. 2014-09-04 09:26:56 +02:00
Michael Vogel e32e458cb8 Added new file for ignoring threads 2014-09-04 01:04:43 +02:00
Michael Vogel dd908c8415 Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct messages. 2014-09-03 01:03:23 +02:00
Michael Vogel 2b182b2dcf After a new friendica contact is added, the user is directed to the contact page of the new contact. (Instead of the remote profile) 2014-09-01 16:55:16 +02:00
Michael Vogel e35c55dd3b Remote-self: It is now possible to chose between two different modes of mirroring. 2014-09-01 14:00:21 +02:00
Michael Vogel 4bdd905b3e Only show foreign items if the profile of the user isn't hidden. Show the user's theme - not the theme of the viewed profile. 2014-08-28 01:06:41 +02:00
Michael Vogel 4ad2bbddc7 If a post is a pure reshare, then show the profile of the original author on the display page. 2014-08-26 17:10:46 +02:00
Michael Vogel 69bb3ff637 Make the network page the new default page after login. 2014-08-25 23:34:29 +02:00
Michael Vogel dd511ac70a The "display" page now shows the current author profile with a "connect" link (if there is no current connection) 2014-08-25 14:09:56 +02:00
Michael Vogel 94d2557077 Vier: Some more design changes to "plus" style. 2014-08-21 01:00:56 +02:00
Michael Vogel d23d26f44d Reduced options when adding a friendica contact and an address was provided via URL parameter. 2014-08-21 00:56:21 +02:00
Michael Vogel 271a184e1e proxy: Added support for long addresses. "vier": New style "Plus" 2014-08-16 01:40:38 +02:00
Michael Vogel de75d8ca7f Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
 2014-08-13 00:18:05 +02:00
Michael Vogel d4b2d3bf8a Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings. 2014-08-13 00:13:13 +02:00
tobiasd d28c1febc7 Merge pull request #1069 from annando/master 
Solved (possible) encoding problem, encoding of URLs with GUID
 2014-08-12 09:01:12 +02:00
tobiasd 016b6428a0 Merge pull request #1067 from Beanow/feature/noscrape 
Added noscrape feature.
 2014-08-10 13:24:21 +02:00
Beanow 9026810496 Added noscrape feature. 2014-08-10 12:45:34 +02:00
Michael Vogel b99737986d The GUID in the link to the items has to be encoded, since it could contain special characters 2014-08-09 09:17:28 +02:00
tobiasd cf0ebd952f Merge pull request #1065 from annando/master 
Refreshing of the network page only when the page is at the beginning
 2014-08-07 08:42:25 +02:00
Michael Vogel f2f73799ba When storing items, the object-type is detected and stored. 2014-08-07 08:02:24 +02:00
Michael Vogel e974e586cc Unified user agent string when fetching data. 2014-08-07 07:58:20 +02:00
Michael Vogel 4d6f28d224 Optimized version of the possibility to reload the content of the network page only at its top. 2014-08-02 00:35:25 +02:00
Michael Vogel 1a865bf400 New description for the option to reload the page only when on top. 2014-08-01 20:11:56 +02:00
Michael Vogel 2f89a9b3e8 Auto update of network page only at top of the page 2014-08-01 19:59:06 +02:00
fabrixxm 27024e3b1d preferred item image size for theme, get smallest photo near scale requested 
themes can declare preferred image size for images in items, with

   $a->theme_info = array(
    "item_image_size" => 1
   );

0: original, 1:640px, 2:320px

mod/photo.php returns the nearest scaled image near requested one
if it doesn't exists, instead of nothing
 2014-07-30 15:37:34 +02:00
Michael Vogel 25237c0929 Make the friendica android client work again (it had problems with the GUID in the notifications) 2014-07-26 15:01:01 +02:00
Michael Vogel dbcfe58ea8 parse_url: Removing of warnings with invalid charsets 2014-07-24 22:50:56 +02:00
Michael Vogel ed1dce93d6 Usage of /display/(guid) as path instead of /display/(user)/(id) 
Bugfix for adding tags to photos
 2014-07-22 00:36:20 +02:00
Michael Vogel bb5f797047 Preventing an endless loop while fetching site infos 2014-07-14 08:37:40 +02:00
Michael Vogel 58c3ac09a3 Improved option to suppress message flooding by some users. 2014-07-10 23:13:50 +02:00
Michael Vogel 6f5bc8d9a7 Setting the user agent to "Mozilla/5.0 (compatible; Friendica)" 2014-07-10 23:13:07 +02:00
tobiasd 829a92a10e Merge pull request #1042 from annando/master 
Workaround for likes from Diaspora, disabling of the automatic reload of the network page
 2014-07-10 07:45:27 +02:00
Michael Vogel 6e67d39241 Relocate the site now relocates adresses in the "unique_contacts" table as well. 2014-07-09 21:36:20 +02:00
Michael Vogel c980e6d20d Possibility to disable the automatic reload of the network page 2014-07-09 21:32:32 +02:00
Michael Vogel 660bd39efa Let an item be accssible via the GUI (additionally to uid and item id) 2014-07-09 20:48:34 +02:00
Beanow e9dc6e4faa Some changes to the labels and an edit profile button. 2014-07-03 18:39:22 +02:00
Beanow 6089bc94b3 Extend profile editor information. 
* Labels for splitting fields into sections.
* Security token for profile_photo action.
 2014-06-28 01:31:11 +02:00
Beanow e6364f6680 Redirect profiles list to default profile, when multi_profiles is disabled. 2014-06-28 01:30:10 +02:00
Beanow a3895c8dee Exposes new profile data for templating. 
* Boolean value of whether multi_profiles is enabled.
* Array needed for yesno_field for the hide-friends option.
 2014-06-27 18:12:15 +02:00
tobiasd 3600ab1ffc Merge pull request #1033 from annando/master 
Temporary paths are now defined automatically
 2014-06-24 06:29:35 +02:00
Michael Vogel 5ed5773f57 The temporary paths (temp, lock, itemcache) are now detected automatically when used. 2014-06-23 01:24:39 +02:00
Tobias Diekershoff b6e546d1e3 don't add http:// if homepage is not set 2014-06-22 09:44:59 +02:00
Michael Vogel 405a0aaee2 Community: New option to reduce the maximum amount if posts per person. 2014-06-10 20:21:43 +02:00
Michael Vogel 48e2b422dd Preparation for an bidirectional app.net connector 2014-06-04 21:25:31 +02:00
Michael Vogel 0c77cee667 New database update system that uses the database structure defined in dbstructure.php 2014-06-04 00:44:58 +02:00
Michael Vogel 13fea42d8c Merge remote-tracking branch 'upstream/master' 2014-05-29 23:04:57 +02:00
Michael Vogel 00b8355ad5 The number of comments per post are now editable. 2014-05-29 22:26:03 +02:00
fabrixxm d5f80f54d4 Merge pull request #999 from annando/master 
Starring now works again
 2014-05-29 14:22:15 +02:00
Michael Vogel 3da39a0b0d Starring now works again 2014-05-29 14:17:37 +02:00
fabrixxm 77a54c66be Merge pull request #998 from annando/master 
"Vier": New font version, fallback for oembed, more tracking variables removed
 2014-05-29 14:04:04 +02:00
Michael Vogel 53d925095f Added some functionality if oembed isn't working. (Should be extended in the future) 2014-05-29 11:45:32 +02:00
tobiasd 97e74f1570 Merge pull request #987 from annando/master 
Auto-killing processes, somce changed code in the plaintext function and speed issues in network
 2014-05-25 07:59:22 +02:00
Michael Vogel 235eae66bb New query parameter that Speeds up the network viee when there are many contacts 2014-05-24 11:01:52 +02:00
tobiasd 01c146414c Merge pull request #965 from annando/master 
Only show connectors when not "hide wall" is enabled
 2014-05-10 06:28:41 +02:00
tobiasd 31312ab1d2 Merge pull request #956 from annando/master 
New database system that uses PDO if present/Test script for doing database upgrades.
 2014-05-09 21:55:01 +02:00
Michael Vogel 5616c58535 Better error handling during install. 2014-05-09 20:44:25 +02:00
Tobias Diekershoff fd7e17f91e save selection to suppress language results (fix 961) 2014-05-05 13:44:33 +02:00
Michael Vogel 6b38968f80 The template "register_adminadd_eml.tpl" was missing for all languages except german. That lead to an empty page when adding users. 2014-05-04 21:11:25 +02:00
Michael Vogel c41b1c2d55 Building a central functionality to export postings to all networks that only support plaintext postings. In near future this will replace the similar code in the several addons. 2014-05-03 12:04:54 +02:00
Michael Vogel 2db1029830 APC support is removed due to problems with PHP 5.5. 2014-05-03 12:02:25 +02:00
Michael Vogel a6b03b6263 The remove page now has the settings menu. 2014-04-29 22:34:48 +02:00
Michael Vogel 7b7e372fb0 Suppress showing unsupported addons in the administration. 2014-04-29 14:22:37 +02:00
Fabrixxm aba27ad404 fix photo comments: use $drop array as in wall_thread and search_item 2014-04-28 09:29:48 -04:00
tobiasd a9c8aed9b1 Merge pull request #942 from davidmoerike/master 
Line: 68 f.
 2014-04-26 09:16:03 +02:00
tobiasd c1d14bcc98 Merge pull request #944 from annando/master 
Some more frontend stuff/Native Diaspora reshare
 2014-04-26 09:13:17 +02:00
Michael Vogel 2846dfeb05 Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values. 2014-04-26 02:22:30 +02:00
David 741aab0916 Now more friendly error message. Will tomorrow add a german translation. 
David
 2014-04-25 06:29:03 +02:00
Tobias Diekershoff 2dfbd448a3 ideni.ca is now pump.io, so don't mention it in OStatus settings 2014-04-24 21:18:12 +02:00
Michael Vogel 9ae9b66328 Export personal data: Now the settings menu on the left side is taken from the settings module. 2014-04-24 11:58:04 +02:00
Michael Vogel b9656cbe23 Delegations: Now the menu of the settings appears at the delegations settings 2014-04-24 11:49:11 +02:00
fabrixxm 807fc60d3e Merge pull request #941 from annando/master 
Moved and renamed menu entries to improve the usability, global css, icons for social networks
 2014-04-24 10:48:07 +02:00
Michael Vogel 30efb0c1e6 menu entry for "Delegations" moved to the settings. 2014-04-24 10:16:02 +02:00
David 44beff1a9a Line: 68 f. 
When trying to upload a file greater than PHP's max_upload_filesize,

the filesize is 0, and maybe some html code appears in the
text input window of the form. Problem seems to disappear
when refusing all uploads if filesize <=0.
 2014-04-23 20:22:53 +02:00
fabrixxm 84189ac775 Merge pull request #932 from annando/master 
Preparation for bidirectional statusnet sync, functions moved from addons into the core and some converting stuff
 2014-04-07 09:53:47 +02:00
Michael Vogel 5f3d584716 Code beautification and some more logging data - no changes in the functionality. 2014-04-04 11:02:36 +02:00
Michael Vogel 12866209e8 parse url: Emtpy values in meta headers are now ignored. Oembed data has priority. Videos are embedded with some further information. 2014-04-04 10:58:31 +02:00
Michael Vogel 77986d76fa Preparations for statusnet connector import 2014-04-04 10:40:46 +02:00
fabrixxm 29092ace44 Merge pull request #927 from annando/master 
Massive SQL stuff
 2014-04-04 07:28:06 +00:00
Michael Vogel e1a41aff05 Groups should now be fast (and accurate) 2014-03-20 23:34:09 +01:00
Michael Vogel a03014a47c Adding functions for the file- and category handling 2014-03-20 18:51:13 +01:00
Michael Vogel 8689ab3e1b Now changing categories also changes them in the term table. 2014-03-20 18:48:08 +01:00
Michael Vogel 9877e43bda Search with tags now works fast. 2014-03-18 22:51:50 +01:00
Michael Vogel 8392217b72 Fixing SQL problem and speeding up search. 2014-03-16 22:42:47 +01:00
Michael Vogel b23dd95c5e OStatus auto completion: option to completely disable the auto completion. 2014-03-16 18:09:42 +01:00
Michael Vogel 285f0774a1 Auto creation of photo directory to improve caching 2014-03-16 17:49:56 +01:00
Michael Vogel b013537124 parse url: Improvements for detecting the page type 2014-03-16 17:48:28 +01:00
Michael Vogel 9496537e5f Now term table is used for categories and putting items to folder 2014-03-16 17:16:01 +01:00
Michael Vogel bbf9378a49 Even more SQL improvements. 2014-03-16 17:12:56 +01:00
Michael Vogel 6e7bd68ebb More "LIMIT 1" removed - and some other SQL improvements. 2014-03-11 23:52:32 +01:00
Michael Vogel 6b8585d48d Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete. 2014-03-09 09:19:14 +01:00
tobiasd d29c981aa2 Merge pull request #919 from annando/master 
plink, disabling features, triming the content of parsed urls
 2014-03-02 08:31:03 +01:00
Michael Vogel 37edb3079d parse_url: Trim the content of the description field. 2014-03-02 01:00:36 +01:00
tobiasd 0eec22f656 Merge pull request #914 from annando/master 
Vier, API and Twitter cards
 2014-02-24 07:21:15 +01:00
Michael Vogel 608d5255ec Support for twitter cards (in both directions) 2014-02-22 15:46:19 +01:00
tobiasd 623bf1c4d1 Merge pull request #912 from annando/master 
More compatible "Vier", more speed and problems with some parsed characters
 2014-02-17 08:00:21 +01:00
Michael Vogel 254159cc26 Only some code beautification. 2014-02-16 17:36:52 +01:00
Michael Vogel 7cba752f8a parse url: Characters like < and > has to be escaped when showing the parsed output. 2014-02-16 17:35:01 +01:00
Michael Vogel 046096e705 Speeding up showing marked posts. 2014-02-16 17:30:42 +01:00
tobiasd d473cd9bc9 Merge pull request #902 from annando/master 
schema.org and oembed
 2014-01-28 09:28:43 -08:00
Michael Vogel a7079d4327 Adding metadata in the schema.org format. 2014-01-26 09:58:41 +01:00
fabrixxm d1befd9069 Merge pull request #890 from tobiasd/bbcode_in_registertext 
add bbcode support for the page register textfield (close #871)
 2014-01-18 01:02:02 -08:00
Tobias Diekershoff b84502c4e6 move <div> to the register.tpl 2014-01-13 14:40:26 +01:00
Tobias Diekershoff fda7bdca2e better logic 2014-01-13 14:25:50 +01:00
Tobias Diekershoff 0d7c91fc10 added a check for http in homepage url, this should fix issue #768 2014-01-12 09:16:46 +01:00
Tobias Diekershoff c52ae17df4 add bbcode support for the page register textfield (Bug #871) 2014-01-12 08:40:52 +01:00
Michael Vogel 8eedebfee3 Cleaning up some changes from the merge 2014-01-05 16:28:42 +01:00
Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/crepair.php
 2014-01-05 16:22:42 +01:00
Michael Vogel 28df35052a Send notifications for each new post of a contact, option for creating a summary for a feed post 2014-01-05 16:10:02 +01:00
fabrixxm 7b5018fb76 Merge pull request #872 from annando/master 
API: Supporting twidere, better supporting of the network field in the item table
 2013-12-27 00:15:44 -08:00
Michael Vogel 4b0e370c4c Better handling of the network field in the item table. 2013-12-27 01:58:21 +01:00
fabrixxm 230ce659bd Merge pull request #866 from annando/master 
API: reworked
 2013-12-26 02:12:27 -08:00
Tobias Diekershoff 25d83f780d only show the remote_self option if admin allows it 2013-12-22 19:30:09 +01:00
Tobias Diekershoff f515def280 added remote_self as option to the contact repair dislog 2013-12-22 17:05:49 +01:00
Tobias Diekershoff 22a6c72b31 added option to the admin panel to allow users to set the remote_self flag 2013-12-22 16:14:34 +01:00
Fabrixxm 9febcedf93 user contacts: fix #797 , add searching in url and nickname, add batch actions 2013-12-17 05:19:06 -05:00
Michael Vogel 5130b19f5e API: API is reworked in many parts so that it should be compatible to more statusnet clients then before (like AndStatus) 2013-12-15 23:00:47 +01:00
Michael Vogel 7e5c8ab91c Keeping an offset for page switching: This helps so that you don't see old messages 2013-12-10 00:13:19 +01:00
Michael Vogel d20d2f74ae Bugfix: Page switching had a problem with the search. And automatic reloading hadn't worked with some search terms 2013-12-08 20:10:28 +01:00
Michael Vogel bae844e367 New style for shared links. Preparation for changes in some addons 2013-12-08 16:49:07 +01:00
Michael Vogel 3b4a20f987 SQL improvements. New parameter for a maximum amount of comments per thread 2013-12-08 14:49:24 +01:00
Michael Vogel b0dd16696a Solving some more SQL warnings ("limit" must never be used in update statements) 2013-12-02 20:30:24 +01:00
Michael Vogel 4f38969148 Optional parameter for parseurl to only fetch data from meta information 2013-12-02 20:24:41 +01:00
Michael Vogel 70e017745a Just some code beautification. 2013-12-02 00:41:59 +01:00
Michael Vogel e0cf2c5167 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
	mod/settings.php
 2013-12-02 00:33:46 +01:00
Michael Vogel 6684107b66 multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma. 2013-12-02 00:11:31 +01:00
Mats Sjöberg 2859ce1483 Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work. 2013-11-21 21:44:18 +02:00
Tobias Diekershoff 9144dd3780 rename some fields to fix issue #775 2013-11-17 16:45:24 +01:00
Tobias Diekershoff 5fd58b29e0 wording for the SUBMIT button while handling with contact groups 2013-11-17 15:33:07 +01:00
Tobias Diekershoff 4101127c01 better worting of the SUBMIT button in the settings tab and the admin panel 2013-11-17 15:22:11 +01:00
Fabrixxm 0414e0a316 More "relocate": 
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
 2013-11-13 06:07:49 -05:00
fabrixxm 3964d86020 Merge pull request #817 from annando/master 
SQL: Query for showing group posts is improved, order by comment date now is working again
 2013-11-11 01:51:58 -08:00
maase2 940f55a2ec Update admin.php 
Improve the SQL query to keep the result quantity small
 2013-11-10 13:23:06 +01:00
Michael Vogel 7ba1416e64 SQL: Query for showing group posts is improved, order by comment date now work again 2013-11-08 08:11:39 +01:00
Michael Vogel eaefcf9de7 All subqueries in tag searches are now reformed. Further SQL improvements 2013-11-03 02:07:44 +01:00
Michael Vogel 759015e5fd Removed many "limit 1" at update and delete queries since they were superflous und generated massiv logfile entries 2013-11-02 16:13:11 +01:00
Michael Vogel 53c06a3625 Several performance improvements. 2013-11-02 10:49:44 +01:00
Tobias Diekershoff 8faeee9965 added config->info and system-suppress_language options to the admin panel 2013-10-20 16:17:39 +02:00
Michael Vogel 028dc3c3b4 Switching the user agent because CloudFlare has blocked the old one 2013-10-15 01:11:01 +02:00
Michael Vogel e70b110984 Switching from "new share" to "old share" 2013-10-15 00:49:49 +02:00
Michael Vogel 1b0b686116 Speeding up the search for tags. 2013-10-15 00:49:13 +02:00
Michael Vogel 693b6d0fd4 Infinite scroll: At the end of the network page new content is loaded automatically 2013-10-15 00:43:11 +02:00
Michael Vogel 370d8d7063 Reverting a forced index. It was good for a profile with many entries - but not on a profile with only a few items. 2013-10-12 08:22:49 +02:00
Michael Vogel 2d1b261fad Speed improvements of queries 2013-10-05 12:30:10 +02:00
Michael Vogel ab7d8bc6ab Delete all APC values before showing them in the settings and admin section 2013-09-27 23:02:59 +02:00
Michael Vogel 34d0eb709b Merge remote-tracking branch 'upstream/master' 2013-09-15 19:39:22 +02:00
Michael Vogel d5ae5ecedd - Improved speed due to forced indexes when showing items. 
- Possibility to setup a hostname
 2013-09-15 10:40:58 +02:00
Silke Meyer 9152198927 Added link to import a profile im register tpl 2013-09-04 20:51:04 +02:00
Tobias Diekershoff 3ff982be99 we use the bugtracker on github now 2013-08-20 11:35:26 +02:00
Michael Vogel e40bcbb4bc Some debugging information added 2013-08-05 23:06:40 +02:00
Michael Vogel 741b932cc9 Merge remote-tracking branch 'upstream/master' 2013-08-05 20:32:02 +02:00
Michael Vogel f70a80bbe5 Changed the tag search. This hopefully speeds it up on larger systems. 2013-08-05 20:31:08 +02:00
fabrixxm 3e4c4f53f7 Merge pull request #750 from zered/deleted_user_disp 
Deleted user display in admin page
 2013-08-05 04:24:54 -07:00
Zered 82972be85e Adding a "User waiting for permanent deletion" table in admin page 2013-08-05 06:08:33 +02:00
Fabrixxm 2f6333c751 remove debug code. again. 2013-08-04 03:11:01 -04:00
Fabrixxm 11d1c1ae8e add tag to term table. fix "#xNNNN" tag filter. 2013-08-03 15:12:50 -04:00
Tobias Diekershoff 0972189372 allow admins to add a new user from the admin panel (eventually fixing oldbug #383) 2013-07-21 08:46:57 +02:00
fabrixxm a4a3ad5327 Merge pull request #720 from fabrixxm/feed_push 
Feed PuSH
 2013-07-01 10:16:53 -07:00
Fabrixxm 759afb4237 uexport: fix full export 
- add new line after each valid json line
- export table row as single json object
 2013-06-28 03:16:25 -04:00
Fabrixxm 0a1697d13a add pubsubhubbub support to feed contacts 2013-06-27 09:51:13 -04:00
Michael Vogel 323186864e Merge remote-tracking branch 'upstream/master' 2013-06-08 12:30:36 +02:00
Michael Vogel a2cef94d8b ostatus completion of threads now works with longer threads well. 2013-06-08 12:28:19 +02:00
Abinoam Jr a29f592ba7 Fix tiny typo on mod/uimport.php 2013-05-29 10:00:35 -03:00
friendica 0cc641fbbc messaging 2013-05-22 22:30:53 -07:00
friendica 6ec1bd2fa8 double quotes in title mess up editpost 2013-05-18 16:02:31 -07:00
Zach Prezkuta 35358baac9 update to v4.0.0; point to local host of SWF 2013-05-11 10:55:09 -06:00
fermionic 3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support 
basic video playback support using VideoJS
 2013-05-11 08:33:36 -07:00
friendica 2c8d33a6e2 rev update 2013-05-09 01:15:22 -07:00
Zach Prezkuta fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06:00
friendica 36f2930e52 http status for disallowed feeds 2013-04-23 20:12:49 -07:00
friendica 115c8a53bf issue546 via Tobias 2013-04-23 18:58:52 -07:00
Tobias Diekershoff b6d1a1f125 tabwidth 2013-04-14 18:19:01 +02:00
Tobias Diekershoff 4dd406055c check password when changing users email 2013-04-14 17:58:16 +02:00
Tobias Diekershoff 5827db0ea3 check current password before changing the password 2013-04-14 17:22:42 +02:00
Zach Prezkuta 2cc73dbef3 allow visiting other people's display/ links if I have a copy of the post 2013-04-07 11:38:37 -06:00
friendica 9660117c70 sync username when changed in either the default profile or the settings page 2013-04-04 15:10:14 -07:00
Tobias Diekershoff c43e65e26b OStatus conversation poll option in the admin panel 2013-03-25 11:00:13 +01:00
Tobias Diekershoff 4ee23069ad typo found in the php.logs 2013-03-24 09:37:11 +01:00
Tobias Diekershoff 39cc7f4565 use _Enable Debugging_ instead of only _Debugging_ in the interface 2013-03-19 07:01:34 +01:00
friendica 108f2e1b81 Merge https://github.com/friendica/friendica into pull 2013-03-18 16:41:56 -07:00
friendica 1ff37ca4c1 double encode any text that is destined for meta fields. 2013-03-18 16:40:33 -07:00
Zach Prezkuta 03f2fa5119 prevent infinite redirect on network page for non-existant group 2013-03-16 10:11:32 -06:00
tobiasd 3bf560f22f Merge pull request #643 from annando/master 
Vier - many changes
 2013-03-05 22:06:39 -08:00
fermionic 1b74e3ff10 Merge pull request #644 from fermionic/20130303-no-embedding-private-images-option 
fix disable embedding option description
 2013-03-04 15:57:57 -08:00
Zach Prezkuta 277c47732b fix disable embedding option description 2013-03-04 16:55:07 -07:00
Michael Vogel 86e19dda22 Vier: Some more changes to the theme. 
Added a switch to suppress displaying of the tags.
 2013-03-05 00:46:11 +01:00
friendica 1c55b0b359 Merge pull request #639 from annando/master 
Community/Open Graph
 2013-03-03 12:07:52 -08:00
friendica ee70e02d0d Merge pull request #640 from fermionic/20130303-no-embedding-private-images-option 
allow admin to prevent private image embedding on hub
 2013-03-03 12:07:35 -08:00
Olaf Conradi aa7aa59def Fix SQL error for missing AND operator 
AND operator was missing from WHERE clause
 2013-03-03 20:44:52 +01:00
Zach Prezkuta 0187283709 allow admin to prevent private image embedding on hub 2013-03-03 09:44:41 -07:00
Michael Vogel 05597b564d Merge remote-tracking branch 'upstream/master' 2013-03-03 16:30:18 +01:00
friendica f07df4f667 merge 2013-03-02 15:46:54 -08:00
Michael Vogel 2866f62c88 Suppoorting Open Graph and Dublin Core when displaying single item 
Following link shorteners in parse_url
 2013-03-02 14:46:06 +01:00
Fabrixxm 4791e5b245 install: add check for php-cli 
Check won't pass if $php -v won't return "(cli)"
 2013-03-01 04:43:04 -05:00
Thomas Willingham f5d15a7ff8 Add support for members-only addons 2013-02-28 00:29:06 +00:00
Tobias Diekershoff 7186331a89 Admin panel: show if an account has expired 2013-02-25 13:02:17 +01:00
Michael Vogel c35feb27f2 community: Only show top postings, no comments 
parse_url: Follow location in "meta"-header
 2013-02-24 12:54:53 +01:00
Zach Prezkuta 3843f821b2 better description 2013-02-23 09:33:29 -07:00
Zach Prezkuta 4db50a3ecb admin option to disable post content in email notifications for the site 2013-02-23 09:31:34 -07:00
Michael Vogel 0d4d15c73d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
 2013-02-20 21:57:26 +01:00
Michael Vogel c90272e2ae supressing warning when importing items. Speeding up community. Changed query for the search. 2013-02-20 21:47:36 +01:00
Tobias Diekershoff 8e65e95d17 add multi vs. single user config to the admin panel 2013-02-17 17:42:32 +01:00
Tobias Diekershoff aa2f1c38e9 add 'hide_help' to admin panel 2013-02-17 12:37:45 +01:00
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
 2013-02-17 12:35:40 +01:00
Tobias Diekershoff fca8a23265 use enotify to send CC mails 2013-02-17 08:20:29 +01:00
friendica 3d86f47bbd Merge pull request #618 from tobiasd/master 
use item title (if set) as mail subject
 2013-02-16 15:56:31 -08:00
Zach Prezkuta 8a8e02cb84 add support for doing a redir/ based on contact url 2013-02-16 11:38:41 -07:00
Tobias Diekershoff 77bc4cd0dc use entry title (if set) as subject when send by email 2013-02-16 11:03:46 +01:00
Fabrixxm 0a79b2300c delete item page respond with json if called via ajax. 2013-02-15 06:34:32 -05:00
Michael Vogel 5e077e541a The community page is speeded up. 
Photos will be compressed before the output.
 2013-02-06 08:01:46 +01:00
friendica b00426c9fb Merge pull request #605 from fermionic/20130204-events-request-too-many-dates 
limit event queries to one month even if no finish date is specified
 2013-02-05 17:36:58 -08:00
friendica 132600eee2 Merge pull request #603 from fermionic/20130204-info-message-shown-on-redir 
add 'quiet' paramter to redir and dfrn_poll to allow calls
 2013-02-05 17:35:39 -08:00
friendica 34c9156fa1 Merge pull request #604 from fermionic/20130204-db-debugging-in-mod-display 
take debugging commands out of mod/display
 2013-02-05 17:22:05 -08:00
friendica 70f02053e1 Merge pull request #606 from fermionic/20130204-themes-cant-use-plugin-hooks 
allow themes to use plugin hooks
 2013-02-05 17:21:42 -08:00
Zach Prezkuta 439974a5d5 allow themes to use plugin hooks 2013-02-04 20:53:53 -07:00
Zach Prezkuta 7e4d4cf375 limit event queries to one month even if no finish date is specified 2013-02-04 20:45:14 -07:00
Zach Prezkuta df53c98798 take debugging commands out of mod/display 2013-02-04 20:39:47 -07:00
Zach Prezkuta cc38986c20 add 'quiet' paramter to redir and dfrn_poll to allow calls that don't produce a Welcome info 2013-02-04 20:34:42 -07:00
friendica be29ae0bce poco xml returning 500 - but with contents? 2013-01-29 18:36:10 -08:00
Michael Vogel 2350aa54eb OStatus-Conversation auto completion works now. 
Some performance issues added as well.
 2013-01-30 01:31:27 +01:00
friendica a5ac69c65e Merge pull request #591 from fermionic/20130126-javascript-free-theme 
Decaf mobile: an (almost) Javascript-free theme
 2013-01-27 19:11:36 -08:00
friendica b58189bb98 Merge pull request #592 from fermionic/20130126-richtext-feature-fixes 
make the richtext feature work for events, wall messages, and contact notes
 2013-01-27 19:11:06 -08:00
friendica c9cce9873d search privacy enhancements for those with blocked walls 2013-01-27 13:14:13 -08:00
Michael Vogel 2cb576d305 Bugfixing after adding timestamps 2013-01-27 13:57:44 +01:00
Zach Prezkuta 187b6441c1 make the richtext feature work for events, wall messages, and contact notes 2013-01-26 13:03:01 -07:00
Zach Prezkuta 488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Michael Vogel fdee002f73 Several improvements for performance measuring 2013-01-26 18:35:39 +01:00
friendica 04b48688b6 add form security to invite page and set maximum per user invites 2013-01-25 13:48:57 -08:00
Michael Vogel 4e3d0018c6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	include/items.php
	update.php
 2013-01-20 14:07:57 +01:00
Michael Vogel 82c00660e0 Preloading of items in the cache when receiving them. 2013-01-17 23:20:40 +01:00
friendica 3742d0d5ba events with no finish date don't appear in calendar 2013-01-16 03:16:45 -08:00
friendica 30f1fb2c4d provide a date indication in reshared content 2013-01-15 14:58:50 -08:00
Zach Prezkuta 28c9123ac8 module to show system down message 2013-01-14 16:48:01 -07:00
Michael Vogel 5501dd0759 Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds. 2013-01-13 17:13:01 +01:00
Michael Vogel b9afb38f4d Some more function calls to ensure that the tags are deleted when an item is deleted 2013-01-13 15:11:06 +01:00
Michael Vogel 3dc615dd9d Adding the tag creating function to the function when a photo is tagged 2013-01-13 15:05:24 +01:00
Michael Vogel 158bfda0ac Changing the tag system to the "term" table. 2013-01-13 14:50:55 +01:00
Michael Vogel 8cef0fa80d Mentions are now displayed much faster. Attention: The related database update can last more than one minute. 
bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page.
 2013-01-13 09:37:15 +01:00
friendica 449b44fe4c Merge https://github.com/friendica/friendica into pull 2013-01-12 15:09:35 -08:00
friendica b5c0714bc4 fix live update on display page 2013-01-12 15:08:59 -08:00
friendica 8b643d4c88 Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements 
fixes and tweaks to Smarty processing
 2013-01-12 12:28:14 -08:00
Zach Prezkuta 74caf1a4a7 * Add MIME types for file attachments 
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
 2013-01-12 06:31:32 -07:00
Zach Prezkuta 609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
Michael Vogel c26cf428a6 The search now searches in the new tag table 2013-01-11 08:51:58 +01:00
Zach Prezkuta bce29054b9 allow Smarty use on international templates 2013-01-10 21:46:48 -07:00
Michael Vogel 82820d8e95 Now the third most likely languages are shown. 
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
 2013-01-09 20:54:18 +01:00
friendica 4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) 2013-01-07 20:14:00 -08:00
Thomas Willingham 0cf3d70875 If we find a home.html, also look for a home.css 2013-01-05 14:31:10 +00:00
friendica 07ba4da634 email header encoding everywhere 2013-01-04 15:47:29 -08:00
friendica c0fd572fec Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init 
Finalize theme decision in a module's _init function
 2013-01-04 14:36:47 -08:00
Zach Prezkuta fdd142c42e never use profile_load outside of a module's _init() function 2013-01-03 10:47:45 -07:00
Christian Vogeley d9961bc3b4 revert one change 2013-01-01 23:47:56 +01:00
Christian Vogeley 4ab7820663 . 2013-01-01 22:44:02 +01:00
Christian Vogeley 5bfd4cf5c4 Move HTML part of oid to template + replace outside the tpl 2013-01-01 22:40:05 +01:00
Christian Vogeley 2a3f8f8ee2 . 2013-01-01 21:08:30 +01:00
Christian Vogeley cde9b6370d Fix registration form 2013-01-01 21:05:24 +01:00
Zach Prezkuta e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
Zach Prezkuta b6981768ee remove more dashes in templates 2012-12-27 09:38:42 -07:00
friendica e935fa78c6 Merge pull request #557 from fermionic/20121224-installer-check-for-smarty3 
add write access to view/smarty3/ as a requirement for the installer
 2012-12-26 13:08:25 -08:00
Zach Prezkuta 263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
Zach Prezkuta e736abd372 small fixes; update smarty3 templates 2012-12-25 12:05:46 -07:00
Zach Prezkuta 11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
fermionic 6603758a5e Merge pull request #558 from fermionic/20121222-use-smarty-template-engine 
fix a few more templates for correct conversion to Smarty3 templates
 2012-12-24 07:47:06 -08:00
Zach Prezkuta ce445a385f fix a few more templates for correction conversion to Smarty3 templates 2012-12-24 08:44:26 -07:00
Zach Prezkuta f74a443c1b add write access to view/smarty3/ as a requirement for the installer 2012-12-24 07:59:46 -07:00
Michael Johnston cd5b9c10c4 fix filer dialog 2012-12-23 18:34:55 -05:00
fermionic 974f60d132 Merge pull request #551 from fermionic/20121222-use-smarty-template-engine 
20121222 use smarty template engine
 2012-12-23 05:31:11 -08:00
Zach Prezkuta b9f4687260 one more place where the template engine is changed 2012-12-23 06:25:50 -07:00
friendica e98dc70008 sn subscription fix 2012-12-23 02:47:14 -08:00
friendica a29842e301 Merge https://github.com/annando/friendica into annando 
Conflicts:
	view/admin_site.tpl
 2012-12-22 23:02:21 -08:00
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Michael Vogel b0759e9a9f Some more system settings are now reachable via front-end 
Bugfixing in the mail import when a reply header isn't set correctly
 2012-12-22 16:16:01 +01:00
Michael Vogel 99ca867869 The performance settings and other systems settings (lock file path, temp path) can now be set via the front end. 2012-12-21 18:23:55 +01:00
Michael Vogel 7c7d3fe5de "share" - now the attribut value for the "author" is escaped 2012-12-21 02:10:26 +01:00
Michael Vogel f4bc5c57f3 New option to enable and disable the "share" element 
Changes to "vier" to use more "font awesome" icons
 2012-12-21 00:08:58 +01:00
Michael Vogel 9ab34f8857 mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header. 2012-12-18 00:47:55 +01:00
Michael Vogel a6b1275f16 Merge remote-tracking branch 'upstream/master' 2012-12-17 10:32:53 +01:00
Michael Vogel 46c5a97a20 New caching system for photos 2012-12-14 22:47:30 +01:00
friendica 4793ebb141 change profile photo link on profile edit page 2012-12-07 16:02:40 -08:00
friendica 8ab24858fb fix "insert web link" for those without richtext feature enabled 2012-12-03 16:31:28 -08:00
friendica 1ad4f5247c default bbcode - don't check editor pref 2012-12-03 01:05:10 -08:00
friendica 8bb0f08c6c default to bbcode format when uploading photos, since default editor is now plaintext 2012-12-03 00:43:06 -08:00
friendica 79fb5509ed bug #511 - if birth year supplied but not a month or day, force a sane default. PHP datetime functions don't handle zero very well. 2012-12-02 13:47:41 -08:00
Zach Prezkuta eb964bbe08 put the correct function with the logic 2012-11-27 19:33:04 -07:00
Zach Prezkuta aef96a1d5e add support for admin choice to force an entire hub to use alt-pager 2012-11-27 19:30:46 -07:00
Thomas Willingham 8c3ea4b4d4 Add max_daily_registrations to admin panel. 2012-11-27 17:13:32 +00:00
friendica 5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica fcbdefcfd5 missing network_to_name 2012-11-22 21:04:03 -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 94204d9160 implement features 2012-11-22 09:14:22 -07:00
friendica 9835efc9e4 fix jenkins tests 2012-11-22 05:06:15 -08:00
friendica 4d289574ca ensure that auto_redir does not loop 2012-11-21 15:41:14 -08:00
Michael Vogel 25b4ec32c7 Clean up code - removed useless cache code 2012-11-17 14:27:30 +01:00
Michael Vogel f17377e6de New cache system with subdirectories 2012-11-17 00:50:39 +01:00
friendica 3dc4c52022 Merge pull request #533 from fabrixxm/moveme 
Fix issue 508
 2012-11-13 14:06:20 -08:00
fabrixxm 5a2c01d572 Merge pull request #532 from fabrixxm/quattrofixs 
template: new $item.shiny; some fix to quattro
 2012-11-13 03:08:26 -08:00
zottel c4e4ee892e Mark items read on filtered network page, but still keep the "mark everything read" mechanism on viewing the unfiltered network page. 2012-11-13 11:30:43 +01:00
Fabrixxm 9afe50d1e5 uimport: add register policy and max daily registrations check (issue 508) 2012-11-13 04:40:15 -05:00
friendica 0e95b6b527 Merge pull request #531 from fabrixxm/master 
"Move Account" docs
 2012-11-10 03:06:28 -08:00
Fabrixxm 41dfc7f29e items: new property 'shiny'. 
separate 'indent' (''|'comment') from 'shiny' (''|'shiny')
 2012-11-09 11:13:59 -05:00
Fabrixxm 1bc9f8b992 help: load Home.md in aside when not in home,add new markdown syntax 
New markdown block "warning"

    ! line1
    ! line2

will be rendered as

   <div class="md_warning"><p>line1</p><p>line2</p></div>
 2012-11-09 03:56:45 -05:00
friendica b01ca0e345 what happened to the photos page vcard? 2012-11-09 00:21:16 -08:00
fermionic cbbd68563b Merge pull request #527 from fermionic/20121106-frost-updates 
frost updates
 2012-11-07 07:41:17 -08:00
Fabrixxm 98958b4fb9 fix uexport query for groups and group members 2012-11-07 09:26:05 -05:00
Zach Prezkuta 999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
Thomas Willingham 3c61ba7f53 Uimport - slightly modify text (better English, not better doco). 2012-11-06 15:01:46 +00:00
Fabrixxm 5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
friendica 1d91b2d1b3 Merge https://github.com/friendica/friendica into pull 2012-11-04 13:43:42 -08:00
friendica caebcc5e83 rev update 2012-11-04 13:43:28 -08:00
friendica cc50abeabe Merge pull request #522 from zzottel/master 
Delete contents from a user when he removes his account
 2012-11-04 13:40:45 -08:00
Thomas Willingham 973efa0c75 Oops, re-kill the dead snake. 2012-11-04 20:02:41 +00:00
Thomas Willingham 190ab46e18 Only show "Welcome to $Sitename" if you haven't made your own homepage. 2012-11-04 19:58:59 +00:00
Thomas Willingham 234598280d Merge remote-tracking branch 'upstream/master' 2012-11-04 19:56:33 +00:00
zottel 6aca58f320 Merge remote branch 'upstream/master' 2012-11-04 11:05:40 +01:00
friendica 0627fdcce7 positional params in "was tagged in a photo" string 2012-11-03 15:29:47 -07:00
friendica f076d7f0dc Merge https://github.com/friendica/friendica into pull 2012-11-03 14:44:46 -07:00
friendica 3303d9db75 put 1i8n position orders in welcome string 2012-11-03 14:43:48 -07: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
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
Tobias Diekershoff 647802f92e get "ago" information into the mail thread view 2012-08-27 19:46:35 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 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
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
Vasudev Kamath 1b3d84422e orient function uses exif_read_data for which valid image types are only JPEG and TIFF as per the document [1]. 
When trying to upload an screenshot with png type I was getting message as *failed* even though image was uploading. So added a fix to check image type before calling orient function. Not sure if this is a proper fix but after this i'm not getting any error during file upload

[1] http://au2.php.net/manual/en/function.exif-read-data.php
 2012-07-07 16:17:26 +05:30
friendica a122fecf50 add additional page types to admin user report 2012-07-05 22:30:13 -07:00
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
friendica 3878b58f0d bug #324 - tinymce used for mail even if editplain being used. 2012-03-09 00:47:10 -08:00
friendica 03b5e3aa0c reworked fix from unary for bug #323 (due to incorrect use of array_key_exists()) 2012-03-07 21:12:31 -08:00
friendica 7ad2dd6565 fix photos after permissions_sql change 2012-03-06 17:52:00 -08:00
friendica 88cd5800cf [privacy] rework latest fix 2012-03-06 17:21:14 -08:00
friendica 39a49d51e3 remove stray debugging 2012-03-06 16:28:52 -08:00
friendica 7431bd9509 fix html reshares when editplain in use 2012-03-06 15:28:27 -08:00
friendica a464e4d33f search should be ok, but a little extra security won't hurt 2012-03-06 15:15:59 -08:00
friendica 21887a36fd [PRIVACY] privacy issue bug #314 2012-03-06 14:53:14 -08:00
friendica 8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08:00
friendica 23460302f5 some admin page fixes and cleanup 2012-03-05 18:51:21 -08:00
Tobias Hößl 02a9fd5dc1 A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore. 2012-03-03 10:44:34 +00:00
Fabio Comuni 5fc3c3ab85 group: fix create new group form 2012-03-02 15:40:17 +01:00
Fabio Comuni b6b7742579 Merge remote-tracking branch 'friendica/master' into randomerror 2012-03-01 11:47:45 +01:00
Fabio Comuni f0b6e76293 admin: fix small string 2012-03-01 11:28:48 +01:00
friendica bbebb4c2a0 notification enhancements 2012-02-29 18:19:08 -08:00
friendica 84d5f495e6 better handling of multiple notifications for same item, and old notifications 2012-02-29 16:26:07 -08:00
Fabio Comuni b71a3af457 Merge remote-tracking branch 'friendica/master' into randomerror 2012-02-29 14:58:37 +01:00
friendica 60ae0d8974 cleaned up mess created when both people request friendship and one approves as duplex 2012-02-28 17:32:44 -08:00
friendica f40ef1bf46 Merge branch 'pull' 2012-02-28 14:53:41 -08:00
friendica 4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code 2012-02-28 14:52:23 -08:00
Tobias Hößl 5bb8ed4b8b Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php 2012-02-28 21:56:42 +00:00
Tobias Hößl 3d249f0edd Merge remote branch 'upstream/master' 2012-02-28 21:19:02 +00:00
fabrixxm 733f830be4 fix url and network display 2012-02-28 19:10:27 +01:00
Tobias Hößl 36a1a43f06 Avoid notices 2012-02-28 13:42:12 +00:00
Tobias Hößl f48556cbc0 contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used 2012-02-28 13:40:41 +00:00
friendica 53412dacd4 update globaldir when page-type changes, add spam date field 2012-02-27 23:27:16 -08:00
friendica 2b730ae86d clicking contact on contacts page broken link 2012-02-27 18:46:11 -08:00
Fabio Comuni 42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
friendica a1861d1128 tagging missing from wallwall and a couple of themes, star missing from dispy 2012-02-26 16:29:06 -08:00
friendica 89560edde2 Merge pull request #50 from annando/master 
massive changes in mail and design updates in "vier"
 2012-02-26 15:07:34 -08:00
friendica 6ddd444afd Merge pull request #49 from CatoTH/master 
Bugfix for del_config
 2012-02-26 14:49:56 -08:00
Michael fe3dfbee56 Mail: New options for actions after importing mails. 2012-02-26 23:39:29 +01:00
Tobias Hößl b102a1d5ec is not always defined; but if defined, then always of type integer 2012-02-26 20:43:23 +00:00
Tobias Hößl 792abc3a24 necessare fields not loaded from DB 2012-02-26 20:40:41 +00:00
Tobias Hößl fd9c12128a should probably be a->user['hidewall'] instead of profile['hidewall'] 2012-02-26 20:39:37 +00:00
friendica 5f7858a688 show experimental and unsupported theme status on theme admin page 2012-02-26 04:17:02 -08:00
Abinoam P. Marques Jr 2d5f8b4b48 mod/item.php pass 'parent' to notification 2012-02-25 16:59:44 -08:00
friendica 2c7da5d0de scale external images 2012-02-25 14:22:51 -08:00
friendica 579738aff7 fixed link for toggling plugin from detail page 2012-02-25 13:00:44 -08:00
friendica c90bac5727 sysnotify count in wrong location, and wrong number 2012-02-25 04:37:12 -08:00
friendica 4839c235da theme seen,unseen notifications 2012-02-25 03:28:07 -08:00
friendica 18bf5d1402 theme info (like plugin info) 2012-02-25 00:30:14 -08:00
friendica 6092567c97 notifications to zeros, bug in notify link 2012-02-24 23:44:55 -08:00
friendica 44c23cda8e theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -08:00
friendica 65ddefe9c5 system notifications to notify module, untranslated string in notifications.tpl 2012-02-23 17:37:03 -08:00
friendica b4d38f6eed implement firehose notify in ping, strip links so notify popup displays correctly in all themes 2012-02-23 16:50:29 -08:00
Fabio Comuni fd3274ff53 less html in mod/group.php, template for group members editor, quattro theme for group edit. 2012-02-23 16:17:36 +01:00
Fabio Comuni cbc60d525e quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside. 
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
 2012-02-23 11:22:32 +01:00
friendica 41636a50aa new notify sort of working in testbubble 2012-02-22 23:34:30 -08:00
friendica 808b886a3e Merge branch 'master' into notify 2012-02-22 22:36:07 -08:00
friendica a19ddb48ee waitman gobble media upload via api patch 2012-02-21 23:35:50 -08:00
friendica 53d3ee8852 new notifications 2012-02-21 19:03:55 -08:00
friendica f03aaf554e mark all notifications read 2012-02-21 16:59:57 -08:00
friendica a97cb88b65 logger_debug was used as string instead of constant 2012-02-21 14:15:10 -08:00
friendica b821399f00 email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes 2012-02-20 19:50:05 -08:00
Abinoam P. Marques Jr 9b2171ecee mod/match.php - Friendika -> Friendica 2012-02-20 19:41:01 -03:00
Abinoam P. Marques Jr 6797485f6e mod/dirfind.php - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
Abinoam P. Marques Jr 12a8796854 mod/dfrn_request.php and templates - Friendika -> Friendica 2012-02-20 19:38:43 -03:00
Fabio Comuni dd09c2d125 use info() for successfull dfrn confirmation instead of notice() 2012-02-20 20:39:19 +01:00
Fabio Comuni edac27c791 ping: return all introductions detail when there are more than one 2012-02-20 20:21:34 +01:00
Abinoam P. Marques Jr dedfc300a0 Fixed log file issues on a freshly installed Friendica. 
* Check to see if log file exists.
* After trying to open it, check to see if it went ok.
* So, check to see if the file size != 0 (fread error with size = 0)
 2012-02-18 14:19:35 -08:00
friendica 1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica 75acc1ed96 support plaintext on editpost, editorinit called before all buttons laid out 2012-02-17 11:49:27 -08:00
friendica 8ff6cb8406 a couple more items to make sure forum delegates can't access if the forum login is shared with the site admin account 2012-02-16 23:58:07 -08:00
friendica 0500fc2826 do not under any circumstances allow a delegated forum admin to access the site admin page. 2012-02-16 23:50:57 -08:00
Abinoam P. Marques Jr. 7b59ad6148 Merge pull request #37 from abinoam/oex 
Oexchange Small Fix
 2012-02-16 04:53:37 -08:00
Abinoam P. Marques Jr 4ac001663e oexchange small fix [_POST -> _REQUEST] 2012-02-16 02:52:35 -08:00
friendica c8704040d3 improvements in newmember page 2012-02-16 01:57:59 -08:00
friendica b1d31aca51 quick comments 2012-02-15 18:13:41 -08:00
friendica d054426101 encode email headers on message deliveries 2012-02-15 15:28:32 -08:00
fabrixxm 16f00cb73b Merge pull request #36 from fabrixxm/master 
Missing icons in 'quattro' and ajax events calendar
 2012-02-15 03:51:44 -08:00
Fabio Comuni 73bee08ac2 enable ajax calendar with $a->config['experimentals']['new_calendar']=1 2012-02-15 12:47:50 +01:00
friendica 07ca8d6574 starred/bookmark searches only returning conversation head without comments 2012-02-14 23:29:24 -08:00
Fabio Comuni 7140e56d1f events js: pass only first line of desc as title; item.desc and item.location as html 2012-02-14 16:48:34 +01:00
Fabio Comuni 22cfb77173 events: first test for full-javascript events calendar 2012-02-14 16:19:48 +01:00
friendica d2a9ce9362 more contacts categorisation, page cleanup 2012-02-13 22:48:35 -08:00
friendica 4de67d95ce proper tab selection when network or search is in effect 2012-02-13 20:42:10 -08:00
friendica d75b6a00d4 tabs and total count for contacts page 2012-02-13 20:38:00 -08:00
Fabio Comuni 850560519a Merge remote-tracking branch 'friendica/master' into mobile 2012-02-13 09:46:42 +01:00
Fabio Comuni 3e664dbdfe reshare in "display" view 2012-02-13 09:33:20 +01:00
friendica 4cfb1fe0cf refresh contact record after setting change 2012-02-11 23:17:55 -08:00
friendica d856ae1fa5 bug #279, add network selector widget to contacts page 2012-02-11 21:39:51 -08:00
friendica 0c4606682f fix link/bookmark reshares 2012-02-11 19:21:41 -08:00
friendica da946bb9b0 bug #278 show only blocked contacts 2012-02-11 03:07:15 -08:00
Abinoam P. Marques Jr 2984b8d5d2 bug #270 - solved 2012-02-10 14:03:43 -08:00
Fabio Comuni ed38808aae hidden jot in "display" to allow reshare 2012-02-10 17:30:22 +01:00
friendica ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -08:00
friendica 7b0a005441 edit post not working after plaintext editor fixes, missing some recent editor template changes 2012-02-09 15:58:26 -08:00
friendica 795e02aa14 bug #273 - no $baseurl variable expansion in install template 2012-02-09 15:13:34 -08:00
friendica 11517a027b if removing a contact after viewing the third page of contacts, go back to page 3 2012-02-08 21:15:26 -08:00
friendica b0ee8dd409 begin cmin, cmax 2012-02-08 17:56:23 -08:00
friendica bb22464165 browser being sent to update_community 2012-02-08 03:40:49 -08:00
friendica c6cdad946e more fixes for textmode 2012-02-07 00:13:16 -08:00
friendica 76308eca67 add toggle to choose sending "friends with" activity even if contact is not hidden 2012-02-06 16:41:05 -08:00
friendica c68235d10d placeholder - spam tab on network page 2012-02-01 00:20:54 -08:00
friendica c0c0f2dc15 add closeness attribute 2012-01-31 23:54:53 -08:00
friendica 4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship 2012-01-30 20:49:54 -08:00
friendica c76b224d8a prune old expired and deleted items 2012-01-30 15:13:24 -08:00
friendica 61246cbd1c some zot-id infrastructure 2012-01-29 15:47:25 -08:00
friendica e43a3a412c store moderated flag if set 2012-01-29 02:09:39 -08:00
friendica d54042dd38 mime_content_type requires access to the file, not just the name 2012-01-28 12:09:17 -08:00
friendica 3197a6e8aa fix some changes lost from another branch 2012-01-26 23:03:27 -08:00
friendica 068cb53a9e page delegation 2012-01-26 20:08:02 -08:00
friendica 167ab537b5 backend for delegating forums 2012-01-26 16:52:12 -08:00
friendica d2a9341128 new event current date off by one, submit button misplaced 2012-01-25 13:42:06 -08:00
friendica e2d0eb4a88 redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic 2012-01-24 18:59:55 -08:00
friendica a76a497d92 implement "moderate" flag on items 2012-01-23 20:56:11 -08:00
Fabio Comuni 30fcda7576 nav: fix intro notification url, fix "See all notifications" url and make it translatable 2012-01-22 19:27:56 +01:00
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica e3a415d409 add photo upload link to album widget and "upload to this album" ability 2012-01-15 17:48:42 -08:00
friendica e12341b716 api post broken with recent change to use REQUEST vars in mod_item 2012-01-15 13:57:00 -08:00
friendica a95000d9f5 manage also needs the new authenticate_success function 2012-01-12 19:18:01 -08:00
friendica df14d7abc4 allow crepair to change name - as long as it isn't blank 2012-01-12 18:54:35 -08:00
friendica cdd56dc5de fix return url when deleting network posts with page params 2012-01-12 18:30:52 -08:00
friendica 4b6990e1ff modularise successful authentication 2012-01-12 15:46:39 -08:00
friendica 0856935d75 use $_REQUEST for all post items, move default api permission code block to simplify logic 2012-01-12 14:20:21 -08:00
friendica 87c4d1c3cd bug #251 - privacy settings not working via API 2012-01-12 13:58:17 -08:00
friendica dcc22ab5c5 improve direct login on network page 2012-01-11 13:38:03 -08:00
friendica 99fc4309be slightly better group icon 2012-01-10 21:09:38 -08:00
friendica 7011f71e8f post preview 2012-01-09 20:03:00 -08:00
friendica a13156c0f3 bypass D* markdown bug for now 2012-01-09 18:52:49 -08:00
friendica 5c72ead74e contact photo missing from friend activities 2012-01-08 01:08:57 -08:00
fabrixxm ad02af4e8f Merge pull request #23 from fabrixxm/master 
Theme works
 2012-01-06 00:42:06 -08:00
friendica cfe8094b45 nets widget - allow all children of specified parent net regardless of network 2012-01-06 00:23:05 -08:00
Fabio Comuni f9b0af6f2f Merge remote-tracking branch 'friendica/master' 2012-01-06 09:11:48 +01:00
Fabio Comuni a9670cbb7d Merge remote-tracking branch 'friendica/master' 2012-01-06 09:10:21 +01:00
friendica c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
friendica 291a82c4a4 backend for per-network streams 2012-01-05 18:11:53 -08:00
friendica b265334c9e added citations back into ping - lost somehow 2012-01-05 16:47:47 -08:00
friendica b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
friendica 53878625f6 backend support for post preview 2012-01-05 15:02:44 -08:00
friendica 47edaf9ad7 dynamic title input box - via fabrixxm 2012-01-04 18:03:09 -08:00
friendica b0c3dc00b9 fix registration request pings 2012-01-04 16:14:26 -08:00
friendica fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -08:00
friendica 969cd145ce suggestion notifications 2012-01-03 17:29:07 -08:00
Fabio Comuni 93563370c9 Merge remote-tracking branch 'friendica/master' 2012-01-03 21:14:48 +01:00
friendica 0db637bf00 hopefully this will speed up the network updates a wee bit more 2012-01-02 19:33:26 -08:00
friendica 71377291ba that didn't work - revert 2012-01-02 18:50:28 -08:00
friendica f4b1d335a5 sql optimisation cont. 2012-01-02 18:40:38 -08:00
friendica 4c35a6b0d7 conversation sql optimisations 2012-01-02 16:54:37 -08:00
Fabio Comuni c7bfd1e1ba install: fix install procedure 
install procedure as a wizard
graphical rappresentation of passed/unpassed system checks
db connection test don't try anymore to create the db
admin email and timezone are asked in a separate pass
fix loading of database.sql, removing comments from phpmyadmin export
fix check for .htconfig.php writability
ask for php-cli path if not found in PATH
install_db.tpl use field_* templates to render the form
 2012-01-02 20:16:28 +01:00
Fabio Comuni be2fd56aae Merge branch 'master' of github.com:fabrixxm/friendica 2012-01-02 15:32:37 +01:00
friendica 4b09566579 try again on the network page sql optimisation 2012-01-02 03:40:52 -08:00
friendica a5144518aa revert sql optimisation - js updates broken 2012-01-02 00:20:06 -08:00
friendica fb3a0baa78 long running query on network page - optimise out the double sub-select 2012-01-01 23:07:53 -08:00
friendica c735582ead hide contacts on approval 2011-12-29 00:23:05 -08:00
friendica 0f87f84cfb notification testing 2011-12-27 14:26:44 -08:00
friendica 5c7df6e964 notify_intro 2011-12-26 15:47:40 -08:00
friendica 356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
friendica 205dcd8f5b Merge branch 'master' into notify 2011-12-25 19:14:45 -08:00
root 09be90be02 modified: settings.php corrected TLS email connector not working due to spelling mistake. 2011-12-25 22:52:15 +00:00
friendica aea5584bf1 Merge branch 'master' into notify 2011-12-22 16:08:17 -08:00
friendica 52137859eb improved cid search 2011-12-22 16:05:03 -08:00
friendica 95b4bc55bf Merge branch 'master' into notify 2011-12-22 15:42:01 -08:00
Fabio Comuni 2ef2d0b79f quattro: contacts and first photo page 2011-12-22 16:33:14 +01:00
friendica 048fcae40b bug #247 2011-12-21 01:45:15 -08:00
friendica d9ede7f7bd implement max daily registrations 2011-12-20 20:12:29 -08:00
friendica 7fbfbdae07 audio/video bb tags showing up on Diaspora 2011-12-20 17:01:41 -08:00
friendica c0c4c46874 remove hashchars from pub keywords 2011-12-20 03:04:20 -08:00
friendica eb05d00794 connect on suggest/match - added to testbubble 2011-12-18 12:51:45 -08:00
friendica 622886a33c make mod-follow "get"-able 2011-12-18 12:41:46 -08:00
friendica 5d6a098ce0 add connect link to suggestion and matches 2011-12-18 01:44:46 -08:00
friendica 974a52a16d add connect link to friend suggest 2011-12-18 01:08:32 -08:00
friendica 3aab1c7140 typo 2011-12-18 00:22:44 -08:00
friendica b0718c4f05 typo 2011-12-18 00:21:01 -08:00
friendica 978717a247 add webfinger to poco, if present 2011-12-18 00:14:34 -08:00
friendica efb9157490 eliminate dup identical hashtags in posts 2011-12-16 01:42:45 -08:00
friendica 6d7781434b must use named vars in plugin args 2011-12-15 01:09:38 -08:00
friendica cb2e68c88e home_init hook 2011-12-15 01:08:19 -08:00
friendica 431a4abd25 name change stragglers, fix newmember links, liveupdate glitch 2011-12-14 14:17:48 -08:00
friendica 4007e7ec19 "new" view broken after liveupdate fixes 2011-12-14 03:51:50 -08:00
friendica 4613e74361 update link locations 2011-12-13 19:17:33 -08:00
friendica ed725df5f1 Merge branch 'master' into notify 2011-12-12 20:13:12 -08:00
friendica ee4975f1cd unnecessary slash in profile update path 2011-12-12 19:08:13 -08:00
friendica e67f69df81 default ajax settings after conversion 2011-12-12 17:30:29 -08:00
friendica e74a960327 change default ajax interval to 40 seconds 2011-12-12 17:10:19 -08:00
friendica c45b903178 live update improvements 2011-12-12 16:11:03 -08:00
friendica 80428a33d5 refactor updates 2011-12-12 14:39:25 -08:00
friendica cbdc667ba2 separate dfrn introductions from email when it comes to expiration of blocked requests 2011-12-11 23:33:56 -08:00
friendica a38d3b82b9 browser_update settings 2011-12-11 21:03:33 -08:00
friendica 50c4b9a780 Merge branch 'master' into notify 2011-12-11 20:03:46 -08:00
friendica 102ea901c3 cannot register at all when multiple_pages is not allowed 2011-12-09 16:50:13 -08:00
friendica 3da3cd686c notifications refactor 2011-12-08 01:28:27 -08:00
friendica d100944fe6 api post default to default post permissions was broken 2011-12-07 14:04:34 -08:00
friendica efeb377a12 w3c valid cleanup 2011-12-06 20:56:51 -08:00
friendica 341fcce75e preg_quote search strings 2011-12-06 19:51:19 -08:00
friendica 7eba8adbf7 pm replies 2011-12-06 19:15:42 -08:00
friendica 0c24784f5e include diaspora mentions in personal (requires adding a Diaspora profile url because they don't use ours) 2011-12-06 15:24:01 -08:00
friendica 47f369e052 hide some contacts from others 2011-12-05 18:36:26 -08:00
friendica c8d5274cee data structures to support hidden friends 2011-12-05 02:16:59 -08:00
friendica 116e20c89d add conv structure 2011-12-05 00:35:44 -08:00
friendica 172fdbcdcf bug #232 2011-12-03 00:08:04 -08:00
fabrixxm e36bdd5c89 Merge pull request #11 from fabrixxm/master 
mention notification in ping
 2011-12-02 07:35:08 -08:00
Fabio Comuni ccc8486544 ping: mention rewording 2011-12-02 08:34:03 +01:00
friendica 513c1c0d68 dynamic delete icons for saved-search on network page 2011-12-01 18:27:45 -08:00
Fabio Comuni 6705549d66 ping: add @-tag notifs, fix intros url 2011-12-01 16:36:02 +01:00
friendica f1af2c224f personal notifications 2011-11-30 22:26:02 -08:00
friendica 37730ecc2a typo 2011-11-30 17:08:16 -08:00
friendica 8f381e01ae html_entity_decode D* incoming text 2011-11-30 03:22:01 -08:00
friendica 73564df4d8 fine tune personal regex's 2011-11-29 22:49:05 -08:00
friendica 84e197cde9 missing paren 2011-11-29 19:53:18 -08:00
friendica 7474c48022 add tag to personal 2011-11-29 19:52:14 -08:00
friendica 7b9ba3bb03 personal tab on network page 2011-11-29 14:35:20 -08:00
friendica 3afa248238 use default post permissions when coming from api - unless permissions are explicitly set. 2011-11-28 20:09:10 -08:00
friendica 034038849c mysql error report fix (no mysqli), suggested friends for new members settings 2011-11-28 19:28:33 -08:00
friendica f4e1135f79 poco addition to provide a "suggestme" for new members 2011-11-28 15:11:59 -08:00
friendica 0f4a42f550 start on bug #227 - more to do 2011-11-25 22:41:50 -08:00
friendica a1c277ed1a remove old liveupdate marker 2011-11-24 18:46:07 -08:00
friendica 757ca5014c move liveupdate after birthdays/events 2011-11-24 17:32:45 -08:00
friendica b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
friendica c568493f57 add expire_starred option, fix "delete selected" on some themes, new project name in email templates 2011-11-21 19:01:05 -08:00
Fabio Comuni cb05e677a9 Merge remote-tracking branch 'friendica/master' 2011-11-21 13:52:15 +01:00
Fabio Comuni a86fd26bd8 more work on quattro. remove html from php for groups and saved searches widgets. 2011-11-21 12:34:22 +01:00
friendica d53db63d41 forum split delivery flag 2011-11-18 21:55:00 -08:00
Fabio Comuni 79603e3146 expire settings for items, notes and photos. 
show default privacy acl in popup
 2011-11-17 15:53:59 +01:00
friendica b4218614ed change hide profile setting text 2011-11-16 04:15:14 -08:00
Fabio Comuni 9b2cbc33ae ping: show tags 2011-11-15 17:41:51 +01:00
fabrixxm 7b48b33b49 Merge pull request #4 from fabrixxm/master 
ping: fix total count and comment/post
 2011-11-14 03:10:51 -08:00
Fabio Comuni 4c2680ca6f ping: fix total count and comment/post 2011-11-14 12:09:11 +01:00
friendica c659512f32 D* doesn't like html entities in post. Convert our hijack-proof hashtag replacement to utf-8 2011-11-13 19:38:30 -08:00
friendica 8a19c7c379 warn about photo caching when updating profile pic 2011-11-12 13:47:51 -08:00
Friendika 58ba7c3969 Merge branch 'pull' 2011-11-12 04:12:03 -08:00
Friendika cf82174520 bug #198 - create activitystream 'friends with' message for Diaspora confirmations 2011-11-12 04:06:33 -08:00
Fabio Comuni 1ff8cddeb6 oembed: replace base64 url for iframe with url site/oembed/url_encoded 
fix http://bugs.friendika.com/view.php?id=191
 2011-11-11 17:33:32 +01:00
Friendika 20217c04f0 "follow" link was missing 2011-11-11 02:56:54 -08:00
Friendika c66b886d7e shared tags for testbubble, prevent tag hijacking of shared tag activities 2011-11-10 17:11:55 -08:00
Friendika 15f2ce5459 contact edit updates 2011-11-09 19:30:14 -08:00
Friendika 722e8e3d49 add allfriends page 2011-11-09 18:33:08 -08:00
Friendika 2825c49573 more work on new contact edit page - plus first port to testbubble 2011-11-09 03:46:36 -08:00
Friendika 02d4a742ab more contact edit page stuff 2011-11-08 21:22:45 -08:00
Friendika 05cabf24a9 first checkin - updated contact_edit, more work remains 2011-11-08 18:30:20 -08:00
Fabio Comuni 0becdb01db oauth: fix add new app 2011-11-07 17:54:46 +01:00
Fabio Comuni 00c342e13d Merge branch 'oauthapi' 2011-11-07 17:41:23 +01:00
Fabio Comuni b070666120 statusnet-friendika post permalink compatibility 2011-11-07 17:39:00 +01:00
Fabio Comuni 4407fc2c5d oauth apps/authorization management in settings page 2011-11-07 17:38:30 +01:00
Fabio Comuni 10e5754e24 oauth: authorize 2011-11-07 17:36:41 +01:00
Friendika cc1c015f20 @ completion is a bit too greedy 2011-11-05 21:43:58 -07:00
Friendika 014c91431e ignore suggestions 2011-11-03 16:00:52 -07:00
Friendika 4f4b03367a plugin check returning 0 vs false 2011-11-03 15:14:33 -07:00
Friendika 35305fb6d9 fix "do not show status post for photo" setting when used with js_upload (value is string "true/false" not integer or boolean) 2011-11-02 21:53:44 -07:00
Friendika bd48a016af fix for multiple consecutive @ tags 2011-11-02 21:07:17 -07:00
Friendika 3ca41fc3bd make@ tag completion work on /display page 2011-11-02 20:38:19 -07:00
Friendika a9ec56ace1 prevent duplicate @ tags 2011-11-02 18:52:55 -07:00
Fabio Comuni 69e41f7703 oauth: authorize view, wrong verifier. 2011-11-02 09:54:07 +01:00
Friendika e38aa67263 link suggestions into the main code 2011-11-01 21:27:11 -07:00
Friendika 158028a0ac first cut friend suggestions 2011-11-01 20:29:55 -07:00
Friendika 3d9a9614e2 common friends 2011-11-01 19:16:33 -07:00
Friendika 573670fa0c more social graph stuff 2011-11-01 16:08:07 -07:00
Friendika 05eca449c8 bookmarks not getting translated to D* 2011-11-01 02:17:36 -07:00
Friendika d4644d7339 name change continued, social graph tools and stuctures, fix for spanish province name 2011-10-31 20:39:04 -07:00
Friendika 0eceade2fe view source of item [bbcode] usage: viewsrc/nnn 2011-10-30 16:28:07 -07:00
Friendika c00aacf9e5 rename 2011-10-30 15:12:07 -07:00
Friendika e5992003e8 better handling of remote urls - especially FB opengraph 2011-10-28 02:50:00 -07:00
Friendika e5a7b3e24b add contact-id to auto-complete response to resolve duplicates 2011-10-27 19:12:30 -07:00
Friendika 056fe0a3aa poco discovery 2011-10-27 14:52:35 -07:00
Friendika ea0ab6fbac poco should now be spec compliant 2011-10-27 04:38:33 -07:00
Friendika abe96155b4 hmmm - why won't poco xml work 2011-10-27 01:54:52 -07:00
Friendika 31502207bd more poco spec compliance 2011-10-27 00:57:19 -07:00
Friendika faa078b83f basic portable contacts http://portablecontacts.net/draft-spec.html no filter/sort, or xml at the moment 2011-10-26 20:09:03 -07:00
Friendika 2d22a58324 @ tag completion enhancements, show url on hover and respect custom attags 2011-10-26 15:14:12 -07:00
Fabio Comuni ff7fc68382 oauthapi: authorize app 2011-10-26 17:15:36 +02:00
Fabio Comuni 155a09cfdf filter by contact type 2011-10-25 15:49:53 +02:00
Fabio Comuni bcb672e7ff autocomplete contacts nickname while writting in a comment box. 2011-10-25 15:01:58 +02:00
Friendika 4ea6f86b20 bug #166 2011-10-24 22:07:42 -07:00
Friendika efe3365431 tag privacy settings 2011-10-24 21:11:05 -07:00
Friendika 790c4a4e1a tag display with item 2011-10-24 17:25:49 -07:00
Friendika 4218e3f494 Merge branch 'pull' 2011-10-24 15:51:14 -07:00
Friendika ea9d3b06f6 Merge pull request #35 from fabrixxm/master 
Use oembed if possible without the addon

Awesome!
 2011-10-24 15:49:28 -07:00
Friendika 3b6b0eaa8b social tag - add UI 2011-10-24 15:47:17 -07:00
Fabio Comuni a9fb8e4d60 Use oembed for bookmark, audio, video, youtube 2011-10-24 14:30:11 +02:00
Friendika f48fd5aa16 more tagging 2011-10-24 04:17:46 -07:00
Friendika 87aedacec7 shared tag search 2011-10-23 21:37:11 -07:00
Friendika 7cbb69d87f tagging 2011-10-23 00:24:37 -07:00
Friendika 01164c8c2f fix various html parse errors 2011-10-20 16:48:07 -07:00
Friendika bef7a5d66b bug #183 - strlen borking on sysmsg, which is now an array 2011-10-20 14:55:40 -07:00
Friendika da416e0181 bug in diaspora_reshare 2011-10-20 05:43:33 -07:00
Friendika 19129e06c3 diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order 2011-10-19 15:08:16 -07:00
Friendika 06096486d4 hopefully solve db update issues bug #182 2011-10-18 00:18:21 -07:00
Friendika 0f24f3b505 post/comment order options 2011-10-17 18:24:23 -07:00
Friendika f0dc77ab6c Merge branch 'pull' 2011-10-17 14:55:46 -07:00
Friendika 278433eac7 origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora 2011-10-17 14:52:03 -07:00
Fabio Comuni 5830682e0c another fix to tabs in notifications 2011-10-17 17:14:10 +02:00
Fabio Comuni a2dc8bad2e fix tabs in notifications 2011-10-17 16:54:21 +02:00
Fabio Comuni 2116943964 Merge remote-tracking branch 'friendika/master' 2011-10-17 16:37:37 +02:00
Friendika d60505ffb0 missing arg xmlize x is friends with y 2011-10-13 01:12:03 -07:00
Friendika df7702709b common tabs to notifications and mail 2011-10-11 21:30:23 -07:00
Friendika 2206d894b3 add contact_widgets and provide widgets on appropriate pages, fix the saved search widget 
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
 2011-10-11 19:27:58 -07:00
Friendika 557a7d0cec stuff 
- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
 2011-10-11 18:24:37 -07:00
Fabio Comuni 906addf865 common_tabs in notifications.php 2011-10-10 17:01:14 +02:00
Fabio Comuni 070e081ae9 Fix url in profile tabs 2011-10-10 16:40:12 +02:00
Fabio Comuni f64e2d63b9 New common tab template. Update css 2011-10-10 15:28:34 +02:00
Friendika 1cfeb61ddc more notification cleanup duepuntozero 2011-10-09 21:34:07 -07:00
Friendika 26f2c868da some notification text cleanup and notification page layout fixes for duepuntozero 2011-10-09 20:26:17 -07:00
Devlon Duthie c49ab66be8 fix for comment on line 117 from github 2011-10-09 00:02:24 -05:00
Devlon Duthie fd6220fb7e added sorting to drop-down notifications list, added posts to this list as well (now the counts match the items) fixed up a couple of typos 2011-10-08 23:24:16 -05:00
Devlon Duthie 8eedbf30f1 added posts to network section of the notifications page 2011-10-08 22:45:48 -05:00
Devlon Duthie 2cba65bd38 fix for 'show all notifications' on notifications drop-down to handle installations in sub-directories + fix for friend notifications (eg: joe became friends with sam) 2011-10-08 16:57:00 -05:00
Devlon Duthie f5fc8dabe5 Anne set testbubble banner to be fixed, I added the other notification types to /notifcations, added link to notifcations drop-down for all notifications and added notifications drop-down to testbubble theme 2011-10-07 01:25:08 -05:00
Friendika 2802c142cb local_deliver testing 2011-10-06 19:10:57 -07:00
Friendika e232c50c9e check author url to see if it matches current contact before relay is accepted 2011-10-06 00:26:25 -07:00
Friendika ecd714ae54 provide ability to repair contact photo 2011-10-05 20:01:42 -07:00
Friendika 7d6a67f903 mostly cosmetic changes to make DB tables accurately reflect the conversation members 2011-10-05 19:16:05 -07:00
Friendika b1e5dfad3c clean up w3c validation and layout for priv mail and lang selector 2011-10-05 15:35:53 -07:00
Friendika d709225b68 better check for orig post author 2011-10-05 13:11:45 -07:00
Friendika 6ff221d5a1 another typo 2011-10-04 21:53:33 -07:00
Friendika c2d70d005b and a typo fix 2011-10-04 21:45:15 -07:00
Friendika 159d06df82 notification issue after last checkin 2011-10-04 21:43:21 -07:00
Friendika 7b648e6da8 performance enhancements 2011-10-04 18:53:56 -07:00
duthied 24595c55d7 Merge pull request #16 from duthied/master 
Minor ui tweaks
 2011-10-04 09:13:49 -07:00
Devlon Duthie f7d055687e - moved the header for profile permissions out of the scrolling div 
- tweaks to the testbubble theme's nav
 2011-10-04 11:10:57 -05:00
Friendika 4a5079f8fb urlescape saved search terms 2011-10-04 05:19:25 -07:00
Friendika 07b09300a9 improve feed import performance 2011-10-04 03:06:34 -07:00
Friendika dfd5cc57c2 tagmatch available to anon, add paging variable to query 2011-10-03 14:47:18 -07:00
Friendika 8edab80673 add tagmatch 2011-10-03 05:10:15 -07:00
Friendika 7091173131 removing another potential way a post could have a zero parent. 2011-10-03 02:39:19 -07:00
Friendika 60147d893c ?f did not have = after it 2011-10-03 01:58:01 -07:00
Devlon Duthie f84c208ac5 broke 'find similar' matches content into a tpl in core, added an extended tpl to testbubble that lists the profile tags 2011-10-03 01:45:27 -05:00
Devlon Duthie da53ebf4b3 added activetab var to message.php for templates 
(testbubble only) added logic to photo header to make tab 'sticky' (active class for styling)
(testbubble only) css fix for avatars in wallitems
 2011-10-02 20:37:47 -05:00
Friendika c72883f068 malformed xml in ping 2011-10-02 01:21:51 -07:00
Friendika 0ad9e7b5f4 option to not post photos to status stream 2011-10-01 06:20:41 -07:00
Friendika f4c961b906 override pragma 2011-10-01 02:22:48 -07:00
Friendika 8fb2d02d3d typo last checkin 2011-09-30 18:00:32 -07:00
Friendika 0508ccf50f restore photo cache 2011-09-30 17:47:33 -07:00
Friendika 097c1f8da7 do not poll for abandoned accounts 2011-09-29 21:20:19 -07:00
Devlon Duthie 0881c04cea classes added to core + testbubble theme 
some fixes to testbubble theme related to tab styling
 2011-09-29 01:20:39 -05:00
Friendika 26905751ea path for country.js - now in js directory 2011-09-28 22:32:39 -07:00
Friendika bedb4eb715 just hostname not url in hm:host - host xrd document 2011-09-28 15:07:01 -07:00
Friendika 360a46178b create zot batch keys 2011-09-28 03:45:48 -07:00
Fabio Comuni 3ca3157e53 ping returns notices and infos also to unlogged users 2011-09-28 09:30:22 +02:00
Friendika 75af366122 zot/salmon new key format for batch keys 2011-09-27 06:50:18 -07:00
Friendika 7e2284043f show profile url in ACL hovertips, add fork identifier to json siteinfo 2011-09-27 05:02:25 -07:00
Fabio Comuni 939449602a Merge remote-tracking branch 'fabrix/newui' 2011-09-27 08:57:16 +02:00
Devlon Duthie 78c3210f6a fixed a bug I introduced when working on the testbubble theme - user's photo widget header div wasn't closed correctly 
+ some opera-friendly style changes
 2011-09-27 00:29:34 -05:00
Fabio Comuni ae024edbf9 fix "friend of" message in ping.php 2011-09-26 12:14:48 +02:00
Fabio Comuni 5792b3d358 Merge branch 'master' into newui 2011-09-26 11:42:48 +02:00
Friendika 116fc7fcf2 zot endpoint 2011-09-26 02:25:43 -07:00
Devlon Duthie 7dbf112092 added widget class to saved arch block on search page 
added header to search results where there are results
 2011-09-25 16:01:05 -05:00
Devlon Duthie 19963884c2 moved invite friends into 'find people' block 
misc. styling tweaks
 2011-09-25 15:45:03 -05:00
Devlon Duthie bbaec4cb78 moved contact group header out of scrolling div so it doens't vanish whenlot 
more css tweaks
 2011-09-25 14:08:08 -05:00
Devlon Duthie 3426ce5f94 Merge remote-tracking branch 'upstream/master' 2011-09-25 13:30:55 -05:00
Devlon Duthie cb1c6dd1e3 really commiting files this time, still getting the hang of git. 
some images added, some classes added to groupidebar, contacts sidebar
notification flags moved out of nav and into banner for testbubble the
testbubble css tweaks
 2011-09-25 13:20:19 -05:00
Friendika 6a9e22550d . 2011-09-24 05:45:34 -07:00
Friendika 7ea6b0a126 fix message ordering glitch on network page 2011-09-23 05:03:12 -07:00
Friendika 3a2bf8ab7c w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator 2011-09-23 03:12:31 -07:00
Friendika a2b2318106 provide permission error vs "not found" for protected photos 2011-09-22 20:03:09 -07:00
Friendika 9161d1832e allow one to toggle into and out of photo edit mode for an entire album 2011-09-21 17:37:02 -07:00
Friendika 11ca81adba keychecks 2011-09-21 05:43:26 -07:00
Friendika f681535ccf oexchange updates to new bookmark API 2011-09-20 16:57:05 -07:00
Friendika 1c8e89bd03 social bookmark API, oexchange enhancements 2011-09-20 16:31:45 -07:00
Friendika 119cd9c0ce more multiline regex fixes 2011-09-20 04:07:24 -07:00
Friendika 9edf15d3ef structures for batch mode (Diaspora/zot) 2011-09-20 01:49:08 -07:00
Friendika 8a11cec61a allow setting all the bookmarked URL fields via script/API 2011-09-19 22:21:55 -07:00
Friendika d653d922b1 sorting through key issue 2011-09-19 21:24:16 -07:00
Friendika 660787916e template escapes 2011-09-19 20:24:32 -07:00
Friendika 63277b57fc template escapes 2011-09-19 19:46:18 -07:00
Friendika a810d2a993 put profile photo on photos page 2011-09-19 16:39:23 -07:00
Friendika fd18b42a5a Check all keys before use 2011-09-19 03:30:59 -07:00
Fabio Comuni 991656a3ef Show "404.tpl" instead of using 'notice()' in case of 404 2011-09-19 11:52:32 +02:00
Friendika 0a30a91b14 basic zot discovery framework 2011-09-19 02:13:59 -07:00
Friendika 2aef98f71d cripple account when expired 2011-09-19 01:17:12 -07:00
Friendika 5b3f645939 account expiration structures 2011-09-18 19:53:45 -07:00
Friendika 8bf6a29d4e optimise the commented date view 2011-09-18 19:04:11 -07:00
Friendika 9b5d5eca07 Merge branch 'friday' 2011-09-16 06:51:33 -07:00
Friendika 9c3503a706 update timestamp on activity change (comment/like) 2011-09-16 06:49:24 -07:00
Fabio Comuni 9d2afc2d3c Merge remote-tracking branch 'friendika/master' into newui 2011-09-16 09:39:29 +02:00
Friendika 8f1e2efd5b if photo is uploaded to "profile photos" album it could not be made into profile photo. 2011-09-15 03:06:43 -07:00
Friendika 46b220518c don't allow events to finish before they begin 2011-09-14 23:09:09 -07:00
Friendika 58b2bb5848 localtime cleanup 2011-09-14 19:53:13 -07:00
Friendika 5c0e135fe9 diaspora protocol changes 2011-09-14 19:33:42 -07:00
Friendika 12fec75489 ability to re-order network page (no UI yet) 2011-09-13 18:40:15 -07:00
Friendika 21d35e52dd provide option for viewing by parent created order 2011-09-13 05:13:01 -07:00
Friendika 4f24494b0b Dreamhost's unreliable process model is really getting irritating 2011-09-12 19:42:10 -07:00
Friendika 57d631b47a supply default value for update 2011-09-11 22:57:12 -07:00
Friendika 17b081f9f7 allow html post to api 2011-09-11 21:52:50 -07:00
Friendika 0e441fe196 bug #147 comments not working on private notes page 2011-09-11 15:09:57 -07:00
Friendika 3f59f63224 saved searches on search page, templates: Invalid argument supplied for foreach() on line 167 2011-09-08 21:42:52 -07:00
Friendika f03c2b1b79 Merge branch 'pull' 2011-09-08 20:00:57 -07:00
Friendika 18157769f0 parent eval order issue 2011-09-08 20:00:06 -07:00
fabrixxm d284f8017c Merge remote-tracking branch 'friendika/master' into newui 2011-09-08 20:15:27 +02:00
Fabio Comuni ad7c111c7c deal with messages without comments or likes 2011-09-08 14:39:53 +02:00
Fabio Comuni 694e74d54d Show conversations in network default view ordered by activity 2011-09-08 11:18:44 +02:00
Friendika f17d91844f part of bug #143 2011-09-07 02:23:17 -07:00
Friendika a5125359d8 faster friend requests (DFRN) 2011-09-06 18:06:19 -07:00
Friendika eeecb412aa view bookmarks 2011-09-06 00:55:24 -07:00
Friendika e921b97a7f bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings 2011-09-05 18:34:30 -07:00
Fabio Comuni abd65e00ab Load infos and notices via ping and show them with js popup 2011-09-05 14:01:21 +02:00
Fabio Comuni 0283cbfcd3 Merge remote-tracking branch 'friendika/master' into newui 2011-09-05 09:09:34 +02:00
Friendika 7e8100d2cd custom attags 2011-09-04 22:40:36 -07:00
Friendika 82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika 481853d2cc saved searches on network page 2011-09-04 17:35:06 -07:00
Friendika 9ff1a3444e add timezone convert module, several other minor or in progress fixes 2011-09-04 00:48:45 -07:00
Friendika 71f71ecf46 error viewing logfiles over 2Gb 2011-09-01 21:54:04 -07:00
Friendika a33edb0042 infrastructure for personalised @ tags (no UI/settings form yet), allow own comments through statusnet connector 2011-09-01 18:02:08 -07:00
Fabio Comuni b38d6d97c3 Avoid a small error in admin 2011-08-31 16:18:37 +02:00
Fabio Comuni 71d44d78ec Installed apps as array instead of string 2011-08-31 16:17:32 +02:00
Friendika f0c3a75ff3 youtube redirect fixes 2011-08-30 23:09:39 -07:00
Friendika f8da48a880 unsafe chars in admin, add img to diaspora markdown processor 2011-08-30 18:46:34 -07:00
Fabio Comuni d0926240a8 Merge remote-tracking branch 'friendika/master' into newui 2011-08-30 11:00:23 +02:00
Friendika 22d9d97d71 remove "online reputation" section on contact editing - nobody ever uses it, and there is no interface to query it. 2011-08-29 19:18:59 -07:00
Friendika f29f228463 bring Diaspora message signing back to the source author - whether they like it or not. 2011-08-28 19:22:27 -07:00
Friendika ada8bee70e remove public disclosure risk 2011-08-27 18:09:43 -07:00
Friendika 99ea045723 some minor work on contact edit page 2011-08-25 18:12:42 -07:00
Friendika 83605cf3dc theme settings for contact photo menu 2011-08-25 05:15:05 -07:00
Friendika 74d61ed00b contact menu beginnings 2011-08-24 22:40:26 -07:00
Friendika 8f6ae2b660 missing salmon key? report it. 2011-08-24 20:40:08 -07:00
Friendika 0883a614a2 don't accept pubsub from diaspora 2011-08-24 01:41:27 -07:00
Friendika 2aa23843e4 D* queue 2011-08-24 01:21:24 -07:00
Friendika 56d64316f4 diaspora photos ? 2011-08-23 18:17:35 -07:00
fabrixxm 97806544bc don't add notification details on new posts 2011-08-23 14:02:04 +02:00
fabrixxm 89c5733ca5 add more notification messages 2011-08-23 13:52:20 +02:00
Friendika b9e4668f68 d* retractions 2011-08-22 20:35:34 -07:00
Friendika eb2ef6dec4 diaspora admin toggle, update install guide 2011-08-22 18:52:02 -07:00
fabrixxm d8bd4fbb3e Merge branch 'master' into newui 2011-08-22 13:56:08 +02:00
Friendika 564ade0685 store key with contact record 2011-08-22 04:55:09 -07:00
Friendika c0be5bea16 fix warning of self-signed cert for photos of our own contacts in comment notification emails 2011-08-20 18:27:12 -07:00
fabrixxm b465d1f30b Merge pull request #158 from fabrixxm/master 
Some works on API
 2011-08-19 08:03:20 -07:00
fabrixxm 43040faf22 move send private message code out of view code 2011-08-19 16:54:41 +02:00
Friendika 18c8f4d8b5 wrong record 2011-08-19 05:29:07 -07:00
Friendika 2ef82cd347 redirect to added contact, not self 2011-08-19 05:24:07 -07:00
Friendika 9a52b15271 don't allow removal of self contact 2011-08-19 05:20:30 -07:00
Friendika ef98c7e020 on follow, land on new contact edit page 2011-08-19 04:52:40 -07:00
Friendika 395faae0b2 double url encode diaspora communications 2011-08-19 02:24:30 -07:00
Friendika c05c20aa56 set writable (e.g. writeable) flag for Diaspora contacts 2011-08-18 21:31:34 -07:00
Friendika bc5935061b dfrn friendship issue 2011-08-18 16:47:45 -07:00
Friendika 9634287839 fix several probe related issues 2011-08-17 23:01:44 -07:00
Friendika c30f523c62 more d* infrastructure for relaying signed messages and storing non-connected people details 2011-08-17 20:52:18 -07:00
fabrixxm afdc639f17 fix friend request query in ping 2011-08-17 21:59:06 +02:00
fabrixxm 07b6c868b3 remove javascript to set selectect nav item. enanche img template prefetch ignoring 2011-08-17 18:36:24 +02:00
fabrixxm bdf42473a0 Merge remote-tracking branch 'friendika/master' into newui 2011-08-17 17:35:37 +02:00
Friendika 673e114bbd D* like and start of relay code 2011-08-16 22:31:14 -07:00
Friendika b28b468b21 cleanup 2011-08-16 20:05:02 -07:00
Friendika c7197b99f9 refactor the diaspora contact logic 2011-08-15 23:19:17 -07:00
Friendika 0eb06b3e2d cronhooks broken 2011-08-15 22:23:17 -07:00
Friendika a589e8e3fe filename typo 2011-08-15 20:47:09 -07:00
Friendika 37a9a5ea62 stupid browsers not honouring meta base 2011-08-15 20:16:00 -07:00
Friendika 8e3506048a diaspora confirm cleanup 2011-08-15 19:31:45 -07:00
Friendika f7a1674cf6 set proper relation for diaspora in mod_follow 2011-08-15 19:15:56 -07:00
Friendika 240941237a privacy enforcement on pubmail_enable 2011-08-15 18:29:49 -07:00
Friendika a6d88fb8f7 diaspora friend approvals 2011-08-15 18:17:19 -07:00
Friendika 44918e2736 turn diaspora posts into x-www-form-urlencoded 2011-08-15 17:14:51 -07:00
Friendika 5d6155a968 fixes share from diaspora 2011-08-15 05:27:24 -07:00
Friendika 0729e205c8 diaspora follow from friendika 2011-08-14 20:38:31 -07:00
Friendika 7952961222 diaspora probe/scrape changes 2011-08-14 18:13:52 -07:00
Friendika 3a0727d496 set network correctly - dfrn_confirm 2011-08-14 05:26:44 -07:00
Friendika fcf6651299 add diaspora support to dfrn_confirm (friendship confirmation) 2011-08-14 05:23:36 -07:00
Friendika bbd545b9ca honour "post to xxx network by default" when using API 2011-08-14 04:26:41 -07:00
Friendika e1db136966 but #118 proxy settings in admin panel 2011-08-12 04:05:20 -07:00
Friendika aefc6209a3 improved diaspora discovery 2011-08-12 03:01:11 -07:00
Friendika fda593caed introduction fails if confirmation differs by http vs https 2011-08-12 02:58:29 -07:00
Friendika 0db145dafa redirect to home after logging in using login url 2011-08-11 04:28:06 -07:00
Friendika 72873cd827 diaspora function dispatcher 2011-08-10 05:10:48 -07:00
Friendika 1bfe1283aa crypto stuff 2011-08-09 18:55:46 -07:00
Friendika 70017ebb8c diaspora encrypt+decrypt working !! 2011-08-09 02:53:51 -07:00
Friendika 7eb7f77413 use separate hcard from profile url 2011-08-07 19:26:44 -07:00
Friendika 0745c00b16 guids on items 2011-08-07 17:33:13 -07:00
Friendika 8812b7f4ca item guids 2011-08-07 17:29:26 -07:00
Friendika 1eec10329a guid functions 2011-08-07 16:56:26 -07:00
Friendika 48ffa880f0 cleanup 2011-08-07 16:15:54 -07:00
Friendika 1d659bd854 move public profile warning to top of page 2011-08-05 06:42:27 -07:00
Friendika 5a5a7bfc4c fallback sha256 openssl_verify code for php releases prior to 5.3 2011-08-05 05:37:42 -07:00
Friendika 6eec04b09c updates to Diaspora decrypt/verify from recent testing 2011-08-05 01:34:32 -07:00
Friendika 2abcf76ec1 salmon protocol changes magicsig draft-experimental, fixes to hostxrd 2011-08-04 22:37:45 -07:00
Friendika f0af4de4a7 wrap text from imported link in [quote] 2011-08-04 19:19:51 -07:00
Friendika d45a66e700 allow custom avatar sizes - needed for Diaspora hcard/vcard 2011-08-03 21:05:39 -07:00
Friendika ad1e827169 several fixes for attachments 2011-08-03 19:18:58 -07:00
Friendika d0b7723bbc re-parent api post item with parent_id and no parent_uri 2011-08-03 16:29:25 -07:00
Friendika e22e823e93 allow group selection from contact edit page 2011-08-02 22:39:35 -07:00
Friendika 2637831d90 some more zot changes migrating back to f9a mainline 2011-08-01 21:02:25 -07:00
Friendika 996425206f api profiles 2011-07-31 20:01:00 -07:00
Friendika b0a9ec0a73 better handling of api comments/replies 2011-07-31 17:52:36 -07:00
Friendika 60caffcd77 convert our native pkcs#8 to pkcs#1 for diaspora-public-key xrd field 2011-07-30 01:03:24 -07:00
Friendika 01703f3be6 get_diaspora_key() 2011-07-30 00:51:59 -07:00
Friendika a61ec584d6 basic diaspora decryption 2011-07-30 00:31:00 -07:00
Fabio Comuni ac6945eed1 Merge remote-tracking branch 'friendika/master' 2011-07-29 17:23:09 +02:00
Fabio Comuni 0111a1231c re-add pending registrations in ping.php, for admin side menu 2011-07-29 17:14:35 +02:00
Fabio Comuni d88ed393f8 notify pending registrations 2011-07-29 16:24:09 +02:00
Friendika 9b2ddb2cc2 auto-friend profiles showing up in directory as community pages 2011-07-28 19:18:07 -07:00
Friendika 04675e3ec3 revup 2011-07-28 16:49:43 -07:00
Friendika c74f0f0cab show full size photos for album view even when photo has been used as a profile photo 2011-07-28 01:01:19 -07:00
Friendika 822fea9d9d installer text changes 2011-07-27 21:48:02 -07:00
Friendika b721fabc3c show lock icon on private events 2011-07-27 02:21:55 -07:00
Friendika 454ff3c7f0 configurable format for date input selectors 2011-07-25 20:59:25 -07:00
Fabio Comuni 99ab06bad3 js to open close popup nav menu and to populate notification menu via ping. 
Update mod/ping to return details about messages and intros
 2011-07-25 16:54:39 +02:00
Fabio Comuni e6444adafd change nav selected css class 2011-07-25 16:52:30 +02:00
Friendika 6b806708d9 typo 2011-07-21 20:21:41 -07:00
Friendika 77cea581b0 better fix for bug #107, last one was flawed 2011-07-21 20:19:55 -07:00
Friendika f4b4f61f66 provide fake first arg to ajax updater 2011-07-21 17:55:15 -07:00
Friendika 1d7d4bf8c6 wrong path for salmon verify 2011-07-20 23:14:43 -07:00
Fabio Comuni 7a069c1438 Load tinyMCE on post editor only if needed. 2011-07-20 11:08:42 +02:00
Friendika b27d68633b register hook 2011-07-19 23:10:09 -07:00
Friendika e2f22a1827 diaspora salmon endpoint (decryption not yet provided) 2011-07-19 21:23:47 -07:00
Friendika 1d35d1e5a1 Merge pull request #141 from fabrixxm/newacl 
New jot ACL selector
 2011-07-19 17:24:09 -07:00
Fabio Comuni 9debbfde1e fix group image name 2011-07-19 16:25:40 +02:00
Fabio Comuni 9fa0956966 New jot acl selector 2011-07-19 16:17:58 +02:00
Friendika c0b8e63a3f basic diaspora discovery 2011-07-18 18:13:46 -07:00
Friendika 1fa2231c20 invite system 2011-07-17 21:12:31 -07:00
Friendika 43110db749 begin invites, fb setup changes 2011-07-17 16:08:47 -07:00
Friendika 944f03d367 change license 2011-07-17 03:34:16 -07:00
Friendika f35a61761a Merge pull request #139 from fabrixxm/update 
Experiment with on-line update
 2011-07-15 01:29:46 -07:00
Friendika 74a608e1c7 openid settings appearing when disabled, don't tag numbers, install admin not getting set 2011-07-12 23:14:38 -07:00
Friendika 706b6e8c84 email notifications not working - unable to change notification settings 2011-07-12 05:09:07 -07:00
Friendika 55bbe2108a event ownership from remote feeds messed up, this is one step - may require more 2011-07-12 01:24:07 -07:00
Friendika 2a65d01ce2 several fixes to parse_url 2011-07-11 17:23:42 -07:00
Friendika 35edf79abe bug #102 2011-07-09 15:06:53 -07:00
Fabio Comuni 4fdc5ff30c First test for friendika "live" update 2011-07-08 17:12:08 +02:00
Friendika 2d2b500639 input the admin email address during install/setup. 2011-07-07 19:12:35 -07:00
Friendika d99dfbe4ef friendika-z configuration details in admin page 2011-07-07 18:25:56 -07:00
Friendika d7b5a606fb don't show mailbox settings at all if disabled 2011-07-06 20:27:18 -07:00
Friendika 3f25830076 more friendika-z 2011-07-06 20:16:40 -07:00
Friendika 94ca19c016 a few minor fixes to settings page 2011-07-06 16:47:55 -07:00
Fabio Comuni e7834e60f8 Update settings page to use field templates. 
Add tabs to switch user settings/plugin settings
Add new field templates 'custom', 'password', radio' and 'yesno'
Update main.js to support advanced fileds
Update duepuntozero, dispy e loozah themes
 2011-07-06 12:10:00 +02:00
Friendika 84d12c3e08 move hidewall to user table - queries are getting too complicated and servers falling over 2011-07-05 23:23:43 -07:00
Friendika c221d5ea59 honour hidden profiles on display item page 2011-07-05 21:11:38 -07:00
Friendika d7154a4606 ability to link contacts that are "really me, but on another system/network". 2011-07-05 19:55:09 -07:00
Friendika 76e56fd44e begin work on relocation conversation 2011-07-05 19:19:11 -07:00
Friendika 24d41e2c6e purify html before trying to parse wild urls. This way at least it should parse. 2011-07-04 23:02:04 -07:00
Friendika 5e1335ac89 don't show delete buttons on community page 2011-07-04 21:52:21 -07:00
Friendika 1048ee744e reversed logic 2011-07-04 21:13:10 -07:00
Friendika 20d3aa2e77 community page 2011-07-04 20:57:07 -07:00
Friendika 78363ecfb1 msearch typo 2011-07-04 00:46:23 -07:00
Friendika a82e0e32b3 add site info to site json response 2011-07-04 00:44:25 -07:00
Friendika e795d1265e show keywords in match results 2011-07-03 21:30:48 -07:00
Friendika cd7098501e change wording of "new item view" to be consistent 2011-07-03 20:18:20 -07:00
Friendika 07ea67e33b removed stray debug statement 2011-07-03 19:57:20 -07:00
Friendika 5ceeb6752d starred items 2011-07-03 19:41:04 -07:00
Friendika bef68a8c7f posts from hidden walls not allowed in search results 2011-07-03 05:54:40 -07:00
Friendika 3538dc15cc improved search - ensure you can see all your own content (logged in members). Visitors can only see public wall posts. 2011-07-03 05:00:11 -07:00
Friendika e6aaa8b59b use local 'match people with my interests' if global directory is not configured 2011-07-02 01:21:56 -07:00
Friendika c23657ab6e also check for blocked 2011-07-01 17:45:00 -07:00
Friendika 9816f14d40 statusnet improvements 2011-07-01 17:39:16 -07:00
Friendika f53a2d6da9 add group highlight to other pages 2011-07-01 06:23:09 -07:00
Friendika b1aa77584f indicate currently selected group in group picker 2011-07-01 06:14:15 -07:00
Friendika 086dc25dd1 logic reversed 2011-06-30 23:23:50 -07:00
Friendika 762fb878f8 don't allow editing of somebody else's event 2011-06-30 23:21:58 -07:00
Friendika 53653f6a4d consolidate perrmisions sql, minor duepuntozero validation fixes 2011-06-30 17:35:35 -07:00
Friendika 8819c73ba1 bug #99 - don't show album name/link if photos are private 2011-06-30 03:39:08 -07:00
Friendika 3eb0b4be2a now that we have admin interface, completely remove register approvals from notifications 2011-06-29 22:38:30 -07:00
Friendika 58d474aa2d switch to text mode group editor after 'n' contacts 2011-06-29 20:42:16 -07:00
Friendika ae0275ec2c collapse multiple spaces in usernames 2011-06-29 19:26:18 -07:00
Friendika ad5b976978 allow spaces in @ tags 2011-06-29 18:59:05 -07:00
Fabio Comuni f4a1820110 re-added last item date in admin user page. relative_date return 'never' if null is passed 2011-06-29 16:06:32 +02:00
Fabio Comuni 1e307e9869 Fix bug #98, add "never" to relative_date(), fix batch operations 2011-06-29 12:05:09 +02:00
Friendika 2a57847816 don't allow blocked/unverified users to reset their password. 2011-06-29 00:59:21 -07:00
Friendika 62340ba86b get app structure needed in regmod 2011-06-29 00:40:43 -07:00
Friendika d5855967a7 do not translate hidden photo album 'Contact Photos' as it may become unhidden when different language is used. 2011-06-28 22:33:02 -07:00
Friendika 0b221e8945 bug #96 move libraries to library - better alignment of like rotator 2011-06-28 21:11:52 -07:00
Friendika 4ca6a9a382 dbg info for photo uploads 2011-06-28 18:59:41 -07:00
Friendika 932397b47b trim webfinger request 2011-06-27 19:47:55 -07:00
Friendika 4418cb4349 preformat webfinger output 2011-06-27 18:13:44 -07:00
Friendika 1947b74e5b some basic margins for friend suggestion screen 2011-06-27 16:18:06 -07:00
Friendika 14c002d7a4 make friend suggest themeable 2011-06-27 03:09:45 -07:00
Friendika 06a4c0f703 ignore current contact on friend suggestion picker 2011-06-27 03:03:58 -07:00
Friendika c410c9013c friend suggestions 2011-06-26 22:57:08 -07:00
Friendika 23f00aaab4 recipient ui, friend suggestions 2011-06-26 21:55:24 -07:00
Friendika 3fe1e19725 pass notify endpoint with friend suggestions 2011-06-26 19:30:57 -07:00
Friendika c9604ef578 allow cross-site xrd/lrdd/webfinger 2011-06-25 19:40:37 -07:00
Friendika 59d9070d13 suggestion template 2011-06-25 19:10:38 -07:00
Friendika e320975d73 bug #95 2011-06-23 22:23:26 -07:00
Friendika a15bd91d17 don't update an event that hasn't changed. 2011-06-23 18:25:33 -07:00
Friendika 38cf37d3c3 new item view, sort by received date - not posted date. 2011-06-23 17:56:59 -07:00
Friendika 5633430a19 don't allow tags in app source 2011-06-23 15:58:43 -07:00
Friendika fa778e0040 Merge pull request #126 from fabrixxm/dispy 
Dispy
 2011-06-23 04:10:12 -07:00
Fabio Comuni 5de7d0f12f add profile tabs to "photos", "events" and "notes". in dispy, show active tab. 2011-06-23 11:30:17 +02:00
Friendika 96857389ac friendika-z initial implementation 2011-06-23 01:57:14 -07:00
Friendika c23c366ff6 receive friendship suggestion over the wire (dfrn) and store 2011-06-22 19:08:30 -07:00
Friendika 55112cfdd0 item source 2011-06-20 19:08:40 -07:00
Friendika 285d617569 using pre - one less str_replace for log viewing 2011-06-20 16:10:03 -07:00
Friendika de24f68112 module to provide local "find people like me" when global dir unavailable 2011-06-20 05:14:42 -07:00
Friendika b56e00c7c5 api post sort of working - output status,user need to be swapped 2011-06-19 20:13:24 -07:00
Friendika c2dcff0d02 move profile privacy settings to the Privacy section of the Settings page 2011-06-19 16:47:03 -07:00
fabrixxm 001982cac0 Change logic in admin.php to load plugin settings form. Add statusnet settings form. 2011-06-19 15:43:10 +02:00
fabrixxm 4b633d54bb admin: fix last item date in users list, fix plugins details template 2011-06-18 08:52:51 +02:00
fabrixxm 23931ab719 Admin: add translatable strings, remove 'rino' settings, invert 'no'-setings, add "plugin_admin" hook for global plugins settings. add settings to twitter connector as example. 2011-06-18 08:29:59 +02:00
Friendika 484b248f73 add pagination to admin/user page to support large numbers of users 2011-06-17 16:21:11 -07:00
Friendika 4ca730e5d7 remove debug statements 2011-06-16 23:17:25 -07:00
Friendika fb0b22fb13 fix admin log viewer (will only read the last 5M of the log, and puts the text into a scrolling div) 2011-06-16 22:20:12 -07:00
Friendika b61a7158da Merge pull request #116 from fabrixxm/admin 
Admin pages
 2011-06-16 15:27:12 -07:00
Fabio Comuni ede011cc32 Admin users page. some fix to template processor. 2011-06-16 14:56:43 +02:00
Fabio Comuni 5f583fb8d6 Admin: register policy in site page, initial users page. Aside 'Users' link show pending registrations. 2011-06-16 12:05:35 +02:00
Friendika c92e6ed929 avoid race condition on delete checked items 2011-06-16 00:38:41 -07:00
Friendika e5b54e74ba delete selected items 2011-06-15 20:43:39 -07:00
Friendika cee63c7a0d preserve original timezone adjust selection when editing events 2011-06-14 21:44:27 -07:00
Friendika ca84823437 Dear $username not expanded/replaced in text emails 2011-06-14 20:49:25 -07:00
Friendika 5105b3febc event calendar links, editing 2011-06-14 19:48:37 -07:00
Fabio Comuni 00e142e4f7 Load plugin info from plugin file. Show README.md or README from plugin dir in plugin details page 2011-06-14 14:21:43 +02:00
Fabio Comuni 25d1637ec4 simple plugin details and log view in admin 2011-06-14 11:54:14 +02:00
Fabio Comuni 5dc8fbccb2 enable/disable plugins from admin page 2011-06-14 11:16:27 +02:00
Fabio Comuni b1184f3fde Merge remote-tracking branch 'friendika-master/master' into admin 2011-06-14 10:37:54 +02:00
Fabio Comuni 5882d8d022 Initial plugins admin page 2011-06-14 10:35:56 +02:00
Friendika 4469f92ea3 prev/next icons (instead of text) for photos 2011-06-13 21:43:21 -07:00
Friendika 05eb9ceaba avoid returning events from getting posted again 2011-06-13 20:42:37 -07:00
Friendika fb92dbf5d6 link events + personal notes to profile tabs 2011-06-13 20:32:30 -07:00
Friendika d5fdd4287d event sharing, cont. 2011-06-13 19:06:49 -07:00
fabrixxm 4ba23df20a fix a typo in site settings page 2011-06-13 18:29:14 +02:00
Fabio Comuni ab27f1393e Admin site page 2011-06-13 18:03:06 +02:00
Fabio Comuni 3364c2a2d8 Initial admin page 2011-06-13 12:52:29 +02:00
Friendika 7c60701efc fixed a few feed problems affecting activity objects/targets 2011-06-10 01:51:14 -07:00
Friendika b857a49bfe event publish 2011-06-09 21:23:45 -07:00
Friendika 8aaf55c1e6 event item 2011-06-09 20:02:48 -07:00
Friendika 9203b48527 default event publish permissions = personal 2011-06-09 01:01:29 -07:00
Friendika d371241e66 events 2011-06-09 00:58:45 -07:00
Friendika 894dfde122 set permalink on photo tags 2011-06-08 22:34:22 -07:00
Friendika dea721a3f8 minor fixes to apps (don't show notes if not logged in) and photos (tag delete link is leaking to unauthorised users) 2011-06-08 21:43:32 -07:00
Friendika df8ac668b8 more calendar work, undo strict_privacy flag to use different approach 2011-06-08 21:06:02 -07:00
Friendika a10abd4860 remove event if attached item is deleted 2011-06-08 00:47:00 -07:00
Friendika 0bfb6314df default uploaded photo permissions were wrong 2011-06-07 22:47:15 -07:00
Friendika e2f1540f25 events, continued. Also better regex matching accounting for empty elements 2011-06-07 22:13:07 -07:00
Friendika 33fe26ecb0 more progress on events 2011-06-07 20:10:43 -07:00
Friendika d2863d1859 first recently uploaded photo (in 3 hours) to an older existing album, post made visible 2011-06-07 16:23:37 -07:00
Friendika c1b2e90e37 basic saving of events 2011-06-06 22:27:38 -07:00
Friendika fcb4316c29 tinymce for event fields 2011-06-06 21:49:07 -07:00
Friendika bbc65f9832 prev/next links in calendar 2011-06-06 21:28:11 -07:00
Friendika 9f51233451 event listings 2011-06-06 20:17:36 -07:00
Friendika 452245d988 more events framework 2011-06-06 19:59:20 -07:00
Friendika c0094aa4f8 strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy issues 2011-06-06 16:26:11 -07:00
fabrixxm 76f4d85d9a Small fix to theme selector 2011-06-06 14:55:54 +02:00
Friendika 4c629e274b begin event module 2011-06-05 23:10:07 -07:00
Friendika 18f4c6094a bug #88, Thanks Chris! Added a couple of minor tweaks for identity checking and consistency with other profile viewing links 2011-06-05 21:05:55 -07:00
Friendika edbad772ba add flag for experimental themes 2011-06-05 18:05:25 -07:00
Friendika 6f34f89ddb mb_string is now required. 2011-06-04 22:48:43 -07:00
Friendika e591ed6b30 minor edits 2011-06-03 07:04:43 -07:00
Friendika 86df81352f show new_member page only on our own profile 2011-06-03 06:22:39 -07:00
Friendika 32bebdfa7e new_member not new_user 2011-06-03 06:17:43 -07:00
Friendika 00c548cc8f new member page 2011-06-03 06:12:34 -07:00
Friendika 20d1de4ced got it wrong - apparently no need to fix json slashes 2011-06-02 20:42:09 -07:00
Friendika 55e727de64 make 'visible to everybody' warning toggle correctly in photos and settings 2011-06-01 22:06:53 -07:00
Friendika 969a25eab2 add titles to shared items if available 2011-06-01 06:41:12 -07:00
Friendika b8c4d73377 show group affiliations in contact editor 2011-05-31 19:24:26 -07:00
Friendika e25ded6d96 don't count wall posts in unseen network total 2011-05-31 17:35:24 -07:00
Friendika f95ea14478 show linked url on user's contact page 2011-05-30 22:17:04 -07:00
Friendika 9f52e311df sort wall items by date order instead of id. bug #61 2011-05-30 19:59:54 -07:00
Friendika 7fb9aa24fb bug #87 alert if email settings don't open mailbox, also display last email connect time 2011-05-29 21:20:50 -07:00
Friendika 547fd1e0e5 small fixes to item post to try and sort out segfault issues on php 5.3 (?) 2011-05-29 15:47:26 -07:00
Friendika 69f014d02b bug #38 ability to restrict profile, wall, photos from non-friends 2011-05-28 00:49:03 -07:00
Friendika 4e8a97f30a bug #38 posts and photos only visible to friends if so configured 2011-05-28 00:42:01 -07:00
Friendika 94af6fb064 correct nickname for display link on comment emails 2011-05-27 18:54:43 -07:00
Friendika 763ff827d5 don't reset photo permissions unless photo has owner-only permissions 2011-05-27 02:37:12 -07:00
Friendika 341f853b04 search from network page 2011-05-26 17:47:33 -07:00
Friendika 7acb8fa6e7 add webfinger diagnostic module 2011-05-26 16:41:36 -07:00
Friendika 3710a6fd07 sort out a couple of email notify issues 2011-05-25 18:15:49 -07:00
Friendika cd536731c3 minor string update 2011-05-25 17:20:41 -07:00
Friendika b6b2997b43 remove debug line 2011-05-25 16:02:02 -07:00
Fabio Comuni ad2aded259 Small tweak to a copule of translatable strings 2011-05-25 12:23:45 +02:00
Friendika 2a679b1164 file attachments 2011-05-25 02:08:15 -07:00
Friendika 73b4faca5c basic file upload/attach 2011-05-24 22:40:52 -07:00
Friendika e3d1ef8ef7 ability to hide profile and wall from unknown people 2011-05-24 16:30:52 -07:00
Friendika 040fc247a0 bug #85 2011-05-23 20:30:37 -07:00
Friendika 19ccd658eb Merge branch 'pull' 2011-05-23 18:18:01 -07:00
Friendika 78b2db3a98 Merge branch 'fabrixxm-master' 
Conflicts:
	boot.php
 2011-05-23 18:17:02 -07:00
Friendika 9a3f5eaf7d Merge pull request #107 from fabrixxm/oembed 
Oembed plugin
 2011-05-23 18:12:14 -07:00
Friendika 3e6180183b improved browser language detect, set user language on login 2011-05-23 17:18:36 -07:00
Fabio Comuni e1107b55c6 add info() function. Works like notice() but show messages in a div with class info-message. 
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
 2011-05-23 11:39:57 +02:00
Fabio Comuni 7c5a7a94d4 Add oembed user option for use oembed instead of standard yotube embedding. 
Remove global option and parse_url use of oembed.
 2011-05-23 10:37:09 +02:00
fabrixxm ef64c5187d add config [system][embed_all] to use oembed with links and youtube. Url parse fallback to default if url has not an oembed rappresentation. 2011-05-23 09:14:57 +02:00
Friendika 5996e2cd4c if no FB image and fb link is on our site, use Friendika logo for fb image. Otherwise it's going to end up being a random friend. 2011-05-22 21:20:28 -07:00
Friendika 576f8eda08 more buggy debugging code removed. 2011-05-22 20:18:39 -07:00
Friendika 44a22c2915 more improvements in twitter handling, reduce duplicates from FB when double friended 2011-05-22 18:40:00 -07:00
Friendika ea0a28ebfb removed buggy debug code ;) 2011-05-22 14:20:31 -07:00
Friendika 8510748b19 friendika page hook for German impressum 2011-05-22 01:15:04 -07:00
Chris Case f4cb6b9b08 fixed a couple of bugs 2011-05-21 23:19:50 -07:00
Chris Case 4cff911939 merged multipart email changes 2011-05-21 21:40:16 -07:00
Chris Case 2cf696d0b5 image updates 2011-05-21 19:27:56 -07:00
Friendika 1ccda19f7a hooks can't contain direct values, must be variables 2011-05-21 17:17:27 -07:00
Friendika 0dfcbe9c44 better handling of twitter follows, remove ajax anchor /#!/ 2011-05-21 17:13:51 -07:00
Friendika bc2297d933 don't insert link summaries containing javascript bug #75 2011-05-21 05:27:53 -07:00
Friendika 22cf6b3fe6 'mark seen' not getting all msgs on profile page 2011-05-20 19:28:48 -07:00
Friendika db60d6d78f photo upload plugin size limit is not working, call photo_end hooks in any error return from mainline so html does not leak into json responses bug #77 2011-05-20 15:57:58 -07:00
Friendika 0abf2f11c6 patches for youtube's change in link and embed formats, please test 2011-05-20 15:46:41 -07:00
Friendika 5f20925220 deny link not clickable on admin approval notification page 2011-05-20 15:11:36 -07:00
Friendika 681885a120 "notes" app 2011-05-20 01:15:02 -07:00
Friendika a6603a54d9 don't send any potentially large embeds over ajax so as to avoid huge prefetch downloads. Strip them out and provide a notice to reload page to view them. Ensures they will only be loaded once. 2011-05-18 20:34:18 -07:00
Friendika 990d5e82a0 doc updates - connecting to services 2011-05-18 17:29:12 -07:00
Friendika f9444c8be5 admin directory view 2011-05-16 18:52:27 -07:00
Friendika 730322ee5f bug #70 - error messages on group deletion, warning cleanup 2011-05-15 16:36:49 -07:00
Friendika df7a4206b7 fix json_encode on url's 2011-05-12 02:15:04 -07:00
Fabio Comuni 31aee6b803 missing / in admin profile url 2011-05-12 10:33:59 +02:00
Fabio Comuni 564f9c924a Serve friendika node info as json from url /friendika/json/ 2011-05-12 10:26:34 +02:00
Friendika b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika a00813497f bring back load_view_file for dispy templates 2011-05-10 23:35:31 -07:00
Friendika 5eea0d5ecb photo lockview not working, temp fix for po2php 2011-05-10 20:10:13 -07:00
Friendika 2fffec912c leave extra line between imported url and content 2011-05-10 18:15:45 -07:00
Friendika c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Friendika cb6c1f91b7 rolling version number in preparation for release 2011-05-09 16:51:25 -07:00
Friendika 3b51f28d25 comment macros showing on photos 2011-05-08 22:58:38 -07:00
Friendika c2e35d2d35 set permalink on uploaded photo items 2011-05-08 22:47:35 -07:00
Friendika 26d748f6d8 Merge pull request #96 from fabrixxm/api 
Status.net Api
 2011-05-05 04:29:45 -07:00
Friendika b3fa03d3b4 Merge pull request #95 from fabrixxm/dispy 
Dispy
 2011-05-05 04:29:14 -07:00
Fabio Comuni b3a5fccc9d template for photo display 2011-05-05 10:53:03 +02:00
Friendika eb2aae7987 missing is_public in editpost 2011-05-05 00:29:56 -07:00
Friendika 5f0b43485a incorrect count of total pages in normal view mode 2011-05-04 20:49:11 -07:00
Friendika 6c1d587ae3 notify not called on new photo album (first item) 2011-05-03 05:27:19 -07:00
Friendika 0f261ef8fa configurable FB poll interval, default 1hr. 2011-05-02 20:14:37 -07:00
Friendika 69dc17eb81 when viewing network group, show my private conversations to the group 2011-04-30 21:53:51 -07:00
Friendika d45ad7bb6b suppress duplicate FB posts (incoming after posted locally) 2011-04-27 04:24:00 -07:00
Friendika 242d4805d5 call post_local_end hook on like/dislike 2011-04-26 17:07:49 -07:00
Friendika a01c40a845 no insecure warning on FB connections 2011-04-26 05:45:53 -07:00
Friendika 245a56f0c1 lots of facebook fixes 2011-04-26 04:39:27 -07:00
Friendika a0e7d8fa00 redirect to profile photo upload on very first login 2011-04-23 17:31:23 -07:00
Friendika 639d52ec18 block_public should also block the contacts page and 'Connect' page if not logged in 2011-04-21 19:12:22 -07:00
Friendika eeb3c13ad3 when public access is blocked, profile page should show login box 2011-04-21 18:39:07 -07:00
Friendika 9e19eef194 "firewall" setting - block all public pages from the public if configured to do so 2011-04-21 17:29:47 -07:00
Friendika 1d4791d38c bin2hex not vice versa 2011-04-21 00:43:37 -07:00
Friendika 6e6d143aab another typo 2011-04-21 00:29:48 -07:00
Friendika 0803abcf53 typo 2011-04-21 00:27:35 -07:00
Fabio Comuni 793fc60a65 add rsd.xml (needs a template) 2011-04-21 09:08:50 +02:00
Fabio Comuni b505e76393 First attemp of api 2011-04-21 09:04:15 +02:00
Friendika a1ef8f669d don't show connect link to authenticated visitors 2011-04-20 15:27:10 -07:00
Friendika c0b7000a83 missing acl selector after merge 2011-04-20 05:51:02 -07:00
Friendika e302741e49 merge status editor instances 2011-04-20 05:48:12 -07:00
Friendika 0af6014c94 keep space before t() for legacy string puller 2011-04-20 05:00:58 -07:00
Friendika afe4cc8bfa pull request #91 fabrixxm (manual merge) 2011-04-20 04:50:12 -07:00
Friendika e0e3cc7a72 edit post broke with recent checkin 2011-04-19 22:37:17 -07:00
Friendika 3787e1e500 provide disclosure warning on private network page 2011-04-19 21:09:25 -07:00
Friendika d874a55178 per contact network page (link in photo menu) 2011-04-19 20:50:02 -07:00
Friendika 29a48de5e2 follow requests most adhere to site allow policy 2011-04-19 16:31:39 -07:00
Friendika a0179235d2 provide a way to disable mailbox integration 2011-04-18 20:20:04 -07:00
Friendika b168847b56 still getting a zero 2011-04-18 16:03:07 -07:00
Friendika e2c9d04b36 leave imap port blank if 0 2011-04-18 15:58:01 -07:00
Friendika ab099e9102 email integration, cont. 2011-04-17 23:27:11 -07:00
Friendika 863ddf1676 mail changes 2011-04-16 08:45:08 -07:00
Friendika 13eaa802e4 relocated "follow" url scraping code so it can be used elsewhere (contact repair, etc.) 2011-04-15 00:59:00 -07:00
Friendika 44c47f118c "profile locator/address" is now called "Identity Address" to reduce confusion 2011-04-14 20:37:42 -07:00
Friendika de131c9e58 set utf-8 on all emails 2011-04-14 17:13:13 -07:00
Friendika 54368e3a0d initial spanish translation 2011-04-14 02:34:43 -07:00
Friendika 974077c06c contact "repair/relocate URL" tool 2011-04-13 20:14:30 -07:00
Friendika 5198e039df better visibility of default post permissions 2011-04-13 17:11:24 -07:00
Friendika 17a7dae67d doco 2011-04-13 16:58:21 -07:00
Friendika 767f165965 local documentation library 2011-04-13 07:07:21 -07:00
Friendika d4bb560e7f small wording change 2011-04-12 21:37:54 -07:00
Friendika 4a514fa966 minor ui tweaks 2011-04-12 21:29:58 -07:00
Friendika 080efe4d1e missed file addition 2011-04-12 21:25:00 -07:00
Friendika e8a0dd40b2 profile visibility editor 2011-04-12 21:21:33 -07:00
Friendika f04e2e7044 edit group links on network page 2011-04-12 18:22:58 -07:00
Friendika 5654ce926c move all message display sub-functions from boot.php into conversation.php 2011-04-12 17:58:16 -07:00
Friendika 5545c8ada9 cleanup 2011-04-12 05:37:26 -07:00
Friendika 61915a524d first cut at group chooser UI 2011-04-12 01:31:55 -07:00
Friendika 6da84027af visual display of group members 2011-04-11 22:47:16 -07:00
Friendika 0ed2d19ac8 death to comment box oddities (a slow death as it will take some time for everybody to upgrade) 2011-04-11 20:11:21 -07:00
Friendika 0085bf0c10 that's better... 2011-04-11 16:42:41 -07:00
Friendika a4836ac1ba wallwall oddities on display page 2011-04-11 16:15:38 -07:00
Friendika ff15ea0993 wrong variable passed 2011-04-11 15:45:19 -07:00
Friendika c8f32536ff pull in new 'writable' dfrn flag 2011-04-11 03:22:09 -07:00
Friendika 9133a2384a all conversations unified except photos 2011-04-11 01:31:04 -07:00
Friendika a0956ee955 some w3c validation issues 2011-04-10 23:01:38 -07:00
Friendika a65c595b16 "display list of status items" moved to include/conversation.php, 
currently network module has been updated to use it for display, other modules to follow
with whatever special case code they require.
 2011-04-10 21:21:16 -07:00
Friendika 9341f2c4d6 little fix 2011-04-10 19:46:40 -07:00
Friendika 3d51518a13 set writable flag on dfrn_poll 2011-04-10 19:29:21 -07:00
Friendika 940d216395 initial dfrn update to pass perms 2011-04-10 18:38:55 -07:00
Friendika 12bc4a44cf [privacy] use owner's default permission settings on "is now friends with..." msg 2011-04-10 15:30:56 -07:00
Friendika 58508201a5 bug #37, ampersand + everything following in url is stripped when using link icon to share link 2011-04-10 03:36:12 -07:00
Friendika bf865f0210 bug #34, line breaks double in retweet/share 2011-04-10 03:00:29 -07:00
Fabio Comuni 1713ffb41c add opensearch support 2011-04-08 10:40:04 +02:00