mexon/friendica
1
0
Fork 0
Code Pull requests Activity
9873 commits 5 branches 60 tags 188 MiB
Commit graph

2525 commits

Author SHA1 Message Date
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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff a9c8aed9b1 Merge pull request #942 from davidmoerike/master 
Line: 68 f.
 2014-04-26 09:16:03 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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