|
|
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 |
|
|
|
dde8d8976d
|
Fix usages of Pager with JSON calls in mod/match and mod/dirfind
|
2018-10-25 00:07:16 -04:00 |
|
|
|
74e80f137b
|
Update Pager->__construct calls for minimal use cases
|
2018-10-25 00:07:16 -04:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a976a4cb68
|
Add new Hook::add method to enable module hooks
|
2018-10-25 00:07:15 -04:00 |
|
|
|
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 |
|
|
|
c60a65c423
|
Fix unsetting non-existent index in Addon::$addons on uninstall
|
2018-10-24 20:44:05 -04:00 |
|
|
|
610e4dd376
|
Merge pull request #6023 from annando/ap-delivery
Preparations to work with BCC
|
2018-10-24 17:18:12 -04:00 |
|
|
|
7f11b2e4e9
|
Deactivated BCC
|
2018-10-24 21:04:21 +00:00 |
|
|
|
f300c8953a
|
We now use bcc for the acl block
|
2018-10-24 20:06:57 +00:00 |
|
|
|
0a790227b6
|
Merge remote-tracking branch 'upstream/develop' into ap-delivery
|
2018-10-24 19:22:07 +00:00 |
|
|
|
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 |
|
|
|
e3f6e7807c
|
Merge pull request #6020 from nupplaphil/friendica-5996
Bugfixing redirects
|
2018-10-24 14:54:51 -04:00 |
|
|
|
072eeb8bec
|
making english sentences
|
2018-10-24 20:52:38 +02:00 |
|
|
|
99a33b7335
|
Code standards
|
2018-10-24 20:44:19 +02:00 |
|
|
|
310d49b82a
|
removed use Friendica\Core\System again
|
2018-10-24 20:24:22 +02:00 |
|
|
|
48535c0959
|
Bugfixing redirects
- Adding App->redirect if both redirects are possible
|
2018-10-24 20:18:46 +02:00 |
|
|
|
9c9ebfc7c9
|
Merge pull request #6013 from JonnyTischbein/issue_comment_media_link_prompt
[frio] Add media / link prompt in comments
|
2018-10-24 12:17:58 -04:00 |
|
Jonny Tischbein
|
6cd17f2229
|
Code Standard: indent + renaming function in camelcase
|
2018-10-24 18:09:54 +02:00 |
|
Ralf Thees
|
722fd653ae
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-24 16:38:29 +02:00 |
|
Jonny Tischbein
|
d2b5f77be9
|
Add multimedia link for jot + enables hover text in jot + autosize in when paste link + renaming / Code Standards
|
2018-10-24 16:20:10 +02:00 |
|
|
|
d6b31dad06
|
Merge pull request #6016 from annando/remove-data
Remove items more memory friendly
|
2018-10-24 02:24:57 -04:00 |
|
|
|
c25d60e107
|
Removed finished work from the comments
|
2018-10-24 04:51:37 +00:00 |
|
|
|
a6f6db8d4e
|
Improve query speed
|
2018-10-24 04:50:27 +00:00 |
|
|
|
c0a24d80dd
|
Remove items more memory friendly
|
2018-10-24 04:46:45 +00:00 |
|
|
|
7538dd2084
|
Merge pull request #6014 from annando/deferred-tasks
Show deferred worker tasks in the admin interface and workerqueue logs
|
2018-10-23 17:39:31 -04:00 |
|
|
|
95dc030926
|
Show deferred worker tasks in the admin interface and workerqueue logs
|
2018-10-23 20:38:28 +00:00 |
|
Jonny Tischbein
|
ee006bdc18
|
Code Standards
|
2018-10-23 20:12:53 +02:00 |
|
Jonny Tischbein
|
d0c43c5597
|
Add prompt for link and media in comment + remove video symbol
|
2018-10-23 19:50:19 +02:00 |
|
Ralf Thees
|
580b7530ca
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-23 18:19:21 +02:00 |
|
|
|
e6fd05d8e8
|
Merge pull request #6011 from fabrixxm/issues/6010
Fix move from Core\Addon to Core\Hook
|
2018-10-23 11:43:41 -04:00 |
|
fabrixxm
|
035603a516
|
Replace Frienica\Core\Addon::isApp() withi Friendica\Core\Hook::isAddonApp()
fix #6010
|
2018-10-23 17:27:53 +02:00 |
|
Ralf Thees
|
53c7e50f12
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-23 17:18:23 +02:00 |
|
|
|
1a1300f1bf
|
Merge pull request #6009 from vinzv/develop
raising profile photo size to comply with frio sidebar profile photo scaling
|
2018-10-23 10:48:03 -04:00 |
|
|
|
cb75c40f4e
|
adapted profile pic resize to 300px for whole system
|
2018-10-23 16:36:57 +02:00 |
|
Ralf Thees
|
5583c070e0
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2018-10-23 15:52:29 +02:00 |
|
|
|
95f9337e0e
|
adapted 300px image size for default avatar
|
2018-10-23 15:16:58 +02:00 |
|
|
|
cbc898d902
|
raising profile photo size to comply with frio sidebar profile photo
skaling
|
2018-10-23 14:30:21 +02:00 |
|
Michael Vogel
|
d61a98a995
|
Merge pull request #6008 from nupplaphil/fixing_tests_2
Fixing tests - part 2
|
2018-10-23 14:23:59 +02:00 |
|
|
|
a79daf3946
|
Fixing tests - part 2
|
2018-10-23 13:53:48 +02:00 |
|
rabuzarus
|
db8968c912
|
Merge pull request #6005 from nupplaphil/friendica-5996
Fixing absolute/relative path
|
2018-10-23 12:26:28 +02:00 |
|
|
|
3e6ea9383b
|
Making redirect message more informative
|
2018-10-23 12:17:41 +02:00 |
|
|
|
9e322d2565
|
Fixing absolute/relative path
|
2018-10-23 12:14:17 +02:00 |
|
|
|
dbe49a0c1a
|
Merge pull request #5998 from annando/ap-queue
Unsuccessful ActivitiyPub transmission are now deferred
|
2018-10-23 06:54:11 +02:00 |
|
|
|
e3e714a45f
|
Unsuccessful ActivitiyPub transmission are now deferred
|
2018-10-23 03:54:18 +00:00 |
|
