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

21416 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
933f43218a
Merge pull request #6037 from annando/ap-signatures 
Diaspora signatures are now stored and transmitted correctly
 2018-10-27 13:49:19 -04:00
Michael
4831688dc0 Diaspora signatures are now stored and transmitted correctly 2018-10-27 14:35:22 +00:00
Hypolite Petovan
de6b640483
Remove extra use statement in mod/item 
Fix #6036
 2018-10-27 09:54:38 -04:00
Hypolite Petovan
ea7a08ace2
Merge pull request #6035 from annando/delivery-chaos 
Fixes duplicated transmissions and not working undo of like/dislike
 2018-10-27 07:34:20 -04:00
Michael
73f596cc46 Fixes duplicated transmissions and not working undo of like/dislike 2018-10-27 11:09:23 +00:00
Tobias Diekershoff
15eada076f
Merge pull request #6033 from annando/ap-events 
AP: Event participation and editing of posts are now supported
 2018-10-27 09:50:48 +02:00
Michael
f2ddcbe632 AP: Event participation and editing of posts are now supported 2018-10-27 06:17:17 +00:00
Hypolite Petovan
7ee8bdafc5
Merge pull request #5966 from JeroenED/theme/frio/oembed/view-active-class 
fixed view of active embedded videos
 2018-10-26 19:25:30 -04:00
Michael Vogel
f32ea03911
Merge pull request #6031 from MrPetovan/bug/add-missing-lang-default-template 
Declare missing `$lang` for default template in App->runFrontend
 2018-10-26 14:46:59 +02:00
Hypolite Petovan
4bcd2d7708 Declare missing $lang for default template in App->runFrontend 2018-10-26 08:13:31 -04:00
Michael Vogel
d38f25ebba
Merge pull request #6029 from tobiasd/20181026-cs 
CS translation update THX Aditoo
 2018-10-26 08:20:14 +02:00
Tobias Diekershoff
96d1664187 CS translation update THX Aditoo 2018-10-26 07:37:31 +02:00
Hypolite Petovan
86df648107
Merge pull request #6026 from annando/ap-event 
AP: We now transmit and process events
 2018-10-26 00:33:48 -04:00
Hypolite Petovan
f174bc1bc2
Merge pull request #6028 from annando/issue-5913 
Issue 5913: Fix fatal error in "RemoveUser"
 2018-10-26 00:32:16 -04:00
Michael
348e0300a6 Issue 5913: Fix fatal error in "RemoveUser" 2018-10-26 04:27:23 +00:00
Michael
cbc417114d AP: We now transmit and process events 2018-10-26 04:13:26 +00:00
Hypolite Petovan
884ab0d71d
Merge pull request #6003 from JonnyTischbein/issue_phototag 
Fix adding / removing photo tags
 2018-10-25 20:48:03 -04:00
Jonny Tischbein
deed949ff0 Code Standards: var name, spaces, array_push short form 2018-10-26 00:18:47 +02:00
Hypolite Petovan
b0898e4886
Merge pull request #6025 from Y-Y/small_typo 
Fix small typo (land -> lang)
 2018-10-25 17:02:10 -04:00
CrystalStiletto
c00eb41b8b
Fix small typo (land -> lang) 2018-10-25 22:59:24 +02:00
Jonny Tischbein
6bab8f1a43 Fix ? 2018-10-25 21:57:11 +02:00
Jonny Tischbein
581d1b9c9e Code Standards: Spaces 2018-10-25 21:49:18 +02:00
Jonny Tischbein
ea36f85457 Code Standard: indent 2018-10-25 21:47:10 +02:00
Jonny Tischbein
b03050c339 Replace update/delete with Term::insertFramTagFieldByItemId + Code Standards + Wording 2018-10-25 21:47:10 +02:00
Jonny Tischbein
e022bac339 Code Standard + renaming deleteAllTags + move its call and add type param 2018-10-25 21:47:10 +02:00
Jonny Tischbein
26ed71cc14 Only perform Term::deleteAllTags when needed + not needed redirect 2018-10-25 21:47:10 +02:00
Jonny Tischbein
272eb5eb82 fix doxygen header + indent 2018-10-25 21:47:10 +02:00
Jonny Tischbein
1689c44085 Fix goaway call 2018-10-25 21:47:10 +02:00
Jonny Tischbein
fd2e06781d Fix adding / removing photo tags + tagrm delete via GET + Item::update / add Term::deleteAllTags 2018-10-25 21:47:10 +02:00
Michael Vogel
dbfe5c9d2a
Merge pull request #6017 from MrPetovan/task/move-pager-out-of-app 
Road to Router Part 5: Move pager out of App
 2018-10-25 21:21:23 +02:00
Hypolite Petovan
aff326f0d8
Merge pull request #5949 from rthees/develop 
Develop: Edit group-name can't be edited in frio-theme
 2018-10-25 10:05:58 -04:00
Ralf Thees
4ddf59e016 indents now with tabs 2018-10-25 09:33:01 +02:00
Ralf Thees
9f152e1b43 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-25 08:59:32 +02:00
Hypolite Petovan
dde8d8976d Fix usages of Pager with JSON calls in mod/match and mod/dirfind 2018-10-25 00:07:16 -04:00
Hypolite Petovan
74e80f137b Update Pager->__construct calls for minimal use cases 2018-10-25 00:07:16 -04:00
Hypolite Petovan
7c0b591043 Move itemCount parameter from constructor to renderFull() 
- Remove Pager->itemCount property and Pager->setItemCount() method
- Update usage
 2018-10-25 00:07:16 -04:00
Hypolite Petovan
14237a9599 Move $pager and $page_offset out of App 
- Move infinite scroll data output in a module hook
- Use Pager instead of paginate() and alt_pager()
 2018-10-25 00:07:15 -04:00
Hypolite Petovan
a976a4cb68 Add new Hook::add method to enable module hooks 2018-10-25 00:07:15 -04:00
Hypolite Petovan
f1ebaf5e7d Add new Content\Pager class 2018-10-25 00:07:15 -04:00
Michael Vogel
920ffab439
Merge pull request #6024 from MrPetovan/bug/fix-disabling-addons 
Fix unsetting non-existent index in Addon::$addons on uninstall
 2018-10-25 05:28:47 +02:00
Hypolite Petovan
c60a65c423 Fix unsetting non-existent index in Addon::$addons on uninstall 2018-10-24 20:44:05 -04:00
Hypolite Petovan
610e4dd376
Merge pull request #6023 from annando/ap-delivery 
Preparations to work with BCC
 2018-10-24 17:18:12 -04:00
Michael
7f11b2e4e9 Deactivated BCC 2018-10-24 21:04:21 +00:00
Michael
f300c8953a We now use bcc for the acl block 2018-10-24 20:06:57 +00:00
Michael
0a790227b6 Merge remote-tracking branch 'upstream/develop' into ap-delivery 2018-10-24 19:22:07 +00:00
Michael
58f82e084d Preparations to work with BCC 2018-10-24 19:19:51 +00:00
Ralf Thees
dfbaa6e198 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2018-10-24 21:14:45 +02:00
Hypolite Petovan
e3f6e7807c
Merge pull request #6020 from nupplaphil/friendica-5996 
Bugfixing redirects
 2018-10-24 14:54:51 -04:00
Philipp Holzer
072eeb8bec
making english sentences 2018-10-24 20:52:38 +02:00
Philipp Holzer
99a33b7335
Code standards 2018-10-24 20:44:19 +02:00