strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
23070 commits 2 branches 55 tags 148 MiB
Commit graph

1956 commits

Author SHA1 Message Date
Roland Häder 1514fdaead
rewrote to static approach and if() condition can be simplified. 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 13:00:10 +01:00
Roland Häder d64dafec63
removed parentheses and indended it for better readability 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:55:39 +01:00
Roland Häder bd4cee8c21
added spaces/curly braces and TODO for better using trim() 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:53:48 +01:00
Roland Häder a70a2381c9
removed old-lost code 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-25 12:49:17 +01:00
Roland Häder daa32d49cf
killme() does the same here + added curly braces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-24 21:19:37 +01:00
Roland Häder 0e19fdfc71
removed parentheses + added TODO about a small rewrite 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-24 21:05:55 +01:00
Roland Häder ccd1e2cc6a
fixed parser error 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-24 20:52:26 +01:00
Roland Häder 843b7a003c
closed internal TODO, merged 2 if() to one + added spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:17:39 +01:00
Roland Häder 11d3fd163a
yet another one removed, thanks to @Hypolite for CR 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:13:28 +01:00
Roland Häder 480871d371
removed no longer old stuff, let's don't stuff code with commented-out code 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:11:58 +01:00
Roland Häder 9521f39ebe
added more spaces #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 22:09:15 +01:00
Roland Häder f85e6d2aac
No parantheses here + no @ (which surpresses warnings and such) #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 21:47:51 +01:00
Roland Häder 47602577f3
Opps, missed one ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 21:45:00 +01:00
Roland Häder f5227c016d
replaced some tabs -> spaces + added curly braces #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-23 21:28:32 +01:00
Roland Häder f173322539
added missing spaces/curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-21 21:52:00 +01:00
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Häder 09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2017-03-20 20:51:32 +01:00
Michael 132688d663 Standards, what else? 2017-03-19 08:04:04 +00:00
Roland Häder 15c77beee2
added missing spaces/curly braces 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:41:21 +01:00
Michael 222550e784 From now on we are using 0001-01-01 as lowest date 2017-03-18 11:42:54 +00:00
Michael e301fa0832 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-18 08:31:43 +00:00
rabuzarus 3cef98caf6 Merge pull request #3226 from annando/1702-only-worker 
The worker is now the only background processing system
 2017-03-17 13:22:23 +01:00
Michael Vogel 98945eb6fa Merge pull request #3213 from Hypolite/issue/#2792-2 
Like behavior fix/improvements
 2017-03-13 18:35:32 +01:00
Michael 77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker 
Conflicts:
	include/onepoll.php
	include/queue.php
 2017-03-12 21:03:44 +00:00
Michael 1624150db4 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 
Conflicts:
	include/onepoll.php
 2017-03-12 20:54:28 +00:00
Tobias Diekershoff 30d82f4391 mark the develop version in the version string 2017-03-12 14:40:08 +01:00
Tobias Diekershoff 2bfa870c47 Friendica Version 3.5.1 2017-03-12 14:38:01 +01:00
Hypolite Petovan da5bbe8b50 Add public_contact() function 
- Add function to retrieve the public contact id (uid = 0) of the
current logged-in user
 2017-03-06 05:06:05 -05:00
Michael 5c92e97173 Added index for performance issues 2017-03-02 05:46:44 +00:00
Michael 0afb0c2ea4 NULL_DATE is now a constant 2017-02-27 23:37:15 +00:00
Michael 99fb15037b Removed some more unneeded stuff 2017-02-27 06:27:22 +00:00
Michael 46308fa1ef Removed worker config stuff 2017-02-26 23:27:10 +00:00
Michael bd793e5987 New version string for RC 2017-02-24 15:02:16 +00:00
Michael 2bfc40d74c Bugfix for not createable spool path 2017-02-19 08:23:21 +00:00
Michael 90b5cbe71c More analytics to analyze the reason for constantly changing temp paths 2017-02-15 21:46:29 +00:00
Michael 40390cc5ec Diaspora Relay: Only accept postings from anyone when the relay is configured 2017-02-10 20:45:22 +00:00
Tobias Diekershoff adedf18b30 Merge pull request #3146 from annando/1701-pnut 
Preparation to add the social network "pnut"
 2017-02-02 09:10:28 +01:00
Michael 275a1c6574 Preparation to add the social network "pnut" 2017-02-02 06:06:23 +00:00
Michael 8a75a20d26 Bugfix: An index was missing 2017-02-01 21:08:13 +00:00
Michael ae849954cc Bugfix: The SSL policy setting was not respected 2017-01-29 13:50:57 +00:00
Hypolite Petovan c38a5e443d Merge branch 'develop' into issue/#3062 
* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js
 2017-01-27 15:30:21 -05:00
Michael Vogel d61a4a67db Merge pull request #3109 from Hypolite/issue/scrap-tinymce 
Scrap TinyMCE
 2017-01-27 21:08:33 +01:00
Hypolite Petovan 66482c1d9c - Remove $theme_richtext_editor boot var 
- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter
 2017-01-26 22:57:53 -05:00
Michael be1db7bdb0 Use cache instead of config for storing last proc_run time 2017-01-22 05:20:14 +00:00
Michael 0548099f6c The config class now makes less database reads. 2017-01-18 21:45:32 +00:00
Michael 045e94ccf3 Some more config stuff 2017-01-17 19:33:06 +00:00
Michael 53393233c3 Replace the direct access of config variables 2017-01-17 19:21:46 +00:00
Michael 2cdf87c56a Deactivated the alternative update script by now 2017-01-16 21:35:35 +00:00
Hypolite Petovan b61479ba6e Merge remote-tracking branch 'friendica/develop' into issue/#3062 
# Conflicts:
#	view/theme/duepuntozero/theme.php
#	view/theme/smoothly/theme.php
 2017-01-12 09:19:59 +11:00
Michael Vogel 3c51820515 Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include 
Normalize App parameter declaration (doc-include folders, boot)
 2017-01-11 09:01:48 +01:00
Hypolite Petovan 87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Hypolite Petovan 479180ca8e Merge branch 'develop' into issue/#3062 2017-01-08 11:44:45 +11:00
Michael ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
Hypolite Petovan b50f1f970f Use placeholder attribute for Comment message 
- Remove global aStr.comment
- Remove global window.commentEmptyText
- Remove head.tpl $comment parameter
 2017-01-08 02:13:55 +11:00
Michael 58c229031e Now for the database version 2017-01-05 22:56:49 +00:00
Roland Häder 9ca789b952
Merge remote-tracking branch 'upstream/develop' into develop 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-31 17:59:14 +01:00
Roland Häder d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop 
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-12-30 21:33:41 +01:00
Michael 55ee80338f Events are now shared with Diaspora. 2016-12-30 03:31:38 +00:00
Tobias Diekershoff 51155d7716 Merge pull request #3047 from annando/1612-indexlength 
New binary data fields to avoid index length problems
 2016-12-29 19:11:54 +01:00
Johannes Schwab 8e2fc0f8a9 Fix test for static calls with PHP 7 2016-12-27 15:51:38 +01:00
Michael 38fed9a77b We should increase the database version as well ... 2016-12-26 06:02:14 +00:00
Roland Häder de689583e2 added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
 2016-12-20 17:58:34 +01:00
Roland Häder 4b221d216e added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 17:57:40 +01:00
Roland Häder 4f26bee453 Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:45:36 +01:00
Roland Häder 0e58bf6675 Changed $a->get_baseurl() to App::get_baseurl() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 12:45:16 +01:00
Roland Häder fb0ed18a43 changed to this: 
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:58:03 +01:00
Roland Häder abff6372dd Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/lock.php
 2016-12-20 10:12:31 +01:00
Roland Häder fb676335db Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:10:33 +01:00
Roland Häder 582b8db8e8 Maybe no longer needed: converted $a->get_baseurl() to App::get_baseurl(). #3010 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 11:55:12 +01:00
Roland Häder 448c5aa694 Cleanup for #3010 - added spaces, thanks to @annando . 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-14 09:42:28 +01:00
Roland Häder 797de5bfe0 Nope, get_basepath() should be static, then also mark it as static (in signature). 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 14:53:57 +01:00
Roland Häder 293436e5fd Some rewrites: 
- max_proccesses_reach() and maxload_reached() (why no _ behind max?) are called
  both way, static and with object reference.
- this is strongly discouraged and should be avoided as its support (in PHP) may
  be dropped in future releases.
- used $a = get_app(); to encapsulate code (even when the function does
  currently the same, it may be changed later)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-13 10:16:36 +01:00
Michael c97306e734 Standards ... 2016-12-01 22:50:07 +00:00
Michael c5d571287c Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool 2016-12-01 13:58:47 +00:00
Michael eff4ad2e0a Spool items that couldn't be stored 2016-12-01 13:50:26 +00:00
Michael d49325d177 Disable richtext editor for frio - followup for #2938 2016-11-29 20:04:31 +00:00
Michael e856ab9a09 The worker can now run from the frontend as well 2016-11-27 00:55:05 +00:00
Michael d93f44b493 Avoid a warning with activated rendertime 2016-11-19 23:41:53 +00:00
Tobias Diekershoff b95bf00e89 Additional info in registration request 2016-11-19 18:22:49 +01:00
rabuzarus 262a149cab Bugfix: "remove_baseurl" wasn't work correct if called statically 2016-11-16 01:14:14 +01:00
Michael 740aaa69f5 Bugfix: "remove_baseurl" accidentally normalized all links 2016-11-15 21:56:28 +00:00
Michael 85875fc07f Bugfix: Avoid warning when posting items and the worker isn't active 2016-11-15 11:52:01 +00:00
Michael e6148f4c1c Performance improvements when storing items (via API) 2016-11-12 13:17:28 +00:00
Hypolite Petovan 97c2e99d46 ping.php improvement: improving get_baseurl 
- Adding more documentation
- Trying hard to make @annando happy
 2016-11-01 17:05:26 -04:00
Hypolite Petovan db874f0fbe ping.php improvement: using baser cache key 2016-10-31 14:27:19 -04:00
Hypolite Petovan cd3f98d27d ping.php improvement: db version bump 2016-10-28 22:27:26 -04:00
Hypolite Petovan 8e50254bb9 Merge branch 'develop' into improvement/ping-performance 2016-10-28 22:26:38 -04:00
Hypolite Petovan cc4363c5c6 ping.php performance: fix formatting 2016-10-28 12:29:55 -04:00
Hypolite Petovan 9e127abbae ping.php performance: improve baseurl caching 
- Add cache invalidation on set_baseurl
- Add documentation
- Fix formatting
 2016-10-28 06:50:08 -04:00
Hypolite Petovan f1c855e755 ping.php performance: Cache notification bbcode 
- Add two fields to notifiy table to store cached bbcode result
- Add bbcode conversion on notif creation
- Add postfact caching if cache field is empty on retrieval
 2016-10-28 06:28:16 -04:00
Hypolite Petovan 301fea8684 ping.php performance: caching baseurl 2016-10-28 05:51:39 -04:00
Michael 3f0656fdbd Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-27 12:18:45 +00:00
Hypolite Petovan 549950d0ae Fix $a to #this in save_timestamp 2016-10-26 07:42:40 -04:00
Michael 967ecb4205 Merge remote-tracking branch 'upstream/develop' into 1610-performance 
Conflicts:
	include/Core/Config.php
	include/Core/PConfig.php
 2016-10-25 16:16:01 +00:00
Michael Vogel 8cab3b5592 More transactions, more queries on uncommitted data 2016-10-24 08:10:27 +00:00
Michael Vogel ee5ada6991 We now use memcache if configured and installed. 2016-10-23 21:59:40 +00:00
Hypolite Petovan 74ce4c2710 Makes save_timestamp conditional 
- Add a .htconfig check to save_timestamp to prevent systematic
profiling
- Removes unused `mark_timestamp()` function including deleted code
comment
 2016-10-21 22:50:58 -04:00
Michael Vogel e2d35bd851 New database version 2016-10-17 20:09:48 +00:00
Michael Vogel 4404bf1651 The creation of unique keys failed for MariaDB 2016-10-09 07:01:19 +00:00
Hypolite Petovan b8d6dc5912 Fix Issue #2816 - Bump database version 2016-10-06 21:01:25 -04:00
Hypolite Petovan 72521cd9c8 Fix Issue #2816 - Change new database version number 2016-10-02 13:16:31 -04:00
Hypolite Petovan 3f619726b1 Fix Issue #2816 - Update dbstructure instead of update 
- Add UNIQUE index support to `update_structure()`
- Move DB update from `update.php` to `dbstructure.php`
- Update DB_VERSION to 1210
 2016-10-01 23:29:30 -04:00
Michael Vogel 629dce0268 Documentation added 2016-09-27 18:29:50 +00:00
Michael Vogel 2f06e9360f "Company" is now "Organisation" and there is an auto update 2016-09-26 19:35:01 +00:00
Michael Vogel d632d282cd We are now having an account type and are publishing it 2016-09-25 20:37:27 +00:00
Michael Vogel 196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
fabrixxm bdd4aed9ba Bump version 2016-09-13 18:52:29 +02:00
fabrixxm 9702081722 Friendica 3.5 2016-09-13 16:46:11 +02: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 0a50dbaece New database version 2016-09-06 19:01:05 +00:00
Michael Vogel 108a1c4ac6 New priority level for stale processes. 2016-08-18 12:33:17 +02:00
Michael Vogel 1bfdc216d0 Only close the session if it had been opened. 2016-08-16 21:35:12 +02:00
Michael Vogel 67b16507f1 Performance improvements for the poller 2016-08-14 21:02:29 +02:00
Michael Vogel 5dff8db751 Redefined the priority constants (to have space for future expansions) 2016-08-08 22:11:24 +02:00
Michael Vogel 29168de677 Process timeouts are now priority depending 2016-08-08 19:20:40 +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
Michael Vogel 7157ca3809 Fastlane is now working with any priority level 2016-08-03 15:59:25 +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 313bc5b0d2 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-30 10:02:39 +02:00
Tobias Diekershoff c9dee2947f quickfix for worker delivery problems 2016-07-28 15:41:25 +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 5e81c105e0 We now work with the "priority" field - that's better 2016-07-24 20:25:11 +02:00
Michael Vogel 8bf7db06db New indexes for the API 2016-07-19 08:43:57 +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 fc25e605cb Logging for feeds improved, new "process id" for logging 2016-07-07 20:32:13 +02:00
Michael Vogel e006bc24d7 Bugfix: Remote auth and picture permissions should now work again. 2016-07-05 08:51:28 +02:00
Michael Vogel e3fb9155f0 Bugfix: On "photos" the session management has to work 2016-07-04 22:36:24 +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 e4c6cfd2d8 Moves the function "is_result" from dba to dbm. 2016-07-02 14:00:42 +02:00
Michael Vogel 91e20f2f9b Remove unused function 2016-07-02 13:42:42 +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 b3c8ff836d Backend/Frontend detection when checking for overload 2016-07-02 08:54:57 +02:00
Michael Vogel c7373dcec4 author-id/owner-id: Post update function/added database documentation 2016-06-23 21:15:54 +02:00
Michael Vogel 0e35427dfc New fields "author-id" and "owner-id" in the item table 2016-06-15 21:20:55 +02:00
fabrixxm 0f8148a4cb Merge pull request #2353 from shtrom/issue757-https-reverse-proxy-headers-on-develop 
Enable SSL on standard and well-known HTTP headers
 2016-06-10 08:36:11 +02:00
rabuzarus 15959d7767 Renamed "Nickname or Email address:" in "Nickname or Email" 2016-06-09 13:12:39 +02:00
Michael Vogel fc66a86dc5 Some optimized sql queries 2016-06-06 22:57:27 +02:00
Michael Vogel ea3a6ec6eb Some more cleanup and code removal. 2016-06-05 20:01:38 +02:00
Michael Vogel 22676f7e21 Issue 2063: Define the constant SIGTERM if not defined 2016-05-22 12:31:32 +02:00
rabuzarus d454905d3c infinite_scroll: move js from index.php to main.js 2016-05-11 01:52:05 +02:00
Michael Vogel 017bfe17f8 Speeding up the gcontact search 2016-04-17 13:46:49 +02:00
Michael Vogel 9f57425d08 Post update ist now done. 2016-04-03 16:36:05 +02:00
Michael Vogel beb1e04069 New field in item table ("shadow") that indicates if there is a shadow entry 2016-04-03 13:48:31 +02:00
Roland Häder 9cfc249b12
Moved is_filled_array() to both dba classes and named it is_result(). 
Please see ticket #2390 for full discussion.

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-12 18:54:55 +01:00
Roland Häder c60605ce0c
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop 2016-03-12 18:50:14 +01:00
Michael Vogel 3189f0e23c Another fix for "goaway". Hopefully now finale. 2016-03-11 20:43:31 +01:00
Michael Vogel c30b369a1a Added documentation 2016-03-08 22:42:37 +01:00
Michael Vogel 65d6d45f8c Changed parameter order 2016-03-08 22:28:49 +01:00
Michael Vogel beb2346cfc The function to check for maxload and the lockfile is centralized 2016-03-08 20:28:09 +01:00
Michael Vogel 4bd1061a09 Only import OStatus threads if we follow the thread starter 2016-03-06 14:53:30 +01:00
Roland Häder 08630ca6f8
Merge branch 'rewrites/is_filled_array_introduced' into rhaeder-develop 2016-03-04 22:53:42 +01:00
Roland Häder b56a9bfacc
Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is no array ?! 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-04 22:53:22 +01:00
Roland Häder 5a439a31f3
Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is no array ?! 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-04 22:46:30 +01:00
Roland Häder 4ec377008d Introduced is_filled_array() + added some missing array initialization 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:31:49 +01:00
Roland Häder 858438daec
More calls replaced with is_filled_array(), ticket #2390 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 16:04:18 +01:00
fabrixxm 04ccd9a776 Merge pull request #2388 from Quix0r/fixes/prevent-e_notice_boot_php 
Prevent some E_NOTICE
 2016-03-01 15:50:20 +01:00
Roland Häder aa548be3b9
Introduced is_filled_array() + added some missing array initialization 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 14:33:54 +01:00
Roland Häder f10d2afca0
Prevent some E_NOTICE in boot.php 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 14:32:19 +01:00
Roland Häder 04a7d6384e
No need to set $a->theme_info = array() everywhere if you can define it in App 
itself.

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 14:27:38 +01:00
Michael Vogel 7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Michael Vogel c770b00d6d Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-17 12:18:46 +01:00
Michael Vogel 8af8567567 Some more ... 2016-02-17 12:18:36 +01:00
Michael Vogel c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00
Michael Vogel ade5ef7065 Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie 2016-02-16 07:58:01 +01:00
Michael Vogel 88018b6e73 Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie 2016-02-14 20:57:57 +01:00
Michael Vogel b0548018d8 Simplepie is removed since we don't use it anymore 2016-02-14 19:50:59 +01:00
Olivier Mehani e5c7a0cf93 Enable SSL on standard and well-known HTTP headers 
Look for the `Forwarded` header with `proto=https`, as specified
in RFC7239 (strictly expecting no whitespace around the = sign).
This also add similar support for `X-Forwarded-Proto: https`,
`Front-End-Https: on` and `X-Forwarded-Ssl: on` (all case-sensitive).

Also add some documentation about this, and an NginX configuration
example, in INSTALL.txt

This should fix #757.

Signed-off-by: Olivier Mehani <shtrom+friendica@ssji.net>
 2016-02-14 13:28:59 +11:00
Michael Vogel 9261154eab Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup 2016-02-13 20:12:31 +01:00
Michael Vogel 2ca6cdf6b6 Improvements how gcontact entries are updated 2016-02-13 12:26:58 +01:00
Fabrixxm c6514d58db add composer-derived autoloader 2016-02-09 11:07:37 +01:00
Michael Vogel 4d33441c2e DB Version was forgotten ... 2016-01-29 03:51:12 +01:00
Michael Vogel 62de6be495 Switched to static methods for DFRN 2016-01-25 15:20:58 +01:00
Michael Vogel 5769c08cbc This line vanished accidentally ... 2016-01-16 09:16:51 +01:00
Michael Vogel 571d1544e4 I guess it is enough to set a variable to zero once ... 2016-01-16 08:58:22 +01:00
Michael Vogel 092c2e5433 Removed some test code 2016-01-15 23:32:13 +01:00
Michael Vogel 90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +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 c4ba035ee3 Add some analysing stuff, rendered value is written now more often 2016-01-14 21:56:37 +01:00
Michael Vogel 75e2ec01fe The gcontact will now be connected to the items 2016-01-05 15:34:27 +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
rabuzarus 038611bcb4 add documentation 2015-12-28 03:17:55 +01:00
fabrixxm 44afff9514 Merge pull request #2198 from rabuzarus/2312_code_cleanup 
boot.php - code cleanup + doxygen
 2015-12-27 18:20:48 +01:00
Tobias Diekershoff 8d8dc2d060 Merge pull request #2197 from annando/1512-ostatus-comment 
Reworked delivery and notifier process - changed OStatus behaviour
 2015-12-27 15:58:32 +01:00
rabuzarus 7530c950e3 help - make use of subfolders 2015-12-26 16:06:38 +01:00
rabuzarus 8e83e423f4 boot.php - doxygen - organize constants in groups 2015-12-25 20:58:26 +01:00
rabuzarus 64989781ff add custom tag @hooks to boot.php & identity.php 2015-12-25 18:36:13 +01:00
rabuzarus e42bbcd6c4 boot.php - small clean up 2015-12-24 11:58:42 +01:00
rabuzarus 40b0d383d5 boot.php - code cleanup + doxygen 2015-12-24 01:31:17 +01:00
Fabrixxm abe0d22784 Update codename 2015-12-22 16:43:07 +01:00
Michael Vogel 307beb47fd Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment 
Conflicts:
	include/ostatus.php
 2015-12-22 11:25:37 +01:00
Fabrixxm 71255d04a2 Friendica 3.5-dev 2015-12-22 10:52:00 +01:00
Fabrixxm 21f044e305 Friendica 3.4.3 2015-12-22 10:45:43 +01:00
Michael Vogel ca4be3ded3 Don't generate a guid shorter than 13 characters 2015-12-16 10:47:26 +01:00
Michael Vogel 6e03477598 Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround. 2015-12-15 23:26:58 +01:00
Michael Vogel 57576e09ed Avoid problems with wrong configured server variables 2015-12-08 19:53:01 +01:00
Michael Vogel d7fc8d7c12 Add an additional way to fetch the basepath (See pull request 2161) 2015-12-08 08:17:29 +01:00
fabrixxm 29e9a7947e Update FRIENDICA_VERSION 2015-12-07 23:24:55 +01:00
Michael Vogel f406e5ddbd Issue 1921: Disable the auto update 2015-12-06 00:18:59 +01:00
Tobias Diekershoff 51d392b97f add the module to the page title 2015-12-01 14:19:06 +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
rabuzarus 902735f6d4 forumlist: dbupdate 2015-11-11 23:39:14 +01:00
Michael Vogel 4528529968 Merge pull request #2005 from tobiasd/20151101-dev 
mark the development version
 2015-11-07 16:01:46 +01:00
Tobias Diekershoff 5cebc6d9b1 we found a dev format 2015-11-07 15:39:55 +01:00
Michael Vogel d6080f4c76 The "addr" field is now in the global contacts as well. 2015-11-05 08:37:00 +01:00
Tobias Diekershoff 1a42e31718 mark the development version 2015-11-01 14:26:06 +01:00
Michael Vogel 57bbe037a7 New network types NNTP and iCal 2015-10-27 07:49:02 +01:00
rabuzarus 649578ae33 Merge develop-new into event-attendance-new 
Conflicts:
	include/conversation.php
 2015-10-11 19:39:55 +02:00
Michael Vogel bb0dff2c75 Improved contact menu 2015-10-10 16:23:20 +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 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
Michael Vogel 5d5d85eb4a Merge remote-tracking branch 'upstream/develop' into 1509-worker 2015-09-29 10:25:59 +02:00
Fabrixxm 2376cf143c Bump Friendica version 2015-09-29 09:25:59 +02:00
Michael Vogel a9fdba638f Avoiding errors when checking for the lockpath 2015-09-19 11:30:19 +02:00
Michael Vogel 3ace2136f0 Checking includes for valid paths 2015-09-13 18:47:10 +02:00
Michael Vogel 0a2c161230 Fork as many processes as possible from the start on. 2015-09-12 17:51:27 +02:00
Michael Vogel ce9b4e868b Database update for worker 2015-09-11 21:56:37 +02:00
Michael Vogel d3a6ebfe7e The worker is now working 2015-09-10 23:10:31 +02:00
Michael Vogel 17b1d45968 Worker: New method for running background processes 2015-09-09 22:42:31 +02:00
Michael Vogel b52bc71c6c Now you can define the duration of the cache entries. 2015-08-24 17:24:14 +02:00
Michael Vogel 123ad84689 Make the hardcoded path to dir.friendica.com configurable 2015-08-23 11:05:10 +02:00
Michael Vogel 59b2891737 The temp path now contains the host name. That should help with servers with multiple installations 2015-08-11 23:26:00 +02:00
Michael Vogel 6ab304b564 Bugfix: Fetching data from noscrape had several issues 2015-07-30 16:30:18 +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 05f8abcfa6 OStatus: Handling of unsupported verbs 2015-07-15 18:27:44 +02:00
Fabrixxm c03c06cf30 Update version 2015-07-06 12:49:43 +02:00
rabuzarus a0b522c3be fix toggle mobile/desktop view 2015-07-02 02:55:03 +02:00
rabuzarus 7c3af0d3ed fix for mobile-view on system pages 2015-07-02 02:15:36 +02:00
rabuzarus 92a7a62608 fix mobile-view 2015-07-01 16:22:08 +02:00
rabuzarus 4463ae11d8 change profile_url in profile_uid 2015-06-28 13:32:03 +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
fabrixxm d2a593b4a0 Merge pull request #1693 from rabuzarus/events-reminder 
use title in events-reminder
 2015-06-25 15:06:55 +02:00
rabuzarus b6b000dd59 delete $md (event-links) because event ID is used 2015-06-25 14:21:12 +02:00
rabuzarus bc2117c68a one whitespace 2015-06-25 13:50:48 +02:00
Michael Vogel e9542a8d17 OStatus: Support for events and questions 2015-06-21 22:36:24 +02:00
Michael Vogel c8430f4c44 Moved all OStatus code in a single file. 2015-06-20 14:40:30 +02:00
Michael Vogel c89c0916e2 Better detection for the mobile client to avoid "{0}" in notifications. 2015-06-13 20:23:26 +02:00
rabuzarus 5f088954be make full title without dots 2015-06-11 00:43:34 +02:00
rabuzarus 66a51f37b2 use title in events reminder not description 2015-06-09 14:26:47 +02:00
Michael Vogel bea70296bf Fixes slow performance after one of the last pull requests. 2015-06-02 22:07:39 +02:00
Michael Vogel d42cea51a2 The item id is now stored in every notification as well 2015-04-16 07:18:06 +02:00
Michael Vogel 9a35e861ce New field in the contact table to better detect "dead profiles" 2015-04-12 11:40:38 +02:00
Michael Vogel 98bf8d85fa The "fastlane" can be removed there. 2015-04-09 19:35:17 +02:00
Michael Vogel 015ebd7d1b "fastlane" should now work with remote adding as well. 2015-04-09 00:33:45 +02:00
Michael Vogel 1cacf64724 Merge pull request #1469 from fabrixxm/changelog 
Update codename and CHANGELOG
 2015-04-02 23:14:40 +02:00
fabrixxm f93e9751b8 Update codename and CHANGELOG 2015-04-02 22:05:52 +02:00
Michael Vogel 97244fa487 Now past events aren't shown at any circumstance. 2015-04-01 23:11:18 +02:00
Michael Vogel 25299f0604 Events from the past aren't shown anymore (hopefully) 2015-04-01 22:25:53 +02:00
Tobias Diekershoff 58ac6bde09 Merge pull request #1455 from pztrn/master 
Do not attempt to create itemcache directory if it already exist.
 2015-03-29 16:05:57 +02:00
Stanislav N. bcf7ade40d Typo 2015-03-29 17:01:51 +05:00
Stanislav N. 6e27510173 Do not try to create itemcache directory if it already exist. 
On FreeBSD, with more-or-less default PHP configuration, when mkdir() is called on already existing directory - it will produce a warning, that could flood all over cron mail. To prevent that flooding a directory existing should be checked.
 2015-03-29 16:56:26 +05:00
Michael Vogel 51cd55c8ad Some more logging added for the DDoS prevention 2015-03-28 08:49:24 +01:00
Michael Vogel 0206f447e1 Preventing a DDoS with the zrl parameter. 2015-03-28 08:29:01 +01:00
Beanow e016db8bc6 Version bump, 3.4.0 2015-03-22 15:25:31 +01:00
Tobias Diekershoff 82abc32a14 Merge pull request #1426 from annando/1503-term-search 
The index for the term search is now massively improved
 2015-03-12 07:15:05 +01:00
Michael Vogel bf61620bd2 The index changed, so the database version must be increased as well. 2015-03-10 07:58:49 +01:00
Michael Vogel 94302a7924 Reworked guid function. 2015-03-09 20:59:57 +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
Fabrixxm caa21e6021 Merge branch 'master' into develop 2015-02-24 09:09:02 +01:00
Fabrixxm 6a5bb80c82 Friendica 3.3.3 
See CHANGELOG
 2015-02-24 09:00:37 +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 d1d794f1ab The global contacts now contain a "generation" value that defines how we know this contact 2015-02-15 10:52:45 +01:00
Michael Vogel 05319083c6 Take the UID from another place. 2015-02-09 21:45:17 +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 842ac46857 Scrape now contains the number of contacts as well. 2015-02-08 23:35:29 +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 10c7ab76a2 Added thread update for central item storage in the update procedure. 2015-02-08 16:03:23 +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
fabrixxm 4cf36ec2cf Update FRIENDICA_VERSION 2015-01-29 09:44:48 +01:00
Michael Vogel 597ef20b71 "about" and "location" is now included in global contacts as well. 2015-01-25 02:29:46 +01:00
Michael Vogel beaca70126 OStatus: Replies now arrive their target. 2015-01-12 00:14:51 +01:00
fabrixxm 418ac91c31 Merge pull request #1274 from annando/issue-1218 
Issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined
 2015-01-09 11:44:38 +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 003e87b112 Merge remote-tracking branch 'upstream/develop' into issue-1218 2015-01-04 20:21:49 +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
Michael Vogel cce561708a Replaced $argv and $argc with the $_SERVER array 2015-01-04 13:24:16 +01:00
Michael Vogel a86c143e24 The "scrape" bugfix lead to partly damaged encodings. This is fixed now. 2015-01-04 11:56:41 +01:00
Michael Vogel b5beb4c69a Litte typo ... 2015-01-02 07:50:21 +01:00
Michael Vogel 38a45d325f See issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined. 2015-01-02 00:01:17 +01:00
Fabio Comuni d10c8ddf57 Update version in boot.php 2014-12-26 10:46:10 +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 5379e07c4e Setting default values for all database fields. 2014-11-09 13:29:27 +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
fabrixxm 86c8362bb8 Bump version to 3.3.1. Add CHANGELOG file 2014-11-06 20:31:27 +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
fabrixxm 53f3b8ab53 Merge pull request #1206 from annando/1410-refresh-to-ssl 
Reload a non-ssl-request to a ssl-request. (only when SSL_POLICY_FULL is enabled)
 2014-10-24 10:56:19 +02:00
Michael Vogel 68e75b4623 Reload a non-ssl-request to a ssl-request. (only when SSL_POLICY_FULL is enabled) 2014-10-24 00:52:29 +02:00
Fabrixxm 63168905ec Fix #1190 2014-10-22 09:04:32 +02:00
Fabrixxm c9667bbd69 add codename to useragent string 2014-10-06 10:06:53 +02:00
Fabrixxm e2dc4f922c Friendica 'Ginger' 3.3 2014-10-06 08:56:55 +02:00
Fabrixxm 70659b67d2 comment out multidomain config support 2014-10-01 09:04:06 +02:00
Tobias Diekershoff 81949173c6 RC for 3.3 2014-09-07 20:41:33 +02:00
Tobias Diekershoff e767e2d750 Merge pull request #1131 from fabrixxm/master 
Bug fixes!
 2014-09-07 17:52:52 +02:00
fabrixxm 6db73c0b6d fix update routine to support update from 3.2 
disable PDO support
 2014-09-07 17:28:38 +02:00
Tobias Diekershoff 04da5ed3bb revup after the Hackathon in Berlin 2014-09-07 15:36:23 +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 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
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
Michael Vogel a333036f00 API: The command "users/search" is now supported. 2014-09-07 07:32:09 +02:00
Michael Vogel e21bcb82d2 Enhance the database structure checks when they failed. 2014-09-04 09:26:56 +02:00
Michael Vogel 24b3befc4d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	update.php
 2014-09-04 02:29:12 +02:00
Michael Vogel 7eeb320085 It is now possible to ignore threads. 2014-09-04 00:58:52 +02:00
friendica 7673579afc Merge https://github.com/friendica/friendica into pull 2014-09-01 21:46:40 -07:00
friendica 9464af0eef resize the item guid field for protocol compatibility - it's getting truncated. 2014-09-01 21:45:34 -07:00
fabrixxm 070581f793 Merge pull request #1086 from annando/master 
Bugfix: Connecting with other users works again/Some more profile optimizing
 2014-08-28 09:16:26 +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
friendica 03245e4a83 increase guid.guid field length for redmatrix-over-diaspora communications 2014-08-26 19:18:19 -07:00
Michael Vogel 316f0a75cd Showing the network name on the display page. 2014-08-25 16:17:49 +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 53dcecd596 If a user is already connected to another user, then don't show the "connect" link on his profile. 2014-08-21 00:57:54 +02:00
Tobias Diekershoff 1adb31e0f0 revup and regenerating the message.po 2014-08-10 15:15:31 +02:00
Tobias Diekershoff 32278e6fe2 revup 2014-08-07 08:46:29 +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 5ed5773f57 The temporary paths (temp, lock, itemcache) are now detected automatically when used. 2014-06-23 01:24:39 +02:00
Michael Vogel 297d8a6cc6 The icon for the website is now changeable in the config 2014-06-17 20:11:35 +02:00
fabrixxm adefb06ff7 Merge pull request #1008 from annando/master 
Expire, "attachment" element and database structure
 2014-06-14 20:05:10 +02:00
Tobias Diekershoff 310ad912fa rev up 
in preperation for the big pull
 2014-06-14 14:09:18 +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
Tobias Diekershoff 248b4fbcce rev up 2014-05-29 14:44:19 +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 b6c1d7dc2b fetching the hostname from the .htpreconfig.php if present 2014-05-29 11:40:54 +02:00
Tobias Diekershoff 5a55541dbd rev up 2014-05-25 08:00:22 +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
Michael Vogel 77986d76fa Preparations for statusnet connector import 2014-04-04 10:40:46 +02: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
Michael Vogel 17236b1801 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	include/acl_selectors.php
 2014-01-13 19:59:34 +01:00
Michael Vogel 43e916e81a New network constant for the Diaspora posting connector. 2014-01-13 19:57:15 +01:00
Tobias Diekershoff b23ce65035 rev update 2014-01-06 07:36:57 +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
Tobias Diekershoff 0d159a77a7 rev update 2014-01-03 10:02:17 +01:00
Tobias Diekershoff 573e0128d6 rev update 2013-12-31 18:01:20 +01: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 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 8feeba7af5 rev update 2013-11-07 10:06:10 +01:00
Michael Vogel 53c06a3625 Several performance improvements. 2013-11-02 10:49:44 +01:00
Michael Vogel 711972a166 Merge remote-tracking branch 'upstream/master' 2013-10-25 23:35:03 +02:00
Michael Vogel 0ffeb4cf92 New field "network" in item table to speed up the system. 2013-10-25 23:33:53 +02:00