miklo
/
friendica
sforkowany z mirror/friendica
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność
13 307 Commity
3 Gałęzie
56 Tagi
164 MiB
Wykres commitów

4389 Commity (3d4e1176ec9b18e9e7547b91d36554f2375ddb8e)

Autor SHA1 Wiadomość Data
gerhard6380 5e1726184a correct some spaces/tabs 2016-09-25 18:45:00 +02:00
gerhard6380 01ff105a43 correct tab indents and CRLF 2016-09-25 18:22:42 +02:00
Michael Vogel 196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
Tobias Diekershoff 252f1827c1 correction of typos 2016-09-24 08:08:04 +02:00
Tobias Diekershoff 1ea9df5974 correction of typos 2016-09-24 08:07:48 +02:00
gerhard6380 528a492282 Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop 2016-09-23 19:38:57 +02:00
gerhard6380 afc7d316a7 Change API documentation to contain new API call /api/friendica/profile/show 2016-09-23 19:26:44 +02:00
gerhard6380 4de12dacc7 New API /api/friendica/profile/show to return data of all profiles a user has to a client 2016-09-23 19:06:41 +02:00
Michael Vogel 5f9a392fc4 At the search we should do it as well. 2016-09-23 06:36:48 +00:00
Michael Vogel 6fd54df940 Some additional beautification 2016-09-22 18:18:26 +00:00
Michael Vogel abbf501602 The string is an array ... 2016-09-22 18:07:32 +00:00
Michael Vogel c6f50d0468 Reworked ejabberd authentification 2016-09-22 02:57:40 +00:00
Michael Vogel 4f5997f30a XMPP authentification for multi domain systems 2016-09-13 20:29:47 +00:00
Michael Vogel 1caa87dce6 Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
Michael Vogel 22f32d9721 New process table for a better detection of running workers 2016-09-09 20:33:54 +00:00
Michael Vogel ac1787d1e5 Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value 2016-09-05 11:52:41 +00:00
Michael Vogel 1cb6043aea Attachments are now displayed again. 2016-09-04 18:06:07 +02:00
Michael Vogel 6e25077893 Merge pull request #2760 from gerhard6380/3.5rc 
API: change friendica_activities to include arrays of users
 2016-09-03 20:47:52 +02:00
Michael Vogel 6df40b1161 sQL: No "NOT NULL" on text fields. 2016-09-03 15:06:42 +00:00
Michael Vogel c02b1c3f36 The "tagged with" message now works again. 2016-09-03 12:48:51 +02:00
gerhard6380 3a31619509 API: change friendica_activities to include arrays of users 2016-09-02 17:01:52 +02:00
Tobias Diekershoff 014fc5dccb Merge pull request #2758 from annando/1609-sql-charset 
Set the charset for the SQL connection for new installations
 2016-09-01 09:22:07 +02:00
Michael Vogel 59ff309ee5 Add the new charset parameter to the database creation 2016-09-01 04:44:29 +00:00
Michael Vogel 9209d88c4a Set the charset for the SQL connection for new installations 2016-09-01 03:50:41 +00:00
Tobias Diekershoff 02c29f1313 Merge pull request #2748 from rabuzarus/rabuzarus-pending 
best_link_url: don't use redirect for pending contacts
 2016-08-31 15:55:26 +02:00
Tobias Diekershoff c62a28d95e Merge pull request #2755 from rabuzarus/theme-init-identity 
fix theme loading
 2016-08-31 15:53:42 +02:00
rabuzarus aedd2cfa60 Update identity.php 2016-08-31 13:49:24 +02:00
Michael Vogel 41613ec55d Bugfix: Fixed two bad sql queries 2016-08-29 18:40:40 +00:00
rabuzarus e0d329ece9 Merge pull request #2750 from annando/1608-worker-priority-again 
Prevent lowest priority calls from never being called
 2016-08-28 00:39:58 +02:00
Michael Vogel 6a167cf8b1 Prevent lowest priority calls from never being called 2016-08-27 21:05:38 +00:00
Michael Vogel e46dae3937 Removed some accidentally written code 2016-08-27 19:53:09 +02:00
Michael Vogel a156d59e2a dbstructure: Set the version when updating manually 2016-08-27 19:50:19 +02:00
rabuzarus c1555b623a best_link_url: don't use redirect for pending contacts 2016-08-26 15:47:45 +02:00
Tobias Diekershoff dc6cce4080 Merge pull request #2746 from annando/1608-diaspora-handle-lowercase 
The handle for Diaspora contacts must always be low…
 2016-08-23 07:52:35 +02:00
Michael Vogel 80bfcc7694 The handle (user@domain.tld) for Diaspora contacts must always be lowercase 2016-08-23 07:48:48 +02:00
Tobias Diekershoff be4ce36a97 Merge pull request #2745 from annando/1608-atachments 
Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode
 2016-08-23 07:48:18 +02:00
Michael Vogel 50dc7a6047 Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode 2016-08-23 07:40:16 +02:00
Tobias Diekershoff f344813054 events with no finish should not export it to ical 2016-08-20 16:16:19 +02:00
Michael Vogel 108a1c4ac6 New priority level for stale processes. 2016-08-18 12:33:17 +02:00
Tobias Diekershoff 789e9577c6 Merge pull request #2737 from annando/1608-worker-again 
Performance improvements for the poller
 2016-08-14 22:10:13 +02:00
gerhard6380 078767630c improved sql statements for direct_messages calls 2016-08-14 22:03:59 +02:00
gerhard6380 01a2eb3555 Implement api/direct_messages/destroy 
Twitter compliant call replaces api/friendica/direct_messages_delete;
JSON return expected by Twitter API and parameter include_entities not
yet implemented
 2016-08-14 22:03:40 +02:00
gerhard6380 ef0cc850d4 remove api_friendica_direct_messages_all 
instead included 'friendica_verbose' parameter into standard function
api_direct_messages_box()
 2016-08-14 22:03:27 +02:00
gerhard6380 f9f1825e33 Removing api_friendica_direct_messages_conversations 
due to implementing 'seen' and 'parent-uri' into standard
api_format_messages() this call is not needed anymore. Adapting comment
blocks.
 2016-08-14 22:03:08 +02:00
gerhard6380 f99a646328 remove api_format_messages_win and include new fields in api_format_messages 2016-08-14 22:02:56 +02:00
gerhard6380 fe5182559f new API calls for private messsages in Win10 app 
new API calls used for Windows 10 app (similar calls to existing but
extended to include seen id and parent-uri)
 2016-08-14 22:02:43 +02:00
Michael Vogel 67b16507f1 Performance improvements for the poller 2016-08-14 21:02:29 +02:00
Michael Vogel 0ea9af3d7d Ping is now using a standard routine to generate the xml. 2016-08-10 22:51:03 +02:00
rabuzarus 5e4eaa433b Merge pull request #2720 from annando/1608-kill-stale-worker 
Process timeouts are now priority depending
 2016-08-08 22:34:45 +02:00
Michael Vogel d138b11868 Use a 10 minute timeout for high priority processes. This may be better. 2016-08-08 21:28:44 +02:00
Michael Vogel 29168de677 Process timeouts are now priority depending 2016-08-08 19:20:40 +02:00
Michael Vogel 61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure 
notifications restructure
 2016-08-08 07:41:48 +02:00
Michael Vogel 65a09c67a0 Bugfix: proc_run hadn't worked anymore due to the priority changes 2016-08-08 07:14:40 +02:00
rabuzarus 0532dc6a61 notifications - correct boolean variable checking 2016-08-07 12:26:49 +02:00
rabuzarus de02154a1b notifications - set default values for some varibles 2016-08-06 18:59:39 +02:00
Michael Vogel 0411eb289e Lower the priority for stale processes 2016-08-04 15:41:32 +02:00
Michael Vogel 074ae59f49 Reschedule killed processes at the beginning of the queue. 2016-08-04 15:33:15 +02:00
Michael Vogel dad74e9650 pubsubpublish is now split into separate calls per entry. 2016-08-04 15:15:43 +02:00
rabuzarus 8ad345c434 notifications - remove TAB (clean up) 2016-08-04 11:46:57 +02:00
Michael Vogel 0cba02a805 Added priority to some forgotten proc_run calls 2016-08-03 18:24:22 +02:00
Michael Vogel 7157ca3809 Fastlane is now working with any priority level 2016-08-03 15:59:25 +02:00
rabuzarus ae905cbd1b Merge develop into 0308-Notifications-restructure 
Conflicts:
	mod/notifications.php
 2016-08-03 12:53:38 +02:00
rabuzarus ce3188d5c6 notifications - move intros to NotificationsManager & make json output work 2016-08-03 12:44:04 +02:00
Michael Vogel ff430640c0 Small variable type fixed, removed unused includes 2016-08-03 10:19:46 +02:00
Michael Vogel d673f44c5b Split cron jobs in cronjobs, introduce fastlane for high priority tasks 2016-08-03 10:03:05 +02:00
fabrixxm 87fb0b7b26 Quick fix to PR #2682 2016-08-02 12:24:07 +02:00
Michael Vogel 13c285d61d Updated documentation 2016-08-02 10:19:10 +02:00
Michael Vogel b9dbb0ace1 Split cronhook call to several single calls 2016-08-02 06:28:34 +02:00
rabuzarus 6d3c15fe91 notifications - add attendance notifications 2016-08-02 00:01:43 +02:00
rabuzarus bcee356f66 notifications - add docu & pagination 2016-08-01 23:04:41 +02:00
rabuzarus 7a4be1cead notifications.php: move more code to NotificationsManager 2016-08-01 18:18:11 +02:00
Tobias Diekershoff c6f7952f37 Merge pull request #2696 from annando/1608-performance 
Small performance improvements
 2016-08-01 08:21:36 +02:00
Michael Vogel d8c4fceef8 Merge remote-tracking branch 'upstream/develop' into 1608-performance 2016-08-01 08:04:11 +02:00
Michael Vogel 02b5f6a34d Merge remote-tracking branch 'upstream/develop' into develop 2016-08-01 08:02:26 +02:00
Michael Vogel 668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
Michael Vogel 84e84a0689 Small performance improvements 2016-08-01 07:22:54 +02:00
trebor 52f641904b notifications.php: reduce code duplication 2016-07-30 10:51:21 +02:00
Michael Vogel 287c9cfbdd Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-26 22:15:49 +02:00
Michael Vogel 0deea97cf2 Merge pull request #2686 from rabuzarus/2107-contact_edit 
frio: templates for contact_edit and crepair
 2016-07-26 09:33:37 +02:00
rabuzarus 768d10536f frio: templates for contact_edit and crepair 2016-07-26 09:09:40 +02:00
rabuzarus e4bef09717 dbm.php - is_result should be a static function 
there was a notice in php.out - `Non-static method dbm::is_result() should not be called statically`
This should fix it.
 2016-07-25 11:46:14 +02:00
Michael Vogel 5e81c105e0 We now work with the "priority" field - that's better 2016-07-24 20:25:11 +02:00
Michael Vogel 747dc934f7 Avoid warning because $a isn't called by reference 2016-07-24 13:53:26 +02:00
Michael Vogel 4be7e5a581 "Fast lane" mechanism to reserve one queue for priority processes 2016-07-24 11:22:44 +02:00
Michael Vogel 7580c8ed11 Processing of high priority processes 2016-07-23 22:57:22 +02:00
Michael Vogel fb447e84ee Some more information about the current queue status of the worker 2016-07-22 18:07:04 +02:00
Michael Vogel 8bf7db06db New indexes for the API 2016-07-19 08:43:57 +02:00
Michael Vogel 4f07dfb35a Optimized queries 2016-07-18 15:25:42 +02:00
Michael Vogel 838f976715 Some more improvements to xml.php, code cleanup 2016-07-17 23:59:35 +02:00
Michael Vogel d7f093cb2e Enhanced XML creation, and so on. 2016-07-17 19:42:30 +02:00
Michael Vogel bc2c565060 Work in progress: API XML output without templates 2016-07-16 12:32:08 +02:00
Michael Vogel de6f48365b Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-15 20:12:46 +02:00
Tobias Diekershoff 0a49b7dc77 Merge pull request #2681 from annando/bugfix-diaspora 
Bugfix: There was an SQL error when adding new entries in the fcontac…
 2016-07-15 17:35:50 +02:00
Michael Vogel 1603aa41ef Bugfix: There was an SQL error when adding new entries in the fcontact table 2016-07-15 17:25:30 +02:00
Michael Vogel a64b7704d8 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-15 17:19:16 +02:00
Michael Vogel 1130f11037 Merge pull request #2680 from fabrixxm/feature-api-update 
API: fix plaintext of reshared attachment
 2016-07-15 16:58:59 +02:00
fabrixxm ec22b6086a API: fix plaintext of reshared attachment 
When replacing `[attachment]` element, text after it wasn't restored.
`[share]` element can contain `[attachment]`, the closing `[/share]` was elided,
then the `[share]` element was shown in plaintext instead of recycle symbol
 2016-07-15 16:53:30 +02:00
Michael Vogel 4e25d08a77 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-15 16:15:20 +02:00
Michael Vogel 6ebfbc5993 API: Use a generic function to create the XML 2016-07-15 15:37:51 +02:00
Tobias Diekershoff 334db69d5d Merge pull request #2678 from fabrixxm/feature-api-update 
api updates
 2016-07-15 15:08:55 +02:00
fabrixxm d68c09e428 API: use `diaspora::is_reshare()` 2016-07-15 12:22:35 +02:00
fabrixxm 43699646d6 API: use doxygen todo style 2016-07-15 11:46:19 +02:00
fabrixxm 66199c9861 API: rework retweeted_status 
`api_share_as_retweet()` now returns a copy of the item with
fields updated to shared content, instead of modify the item itself.
The new item array is used to build 'retweeted_status'.
 2016-07-14 16:39:40 +02:00
fabrixxm c7876d0c38 API: add docs to `api_item_get_user()` 
and remove commented out lines
 2016-07-14 13:36:15 +02:00
fabrixxm 18bd7f5eb7 API: use regex instead of SimpleXMLElement 
It's easier with exotic chars.
And the editor replaced all leading spaces with tabs.
 2016-07-14 13:32:31 +02:00
Michael Vogel 2c5fb55725 Diaspora: Link to protocol description added. Support for creation date of comments 2016-07-14 07:20:20 +02:00
fabrixxm ce2f765d28 API: rework share as retweet 
new shared status xml template.
<retweeted_status> element in xml.
parent status keeps his body and author, 'retweeted_status'
get body, author and plink from share bbcode.
 2016-07-13 22:29:07 +02:00
fabrixxm 3cd2ed54eb api: item owner and activities details 
return new fileld for items 'friendica_owner'.
'user' is always the author of the item.
Items activitites now returns array of contacts details: {'name','url'}
 2016-07-13 19:58:38 +02:00
Michael Vogel 4b29937a74 Worker: New value for cooldown time after each function call 2016-07-13 19:43:16 +02:00
fabrixxm 95b7de6313 API: Fix `api_array_to_xml()` 2016-07-13 19:11:10 +02:00
Michael Vogel fdd679636b Bugfix: Avoid a warning if "theme_info" isn't an array 2016-07-12 12:59:34 +02:00
rabuzarus 4e4580f326 Merge pull request #2669 from annando/1607-new-probe 
New probing mechanism
 2016-07-11 21:42:48 +02:00
Michael Vogel a64db18731 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-11 20:45:56 +02:00
Michael Vogel 0a46a3d10e Bugfix: Avatar pictures of mail contacts weren't displayed correctly 2016-07-11 20:42:18 +02:00
Michael Vogel ee7f10f130 Some more little documentation 2016-07-11 19:48:37 +02:00
rabuzarus 15471f3835 add possibility to load custom page templates + none.php pagetemplate is part of core now 2016-07-11 10:33:39 +02:00
Michael Vogel aad3fb2d32 Some more documentation 2016-07-10 18:44:48 +02:00
Michael Vogel 230bfcebea Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-10 14:03:10 +02:00
Tobias Diekershoff 26098fa263 Merge pull request #2671 from annando/1607-diaspora-soapbox-connect 
Bugfix: Diaspora connect requests to soapbox account work now
 2016-07-10 13:55:56 +02:00
Michael Vogel 9ac26802ce Diaspora: Send the profile data after a successful connect 2016-07-10 13:11:09 +02:00
Michael Vogel 19377f2a9c Just make the bugfix a little bit simpler 2016-07-10 12:18:10 +02:00
Michael Vogel 84aa01b377 Bugfix: Diaspora connects to a Soapbox account weren't established correctly 2016-07-10 12:09:58 +02:00
Michael Vogel 8a11a60932 Small text correction 2016-07-10 09:29:43 +02:00
Michael Vogel b9da831138 Fallback for empty names 2016-07-10 09:27:40 +02:00
Michael Vogel f27bc00464 Remove obsolote functions 2016-07-09 20:09:09 +02:00
Michael Vogel 058c93a64c Changed documentation 2016-07-08 22:55:39 +02:00
Michael Vogel f86dac652f OStatus now has "location" and "about", probing for urls added 2016-07-08 22:31:11 +02:00
Michael Vogel 0ccb171449 Probing now has a Twitter detection. 2016-07-08 21:15:20 +02:00
Michael Vogel e43a90252c Diaspora: Relayed retraction hadn't worked. 2016-07-08 20:39:14 +02:00
Michael Vogel b954714464 If the nick is missing then take the first part of the name 2016-07-08 20:37:10 +02:00
Michael Vogel edfee710fe To-Do added 2016-07-07 23:35:44 +02:00
Michael Vogel db1d8caaf2 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-07 23:35:14 +02:00
Michael Vogel a65547c578 Added documentation 2016-07-07 23:04:30 +02:00
Michael Vogel c625b6aba8 If a page contains a feed url then follow it. 2016-07-07 22:37:16 +02:00
Tobias Diekershoff b4b2a6d5b8 Merge pull request #2666 from annando/1607-more-logging 
Logging for feeds improved, new "process id" for logging
 2016-07-07 22:36:20 +02:00
Michael Vogel 2e37234a41 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-07 21:57:10 +02:00
Michael Vogel fc25e605cb Logging for feeds improved, new "process id" for logging 2016-07-07 20:32:13 +02:00
Tobias Diekershoff 5b03db4a1b adjust the rand bounderies to be within the allowed max value 2016-07-05 15:45:39 +02:00
Michael Vogel 585c893456 You can now prove with an uid (important for mails) 2016-07-04 22:34:35 +02:00
Michael Vogel 4e5d335492 Removed the legacy function calls, removed unused functions 2016-07-04 08:05:30 +02:00
Michael Vogel e1c0b4fe03 Warnings removed 2016-07-04 00:49:38 +02:00
Michael Vogel f5593b1981 Removed old code 2016-07-04 00:14:08 +02:00
Michael Vogel b124b94288 Support for noscrape when probing. 2016-07-03 23:11:21 +02:00
Michael Vogel 99f94edc9c New class to probe urls 2016-07-03 22:27:16 +02:00
Tobias Diekershoff ce64955fe0 Merge pull request #2659 from annando/1607-bugfix-scrape-diaspora 
Bugfix: The notify value for Diaspora wasn't assigned
 2016-07-02 22:07:41 +02:00
Tobias Diekershoff 598a9f76a6 Merge pull request #2658 from annando/1607-maxload 
Central Backend/Frontend detection when checking for overload
 2016-07-02 21:52:48 +02:00
Michael Vogel 34475ad262 Bugfix: The notify value for Diaspora wasn't assigned 2016-07-02 21:14:21 +02:00
Tobias Diekershoff 7cda169f24 Merge pull request #2657 from annando/1607-share-contact 
Only use the profile data in shares if there is data
 2016-07-02 20:06:20 +02:00
Michael Vogel f1af0fe360 Obly use the profile data in shares if there is data 2016-07-02 17:51:16 +02:00
Michael Vogel c7f10bacb5 Merge remote-tracking branch 'upstream/develop' into 1607-is-result2 2016-07-02 14:01:52 +02:00
Michael Vogel e4c6cfd2d8 Moves the function "is_result" from dba to dbm. 2016-07-02 14:00:42 +02:00
Tobias Diekershoff b580a338f6 Merge pull request #2654 from annando/1607-thumb-micro 
use thumb avatar size instead of micro size in the contact list
 2016-07-02 13:53:35 +02:00
Michael Vogel 7d531afd00 Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced 
Conflicts:
	boot.php
 2016-07-02 13:38:23 +02:00
Michael Vogel e67554924a use thumb avatar size instead of micro size in the contact list 2016-07-02 09:32:42 +02:00
Michael Vogel c549ae939c Added the new function to the poller. 2016-07-02 09:31:28 +02:00
Michael Vogel c1ce7059b6 If it doesn't work with the new method, try the old one 2016-06-30 22:58:56 +02:00
Michael Vogel e5dd67121f Some logging added. 2016-06-30 22:42:46 +02:00
Michael Vogel 97abbe83f4 Diaspora: Support for reading the /fetch/post/ functionality 2016-06-30 22:18:48 +02:00
Michael Vogel 24e0fffa2e Small bugfix 2016-06-30 07:56:06 +02:00
Michael Vogel d125939888 Just some more centralised functionality 2016-06-30 07:46:00 +02:00
Michael Vogel 99f0746660 Cleaned up the code 2016-06-30 07:32:07 +02:00
Michael Vogel 2c7fd1cb3c It should be now valid 2016-06-30 01:18:44 +02:00
Michael Vogel 2d72e2d932 Diaspora: Support for new fetch functionality (replacement for /p/) 2016-06-29 22:50:30 +02:00
Michael Vogel 230a645307 Diaspora: Another Bugfix for the new protocol 2016-06-29 20:37:04 +02:00
Michael Vogel 152efdaec5 Diaspora: Incompatibilities with signature check solved 2016-06-29 10:33:43 +02:00
Tobias Diekershoff 773517a734 Merge pull request #2638 from annando/1606-avatar-handling 
Imrpoved avatar handling when storing them/partly use of "micro"
 2016-06-25 19:51:00 +02:00
rabuzarus fd72f36ffe move html from function micropro() to own templates 2016-06-25 18:46:47 +02:00
Michael Vogel ad6b3f8815 Merge pull request #2636 from rabuzarus/2506_frio_strings 
add missing strings for frio
 2016-06-25 14:03:34 +02:00
Michael Vogel 0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" 2016-06-25 13:56:55 +02:00
rabuzarus 073f520cee add missing strings for frio 2016-06-25 12:21:13 +02:00
Michael Vogel e2023b6667 Store the guid value as well. 2016-06-25 11:52:52 +02:00
Michael Vogel ec5b3109e4 Support for the case when the guid and public key will vanish from webfinger 2016-06-25 00:38:47 +02:00
Tobias Diekershoff f8a20a15d3 Merge pull request #2633 from annando/1606-author-id-update 
author-id/owner-id: Post update function/added database documentation
 2016-06-24 07:03:46 +02:00
Michael Vogel eabf8734a8 Merge pull request #2631 from rabuzarus/1906-event-test 
cal export && public calendar - fix permissions
 2016-06-23 23:24:27 +02:00
Michael Vogel c7373dcec4 author-id/owner-id: Post update function/added database documentation 2016-06-23 21:15:54 +02:00
rabuzarus e352458ef0 pub calendar - permission clean up and docu 2016-06-23 10:07:13 +02:00
rabuzarus cd92a0dc34 Merge pull request #2624 from annando/1606-contact-id 
Item: New fields for author id and owner id - avatar improvement with relocation
 2016-06-22 14:26:39 +02:00
rabuzarus 2cac69ca86 cal export && public calendar - even better permissions testing 2016-06-22 13:50:47 +02:00
rabuzarus 8cc5dd35e8 cal export && public calendar - fix permissions 2016-06-22 00:39:52 +02:00
Michael Vogel 49c19a3c00 Merge pull request #2628 from rabuzarus/1906-event-test 
move the cal addon (exporting calendars) to core
 2016-06-21 22:48:31 +02:00
Michael Vogel 266fea3874 Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-21 00:10:24 +02:00
rabuzarus 71c9f562ae move the cal addon (exporting calendars) to core 2016-06-20 23:31:49 +02:00
Michael Vogel a657377616 Diaspora: Try to fetch the uri if we already received the message 2016-06-20 22:48:55 +02:00
Michael Vogel 40a44f1571 Some manual revert ... 2016-06-20 22:48:09 +02:00
Michael Vogel 467176fa65 Diaspora: Ensure that we always store the correct URI 2016-06-20 22:43:14 +02:00
Michael Vogel 65b541413f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-20 07:28:47 +02:00
rabuzarus 7495a34b32 implement a public calendar for vistors of someones profile page 2016-06-19 22:04:34 +02:00
Michael Vogel 0adff6f6b8 Fix for author-thumb/owner-thumb - DFRN: Relocate stuff 2016-06-19 20:01:25 +02:00
Michael Vogel 91db7a549c Optimised the amount of function for the item query 2016-06-19 08:32:38 +02:00
Michael Vogel c3ed6f7d01 Improved default value handling 2016-06-19 01:22:32 +02:00
Michael Vogel e512a83ecc Massively updated avatar handling 2016-06-19 01:07:20 +02:00
Michael Vogel bf2e23c205 Merge pull request #2616 from rabuzarus/1206-events-template 
use standard templates in events + frio templates for events
 2016-06-18 15:01:00 +02:00
rabuzarus b977efc95c code highlight - some spacing for readability 2016-06-17 15:29:01 +02:00
rabuzarus 7dc5fc8b9f Merge develop into 1206-events-template 
Conflicts:
	view/theme/frio/css/style.css
 2016-06-17 14:33:08 +02:00
rabuzarus 4313982e02 frio - event - code clean up + docu 2016-06-17 14:27:33 +02:00
rabuzarus 8b4c416713 frio: events - split event form in different sections 2016-06-16 20:16:16 +02:00
rabuzarus 0167a2bd61 port of Hubzillas code highlight feature 2016-06-16 11:38:12 +02:00
Michael Vogel 8762fb671f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-16 10:48:52 +02:00
Michael Vogel 3c9a80a31c dfrn relocate: addr field added, gcontact update added 2016-06-15 21:23:22 +02:00
Michael Vogel 0e35427dfc New fields "author-id" and "owner-id" in the item table 2016-06-15 21:20:55 +02:00
Michael Vogel 7f5a2d5c23 Categories were missing 2016-06-14 09:50:17 +02:00
Michael Vogel a05f0c39a6 Merge remote-tracking branch 'upstream/develop' into 1606-time-travel 2016-06-13 22:32:40 +02:00
Michael Vogel 81395fe385 Avoid time travel in posts (received before created) 2016-06-13 22:21:33 +02:00
Michael Vogel 2815173a52 Bugfix: Items weren't sorted correctly 2016-06-13 22:20:09 +02:00
Fabrixxm 6e28cdf2ee Fix Config and PConfig ::get() on new keys 2016-06-13 10:28:40 +02:00
rabuzarus 5e98f27fcd frio: events - work on event_form.tpl + datetime.php 2016-06-13 10:19:38 +02:00
rabuzarus 869a439466 Merge pull request #2595 from annando/1606-contact-priority 
Priority for native networks when searching by contact url
 2016-06-13 09:28:54 +02:00
Michael Vogel 125d80292b Some cleanup 2016-06-12 23:06:48 +02:00
Michael Vogel c68f28bc77 Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup 2016-06-12 21:07:45 +02:00
Michael Vogel c05898c57d The queries for items are unified (a little bit) 2016-06-12 21:04:55 +02:00
rabuzarus 64753f474c fix config & pconfig 2016-06-12 18:55:20 +02:00
Michael Vogel 6d50d18242 Merge pull request #2584 from rabuzarus/0906-profiles 
some restructure in profiles.php + frio template for profiles settings
 2016-06-12 14:20:42 +02:00
Michael Vogel 09fbcbc685 Just some added todo 2016-06-12 12:06:15 +02:00
Michael Vogel aac9caab2d Priority for native networks when searching by contact url 2016-06-12 10:46:15 +02:00
Fabrixxm 136ae34245 Add `$default_value` parameter to `Config::get()` and `PConfig::get()` 2016-06-10 12:00:34 +02:00
Fabrixxm 6c346b1ab6 Move `Config` and `PConfig` classes in `\Friendica\Core namespace` 2016-06-10 11:52:01 +02:00
Fabrixxm f2e79e976d set include/ folder base for 'Friendica' PSR4 namespace 2016-06-10 11:50:52 +02:00
rabuzarus 3a9a9e6a1c frio + core: some restructure in profiles.php + frio template for profiles settings 2016-06-10 11:24:38 +02:00
fabrixxm 60c1172e7e Merge pull request #2576 from rabuzarus/0806-PConfig 
move config to its own class (with legacy support)
 2016-06-10 11:13:08 +02:00
Michael Vogel 098a8ac6c2 Bugfix: In threads the contact data from users weren't taken. 2016-06-08 22:50:57 +02:00
rabuzarus 023c43fa4a config && pconfig: return NULL if config is unset 2016-06-08 21:52:10 +02:00
rabuzarus 7e8ea1cb87 move config to its own class (with legacy support) 2016-06-08 11:02:18 +02:00
Michael Vogel aad00ddc04 Renamed template 2016-06-08 07:11:16 +02:00
Michael Vogel f59b21d4a8 Merge remote-tracking branch 'upstream/develop' into 1606-shared-template 2016-06-07 22:40:29 +02:00
Michael Vogel e2e32eecac New template for shared content instead of hardcoded stuff in source 2016-06-07 22:29:50 +02:00
rabuzarus 3a368214c0 frio: saved_searches_aside & searchbox template 2016-06-07 15:29:38 +02:00
Michael Vogel fc66a86dc5 Some optimized sql queries 2016-06-06 22:57:27 +02:00
Tobias Diekershoff 9d72c3d170 Merge pull request #2565 from rabuzarus/0606-confic-docu 
move pconfig to its own class
 2016-06-06 18:31:37 +02:00
rabuzarus fa02d0f2f8 rename PConfig::del to PConfig:delete 2016-06-06 10:46:33 +02:00
rabuzarus f10011c282 move pconfig to it's own class PConfig 2016-06-06 10:22:14 +02:00
rabuzarus 5f081cc47b add doxygen to config functions 2016-06-06 10:01:14 +02:00
Michael Vogel 3d27ebcb34 Added documentation 2016-06-06 06:29:03 +02:00
Michael Vogel a25d58b2ee Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-06 06:21:36 +02:00
Michael Vogel 3e7e866e13 Baseurl removed 2016-06-05 21:22:14 +02:00
Michael Vogel 4b640dbd97 Fetching of profile data improved 2016-06-05 21:17:55 +02:00
Michael Vogel ea3a6ec6eb Some more cleanup and code removal. 2016-06-05 20:01:38 +02:00
Michael Vogel 98272fe386 Some better handling of "bd" and "birthday" 2016-06-05 15:09:40 +02:00
Michael Vogel 572402224f "bd" now always shows the upcoming birthday 2016-06-05 15:03:04 +02:00
Michael Vogel 71d3274841 Unified contact data handling 2016-06-05 13:57:11 +02:00
Michael Vogel 0518f004c2 removed duplicated functions 2016-06-04 12:20:09 +02:00
Michael Vogel b45772ba6e Configurable amount of maximum processes 2016-06-04 11:04:26 +02:00
Michael Vogel 140225b1a8 Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-04 10:18:43 +02:00
rabuzarus 33f7513ff3 Merge pull request #2554 from annando/1606-mention-class 
Mentions are now having an own class
 2016-06-04 09:45:42 +02:00
Michael Vogel df337e57d1 Quit when processlist is too long 2016-06-03 23:10:23 +02:00
Michael Vogel 4914e8826b Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-02 07:37:37 +02:00
Michael Vogel 46659f15d3 One div too much 2016-06-01 21:58:50 +02:00
Michael Vogel 09e63e616a Shared content now has a surrounding div 2016-06-01 21:57:08 +02:00
Michael Vogel 85a9c7d96e The poller now has the logging for processes as well. 2016-06-01 21:54:02 +02:00
Michael Vogel 0b766b86ba By setting the "userinfo" class the hovercard in frio works with mentions 2016-06-01 17:10:43 +02:00
Michael Vogel 85f42ad26d Tags are now supported as well 2016-06-01 16:19:53 +02:00