Hypolite Petovan
|
0f2c27e041
|
Merge branch 'develop' into issue/missing-private-image-src
|
2016-12-03 10:34:48 -05:00 |
|
Tobias Diekershoff
|
7ecc0a063c
|
Update DE translation THX Rabuzarus
|
2016-12-03 10:09:40 +01:00 |
|
Tobias Diekershoff
|
bdae456e5d
|
Merge pull request #2988 from rabuzarus/20161202_-_embed_text_complete
autocomplete: add [embed] tag to tag autocomplete and to docu docs
|
2016-12-02 20:20:20 +01:00 |
|
rabuzarus
|
7a9a1b3722
|
autocomplete: add [embed] tag to tag autocomplete and to docu docs
|
2016-12-02 19:39:35 +01:00 |
|
Tobias Diekershoff
|
e20e64390b
|
Merge pull request #2986 from annando/1612-spool
Spool items that weren't stored before
|
2016-12-02 17:14:10 +01:00 |
|
Michael
|
b904aaff11
|
Merge remote-tracking branch 'upstream/develop' into 1612-spool
|
2016-12-02 09:54:34 +00:00 |
|
Michael
|
6619e0791d
|
Much more standards
|
2016-12-01 22:52:35 +00:00 |
|
Michael
|
c97306e734
|
Standards ...
|
2016-12-01 22:50:07 +00:00 |
|
Michael
|
13150c09a5
|
File was missing
|
2016-12-01 21:11:52 +00:00 |
|
Michael
|
6845775ff9
|
Store spooled data
|
2016-12-01 20:53:18 +00:00 |
|
Tobias Diekershoff
|
df8db7d90d
|
Merge pull request #2985 from annando/1612-ping
Little improvements to the queries in ping.php
|
2016-12-01 20:37:45 +01:00 |
|
Michael
|
c5d571287c
|
Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool
|
2016-12-01 13:58:47 +00:00 |
|
Michael
|
eff4ad2e0a
|
Spool items that couldn't be stored
|
2016-12-01 13:50:26 +00:00 |
|
Michael
|
aea122cd20
|
Little improvements to the queries in ping.php
|
2016-12-01 13:44:30 +00:00 |
|
Tobias Diekershoff
|
9a3941cf6e
|
themes richtext
|
2016-12-01 14:13:26 +01:00 |
|
Tobias Diekershoff
|
6ef69ad2da
|
Merge pull request #2983 from annando/issue-2915-2918
Disable richtext editor for frio - followup for #2938
|
2016-12-01 14:10:08 +01:00 |
|
Tobias Diekershoff
|
ec69a52361
|
some more changes
|
2016-12-01 10:08:09 +01:00 |
|
Tobias Diekershoff
|
1fc35d5f44
|
Merge pull request #2979 from annando/issue-2772
Issue 2772: Pending contacts should now be displayed
|
2016-12-01 08:51:04 +01:00 |
|
Tobias Diekershoff
|
ac954278a5
|
Merge pull request #2984 from annando/1611-frontend
The frontend worker is now a full replacement of the crontab call
|
2016-12-01 08:47:31 +01:00 |
|
Michael
|
57c95c93e1
|
The frontend worker is now working as a full replacement for the crontab.
|
2016-11-30 19:24:58 +00:00 |
|
Michael
|
1f50dc368e
|
Merge remote-tracking branch 'upstream/develop' into 1611-frontend
|
2016-11-30 04:46:47 +00:00 |
|
Michael
|
63389ba23d
|
Pending or blocked - that's the question ...
|
2016-11-30 04:30:48 +00:00 |
|
Michael
|
cc5eebd173
|
The frontend worker can now fork background processes
|
2016-11-29 22:40:19 +00:00 |
|
Michael
|
624fabf884
|
Somehow the changes of pull request 2748 got vanished
|
2016-11-29 20:25:27 +00:00 |
|
Michael Vogel
|
d620c5d996
|
Merge pull request #2982 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: include the graphic of the connection process into the doxygen header
|
2016-11-29 21:09:59 +01:00 |
|
Michael
|
d49325d177
|
Disable richtext editor for frio - followup for #2938
|
2016-11-29 20:04:31 +00:00 |
|
rabuzarus
|
a208d2e72b
|
dfrn_request: include the graphic of the connection process into the doxygen header
|
2016-11-29 19:57:30 +01:00 |
|
Michael Vogel
|
efb2df41ba
|
Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
Add protocol docu to the help docs
|
2016-11-29 19:38:31 +01:00 |
|
Michael Vogel
|
fa8eb101d4
|
Merge pull request #2981 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries
|
2016-11-29 19:33:57 +01:00 |
|
Michael
|
af3549fa01
|
The first check for "pending" isn't neccessary.
|
2016-11-29 18:31:37 +00:00 |
|
Michael
|
b2302f6290
|
Maybe we shouldn't count pending contacts
|
2016-11-29 18:23:34 +00:00 |
|
rabuzarus
|
4566ad81fd
|
protocol.md - fix typo
|
2016-11-29 16:10:32 +01:00 |
|
rabuzarus
|
a68735b725
|
update contact request $ confirmation graphics
|
2016-11-29 16:00:07 +01:00 |
|
rabuzarus
|
54f3867ebd
|
dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries
|
2016-11-29 15:52:12 +01:00 |
|
rabuzarus
|
250f978872
|
Merge pull request #2978 from annando/issue-2518
Issue 2518: Remove contact data in the background
|
2016-11-29 14:59:00 +01:00 |
|
Michael Vogel
|
86665d47a6
|
Merge pull request #2980 from rabuzarus/20161129_-_small_dfrn_request_polish
dfrn_request: added $blocked and $pending as variable to make code mo…
|
2016-11-29 09:42:26 +01:00 |
|
Tobias Diekershoff
|
d55d500e35
|
Merge pull request #2975 from annando/1611-frontend-worker
The worker can now run from the frontend as well
|
2016-11-29 09:40:59 +01:00 |
|
Michael
|
fd28ecaacc
|
Pending contacts shouldn't be displayed in the sidebar
|
2016-11-29 06:40:35 +00:00 |
|
rabuzarus
|
0d223aa6f1
|
dfrn_request: added $blocked and $pending as variable to make code more understandable
|
2016-11-29 03:08:46 +01:00 |
|
Michael
|
eede89f537
|
Some brackets added
|
2016-11-28 22:18:37 +00:00 |
|
Michael
|
3a76a6766f
|
Issue 2772: Pending contacts should now be displayed
|
2016-11-28 22:11:13 +00:00 |
|
Michael
|
e7ef34298a
|
remove "blubb"
|
2016-11-28 21:48:06 +00:00 |
|
Michael
|
a38a5019d0
|
Issue 2518: Remove contact data in the background
|
2016-11-28 21:44:04 +00:00 |
|
Michael Vogel
|
9894f7cea7
|
Merge pull request #2965 from tobiasd/20161122-cpActiveResponse
active response
|
2016-11-28 21:14:42 +01:00 |
|
Michael Vogel
|
0ef764b167
|
Merge pull request #2970 from Hypolite/improvement/ping-php-json
ping.php: Ensure data structure consistency
|
2016-11-28 21:08:36 +01:00 |
|
Michael Vogel
|
37e8f6b442
|
Merge pull request #2973 from rabuzarus/berlin_parse_url
parse_url: recognize image/video/audio files + move functions into own class
|
2016-11-28 21:05:31 +01:00 |
|
rabuzarus
|
6c0bc15ecb
|
docu fix: insert line break
|
2016-11-28 20:18:28 +01:00 |
|
rabuzarus
|
3cb9324072
|
frio: some css work for help docs
|
2016-11-28 18:40:25 +01:00 |
|
Michael Vogel
|
4ff49807ca
|
Merge pull request #2976 from rabuzarus/20161128_-_fix_posible_double_request
Bugfix: better detection dfrn_request of double connection requests
|
2016-11-28 18:19:20 +01:00 |
|
rabuzarus
|
36e4aea7ef
|
docs: add documentation about used protocols
|
2016-11-28 17:55:56 +01:00 |
|