clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
20,805 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

4897 Commits

Author SHA1 Message Date
Michael Vogel 103535d620
Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks 
Rewrite JS hooks
 2018-10-01 17:10:30 +00:00
Jonny Tischbein 1803862fc5 associative array + adding mysql value + removing table header 2018-09-27 19:46:28 +02:00
Jonny Tischbein 24117c24ce Get PHP Configuration for upload limit and display in /admin summary site 2018-09-27 18:53:16 +02:00
Hypolite Petovan a6996601d5
Merge pull request #5789 from friendica/master 
Update develop from master-2019.09
 2018-09-23 18:55:20 -04:00
Hypolite Petovan 1eaa523e61 Remove unused App->page['end'] 
- Remove unused empty templates
 2018-09-20 21:02:28 -04:00
Hypolite Petovan 8dc5b04be7
Merge pull request #5776 from annando/fix-contact 
Fix: Update routine for conversations in contacts was missing
 2018-09-20 10:10:45 -04:00
Jonny Tischbein 0f63a62761 fix return fallback to SESSION Variable 2018-09-20 15:55:24 +02:00
Michael 58d43ad576 Fix: Update routine for conversations in contacts was missing 2018-09-20 12:44:40 +00:00
Jonny Tischbein 58f26d195f adjust argc check in mod/editpost + relative path in mod/message 2018-09-20 14:41:52 +02:00
Jonny Tischbein 807ad14521 calculate form return_url for post and message instead of using SESSION var 2018-09-19 23:55:29 +02:00
Michael Vogel bd0515714c
Merge pull request #5765 from MrPetovan/bug/php7-remove-pear-text_highlighter 
[php7] Remove PHP code highlighting
 2018-09-18 18:34:46 +00:00
Hypolite Petovan d6985baaed Improve mod/babel 
- Handle multiple line endings
- Conserve HTML special chars in input box on submit
- Add new result panel with HTML::toMarkdown result
 2018-09-17 23:18:34 -04:00
Hypolite Petovan c4ea3bfb3e
Merge pull request #5728 from rabuzarus/20180905_-_fix_lockview 
lockview - prevent notices
 2018-09-16 23:02:23 -04:00
Hypolite Petovan 87c425e388 Improve whitespace display in mod/babel 
- Add a couple more result panels for Markdown input
- Remove \x28/\x29 parentheses encoding
- Convert remaining double quotes
 2018-09-16 09:07:17 -04:00
Michael 8c00e88f79 The endless saga of the fight against notices continues 2018-09-13 21:11:52 +00:00
Hypolite Petovan 70c94abd8e
Merge pull request #5759 from annando/issue-5733 
Issue 5733: Removing contacts does work now on the same machine as well
 2018-09-12 19:40:03 -04:00
Michael c4825a8b53 Fixing parentheses 2018-09-12 18:49:36 +00:00
Michael 7daa46503d Don't risk incompatibilities 2018-09-12 06:13:04 +00:00
Michael 96d10c25e3 Issue 5733: Removing contacts does work now on the same machine as well 2018-09-12 06:05:14 +00:00
Hypolite Petovan 7529fc61dd Fix introductions notifications links 2018-09-11 19:54:45 -04:00
Michael 8b96a53fba Burn notices, burn 2018-09-11 04:10:11 +00:00
Hypolite Petovan e461474290 Fix count being called on the wrong variable in mod/notes 2018-09-09 18:34:05 -04:00
Hypolite Petovan 071aff223a Format source of mod/events 2018-09-09 09:51:59 -04:00
Michael d581318c7c Notices come, notices go ... 2018-09-09 06:32:01 +00:00
Benjamin Lorteau 71215115eb Restore template choice by notification label 2018-09-07 11:15:23 -04:00
Tobias Diekershoff 55f72b5767
Merge pull request #5743 from MrPetovan/bug/fix-empty-notifications 
Fix empty notifications
 2018-09-07 07:33:47 +02:00
Hypolite Petovan 480d792356
Merge pull request #5732 from annando/fix-picture-posts 
Fix: Posts with pictures will now look good again on connector networks
 2018-09-06 19:00:44 -04:00
Hypolite Petovan f85af78097 Source format mod/notifications 
- Add array alignment
- Convert remaining double quotes to quotes
- Replace x() with defaults()
- Add missing spaces
 2018-09-06 18:55:06 -04:00
Hypolite Petovan 2f7ba13702 Restore display when there aren't unread notifications 2018-09-06 18:42:57 -04:00
Michael 6113fdc940 Issue 5733: Changing relationship values does work now again with DFRN 2018-09-06 09:20:45 +00:00
Michael 04fb885857 Fix: Posts with pictures will now look good again on connector networks 2018-09-06 04:24:34 +00:00
rabuzarus 1fe1628237 lockview - prevent notices 2018-09-05 18:44:47 +02:00
rabuzarus bd9d102da2 apply coding standards to lockview module 2018-09-05 14:24:51 +02:00
rabuzarus 88d25f977a fix lockview for photos 
- use the private field only for items because other tables than the item table don't have the private field
 2018-09-05 14:12:56 +02:00
Tobias Diekershoff 31cbc80981
Merge pull request #5722 from annando/dissolve 
Restore the behaviour to remove the remote contact upon termination
 2018-09-05 08:23:41 +02:00
Michael Vogel d7bb671b77
Merge pull request #5720 from MrPetovan/bug/fix-unfollow 
Remove extraneous SQL condition part in mod/unfollow
 2018-09-05 05:42:00 +00:00
Michael 9ef1d827f3 Restore the behaviour to remove the remote contact upon termination 2018-09-05 05:02:06 +00:00
Hypolite Petovan 9de0d35450 Remove extraneous SQL condition part in mod/unfollow 2018-09-04 19:29:36 -04:00
Hypolite Petovan 59d06b6c78
Merge pull request #5719 from annando/notices-yeah 
Good news, everyone - again somce notices removed
 2018-09-04 19:09:11 -04:00
Michael 635c8d7450 Beautified the code 2018-09-04 21:24:30 +00:00
Michael 821429fdf1 Good news, everyone - again somce notices removed 2018-09-04 17:48:09 +00:00
Hypolite Petovan 475d3f8f3a Fix formatting in mod/parse_url 2018-09-02 17:24:56 -04:00
Michael 58148905f1 Changed documention 2018-09-02 17:48:07 +00:00
Tobias Diekershoff d5a3b0bd5e
Merge pull request #5710 from annando/fix-api 
Fix for timeout issues when posting to the API
 2018-09-02 14:52:09 +02:00
Michael 703c668a37 More notices ... 2018-09-02 08:01:13 +00:00
Michael 4bb45f611f Fix for timeout issues when posting to the API 2018-09-02 07:20:04 +00:00
Michael Vogel 196ef0111c
Merge pull request #5704 from MrPetovan/bug/fix-unfollow 
Fix unfollow sharing-only contacts (except connector protocols)
 2018-08-31 15:40:51 +00:00
Benjamin Lorteau 76b40cf05e Use User::getOwnerDataById in mod/unfollow 2018-08-31 11:22:51 -04:00
Michael 380eeaab88 Still there had been notices - must have a good camouflage 2018-08-31 05:08:22 +00:00
Hypolite Petovan e25c579c76 Add Protocol::NATIVE_SUPPORT constant usage to mod/contacts 2018-08-30 21:03:57 -04:00