Commit graph

13831 commits

Author SHA1 Message Date
Tobias Diekershoff
f9911637e3 help text for settings should be translateable 2016-11-10 10:21:24 +01:00
Jens Tautenhahn
7b5c5c0fa2 count only version numbers starting with "numbers / dot or dash / numbers" in federation statistics 2016-11-09 21:48:36 +01:00
gerhard6380
623d809cc3 changes in api call for showing profiles and disable proxy for images in html code for api calls 2016-11-09 21:35:52 +01:00
Jens Tautenhahn
12dd657868 fixes an sql error in NotificationsManager 2016-11-09 21:32:15 +01:00
Tobias Diekershoff
350887f892 prepare for Mastodon in the federation stats and include BlaBlaNet 2016-11-09 14:25:51 +01:00
rabuzarus
9fa0be784a Merge pull request #2898 from tobiasd/20161109-debbcide
DE translation of the BBCode reference, small stuff on the EN version
2016-11-09 14:24:35 +01:00
Tobias Diekershoff
fca72c4996 DE translation of the BBCode reference, small stuff on the EN version 2016-11-09 14:05:33 +01:00
Michael Vogel
d33eeee336 Merge pull request #2897 from rabuzarus/07.11-fix_login
ref_session_write: fix update for entry in the session table
2016-11-07 22:59:27 +01:00
rabuzarus
d025b83c93 ref_session_write: fix update for entry in the session table 2016-11-07 22:25:09 +01:00
rabuzarus
a337021c31 chache: correct misspelling 2016-11-07 22:20:13 +01:00
rabuzarus
915689dd79 chache: check for valid serialized data + uncomment caching of contact suggestion 2016-11-07 22:12:11 +01:00
Michael Vogel
c1581fd432 Merge pull request #2890 from Hypolite/improvement/misc-performance
Misc performance improvement
2016-11-06 22:38:56 +01:00
rabuzarus
747e53b37b Merge pull request #2891 from tobiasd/20161106-regenmsg
regenerated master messages.po file
2016-11-06 17:52:39 +01:00
Tobias Diekershoff
6472c7292f regenerated master messages.po file 2016-11-06 16:01:07 +01:00
Hypolite Petovan
67cdbe4538 misc performance: restore session write condition, keep 1 query 2016-11-06 01:00:17 -04:00
Hypolite Petovan
7b9470b804 misc performance: remove extraneous session write DB query 2016-11-06 00:52:31 -04:00
Hypolite Petovan
bae9f0852f misc performance: cache contact details by url during script 2016-11-06 00:51:23 -04:00
Tobias Diekershoff
27a2e44d89 Merge pull request #2888 from annando/1610-priority-dbclean
Improved priorities and some more dbclean queries
2016-11-05 08:27:02 +01:00
Tobias Diekershoff
ba1cd57087 Merge pull request #2887 from annando/1611-api-performance
API calls should be much faster than before
2016-11-05 08:25:09 +01:00
Michael
9518785c81 Merge branch '1610-priority-dbclean' of github.com:annando/friendica into 1610-priority-dbclean 2016-11-05 05:26:29 +00:00
Michael
4b33573c20 Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean 2016-11-05 05:25:22 +00:00
Michael Vogel
50651340ce Merge pull request #2886 from rabuzarus/0311_fix_photo_albums
cache: serialize the cache content directly in the cache class
2016-11-05 06:12:29 +01:00
rabuzarus
34596d448f Merge pull request #2889 from Hypolite/bug/wall-thread-error
[frio] Fix wall_thread.tpl error with unstareable items
2016-11-05 02:41:02 +01:00
Hypolite Petovan
98d52bc568 [frio] fix wall_thread.tpl error with unstareable items 2016-11-04 21:19:07 -04:00
Michael
c32b2463b9 Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean 2016-11-04 22:57:43 +00:00
Michael
37985a0d3f Use "micro" 2016-11-04 22:56:50 +00:00
Michael
fbfaef1968 API calls should be much faster than before 2016-11-04 22:45:20 +00:00
rabuzarus
e446e9571f some more coding style correction 2016-11-04 19:26:28 +01:00
Tobias Diekershoff
a6776f0cc1 Merge pull request #2885 from Hypolite/improvement/bbcode-documentation
bbcode documentation: minor style changes
2016-11-04 17:15:17 +01:00
rabuzarus
5459b00499 cache: serialize the cache content directly in the cache class 2016-11-04 16:44:49 +01:00
Hypolite Petovan
3d29b7745c bbcode documentation: minor style changes 2016-11-04 11:20:47 -04:00
rabuzarus
75166cae27 Merge pull request #2882 from Hypolite/improvement/bbcode-documentation
BBCodes documentation improvement
2016-11-04 02:34:29 +01:00
Hypolite Petovan
3579a14945 bbcode documentation: minor formatting changes 2016-11-03 21:01:09 -04:00
rabuzarus
8de5d6d198 Merge pull request #2884 from tobiasd/20161103-fixnotifications
missing placeholder for name_cache value
2016-11-03 14:29:34 +01:00
Tobias Diekershoff
3a2ec5e4db missing placeholder for name_cache value 2016-11-03 14:00:20 +01:00
Hypolite Petovan
106f003447 bbcode documentation: BBCodes.md complete rewrite
- Switched to table display to put BBCodes and result side-by-side
- Added all missing BBCodes
2016-11-02 22:42:19 -04:00
Hypolite Petovan
68bf1aa4cd bbcode documentation: fix anchors on frio 2016-11-02 22:41:07 -04:00
Michael Vogel
9dd3e9d19a Merge pull request #2878 from Hypolite/improvement/ping-performance
Improving ping.php performance
2016-11-02 21:56:18 +01:00
Hypolite Petovan
aff467adf2 bbcode documentation: improve cleancss 2016-11-01 23:08:26 -04:00
Hypolite Petovan
6626ef64a9 bbcode documentation: enable overline 2016-11-01 23:07:37 -04:00
Hypolite Petovan
73627df520 Merge branch 'develop' into improvement/bbcode-documentation 2016-11-01 19:29:56 -04:00
Michael
b5d004e1d7 run dbclean as long as there is some data to be purged 2016-11-01 21:36:15 +00:00
Hypolite Petovan
97c2e99d46 ping.php improvement: improving get_baseurl
- Adding more documentation
- Trying hard to make @annando happy
2016-11-01 17:05:26 -04:00
Hypolite Petovan
5e188a9250 ping.php improvement: datetime.php formatting 2016-11-01 02:04:59 -04:00
Michael
4d966e1e21 Changed priority for onepoll/further enhancement for dbclean 2016-10-31 21:32:08 +00:00
Tobias Diekershoff
7823223a05 Merge pull request #2879 from annando/1610-performance-too
Avoiding deadlocks and small sql improvements
2016-10-31 21:22:17 +01:00
Hypolite Petovan
db874f0fbe ping.php improvement: using baser cache key 2016-10-31 14:27:19 -04:00
Hypolite Petovan
63b1e822cd bbcode documentation: improved webfinger profile regexp 2016-10-31 00:00:12 -04:00
Hypolite Petovan
c2e17cb9c4 bbcode documentation: fix broken bookmark form: #^[url]...[/url]
- Prevents the advance recognition of `^` in tags before bbcode()
- Formatting
- Documentation
2016-10-30 23:59:14 -04:00
Michael
2e59eec35d Added some comments 2016-10-29 22:06:18 +00:00