keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
16607 commits 4 branches 0 tags 179 MiB
Commit graph

4014 commits

Author SHA1 Message Date
Adam Magness
8522c47353 Remove Includes 
Removed references to include/config.php and include/probe.php and deleted the respective files.
 2017-11-07 12:14:03 -05:00
Adam Magness
b995e858e6 Review changes 
Replacements for ::delete() as well as changes to include use statements.
 2017-11-07 09:12:01 -05:00
Adam Magness
0dfa57948f Issue-#3873 
Replace deprecated functions with new syntax.
 2017-11-07 06:24:39 -05:00
Michael Vogel
669dafcf22
Merge pull request #3876 from tobiasd/2017107-followup3874 
add version info to notification text
 2017-11-07 06:44:05 +01:00
Tobias Diekershoff
a49c1be7c9 add version info to notification text 2017-11-07 06:32:10 +01:00
Hypolite Petovan
c847a2f9cc
Merge pull request #3874 from tobiasd/20171009-checkversion 
check upstream version
 2017-11-06 13:59:49 -05:00
Tobias Diekershoff
7881fd7dc9 std foo 2017-11-06 18:20:39 +01:00
Tobias Diekershoff
143e7fc6b7 dont use the entire url as option 2017-11-06 18:05:42 +01:00
Tobias Diekershoff
1f9b52f2bf code corrections 2017-11-06 17:45:33 +01:00
Michael
930309d2ec Merge remote-tracking branch 'upstream/develop' into worker-class 2017-11-05 17:23:53 +00:00
Hypolite Petovan
93fd189198
Merge pull request #3866 from annando/detailled_notif 
There is now a user switch to change between notification styles
 2017-11-05 08:14:10 -05:00
Michael
478e363967 proc_run was replaced 2017-11-05 12:15:53 +00:00
Michael
da212a28a2 New worker class that does all the work 2017-11-05 10:33:46 +00:00
Tobias Diekershoff
0d0751fce3 comparison works now 2017-11-05 07:45:49 +01:00
Michael
9c78938ca9 Improved "if" construct 2017-11-04 21:27:32 +00:00
Michael
4831587250 Some explanation added 2017-11-04 14:00:29 +00:00
Michael
2894214347 Misspelled "detailed" 2017-11-04 12:08:12 +00:00
Michael
7de3eae8d0 There is now a user switch to change between condensed and detailled notifications 2017-11-04 12:01:08 +00:00
Tobias Diekershoff
6ee747dee8 missed something 2017-11-04 09:48:20 +01:00
Michael
4347e479d3 noscrape now contains "last-activity" which tells roughly the last activity 2017-11-04 08:38:22 +00:00
Tobias Diekershoff
53f83dc0a1 typo 2017-11-04 09:31:57 +01:00
Tobias Diekershoff
08977cbc6b this setting is not used anymore 2017-11-04 08:32:34 +01:00
Tobias Diekershoff
87c39cc396 this setting is not used anymore 2017-11-04 08:23:56 +01:00
Tobias Diekershoff
33ad8117ce this setting is not used anymore 2017-11-04 08:22:42 +01:00
Tobias Diekershoff
503ffa98d2 settings for checkversion 2017-11-04 08:15:28 +01:00
Tobias Diekershoff
1928217f83 added config wrapper around new option, opt-in 2017-11-03 15:52:40 +01:00
Tobias Diekershoff
79add903fe wording 2017-11-03 15:52:40 +01:00
Tobias Diekershoff
778c83bf25 show a notification in the admin panel if a newer version is available 2017-11-03 15:52:40 +01:00
Michael
d739fe2503 Issue 3860: Enhanced support of "!" for forums 2017-11-03 05:07:19 +00:00
Michael
937f36f754 @posts to only the forum should be treated like !posts 2017-11-02 21:25:20 +00:00
Michael
a2f9ea2642 Forum posts with "!" are now created directly as forum post 2017-11-02 20:15:14 +00:00
Michael
82321114ab If a post is dedicated to a single forum then it will be rewritten to a forum post 2017-11-01 23:20:43 +00:00
Michael
5222606602 Use the exclamation mark to address forums as well 2017-10-31 19:33:23 +00:00
hoergen
a5d8d1fd77
Update display.php 
adding baseurl to image tags for twitter and open Graph
 2017-10-31 02:45:58 +01:00
Michael
e2224a2ddc Some Webfinger clean up 2017-10-28 11:48:29 +00:00
Michael
0b7e8b7fb4 Hubzilla doesn't return the handle in the hcard 2017-10-27 06:17:24 +00:00
Hypolite Petovan
0c347d1466 Merge pull request #3819 from annando/photo-rework 
Better handling for GIF even, if not supported by the graphics library
 2017-10-23 13:04:52 -04:00
Hypolite Petovan
476d7d9533 Merge pull request #3813 from annando/remove-old-stuff 
Removed stuff that was never used or isn't used anymore
 2017-10-23 10:00:16 -04:00
Michael
b513a597c8 Static methods should be called statically 2017-10-21 16:13:25 +00:00
Michael
2624abdc35 Now only resize if supported 2017-10-21 15:31:31 +00:00
Michael
09727024ba Better handling for GIF even, if not supported by the graphics library 2017-10-21 15:09:47 +00:00
rabuzarus
f2d51737eb fix some HTML violations in frio 2017-10-20 15:21:42 +02:00
Michael
69afe50345 Removed stuff that was never used or isn't used anymore 2017-10-19 07:41:15 +00:00
Michael
0695fa699c Removed "service class" functionality 2017-10-18 21:44:27 +00:00
Michael
c92ed9bc5e Bugfix: Switch to all networks when posts for a single contact are selected. 2017-10-18 18:54:06 +00:00
Tobias Diekershoff
59ce6de50c Merge pull request #3805 from annando/nodeinfo-fix 
Bugfix: Local comments weren't calculated.
 2017-10-18 19:13:58 +02:00
Michael Vogel
d60f96f0e1 Merge pull request #3797 from rabuzarus/20171015_-_duplicate_event 
add event action: duplicate events
 2017-10-18 18:57:58 +02:00
Michael
3b783f6ac9 Bugfix: Local comments weren't calculated. 2017-10-18 16:54:12 +00:00
rabuzarus
10ba6df17f initilize $sh_disabled 2017-10-18 13:23:26 +02:00
Tobias Diekershoff
a1099a021a relocation message is also send to D* contacts 2017-10-18 11:04:44 +02:00
Tobias Diekershoff
edb16f8dc8 Merge pull request #3803 from annando/conversation-feed 
we now provide a feed for the conversation
 2017-10-18 08:29:47 +02:00
Michael
4744d6bf84 we now provide a feed for the conversation 2017-10-18 06:25:22 +00:00
Michael
d675c84051 Issue 3801: Personal notes hadn't been displayed 2017-10-18 04:55:03 +00:00
rabuzarus
c1699364ae reload the acl if a new event edit or copy modal is opened 2017-10-15 22:34:31 +02:00
Michael
08f461f70c Bugfix: Revive dead contacts 2017-10-15 19:34:15 +00:00
rabuzarus
74d813042f extend checkbox template for customized attributes 2017-10-15 18:45:49 +02:00
rabuzarus
4584670af4 add event action: duplicate events 2017-10-15 17:30:28 +02:00
Michael
5acdd18c00 Improve the data generation for the display page 2017-10-12 19:54:49 +00:00
Michael
a29b7e7153 "dba" is now a static class 2017-10-11 12:56:36 +00:00
Tobias Diekershoff
ed13034e23 Merge pull request #3773 from annando/force-republish 
Force a republish to the directory server
 2017-10-09 21:39:24 +02:00
Michael
c8eefbd091 Force a republish to the directory server 2017-10-09 19:26:45 +00:00
Tobias Diekershoff
495b639e55 .com -> .ca 2017-10-08 10:22:29 +02:00
Michael
ecce105ae8 Avoid SQL error when in Forum view 2017-10-07 21:51:03 +00:00
Michael
68c6788762 Bugfix: Wrong function in search 2017-10-07 19:51:49 +00:00
Michael
88a70f9e2a Possibly better handling of the single user admin setting 2017-09-30 13:58:07 +00:00
Michael
bd88179419 Add additional checks for the worker 2017-09-30 11:19:46 +00:00
Alexandre Alapetite
da4b08fc4a SQL fix fbrowser (RC) 
https://github.com/friendica/friendica/pull/3742

Fixing non-standard GROUP BY, and non-standard ORDER BY.

```
DB Error 1055: Expression #2 of SELECT list is not in GROUP BY clause
and contains nonaggregated column 'friendica.photo.id' which is not
functionally dependent on columns in GROUP BY clause; this is
incompatible with sql_mode=only_full_group_by
q, fbrowser_content
SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS
`hiq`,max(`scale`) AS `loq`, `desc` FROM `photo` WHERE `uid` = 1 AND
`album` != 'Contact Photos' AND `album` != 'Contact Photos' GROUP BY
`resource-id` ORDER BY created DESC LIMIT 0, 10
2017-09-27T17:16:35Z@tmkfko6titb71nug3i4vr1mnb1 [NORMAL]:dba.php:553:p
DB Error 1055: Expression #2 of SELECT list is not in GROUP BY clause
and contains nonaggregated column 'friendica.photo.id' which is not
functionally dependent on columns in GROUP BY clause; this is
incompatible with sql_mode=only_full_group_by
q, fbrowser_content
```

```
ERROR 1055 (42000): Expression #1 of ORDER BY clause is not in GROUP BY
clause and contains nonaggregated column 'friendica.photo.created' which
is not functionally dependent on columns in GROUP BY clause; this is
incompatible with sql_mode=only_full_group_by
```
 2017-09-28 21:24:07 +02:00
Michael
289dde39ce Removed unused setting 2017-09-25 19:05:05 +00:00
Michael
66515ed85e Diaspora: Posts from Diaspora relais are transmitted the old way 2017-09-25 04:24:47 +00:00
Michael
8983dcaa77 Improvements for following/unfollowing of Diaspora and OStatus 2017-09-23 14:48:27 +00:00
Michael
b79c3241c6 Directly serve atom+xml if requested 2017-09-19 11:53:19 +00:00
Michael
72b42ad688 Last blob is now filled with the new functions 2017-09-15 21:17:58 +00:00
Michael
dfd48dd6f6 "qu" is no more 2017-09-15 21:00:39 +00:00
Michael
6d7ececc42 Bugfix for pictures that weren't stored / reworked database calls 2017-09-15 19:41:30 +00:00
Michael
c12075a005 Merge remote-tracking branch 'upstream/develop' into network-page 2017-09-15 06:42:33 +00:00
Tobias Diekershoff
0384e875a2 Merge pull request #3702 from annando/new-dba 
The old database function is now replaced with a wrapper
 2017-09-15 08:31:25 +02:00
Michael
c3589dc043 Added documentation 2017-09-14 06:10:33 +00:00
Michael
c6ceae5225 The old database function is now replaced with a wrapper 2017-09-14 05:19:05 +00:00
Michael
92537d6926 Rearranged code 2017-09-13 09:20:08 +00:00
Michael
a5cf2c69c8 Reworked network page 2017-09-13 06:43:43 +00:00
Michael
3dcd281de4 Rearranged code 2017-09-12 11:04:59 +00:00
Michael
c636b0a6b2 We can now unfollow a contact without deleting it 2017-09-12 06:08:24 +00:00
Michael
4b403e4fe2 OStatus: Reworked import 2017-09-10 07:21:23 +00:00
Michael
637eb0bfb4 Bugfix: Mails weren't sent 2017-09-08 15:14:33 +00:00
Michael
d25670a4e6 "remote self" should work now 2017-09-06 16:20:14 +00:00
Michael
b1668ffdda Address instead of url 2017-09-01 19:32:12 +00:00
Michael
88fb02db8d Small correction 2017-08-31 12:10:17 +00:00
Michael
0e8104b172 Links to profiles in mails mow show the profile address and "redir" always works 2017-08-31 12:01:44 +00:00
Michael
5f33f28b9e Display hadn't shown public items that weren't known to the user 2017-08-30 20:20:01 +00:00
Michael
5ab697e726 Removed unused template variable 2017-08-30 06:20:01 +00:00
Michael
02179e9419 Some missing tab 2017-08-30 06:16:31 +00:00
Michael
04f286dca2 Support for JSON based webfinger 2017-08-30 05:34:37 +00:00
Michael
1893c3df16 Pleroma-Servers are now detected and displayed in the statistics 2017-08-29 16:40:08 +00:00
Michael
c382f9f3d7 Some more 2017-08-26 07:52:49 +00:00
Michael
5adfeb0bd5 App::get_baseurl is now replaced with System::baseUrl 2017-08-26 07:32:10 +00:00
Michael
3c24bed412 New class "System" 2017-08-26 06:04:21 +00:00
Michael
21b239cbc7 Documentation was updated. (Reference to poormancron removed) 2017-08-25 02:49:25 +00:00
Michael
6998897a34 Limit the number of feed entries (Can solve resub problems) 2017-08-23 23:01:37 +00:00
Michael
2293757a36 Just some empty lines 2017-08-23 20:33:32 +00:00
Michael
b378f5fb01 The "hub" url now contains the nickname 2017-08-23 05:01:15 +00:00