tobias/friendica
1
0
Fork 0
Code Pull requests Activity
21005 commits 2 branches 61 tags 183 MiB
Commit graph

4936 commits

Author SHA1 Message Date
Hypolite Petovan
58c6ef2bc0
 		Merge pull request #5841 from JonnyTischbein/issue_profile_edit_sexual_marital 
Fix (short) profile editing showing 'e' for martial and sexual preferences
 2018-10-06 07:13:04 -04:00
Jonny Tischbein
17019772a4 Fix (short) profile editing showing 'e' for martial and sexual preference 2018-10-06 11:37:15 +02:00
Michael
09302367d5 Include AP in the contact search 2018-10-06 03:17:44 +00:00
Jonny Tischbein
faa86aa2c0 fix indent with tabs 2018-10-04 21:38:44 +02:00
Jonny Tischbein
07489a3a9c Install: After detecting DB already in use, go back to db_stettings with error 2018-10-04 18:53:52 +02:00
Michael
78a7e130ae Another renamed function 2018-10-03 15:50:21 +00:00
Michael
8841519c0d Renamed functions 2018-10-03 15:41:51 +00:00
Michael
3ab837f3c7 Functionality is now split 2018-10-03 09:15:38 +00:00
Hypolite Petovan
1f7cb530c7
 		Merge pull request #5812 from annando/develop 
Issue 5811: "objects" instead of "object"
 2018-10-02 22:11:28 -04:00
Michael
518d461a8f Issue 5811: "objects" instead of "object" 2018-10-02 20:12:38 +00:00
Hypolite Petovan
406b46b635
 		Merge pull request #5800 from JonnyTischbein/issue_return_path 
Update return path former via $_SESSION['return_url']
 2018-10-02 12:30:38 -04:00
Jonny Tischbein
6d1b98dc0e wrong var name - conversation not found 2018-10-02 18:24:16 +02:00
Jonny Tischbein
ecb67cfcb4 syntax typo 2018-10-02 18:22:23 +02:00
Jonny Tischbein
fa3bbc5f45 Code Standards + return path for \!local_user() and cancel 2018-10-02 18:13:58 +02:00
Hypolite Petovan
505350c9fb
 		Merge pull request #5794 from annando/ap1 
ActivityPub support
 2018-10-02 11:24:04 -04:00
Jonny Tischbein
9915523490 mod/message return to conversation if message deleted 2018-10-02 13:16:43 +02:00
Michael
7e9499ac13 AP contacts are now tagged upon commenting 2018-10-01 21:09:08 +00:00
Michael Vogel
103535d620
 		Merge pull request #5773 from MrPetovan/task/rewrite-js-hooks 
Rewrite JS hooks
 2018-10-01 17:10:30 +00:00
Michael
93ccca5807 AP hast to be enabled here as well 2018-09-30 21:23:40 +00:00
Jonny Tischbein
57fe36e9a3 replace session return url by static pages 2018-09-30 19:26:29 +02:00
Jonny Tischbein
0a699be3c0 replace session return url by static pages 2018-09-30 19:03:05 +02:00
Michael
761bdafa34 Correct content type 2018-09-30 14:13:07 +00:00
Michael
cb44aa83c7 Object instead of Display 2018-09-30 12:21:57 +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
Michael
cb9be8a7ab UUID is now createUUID 2018-09-27 11:52:15 +00:00
Michael
60b0759b50 UUID instead of GUID 2018-09-26 20:03:46 +00:00
Michael
834422d52f Merge remote-tracking branch 'upstream/develop' into ap1 2018-09-24 21:48:40 +00: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
Michael
8c7e5bb776 all endpoints are now working 2018-09-23 17:29:31 +00:00
Michael
6df6d82427 We can now like and dislike 2018-09-23 08:52:07 +00:00
Michael
a56565fa99 AP is enabled for all users 2018-09-22 23:49:27 +00:00
Michael
c083ae047c Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-22 15:18:53 +00: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
Michael
f772ece86f New delivery module for ap 2018-09-17 21:13:08 +00:00
Hypolite Petovan
c4ea3bfb3e
 		Merge pull request #5728 from rabuzarus/20180905_-_fix_lockview 
lockview - prevent notices
 2018-09-16 23:02:23 -04:00
Michael
699a4140f9 Now sending does finally work - and some AP standards are improved as well 2018-09-16 20:12:48 +00:00
Michael
e4d28629e4 First posting tests 2018-09-16 17:47:00 +00: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
6f3b2b6586 Handling of unlisted posts, better uid detection 2018-09-16 09:06:09 +00:00
Michael
2eabe45a8e Contact reject does work now as well 2018-09-15 22:25:58 +00:00
Michael
e45206ae5d Merge remote-tracking branch 'upstream/2018.08-rc' into ap1 2018-09-15 20:49:46 +00:00
Michael
86bd283705 The whole contact handling does work now, yeah ... 2018-09-15 20:31:05 +00:00