|
|
d0488f25be
|
Merge pull request #2904 from silke/vagrant
For Vagrant dev machine
|
2016-11-12 12:34:57 +01:00 |
|
Silke Meyer
|
09c2e1c0a1
|
Increased memory of vagrant machine to 1024 MB
|
2016-11-12 10:16:56 +01:00 |
|
Silke Meyer
|
7886de5c39
|
Merge branch 'develop' of https://github.com/friendica/friendica into develop
|
2016-11-12 10:05:46 +01:00 |
|
rabuzarus
|
74ca1faa32
|
Merge pull request #2903 from tobiasd/20161110-messagespo
regenerated master messages.po file
|
2016-11-10 15:51:16 +01:00 |
|
|
|
0e1b13f3dd
|
regenerated master messages.po file
|
2016-11-10 15:43:47 +01:00 |
|
fabrixxm
|
e13b822e1e
|
Merge pull request #2901 from tobiasd/20161110-helptxt
help text for settings should be translateable
|
2016-11-10 15:27:23 +01:00 |
|
|
|
6657302602
|
DE translation of the core
|
2016-11-10 10:28:20 +01:00 |
|
|
|
af214e317d
|
ES translation of the core THX Alberto Díaz Tormo!
|
2016-11-10 10:27:58 +01:00 |
|
|
|
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 |
|
Jens Tautenhahn
|
12dd657868
|
fixes an sql error in NotificationsManager
|
2016-11-09 21:32:15 +01:00 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
9518785c81
|
Merge branch '1610-priority-dbclean' of github.com:annando/friendica into 1610-priority-dbclean
|
2016-11-05 05:26:29 +00:00 |
|
|
|
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 |
|
|
|
c32b2463b9
|
Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean
|
2016-11-04 22:57:43 +00:00 |
|
|
|
37985a0d3f
|
Use "micro"
|
2016-11-04 22:56:50 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4d966e1e21
|
Changed priority for onepoll/further enhancement for dbclean
|
2016-10-31 21:32:08 +00:00 |
|
