Commit graph

17937 commits

Author SHA1 Message Date
Michael
03aafa8228 Public commenting is now always enabled 2018-01-31 23:22:41 +00:00
Michael Vogel
28d79281a9
Merge pull request #4365 from MrPetovan/task/4116-add-autoload-to-library
Add library/ to autoload
2018-01-31 18:20:33 +01:00
Hypolite Petovan
53eab506bf
Merge pull request #4370 from tobiasd/20180131-cal2
add medi=print to the event_head template files
2018-01-31 10:34:35 -05:00
Tobias Diekershoff
c28b62b302 lets print out the internets 2018-01-31 11:31:47 +01:00
Michael Vogel
3a89e23288
Merge pull request #4366 from tobiasd/20180131-msg
regenerated master messages.po file
2018-01-31 07:27:07 +01:00
Tobias Diekershoff
eac3a21c57 regenerated master messages.po file 2018-01-31 07:11:19 +01:00
Hypolite Petovan
ea01d7078a Remove require calls to library/asn* 2018-01-31 00:49:11 -05:00
Hypolite Petovan
13849299f9 Remove require calls to library/OAuth1 2018-01-31 00:49:11 -05:00
Hypolite Petovan
6edf84f528 [Composer] Add library/ as a PSR-0 folder for autoloading 2018-01-31 00:49:11 -05:00
Hypolite Petovan
be4c237766 Remove library/slinky 2018-01-31 00:49:11 -05:00
Hypolite Petovan
be5230844a [Composer] Upgrade npm-asset/fullcalendar to version 3.8.2 2018-01-31 00:49:11 -05:00
Tobias Diekershoff
21f6cbb7be
Merge pull request #4364 from MrPetovan/develop
Add missing use for Model\Item in Worker\Delivery
2018-01-31 06:47:36 +01:00
Hypolite Petovan
997b058743 Add missing use for Model\Item in Worker\Delivery 2018-01-30 21:14:44 -05:00
Hypolite Petovan
112e55e760
Merge pull request #4363 from annando/follow-fail
Quit if follow fails because of not configured addon
2018-01-30 15:49:12 -05:00
Michael
f8526c1664 Some other message 2018-01-30 20:48:12 +00:00
Michael
e08be4e921 Improved message 2018-01-30 19:31:57 +00:00
Michael
edf7213297 Better message 2018-01-30 19:20:41 +00:00
Michael
ae362f01d5 Quit if follow failes because of not configured addon 2018-01-30 18:51:09 +00:00
Hypolite Petovan
c0b8685343
Merge pull request #4360 from annando/diaspora-forum
Basic forum support for Diaspora
2018-01-30 08:55:47 -05:00
Michael Vogel
c9edbd0b55
Merge pull request #4361 from tobiasd/20180130-adminmenu
Admin menu reorganisation
2018-01-30 14:34:26 +01:00
Tobias Diekershoff
7ef77b926a Admin menu reorganisation
The aside menu in the admin panel is now handled in one array, which also
holds the submenu items. Also the sections of the menu are now a bit more
structured and separated from each other.
2018-01-30 13:37:00 +01:00
Michael
9cbc4a7355 Basic forum support for Diaspora 2018-01-30 06:22:09 +00:00
Hypolite Petovan
59406b24c5
Merge pull request #4359 from tobiasd/20180129-fedstat
positioning of the fedstat graph
2018-01-29 12:00:40 -05:00
Tobias Diekershoff
88e71a102c same indentation style 2018-01-29 17:51:59 +01:00
Tobias Diekershoff
8eb8288b68 positioning of the fedstat graph
This is a followup on #4266 resizing the fedstat graph in the admin panel
so that it fits alongside the intro text again. Checked also with duepunto,
quattro and vier theme.
2018-01-29 17:39:44 +01:00
Tobias Diekershoff
5cae43c8c7
Merge pull request #4358 from annando/empty-needle
Avoid empty needle warning
2018-01-29 07:23:32 +01:00
Michael
6d19c780d9 Avoid empty needle warning 2018-01-29 06:03:39 +00:00
Michael Vogel
edda62ef9f
Merge pull request #4357 from friendica/revert-4356-revert-4353-task/4116-move-twitteroauth-to-composer
Move TwitterOAuth to Composer, part 2b : Remove library/twitteroauth
2018-01-29 06:47:41 +01:00
Hypolite Petovan
cfd09d995c
Revert "Revert "Move TwitterOAuth to Composer, part 2 : Remove library/twitteroauth"" 2018-01-28 22:37:30 -05:00
Michael Vogel
ceef8771f2
Merge pull request #4356 from friendica/revert-4353-task/4116-move-twitteroauth-to-composer
Revert "Move TwitterOAuth to Composer, part 2 : Remove library/twitteroauth"
2018-01-28 23:48:35 +01:00
Michael Vogel
6f28f175d8
Revert "Move TwitterOAuth to Composer, part 2 : Remove library/twitteroauth" 2018-01-28 23:48:20 +01:00
Michael Vogel
c48e8106e3
Merge pull request #4353 from MrPetovan/task/4116-move-twitteroauth-to-composer
Move TwitterOAuth to Composer, part 2 : Remove library/twitteroauth
2018-01-28 22:41:45 +01:00
Michael Vogel
78de9d0022
Merge pull request #4355 from MrPetovan/task/4265-remove-jquery-migrate
Move js/ folder under view/
2018-01-28 22:38:03 +01:00
Hypolite Petovan
cd392db078 Move js/ folder under view/
- Move library/cropper to view/js/cropper
- Move library/jquery-textcomplete to view/js/jquery-textcomplete
2018-01-28 16:17:36 -05:00
Michael Vogel
84dab1f290
Merge pull request #4354 from MrPetovan/task/4265-remove-jquery-migrate
Remove jQuery Migrate file
2018-01-28 22:14:21 +01:00
Hypolite Petovan
a05eeeb49c Remove jQuery Migrate file
- Remove script references
2018-01-28 15:54:20 -05:00
Hypolite Petovan
15afcd5378 Remove now unused library/twitteroauth 2018-01-28 14:48:05 -05:00
Michael Vogel
946fc82c77
Merge pull request #4350 from MrPetovan/task/4116-move-twitteroauth-to-composer
Move TwitterOAuth to composer Part 1
2018-01-28 19:19:21 +01:00
Hypolite Petovan
6d93c50457 Revert "[Doc] Add extra command for addon install/update"
This reverts commit 0e19ce3a65.
2018-01-28 12:57:03 -05:00
Hypolite Petovan
de15984fd1 Revert "[Doc] Fix indentation"
This reverts commit 938c42cf90.
2018-01-28 12:57:01 -05:00
Hypolite Petovan
174ae78ec1
Merge pull request #4351 from annando/item-move
Most functions now moved from include/items.php
2018-01-28 12:54:41 -05:00
Michael
6871481a78 Moved "limitBodySize" 2018-01-28 17:36:37 +00:00
Michael
bdbfffafea Renamed the contact relationship functions 2018-01-28 17:26:39 +00:00
Michael
2cb74909c0 Standards 2018-01-28 16:28:59 +00:00
Michael
630cdaeb96 Added some defaults 2018-01-28 16:16:21 +00:00
Michael
e080ea03c0 Function needed to be public, not private 2018-01-28 14:06:02 +00:00
Michael
bd9cb4595d Merge remote-tracking branch 'upstream/develop' into item-move 2018-01-28 14:05:39 +00:00
Michael Vogel
f777dd8d70
Merge pull request #4352 from zeroadam/feature/FixPoCo
Fix old function call
2018-01-28 15:03:48 +01:00
Adam Magness
c6443572e3 Fix old function call
Fix missed fetch_url() call
2018-01-28 09:02:19 -05:00
Michael
7b27dda784 Most functions now moved from include/items.php 2018-01-28 11:18:08 +00:00