rabuzarus
|
64989781ff
|
add custom tag @hooks to boot.php & identity.php
|
7 years ago |
|
rabuzarus
|
f3395dd6f3
|
add custom tag @hooks to doxygen
|
7 years ago |
|
rabuzarus
|
839895e434
|
identity.php - code cleanup + doxygen
|
7 years ago |
 Tobias Diekershoff
|
5f7e0c71b3
|
missing http
|
7 years ago |
|
Tobias Diekershoff
|
e855043439
|
added a brief note how to generate docs with Doxygen to the developers intro page
|
7 years ago |
|
Tobias Diekershoff
|
c3ae4a03bb
|
Merge pull request #2201 from annando/1512-location-bbcode
Bugfix: The location wasn't parsed through bbcode
|
7 years ago |
Michael Vogel
|
0c924d36cb
|
Bugfix: The location wasn't parsed through bbcode
|
7 years ago |
|
rabuzarus
|
e42bbcd6c4
|
boot.php - small clean up
|
7 years ago |
|
rabuzarus
|
40b0d383d5
|
boot.php - code cleanup + doxygen
|
7 years ago |
|
Michael Vogel
|
61956e1098
|
There is now a config value for the session management to not use the database
|
7 years ago |
|
Michael Vogel
|
7faa111c9b
|
Merge pull request #2196 from fabrixxm/asparagus
Update codename
|
7 years ago |
Fabrixxm
|
abe0d22784
|
Update codename
|
7 years ago |
|
Michael Vogel
|
307beb47fd
|
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment
Conflicts:
include/ostatus.php
|
7 years ago |
|
Fabrixxm
|
71255d04a2
|
Friendica 3.5-dev
|
7 years ago |
|
Fabrixxm
|
7f76c3dd41
|
Merge branch 'master' into develop
|
7 years ago |
|
Fabrixxm
|
21f044e305
|
Friendica 3.4.3
|
7 years ago |
|
Fabrixxm
|
c007722041
|
Merge branch 'release-3.4.3-rc'
|
7 years ago |
|
Michael Vogel
|
989d949bd0
|
Merge pull request #2193 from fabrixxm/changelog
Update CHANGELOG
|
7 years ago |
|
Fabrixxm
|
156be7a17b
|
Update CHANGELOG
|
7 years ago |
|
Michael Vogel
|
1b0b4d8c57
|
Merge pull request #2195 from fabrixxm/last-minute
Last minute
|
7 years ago |
|
Fabrixxm
|
770bba021e
|
call resizeIframe() function until size is stable
(iframe content finished to load, hopefully)
should remove scrollbars on rich oembeds
|
7 years ago |
|
Fabrixxm
|
d4dd863b4b
|
quattro: style managed unread notification
|
7 years ago |
|
Fabrixxm
|
bb7330cf2e
|
Update CHANGELOG
|
7 years ago |
|
Tobias Diekershoff
|
7faa88613d
|
Merge pull request #2192 from fabrixxm/quattro-message-aside
quattro: fix PM aside template
|
7 years ago |
|
Fabrixxm
|
b79d98aea5
|
quattro: fix PM aside template
errors was raised with new "show message list in aside" patch
|
7 years ago |
|
Michael Vogel
|
185f03f12c
|
Merge pull request #2191 from tobiasd/20151217-fr
FR: update to the translation
|
7 years ago |
|
Michael Vogel
|
7ee1eb2978
|
Code clean up.
|
7 years ago |
|
Tobias Diekershoff
|
719989249f
|
FR: update to the translation
|
7 years ago |
|
Michael Vogel
|
ca4be3ded3
|
Don't generate a guid shorter than 13 characters
|
7 years ago |
|
Tobias Diekershoff
|
8944ad1ac1
|
Merge pull request #2190 from annando/1512-getload
Sometimes the function "sys_getloadavg" doesn't return an array.
|
7 years ago |
|
Michael Vogel
|
33f354a68c
|
Bugfix for the maximum load check in worker.
|
7 years ago |
|
Michael Vogel
|
6e03477598
|
Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround.
|
7 years ago |
|
Michael Vogel
|
f19d9aa430
|
Merge pull request #2189 from rabuzarus/1512_vier_images
vier: fix missing icons
|
7 years ago |
|
rabuzarus
|
19a72b30b4
|
vier: fix missing icons
|
7 years ago |
|
Michael Vogel
|
8972c8c219
|
Merge pull request #2188 from rabuzarus/1512_allfriends_pager
add pager to common friends and allfriends
|
7 years ago |
|
rabuzarus
|
2cf1aaa791
|
add pager to common friends and allfriends
|
7 years ago |
|
Tobias Diekershoff
|
791d152b8f
|
Merge pull request #2186 from annando/1512-profile-bbcode
Bugfix: The bbcode conversion of the profile was inconsistent
|
7 years ago |
|
Michael Vogel
|
dff9f623b7
|
Merge pull request #2157 from gerhard6380/patch-1
Update api.md
|
7 years ago |
|
Michael Vogel
|
f42a7a3469
|
Just one more place where we had forgotten to use the bbcode function for the about text
|
7 years ago |
|
Michael Vogel
|
d077dbbcde
|
Bugfix: The bbcode conversion of the profile was inconsistent
|
7 years ago |
|
Michael Vogel
|
2e0ebcd1c8
|
The "about" in feed has to be rendered as HTML
|
7 years ago |
gerhard6380
|
d02bd08bde
|
Update api.md
|
7 years ago |
|
Michael Vogel
|
b9abfd24f0
|
Rearrangements
|
7 years ago |
|
fabrixxm
|
ca201476b6
|
Merge pull request #2185 from tobiasd/20151214-translations
update to translation for DE, FR; IT
|
7 years ago |
|
Tobias Diekershoff
|
9640eb7c81
|
IT update to the strings
|
7 years ago |
|
Tobias Diekershoff
|
053b69eee4
|
FR update to the strings
|
7 years ago |
|
Tobias Diekershoff
|
e97a6dfb77
|
DE update to the strings
|
7 years ago |
|
fabrixxm
|
7a5ac4490d
|
Merge pull request #2183 from rabuzarus/1412_profile_addr_fix
fix displaying forum in hcard
|
7 years ago |
|
rabuzarus
|
e61d6e030e
|
fix account_type
|
7 years ago |
|
fabrixxm
|
9bd5be66d3
|
Merge pull request #2179 from tobiasd/20151214-messages
regenerated messages.po and small changes to run_xgettext
|
7 years ago |
