fabrixxm
|
44afff9514
|
Merge pull request #2198 from rabuzarus/2312_code_cleanup
boot.php - code cleanup + doxygen
|
2015-12-27 18:20:48 +01:00 |
|
Tobias Diekershoff
|
8d8dc2d060
|
Merge pull request #2197 from annando/1512-ostatus-comment
Reworked delivery and notifier process - changed OStatus behaviour
|
2015-12-27 15:58:32 +01:00 |
|
Michael Vogel
|
fe141e4441
|
Merge pull request #2207 from tobiasd/20151227-typo
typos in OStatus (re)subscribing
|
2015-12-27 09:43:24 +01:00 |
|
|
Tobias Diekershoff
|
bc9c3d80fa
|
typos in OStatus (re)subscribing
|
2015-12-27 08:44:23 +01:00 |
|
|
Tobias Diekershoff
|
06defed4cb
|
Merge pull request #2206 from annando/1512-diaspora-sql
Diaspora: Fixed possible SQL injection
|
2015-12-27 07:02:21 +01:00 |
|
|
Michael Vogel
|
7825704bd6
|
Diaspora: Fixed possible SQL injection
|
2015-12-27 03:54:20 +01:00 |
|
|
Tobias Diekershoff
|
6e2c09b1ea
|
Merge pull request #2203 from rabuzarus/2512_doxy-hooks
add custom tag @hooks to doxygen
|
2015-12-26 10:53:30 +01:00 |
|
|
Tobias Diekershoff
|
1eae40592c
|
Merge pull request #2204 from rabuzarus/2512_todo_list
reformat todo according to doxygen style
|
2015-12-26 08:50:17 +01:00 |
|
|
Michael Vogel
|
fa88bdf2e2
|
Merge pull request #2202 from tobiasd/20151225-doxygen
brief instruction on how to use Doxygen
|
2015-12-26 07:27:39 +01:00 |
|
rabuzarus
|
3df5c17124
|
reformat todo according to doxygen style
|
2015-12-25 23:17:34 +01:00 |
|
|
rabuzarus
|
8e83e423f4
|
boot.php - doxygen - organize constants in groups
|
2015-12-25 20:58:26 +01:00 |
|
|
Michael Vogel
|
5b94c4fe41
|
Yes is no and no is yes ...
|
2015-12-25 19:57:38 +01:00 |
|
|
rabuzarus
|
ba2517fd71
|
Merge develop into 2512_rebase_cleanup
Conflicts:
include/identity.php
|
2015-12-25 19:18:12 +01:00 |
|
|
rabuzarus
|
be2d6fa85e
|
little fix for @hooks in Doxyfile
|
2015-12-25 18:37:38 +01:00 |
|
|
rabuzarus
|
64989781ff
|
add custom tag @hooks to boot.php & identity.php
|
2015-12-25 18:36:13 +01:00 |
|
|
rabuzarus
|
f3395dd6f3
|
add custom tag @hooks to doxygen
|
2015-12-25 17:30:55 +01:00 |
|
|
rabuzarus
|
839895e434
|
identity.php - code cleanup + doxygen
|
2015-12-25 17:26:04 +01:00 |
|
|
Tobias Diekershoff
|
5f7e0c71b3
|
missing http
|
2015-12-25 12:25:39 +01:00 |
|
|
Tobias Diekershoff
|
e855043439
|
added a brief note how to generate docs with Doxygen to the developers intro page
|
2015-12-25 12:23:57 +01:00 |
|
|
Tobias Diekershoff
|
c3ae4a03bb
|
Merge pull request #2201 from annando/1512-location-bbcode
Bugfix: The location wasn't parsed through bbcode
|
2015-12-25 10:02:59 +01:00 |
|
|
Michael Vogel
|
0c924d36cb
|
Bugfix: The location wasn't parsed through bbcode
|
2015-12-24 12:56:27 +01:00 |
|
|
rabuzarus
|
e42bbcd6c4
|
boot.php - small clean up
|
2015-12-24 11:58:42 +01:00 |
|
|
rabuzarus
|
40b0d383d5
|
boot.php - code cleanup + doxygen
|
2015-12-24 01:31:17 +01:00 |
|
|
Michael Vogel
|
61956e1098
|
There is now a config value for the session management to not use the database
|
2015-12-22 22:11:08 +01:00 |
|
|
Michael Vogel
|
7faa111c9b
|
Merge pull request #2196 from fabrixxm/asparagus
Update codename
|
2015-12-22 17:57:16 +01:00 |
|
|
Fabrixxm
|
abe0d22784
|
Update codename
|
2015-12-22 16:43:07 +01:00 |
|
|
Michael Vogel
|
307beb47fd
|
Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment
Conflicts:
include/ostatus.php
|
2015-12-22 11:25:37 +01:00 |
|
|
Fabrixxm
|
71255d04a2
|
Friendica 3.5-dev
|
2015-12-22 10:52:00 +01:00 |
|
|
Fabrixxm
|
7f76c3dd41
|
Merge branch 'master' into develop
|
2015-12-22 10:50:52 +01:00 |
|
|
Fabrixxm
|
21f044e305
|
Friendica 3.4.3
|
2015-12-22 10:45:43 +01:00 |
|
|
Fabrixxm
|
c007722041
|
Merge branch 'release-3.4.3-rc'
|
2015-12-22 10:43:57 +01:00 |
|
|
Michael Vogel
|
989d949bd0
|
Merge pull request #2193 from fabrixxm/changelog
Update CHANGELOG
|
2015-12-22 09:52:12 +01:00 |
|
|
Fabrixxm
|
156be7a17b
|
Update CHANGELOG
|
2015-12-22 09:08:53 +01:00 |
|
|
Michael Vogel
|
1b0b4d8c57
|
Merge pull request #2195 from fabrixxm/last-minute
Last minute
|
2015-12-21 22:50:51 +01:00 |
|
|
Fabrixxm
|
770bba021e
|
call resizeIframe() function until size is stable
(iframe content finished to load, hopefully)
should remove scrollbars on rich oembeds
|
2015-12-21 16:41:55 +01:00 |
|
|
Fabrixxm
|
d4dd863b4b
|
quattro: style managed unread notification
|
2015-12-21 16:19:56 +01:00 |
|
|
Fabrixxm
|
bb7330cf2e
|
Update CHANGELOG
|
2015-12-21 15:51:21 +01:00 |
|
|
Tobias Diekershoff
|
7faa88613d
|
Merge pull request #2192 from fabrixxm/quattro-message-aside
quattro: fix PM aside template
|
2015-12-21 09:57:17 +01:00 |
|
|
Fabrixxm
|
b79d98aea5
|
quattro: fix PM aside template
errors was raised with new "show message list in aside" patch
|
2015-12-21 09:43:10 +01:00 |
|
|
Michael Vogel
|
185f03f12c
|
Merge pull request #2191 from tobiasd/20151217-fr
FR: update to the translation
|
2015-12-20 22:17:26 +01:00 |
|
|
Michael Vogel
|
7ee1eb2978
|
Code clean up.
|
2015-12-20 10:44:03 +01:00 |
|
|
Tobias Diekershoff
|
719989249f
|
FR: update to the translation
|
2015-12-17 08:27:02 +01:00 |
|
|
Michael Vogel
|
ca4be3ded3
|
Don't generate a guid shorter than 13 characters
|
2015-12-16 10:47:26 +01:00 |
|
|
Tobias Diekershoff
|
8944ad1ac1
|
Merge pull request #2190 from annando/1512-getload
Sometimes the function "sys_getloadavg" doesn't return an array.
|
2015-12-16 06:21:17 +01:00 |
|
|
Michael Vogel
|
33f354a68c
|
Bugfix for the maximum load check in worker.
|
2015-12-16 00:14:53 +01:00 |
|
|
Michael Vogel
|
6e03477598
|
Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround.
|
2015-12-15 23:26:58 +01:00 |
|
|
Michael Vogel
|
f19d9aa430
|
Merge pull request #2189 from rabuzarus/1512_vier_images
vier: fix missing icons
|
2015-12-15 15:47:09 +01:00 |
|
|
rabuzarus
|
19a72b30b4
|
vier: fix missing icons
|
2015-12-15 15:13:46 +01:00 |
|
|
Michael Vogel
|
8972c8c219
|
Merge pull request #2188 from rabuzarus/1512_allfriends_pager
add pager to common friends and allfriends
|
2015-12-15 14:53:06 +01:00 |
|
|
rabuzarus
|
2cf1aaa791
|
add pager to common friends and allfriends
|
2015-12-15 14:31:24 +01:00 |
|