Tobias Diekershoff
|
e9fe220116
|
Merge pull request #2356 from annando/1602-redmatrix-name
We now show the correct platform (redmatrix or hubzilla)
|
2016-02-15 07:38:16 +01:00 |
|
|
Tobias Diekershoff
|
57ddcd626f
|
Merge pull request #2349 from annando/1602-gcontact-cleanup
Updating of gcontact data has improved
|
2016-02-15 07:37:11 +01:00 |
|
Michael Vogel
|
ec1bfe3d22
|
Merge remote-tracking branch 'upstream/develop' into 1602-redmatrix-name
|
2016-02-14 21:03:57 +01:00 |
|
|
Michael Vogel
|
7f1f549c6f
|
Fallback when there is no nick name
|
2016-02-14 15:08:49 +01:00 |
|
|
Michael Vogel
|
21fc3c60d4
|
We now show the correct platform (redmatrix or hubzilla)
|
2016-02-14 15:05:43 +01:00 |
|
|
Michael Vogel
|
922186bdd1
|
Small bugfix for the keyword bug in the gcontact table
|
2016-02-14 12:39:57 +01:00 |
|
|
Michael Vogel
|
5d35974c19
|
"addr" and "server_url" are now generated directly in "update_gcontact" if not given.
|
2016-02-14 11:56:23 +01:00 |
|
|
Michael Vogel
|
b9e1792076
|
The shadow contact (contact with uid=0) will be updated now as well.
|
2016-02-14 07:31:57 +01:00 |
|
|
Michael Vogel
|
5086b8b2a7
|
DFRN Bugfix: The poco data wasn't sent
|
2016-02-14 00:14:03 +01:00 |
|
|
Michael Vogel
|
15296b8036
|
Avoid errors when noscrape data can't be fetched.
|
2016-02-13 22:20:00 +01:00 |
|
|
Michael Vogel
|
f496af08bb
|
OStatus: The gcontact table will now be updated from the conversation as well
|
2016-02-13 21:35:05 +01:00 |
|
|
Michael Vogel
|
9261154eab
|
Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup
|
2016-02-13 20:12:31 +01:00 |
|
|
Tobias Diekershoff
|
d0b5c16a20
|
Merge pull request #2351 from annando/1602-performance-unread-group
Optimized query for unread group postings
|
2016-02-13 19:43:33 +01:00 |
|
|
Tobias Diekershoff
|
6268d776af
|
Merge pull request #2350 from annando/1602-vier-aside-img
Vier: Pictures in the side bar shouldn't be larger than the side bar
|
2016-02-13 19:42:35 +01:00 |
|
|
Michael Vogel
|
bf7dedb03b
|
Optimized query for unread group postings
|
2016-02-13 18:15:24 +01:00 |
|
|
Michael Vogel
|
307f90cdfe
|
Vier: Pictures in the side bar shouldn't be larger than the side bar
|
2016-02-13 14:21:53 +01:00 |
|
|
Michael Vogel
|
a4da9fb55d
|
Update the gcontact entry when the contact entry is checked for updates
|
2016-02-13 14:09:08 +01:00 |
|
|
Michael Vogel
|
253ba45c1a
|
Added a to-do
|
2016-02-13 13:30:53 +01:00 |
|
|
Tobias Diekershoff
|
4ee15cc682
|
Merge pull request #2334 from fabrixxm/feature_autoloader
Autoloader
|
2016-02-13 12:27:24 +01:00 |
|
|
Michael Vogel
|
2ca6cdf6b6
|
Improvements how gcontact entries are updated
|
2016-02-13 12:26:58 +01:00 |
|
fabrixxm
|
a7498ef50d
|
doc: add quick intro to autoloading
|
2016-02-13 10:57:37 +01:00 |
|
|
Tobias Diekershoff
|
036311237f
|
Merge pull request #2348 from annando/1602-poller-again
Database connections: When we now check for user values and system values
|
2016-02-12 11:25:49 +01:00 |
|
|
Michael Vogel
|
acb09d3a3d
|
Database connections: When we now check for user values we check the system values as well
|
2016-02-12 11:04:25 +01:00 |
|
|
Fabrixxm
|
89d63b2523
|
docs: small fixes to help sidebar
|
2016-02-12 09:26:42 +01:00 |
|
|
Fabrixxm
|
45c4e3455e
|
docs: add brief autoloading help page, fix smarty3 help page name
|
2016-02-12 09:25:33 +01:00 |
|
|
Tobias Diekershoff
|
8451397857
|
Merge pull request #2346 from annando/1602-poller-user-limits
Poller: Now the user limits can be detected automatically as well
|
2016-02-12 08:17:30 +01:00 |
|
|
Tobias Diekershoff
|
810843763d
|
Merge pull request #2347 from annando/1602-dfrn-forum
DFRN-Bugfix: Forums should work now
|
2016-02-12 08:16:10 +01:00 |
|
|
Michael Vogel
|
b5c5471748
|
Added some documentation
|
2016-02-12 07:39:08 +01:00 |
|
|
Michael Vogel
|
4dad744c35
|
DFRN-Bugfix: Forums should work now
|
2016-02-11 22:35:06 +01:00 |
|
|
Michael Vogel
|
5027fbf733
|
Poller: Now the user limits can be detected automatically as well
|
2016-02-11 21:39:34 +01:00 |
|
|
Tobias Diekershoff
|
82ffd0f596
|
Merge pull request #2344 from annando/1602-poller-processlist
Poller: Use the processlist
|
2016-02-11 11:51:02 +01:00 |
|
|
Michael Vogel
|
4af77b60ce
|
Poller: Use the processlist when the number of maximum database connections was provided manually
|
2016-02-11 11:33:45 +01:00 |
|
|
Tobias Diekershoff
|
a4804a25ee
|
Merge pull request #2343 from fabrixxm/api_ping
fix missing html2plain() function declaration
|
2016-02-11 09:34:47 +01:00 |
|
|
fabrixxm
|
e20aad4347
|
fix missing html2plain() function declaration
|
2016-02-11 09:05:00 +01:00 |
|
|
Tobias Diekershoff
|
c5f2157eb2
|
Merge pull request #2336 from stieben/move-div-pause
Move div#pause to view/default.php
|
2016-02-11 07:36:37 +01:00 |
|
|
Tobias Diekershoff
|
f48a639537
|
Merge pull request #2341 from annando/1602-contact-bugfix
Bugfix: The "keywords" field in the gcontact table wasn't set correctly
|
2016-02-11 07:35:32 +01:00 |
|
|
Michael Vogel
|
ef0f826fd0
|
Merge pull request #2325 from fabrixxm/api_ping
Api for notifications
|
2016-02-10 23:47:11 +01:00 |
|
|
Michael Vogel
|
20d7d18379
|
Bugfix: The "keywords" field in the gcontact table wasn't set correctly
|
2016-02-10 23:39:18 +01:00 |
|
|
Tobias Diekershoff
|
255638ff65
|
Merge pull request #2338 from annando/1602-poller-max
Poller: The maximum number of connections can now be configured
|
2016-02-10 12:49:49 +01:00 |
|
|
Michael Vogel
|
902820b30d
|
Added documentation
|
2016-02-10 07:56:49 +01:00 |
|
|
Michael Vogel
|
211be5bfc5
|
Poller: The maximum number of connections can now be configured
|
2016-02-09 23:28:33 +01:00 |
|
Andrej Stieben
|
e104c58191
|
Added div#pause to themes' default.php
As requested by @tobiasd and @rabuzarus.
|
2016-02-09 16:41:19 +01:00 |
|
|
Andrej Stieben
|
4d7a6aaed2
|
Moved div#pause from index.php to view/default.php
This closes #2320.
|
2016-02-09 15:54:35 +01:00 |
|
|
Fabrixxm
|
04dceb9551
|
Merge branch 'develop' into api_ping
|
2016-02-09 14:06:57 +01:00 |
|
|
fabrixxm
|
b5100b3154
|
Merge pull request #2332 from annando/1602-no-guid
Get rid of the "guid" table. We don't need it anymore.
|
2016-02-09 13:40:05 +01:00 |
|
|
Fabrixxm
|
d2a9aa1972
|
add some doxygen comments
|
2016-02-09 11:10:00 +01:00 |
|
|
Fabrixxm
|
aec8a1883e
|
let autoloader include files for HTMLPurifier
|
2016-02-09 11:08:26 +01:00 |
|
|
Fabrixxm
|
c6514d58db
|
add composer-derived autoloader
|
2016-02-09 11:07:37 +01:00 |
|
|
Fabrixxm
|
c28109ca94
|
Update HTMLPurifier to v4.7.0
|
2016-02-09 11:06:17 +01:00 |
|
|
Michael Vogel
|
2932ebfbc8
|
Merge pull request #2331 from fabrixxm/revert_pr2319
Revert "Merge pull request #2319 from stieben/develop"
|
2016-02-09 10:52:46 +01:00 |
|