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

4235 commits

Author SHA1 Message Date
Hypolite Petovan
3cebdee867 Fix mod/admin.php formatting 2017-11-29 20:28:30 -05:00
Adam Magness
0373056448 Review and Use statements 
use statements and review changes.
 2017-11-29 17:29:11 -05:00
Michael
fe348acb49 Small fixes to "nogroup" 2017-11-29 20:59:06 +00:00
Adam Magness
0091d318e5 Function names 
Update function names and corresponding function calls
 2017-11-29 12:17:12 -05:00
Adam Magness
54827e7fed Photo to src 
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
 2017-11-29 07:52:27 -05:00
Michael
8bffee43b3 Threads are now always enabled. 2017-11-28 18:54:39 +00:00
Michael Vogel
3f448d9a42
Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate 
Migrate password hashing Part 1: Add User::authenticate
 2017-11-27 15:14:36 +01:00
Michael
9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Michael
a6de1a1ae8 Posting images to public forums now really does work. 2017-11-26 22:28:46 +00:00
Hypolite Petovan
2196a0577b Remove unused upubkey and uprvkey from queries 
- Switched queries to new dba::* functions
 2017-11-26 14:55:47 -05:00
Hypolite Petovan
ec6f5193e2 Switch to User::authenticate 
- Removed hash('whirlpool') to check password
 2017-11-26 14:46:08 -05:00
Hypolite Petovan
90a8ae2cb8 Fix formatting 
- include/auth.php
- include/oauth.php
- include/user.php
- mod/removeme.php
- src/Worker/Queue.php
 2017-11-26 14:18:45 -05:00
Michael
661f9af93a Network page: Selecting a forum overrides the group selection 2017-11-26 16:17:32 +00:00
Hypolite Petovan
3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud 
A tag cloud widget for the profile page
 2017-11-26 11:16:14 -05:00
Michael
f059b33390 Avoid empty user export when there are UTF8 problems 2017-11-26 13:58:24 +00:00
Hypolite Petovan
068d3dc746
Merge pull request #3959 from annando/image-forum 
Images that are uploaded to public forums are now public
 2017-11-25 21:40:33 -05:00
Michael
cb7648359c When we are requesting a conneczion, the contactis no longer "blocked" 2017-11-26 02:31:26 +00:00
Michael
a7088f5b67 Images that are uploaded to public forums are now public 2017-11-26 02:03:59 +00:00
rabuzarus
4224209497 Merge develop into 20171122_-_port_tagcloud 
Conflicts:
	include/features.php
 2017-11-25 23:41:20 +01:00
Michael
1adff81a25 Documentation for "fetch further information" 2017-11-25 14:43:28 +00:00
Michael
3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00:00
Adam Magness
609a4de5d0 src Standards 
This basically completes coding standards changes for the entire src directory, with the exception of App.php
 2017-11-23 14:01:58 -05:00
rabuzarus
19afabd268 tags: possibility to filter posts for tags and profile owner (profile) 2017-11-23 00:59:20 +01:00
rabuzarus
d7d653aab6 port tag cloud widget from hubzilla 2017-11-22 21:29:07 +01:00
Adam Magness
7cee150868 ForumManager to src 
ForumManager moved to Friendica\Content namespace
 2017-11-21 07:20:22 -05:00
Hypolite Petovan
33ad6b6d7e
Merge pull request #3927 from rabuzarus/20171121_-_fix_reg_notifs 
Bugfix: show no registrations notifs if there are none
 2017-11-20 23:54:11 -05:00
rabuzarus
04a7291303 Bugfix: show no registrations notifs if there are none 2017-11-21 03:45:13 +01:00
Adam Magness
69fd3c60b0 Indentation fix 
errant indentation change
 2017-11-20 19:03:58 -05:00
Adam Magness
1726ededac Emailer to src 
Move emailer to src Friendica\Util namespace
 2017-11-20 15:37:30 -05:00
Adam Magness
ddacbf2c13 XML class standards 
updated the xml class for PSR-2
 2017-11-20 12:56:31 -05:00
Hypolite Petovan
b85c94a60d
Merge branch 'develop' into issue/3878-move-Contact-to-src 2017-11-19 18:09:14 -05:00
Hypolite Petovan
81647cefed
Merge pull request #3920 from annando/scripts 
The poller is now the worker and we have a "scripts" folder
 2017-11-19 17:25:14 -05:00
Hypolite Petovan
898fe2db1e Code cleanup 
- Remove extraneous use statements
- Format require_once
 2017-11-19 17:06:18 -05:00
Hypolite Petovan
5ee728972e Remove include/Contact.php 
- Remove all mentions to include/Contact.php
 2017-11-19 17:05:21 -05:00
Hypolite Petovan
ec02af593d Change called method names 
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
 2017-11-19 17:03:39 -05:00
Hypolite Petovan
b92fc24ff0 Add Contact Object 
- Add Profile Object
- Add User Model
- Add use statements
 2017-11-19 16:55:28 -05:00
Michael
920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Adam Magness
a6d501bc4e Overzealous rename 
reverted change to function name.
 2017-11-19 16:14:16 -05:00
Adam Magness
d9e9cbe753 Coding Standards 
A few updates for coding standards
 2017-11-19 15:32:54 -05:00
Michael
183999ee08 No german compound wording :-) 2017-11-19 19:47:04 +00:00
Michael
8cd21269ff The last of the big workers moved ... delivery and notifier 2017-11-19 18:59:55 +00:00
Michael
2de457489f "CreateShadowentry" and "ProfileUpdate" now moved as well 2017-11-19 16:59:37 +00:00
Hypolite Petovan
2336fa9d74 Add smart_threading user setting 2017-11-19 00:57:31 -05:00
Michael
1f28cbd2c6 And now DiscoverPoCo.php 2017-11-18 11:02:46 +00:00
Michael
01362461cf poller.php is cleaned up, unneeded stuff has been removed 2017-11-18 11:01:01 +00:00
Michael
925d2d2383 Directory moved 2017-11-18 07:59:30 +00:00
Adam Magness
cd12de46f8 OStatus moved to src 
OStatus moved to Friendica\Protocol namespace. References and function calls updated.
Related to #3878
 2017-11-15 23:09:11 -05:00
Adam Magness
259f91caa9 PortableContact created 
Create PortableContact and remove socgraph, update references, and calls
 2017-11-15 10:53:16 -05:00
Adam Magness
47db624105 GlobalContact created 
Moved DirSearch and GlobalContact related functions to Friendica\Model namespace
 2017-11-15 09:47:49 -05:00
Michael
476facde61 Onepoll moved as well 2017-11-12 18:50:35 +00:00
Adam Magness
4d146acf90 Smilies to src 
Move Smilies to Friendica\Content namespace.

Related to #3878
 2017-11-11 07:21:15 -05:00
Hypolite Petovan
6b23548a2b
Merge pull request #3896 from tobiasd/20171110-community 
adding a global community disclaimer
 2017-11-10 16:17:38 -05:00
Tobias Diekershoff
fd2b807292 halfe the double 2017-11-10 22:00:39 +01:00
Tobias Diekershoff
4f95b413fa some corrections 2017-11-10 20:57:02 +01:00
Tobias Diekershoff
3e1d0bf7a8 move HTML to template and add an optional hint that a global community page shows all arriving public postings 2017-11-10 20:25:17 +01:00
Adam Magness
bc49fc974c Capitalized XML 
Acronym classes should be capitalized
 2017-11-10 07:45:33 -05:00
Adam Magness
f245bc8359 Move xml to namespace 
Relocate xml from include to src
Related to #3878
 2017-11-10 07:18:24 -05:00
Tobias Diekershoff
b8a76794e0 add info text about email on registration 2017-11-10 08:06:56 +01:00
Adam Magness
06c3af9b60 Move Cache to src 
relocate the cache class to Friendica\Core namespace
 2017-11-09 11:05:18 -05:00
Hypolite Petovan
ee5b9de6ad Reverting RINO crypto code to php-encryption version 1.2 2017-11-09 03:20:18 -05:00
Hypolite Petovan
1262d6bfee Function name typo 2017-11-09 03:01:53 -05:00
Hypolite Petovan
918f2e8593 Fix another php-encryption version migration error 2017-11-09 03:01:02 -05:00
Hypolite Petovan
d5aff9ac31 Fix php-encryption version 2 compatibility issues 2017-11-09 02:35:11 -05:00
Hypolite Petovan
acd65aade1 Switch to new php-encryption library version 
- Remove references to library/ files
- Add namespace to library classes
 2017-11-09 02:21:37 -05:00
Adam Magness
4ca68c7af0 Class file relocations 
Issue #3878
 2017-11-08 08:37:03 -05:00
Adam Magness
6189f6c8e7 Relocate class files from /include to /src/ 
dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated.
 2017-11-08 08:36:48 -05:00
Michael
063358301f One space more 2017-11-08 13:08:26 +00:00
Michael
76caf7a9cf Small corrections 2017-11-08 06:43:20 +00:00
Michael
76f73c7236 And some more places 2017-11-07 22:15:59 +00:00
Michael
5a6fa4ae87 Some more 2017-11-07 21:53:11 +00:00
Adam Magness
a782ab50f9 Correct deletion 
Bring back mod/probe.php and delete include/probe.php as intended.
 2017-11-07 12:31:32 -05:00
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
Michael
e607a9dcda Our user feeds now look more like OStatus 2017-08-22 10:18:07 +00:00
Michael
17b05c9ad9 Hash tag links now do a redir 2017-08-19 09:22:50 +00:00
Michael
791fc1d8b3 DFRN: Improved delivery status handling 2017-08-16 04:08:57 +00:00
Michael
4f6f47f714 Now the bugfix really should work 2017-08-14 20:58:02 +00:00
Michael
2d99e86b12 Bugfix for PR 3630: "get_contact_details_by_url" not always returned a value 2017-08-14 20:17:17 +00:00
Michael
0ac725dc47 Some more updated queries 2017-08-12 22:15:16 +00:00
Michael
41a81624a2 Now deletions will also work with complicated queries 2017-08-12 18:07:47 +00:00
Michael
89017d4e6c DBA: The condition can now be a complex string 2017-08-12 13:54:29 +00:00
Michael
1d8c91c478 Restructured "dba::exists" function 2017-08-12 08:55:50 +00:00
Michael
b14b44e8a8 Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-12 07:37:06 +00:00
Michael Vogel
adf06e9c81 Merge pull request #3627 from tobiasd/20170812-invite 
wrong url
 2017-08-12 09:33:14 +02:00
Tobias Diekershoff
3b67ef3e9c wrong url 2017-08-12 07:46:37 +02:00
Michael
05393a6faa Merge remote-tracking branch 'upstream/develop' into dba-2 2017-08-11 16:24:33 +00:00
Michael
99f0c01cdd Some more changed queries 2017-08-11 16:21:55 +00:00
Michael
d352a290fe Parameter wasn't replaced 2017-08-11 08:55:07 +00:00
Michael
d810b21f87 New dba functions 2017-08-11 08:04:01 +00:00
Tobias Diekershoff
e6e8ebbac5 Merge pull request #3622 from annando/new-dba 
Enhanced dba functions, several replaced database calls
 2017-08-11 08:11:20 +02:00
Tobias Diekershoff
e89e008565 missing bracket 2017-08-10 10:31:45 +02:00
Michael
fce72cbbc8 Modifed "update" and "insert" function / many changed queries 2017-08-09 21:12:41 +00:00
Tobias Diekershoff
6504156508 add a switch to the Markdown parser for using hard line breaks (issue 3592) 2017-08-09 16:04:53 +02:00
Tobias Diekershoff
ee6956a91a else is sufficient here 2017-08-03 07:23:05 +02:00
Tobias Diekershoff
0c8c69371c no global directory URL defined? 2017-08-03 07:22:29 +02:00
Tobias Diekershoff
6cf951c930 use /servers instead of /siteinfo for the directory link in invitations 2017-08-02 08:48:01 +02:00
Tobias Diekershoff
7034d6efbd use /servers instead of /siteinfo for the directory link in invitations 2017-08-02 08:47:09 +02:00
Tobias Diekershoff
016e4a0efc Show contacts personal message in local profile 2017-08-01 17:47:13 +02:00
Michael
55569f9df3 This is a fix for issue 3536. Now likes aren't show anymore on the community page. 2017-07-31 19:29:43 +00:00
Michael
c98ae304c0 Endless scroll now avoids showing the same items 2017-07-31 06:04:37 +00:00
Michael
79fe249c54 Better use a wrapper 2017-07-22 06:43:04 +00:00
Michael
5d7e1e1a15 Use the realpath for the handling with (temporary) paths 2017-07-22 05:50:25 +00:00
Tobias Diekershoff
b5f58d317e there was a string not marked for translation 2017-07-14 15:21:08 +02:00
Michael Vogel
896bf4046c Merge pull request #3569 from tobiasd/20170702-delete 
delete item from admin panel
 2017-07-10 18:44:19 +02:00
Tobias Diekershoff
dc41ac0f61 use drop_item and some magic 2017-07-10 14:55:40 +02:00
Tobias Diekershoff
9304bb6422 Typos 2017-07-07 20:54:26 +02:00
Tobias Diekershoff
aabde5422b allow the admin to delete an item by GUID from the admin panel 2017-07-07 10:38:07 +02:00
rabuzarus
8ed6b037cf Merge pull request #3561 from annando/issue-3560 
Guests should be able to use the search as well
 2017-07-04 01:09:01 +02:00
Michael
e26991ba26 Guests should be able to use the search as well 2017-07-03 20:48:44 +00:00
Michael Vogel
2b161108fe Merge pull request #3439 from tobiasd/20170506-token 
[Needs OpenID testing] Add token to register
 2017-07-02 21:31:53 +02:00
Michael Vogel
578cb0a55c Merge pull request #3539 from AndyHee/20170617-admin_settings 
Corrected names for counting/ listing account-types in admin panel
 2017-06-28 07:24:41 +02:00
Michael
be3bfaec80 Only show the number of workerqueue entries that aren't done 2017-06-20 02:05:16 +00:00
Michael
cf179188b6 Some more worker fine tuning 2017-06-17 13:58:18 +00:00
AndyHee
d7b411e9bc Corrected names of account-types 2017-06-17 12:36:14 +07:00
Tobias Diekershoff
de5a0dadb0 Merge pull request #3534 from AndyHee/20170609-User_settings 
Better input hints, user settings, account types
 2017-06-09 12:39:50 +02:00
Andy H3
c8f87e1c28 Updated settings.php 2017-06-09 16:21:25 +07:00
Tobias Diekershoff
1838024f6d Merge pull request #3528 from Hypolite/task/replace-explicit-php-logical-operators 
Replace explicit php logical operators
 2017-06-09 07:44:19 +02:00
Hypolite Petovan
ad4cdf2a9d Replace lowercase operators 2017-06-08 21:03:44 -04:00
Hypolite Petovan
9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
Michael
97fd47c614 Moved include to top 2017-06-07 08:46:38 +00:00
Michael
6e6941a546 We have an alternate link 2017-06-06 21:56:25 +00:00
Michael
932e14971f Issue 2864: Add a "alternate" link on display page 2017-06-06 17:56:22 +00:00
Michael
21eb9a4b2e Fixed locking behaviour for the worker 2017-06-03 07:25:01 +00:00
Michael
f6d10198cc Bugfix: The poller often couldn't store the pid in the workerqueue 2017-05-30 13:20:29 +00:00
Tobias Diekershoff
f3c3c57a0e Merge pull request #3497 from annando/1705-dbstructure-admin-page 
The database structure is now checked ad the admin summary page
 2017-05-28 11:07:45 +02:00
Michael
104acec09c The database structure is now checked ad the admin summary page 2017-05-28 08:39:41 +00:00
Hypolite Petovan
e762531134 Restore missing include 2017-05-27 21:47:54 -04:00
Michael
e37b6bcd41 Probing via web frontend shouldn't use the cache. 2017-05-23 19:38:47 +00:00
Michael
6e8e326705 Bugfix: Timeout problems when saving profile settings 2017-05-19 06:01:13 +00:00
Michael
192a5e254a Merge remote-tracking branch 'upstream/3.5.2rc' into bugfix-mail 2017-05-17 19:56:38 +00:00
Michael
696404739b Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short 2017-05-17 19:25:30 +00:00
Michael
80103f8ad9 Issue 3309: Avatar update should work now 2017-05-16 21:21:54 +00:00
Michael
e884090efa Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba 
Conflicts:
	include/uimport.php
 2017-05-13 04:13:07 +00:00
Michael
74a0a92742 Just some more dba::delete 2017-05-13 04:04:17 +00:00
Hypolite Petovan
2bbcbdc704 Merge pull request #3381 from Quix0r/rewrites/coding-convention-split2-4-2 
Coding convention applied split 2-4-2 (of 2-14-2)
 2017-05-12 21:40:30 -04:00
Michael
6ef24890bb dbclean is now using the new database functions / new functions for commit, rollback and transaction 2017-05-11 20:13:45 +00:00
Roland Häder
7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2 
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-05-11 14:54:26 +02:00
Michael Vogel
bc724f2b68 Merge pull request #3458 from Hypolite/bug/missing-require-poco 
Missing require for poco_serverlist
 2017-05-09 06:56:32 +02:00
Hypolite Petovan
108f0b2d1e Improve refactoring 
- Rename $contacts to $users where meaningful
- Use Config::get instead of get_config
- Move requires for lazy inclusion
 2017-05-08 23:03:52 -04:00
Hypolite Petovan
d5b660a72f Add missing require for poco_serverlist 2017-05-08 21:55:19 -04:00
Hypolite Petovan
70cc2ccc7a Fix standards + refactored variables with meaningful names 2017-05-08 21:55:04 -04:00
rabuzarus
cc8a3a4101 rename methods of the Probe class to camelCase 2017-05-08 16:19:10 +02:00
Michael Vogel
6680ce1dd7 Merge pull request #3445 from Hypolite/improvement/move-probe-to-src 
Move Probe to src
 2017-05-07 23:14:22 +02:00
Hypolite Petovan
74479c4020 Merge pull request #3448 from annando/1705-dba-functions 
The first queries are replaced with the new functions. More to come ...
 2017-05-07 17:10:39 -04:00
Hypolite Petovan
45ec3fb5d8 Add missing include/probe require for probe_url support 2017-05-07 17:08:32 -04:00
Michael
2c11e91e65 The first queries are replaced with the new functions. More to come ... 2017-05-07 20:52:00 +00:00
Alexandre Alapetite
02faf42403 Fix SQL syntax bug in mod message 2017-05-07 21:39:00 +02:00
Hypolite Petovan
3a2988c3fd Rename include/Scrape to include/probe 2017-05-07 14:45:19 -04:00
Hypolite Petovan
36e515ee6d Move Probe to src 2017-05-07 14:44:30 -04:00
Hypolite Petovan
82b423c5ac Fix require_once format 2017-05-07 14:40:23 -04:00
Hypolite Petovan
86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
Michael
c52b2f392f Probing has to be done uncached 2017-05-07 16:33:54 +00:00