Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 19:20:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
19895 commits 3 branches 64 tags 237 MiB
Commit graph

4685 commits

Author SHA1 Message Date
Michael
060997feda (Partly) reworked notes 2018-06-10 19:29:34 +00:00
Michael
c1d9c29eea Search is now changed as well. 2018-06-10 14:36:22 +00:00
Michael
8375d4ac4c Notes again 2018-06-10 08:58:03 +00:00
Michael
b26c5e7f73 And now the notes 2018-06-10 08:30:27 +00:00
Michael
a89a1f31b5 Profile is now using the new function as well 2018-06-10 08:08:53 +00:00
Michael
5d9083c369 Bugfix in notifications / network and display are using the new functions now 2018-06-10 07:26:37 +00:00
Michael
18a77a1b45 Removed some quick and dirty hack to upload pictures 2018-06-05 05:42:26 +00:00
Michael
d9bdba491a We don't poll, we work ... Bugfix for renamed config value. 2018-06-04 21:17:37 +00:00
Michael
93fd04e381 Removed deprecated functionality 2018-06-03 07:48:13 +00:00
Michael
3f07d01dd1 Get rid of unneeded or redundant fields 2018-06-03 07:42:56 +00:00
Michael
8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
Michael
b5b172500d Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-01 12:32:51 +00:00
Hypolite Petovan
93daf7883e Merge branch 'master' into develop 
- Updated new develop version label
- Incremented database build number
 2018-06-01 07:30:04 -04:00
Michael
ae8d7267a0 "redir" is now centralized and works with the public contact 2018-06-01 06:46:34 +00:00
Hypolite Petovan
71ab86d0c3
Merge pull request #5150 from abanink/5147 
5147 Typo 'bandwith' should be 'bandwidth'
 2018-05-31 10:35:24 -04:00
Pascal Deklerck
bdb82572ba redo correct typo Bandwith to Bandwidth in mod/settings.php 2018-05-31 06:39:30 +02:00
Pascal Deklerck
de1e514be3 redo correct typo bandwith to bandwidth in mod/admin.php 2018-05-31 06:38:14 +02:00
Pascal Deklerck
8fd33f89ea undo change to mod/admin.php 2018-05-30 20:28:38 +02:00
Pascal Deklerck
307a19074f undo changes to strings files 2018-05-30 20:22:34 +02:00
Pascal Deklerck
e1dd1aa358 5147 Typo 'bandwith' should be 'bandwidth' 2018-05-30 08:50:29 +02:00
Hypolite Petovan
2e97cbe728
Merge pull request #5144 from annando/deleted-item 
Fix for not being able to delete items you don't own
 2018-05-29 15:14:51 -04:00
Michael
5bcb9daa43 Use local_user instead 2018-05-29 18:57:32 +00:00
Tobias Diekershoff
8eefe542df rewording 2018-05-29 16:54:40 +02:00
Michael
8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
Tobias Diekershoff
3f93b982b6 hide profile help text clarification 2018-05-28 16:16:23 +02:00
Michael
c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item 2018-05-27 10:38:49 +00:00
Michael
54136f3a74 Added the new parameter to the delete function. 2018-05-26 21:38:45 +00:00
Michael
4c36109f02 Some more places to add the user id 2018-05-26 20:03:30 +00:00
Michael
bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
Hypolite Petovan
3965615fbc
Merge pull request #5129 from tobiasd/20180526-adminpanel 
added a warning to an admin setting
 2018-05-26 08:35:17 -04:00
Hypolite Petovan
5cc1405bae
Merge pull request #5127 from tobiasd/20180525-register 
Opt-In to listing in the directory
 2018-05-26 08:34:42 -04:00
Tobias Diekershoff
c65c870032 added a warning to an admin setting 2018-05-26 07:32:39 +02:00
Tobias Diekershoff
112c7b0248 remove false othion HTML ignored 2018-05-26 07:09:32 +02:00
Tobias Diekershoff
9041bacebf exchange help text 2018-05-25 20:32:48 +02:00
Tobias Diekershoff
e996354922 Opt-In to listing in the directory 2018-05-25 19:53:03 +02:00
Hypolite Petovan
44caf05f06
Merge pull request #5110 from annando/nodeinfo 
Nodeinfo: The number of comments is now calculated more reliable
 2018-05-22 17:20:06 -04:00
Michael
5430354f54 Issue 5111: missing "use DBM" in "removeme" 2018-05-22 20:17:32 +00:00
Michael
89a20ddbd7 Nodeinfo: The number of comments is now calculated more reliable 2018-05-22 20:10:18 +00:00
Hypolite Petovan
c41332364f
Merge pull request #5089 from tobiasd/20180519-tos 
privacy statement
 2018-05-20 08:20:16 -04:00
Tobias Diekershoff
f7c24a20ae cite: just some small styling thing 2018-05-20 08:43:43 +02:00
Michael
c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
Tobias Diekershoff
dd629d5fa4 registration: added display of privacy statement if enabled 2018-05-19 18:53:54 +02:00
Tobias Diekershoff
ae62c1d1ea admin panel: added privacy statement preview 2018-05-19 18:52:23 +02:00
Tobias Diekershoff
139f7cdc41
Merge pull request #5088 from annando/display-update 
Follow up: Display update should really be fixed now.
 2018-05-19 18:19:52 +02:00
Michael
e28819655c Follow up: Display update should really be fixed now. 2018-05-19 16:04:57 +00:00
Hypolite Petovan
d4ebf7ae52
Merge pull request #5086 from annando/issue-2880 
Issue 2880: Editing post doesn't destroy mentions or hashtags anymore
 2018-05-19 12:01:05 -04:00
Tobias Diekershoff
9b55e52184
Merge pull request #5087 from annando/issue-4819 
Issue 4819: The introduction note is now stored
 2018-05-19 17:44:42 +02:00
Michael
c214353a5d Issue 4819: The introduction note is now stored displayed on the contact page. 2018-05-19 15:29:34 +00:00
Michael
3fe07cca57 Issue 2880: Editing post doesn't destroy mentions or hashtags anymore 2018-05-19 14:55:27 +00:00
Michael
b1a9030369 Fix constant display updates 2018-05-19 06:12:55 +00:00
Tobias Diekershoff
81089e1b2e
Merge pull request #5083 from annando/fix-spamming 
Fix: Avoid getting spammed when an admin has got several accounts
 2018-05-19 08:06:33 +02:00
Michael
1cd6976faa Fix missing $ 2018-05-19 05:59:43 +00:00
Michael
e9848d7b8f End subscription for unreachable subscribers 2018-05-19 03:56:29 +00:00
Michael
a4d976b70f Fix: Avoid getting spammed when an admin has got several accounts 2018-05-19 03:38:43 +00:00
Michael
be469f6bca Fix for subscribing to the wrong feed from OStatus 2018-05-18 13:23:27 +00:00
Michael
feb3d76a5b Fix: Subscriptions from GNU Social partially don't work 2018-05-18 12:18:12 +00:00
Roland Häder
d1783e9aeb
Fixes for #4965: 
- better descriptive tooltip for adding/removing contact from/to group

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 02:24:42 +02:00
Roland Häder
6129eb1623
OpenId possibly fixed: 
- The LightOpenId class' constructor now requires the hostname from where the
  requested started, added it now
- sometimes need to invoke get_app() as $a was not around

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 00:24:25 +02:00
Roland Häder
5a7bcd4725
Added empty line after if() block (convention) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:22 +02:00
Roland Häder
bacb7b70f6
Cleanups: 
- added empty lines
- removed old-lost commented out line

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder
57e668d9e0
Continued: 
- avoided else() block which reduces code complexibility
- used more x()
- added curly braces
- added known type-hints

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Michael
dcfd81e2ee
Some corrections 2018-05-14 22:50:04 +02:00
Michael
d54c79a772
Replace old database queries with the new ones 2018-05-14 22:50:04 +02:00
Roland Häder
8bc565be74
Continued: 
- ops, another rebase-leftover fixed

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:03 +02:00
Roland Häder
befb080b70
Continued: 
- moved to Config class

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:03 +02:00
Roland Haeder
2fd14eac70
Opps, cutted this out by accident ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:50:03 +02:00
Roland Haeder
6579396627
removed TODO, one day this all needs refacturizing ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:50:02 +02:00
Roland Haeder
1d15e68678
added more curly braces + spaces for #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:50:01 +02:00
Roland Häder
bc21bf0ee6
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:01 +02:00
Michael
3bb5a416f8
Some corrections 2018-05-14 22:50:00 +02:00
Michael
8b775d48f9
Replace old database queries with the new ones 2018-05-14 22:50:00 +02:00
Roland Häder
cbe12eba76
Continued: 
- ops, another rebase-leftover fixed

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:59 +02:00
Roland Häder
7a29944836
Fixes/cleanup: 
- added missing curly braces (and some absent caused parser errors)
- <include|require>[_once] are keywords, so don't use them as such
- removed/added empty lines

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:59 +02:00
Roland Haeder
8e42e797cc
Opps, cutted this out by accident ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:57 +02:00
Roland Haeder
7514a3beb8
rewrote for() loop to foreach() + added curly braces/spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:57 +02:00
Roland Haeder
5ee91330a7
removed TODO, one day this all needs refacturizing ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:57 +02:00
Roland Haeder
85039d41a2
added more curly braces + spaces for #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:56 +02:00
Roland Häder
d9d60346ff
more usage of dbm::is_result() and sorted a bit statements 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:56 +02:00
Roland Haeder
128c9b20e0
fixed curly braces + added more 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
1de8e31df6
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
99440f3c56
Beatification: 
- added space after curly braces (MrPetovan)
- added TODO for possible rewrite candidate

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 14:21:53 +02:00
Roland Häder
87dbe03521
reverted back ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:20:15 +02:00
Roland Häder
445cc1cb99
Fixes: 
- brought back comment (ops)
- DBM is the class name (not dbm)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:06:43 +02:00
Roland Häder
8d9547777e
Ops, was redundant here. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:05:31 +02:00
Roland Häder
594f946ad6
No extra empty line here 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:04:49 +02:00
Michael
249d84c0b3 Automatic table optimisation is deactivated by default now 2018-05-13 05:41:05 +00:00
Roland Häder
5debcbb5a6
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-10 13:07:22 +02:00
Michael
40d3e7982c Adopt the relay definition according to the suggestions from @jaywink 2018-05-10 11:04:18 +00:00
Michael
6c792588fd Ensure to mostly fetch the item with an non zero user id 2018-05-08 22:26:49 +00:00
Michael
eb4650ff23 dbclean settings are now available from the frontend 2018-05-07 05:37:20 +00:00
Michael
1230ff146a "remote-self" is now working for Diaspora and Twitter as well 2018-05-04 21:12:13 +00:00
Michael
eecd1e47e4 Some corrections 2018-05-02 21:12:48 +00:00
Michael
4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
Hypolite Petovan
352e136132
Merge pull request #4961 from annando/direct-dfrn 
Direct Relay is now working with DFRN as well
 2018-04-30 14:06:35 -04:00
rabuzarus
0c0b715c63 Merge develop into 20180425_-_fix_help_aside 2018-04-30 14:56:25 +02:00
Michael
74aa3499b0 Additional logging 2018-04-30 12:41:56 +00:00
Michael
aa4945f4a0 "x-social-relay" now exposes all supported protocols 2018-04-30 04:01:04 +00:00
Philipp Holzer
b4f5311e7f Add Install Mode 
- merge `friendica/develop` to `nupplaphil/install_mode`
 2018-04-29 20:15:12 +02:00
Michael
fd318a1193 Corrected query to don't show hash tag posts from blocked or ignored contacts 2018-04-28 16:12:45 +00:00
Philipp Holzer
8815d07765 Add Install Mode 
- fixed mistake
 2018-04-28 17:06:08 +02:00