aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* mergeChristian Vogeley2014-12-073-126/+2
|
* Missing include if photo album widget called from not-the-photos page.Thomas Willingham2014-12-041-1/+2
|
* Merge pull request #721 from magicoli/masterRedMatrix2014-12-048-112/+111
|\ | | | | update fr
| * update fr: 'to prod', better translated by 'encourager'Olivier van Helden2014-12-042-10/+10
| |
| * update fr: checked mail templates and another bunch of typoes in stringsOlivier van Helden2014-12-048-36/+35
| |
| * update fr: use prefixFromNow to display time delta in the most used, natural ↵Olivier van Helden2014-12-042-4/+4
| | | | | | | | form ("Il y a 2 jours" and not "2 jours auparavant")
| * update fr - sorry for multiple posts, I will try to find time to check the ↵Olivier van Helden2014-12-042-36/+36
| | | | | | | | whole french translation and submit once.
| * update frOlivier van Helden2014-12-042-28/+28
| | | | | | | | | | | | - resubmitted, after online tests, correct translations for poked, pinged, etc - fix wrong sense for poked - there were two different translations for [red:notify], changed to the most used (Red:Notification) everywhere.
| * Merge pull request #2 from friendica/masterOlivier van Helden2014-12-032-2/+3
| |\ | |/ |/| Pull from friendica/master
* | Merge pull request #720 from magicoli/masterThomas Willingham2014-12-042-24/+24
|\| | | | | update fr
| * update fr: fix typo and ambiguous changes in ↵Olivier van Helden2014-12-032-11/+11
| | | | | | | | 1ea73a55e8276006b4c0f0307dfbe2a35acdff33
| * update fr typoesOlivier van Helden2014-12-032-33/+33
| |
| * Merge pull request #1 from friendica/masterOlivier van Helden2014-12-03478-36595/+54051
| |\ | | | | | | Merge master from friendica
* | | Put dir back - the fat lady didn't sing afterall.Thomas Willingham2014-12-042-2/+3
| |/ |/|
* | add comodo intermediate certs and a method to add other intermediate certs.friendica2014-12-035-2/+4080
| |
* | can't reset public to false because it may have been passed in as true and ↵friendica2014-12-011-5/+5
| | | | | | | | this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-0123-8754/+8897
|\ \ | | | | | | | | | | | | Conflicts: version.inc
| * | Don't allow affinity of 0 in connedit.Thomas Willingham2014-12-023-2/+3
| | |
| * | Somewhat subtle process_delivery() bug - $public was not being reset if a sysThomas Willingham2014-12-011-0/+1
| | | | | | | | | | | | channel is reached but then the loop iterated over another channel.
| * | Merge pull request #718 from tuscanhobbit/devPaolo T2014-12-012-4035/+4077
| |\ \ | | | | | | | | Italian translation
| | * | Italian translationPaolo Tacconi2014-12-012-4035/+4077
| |/ /
| * | The other half of 'any theme for any device'. Closes #71Thomas Willingham2014-11-301-6/+11
| | |
| * | Handle included txt files (ie, install doco) as BBCode, otherwise it strips allThomas Willingham2014-11-301-1/+1
| | | | | | | | | | | | | | | white space. Was going to use Markdown, but lots of not-markdown gets parsed then, so...
| * | Whitespace. Stupid £#@£@$ editor.Thomas Willingham2014-11-292-7/+7
| | |
| * | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-11-2973-5591/+6208
| |\ \
| | * \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-11-294-4516/+4568
| | |\ \
| | | * | update nl (typo)Jeroen2014-11-292-2/+2
| | | | |
| | | * | update nlJeroen2014-11-292-3957/+3999
| | | | |
| | | * | Merge pull request #715 from f03el/masterThomas Willingham2014-11-292-559/+569
| | | |\ \ | | | | | | | | | | | | Update Swedish strings
| | | | * | Update Swedish stringsErik Lundin2014-11-292-559/+569
| | | | | |
| | * | | | readd link_colour againmarijus2014-11-291-1/+1
| | |/ / /
| | * / / bootstrap-3.3.1 and minor css fixesmarijus2014-11-299-188/+227
| | |/ /
| * | | Fix abook_toggle_flag from postgres stuffThomas Willingham2014-11-291-5/+7
| | | |
* | | | rev updatefriendica2014-12-011-1/+1
| |/ / |/| |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-282-19/+20
|\| |
| * | Issue #713 Arguably, we shouldn't allow poking yourself and stuff eitherThomas Willingham2014-11-291-1/+2
| | | | | | | | | | | | but I like that, so...
| * | Doco - #710 flipped the colours. Unsurprisingly, they were the otherThomas Willingham2014-11-281-18/+18
| | | | | | | | | | | | | | | way round because they were created on a dark theme. The right thing to do is not to specify a colour at all, and let the themes handle it.
* | | update mozilla cacert.pemfriendica2014-11-283-732/+849
| | |
* | | doc updatesfriendica2014-11-2857-155/+564
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-275-4080/+3988
|\ \
| * \ Merge pull request #710 from anaqreon/features-docRedMatrix2014-11-283-132/+8
| |\ \ | | | | | | | | Documentation wording
| | * | Documentation wordingAndrew Manning2014-11-253-132/+8
| | | | | | | | | | | | | | | | | | | | Improved wording. Replaced white colored text with black because the default theme makes the white invisible.
| * | | Merge pull request #712 from f03el/masterRedMatrix2014-11-282-3948/+3980
| |\ \ \ | | | | | | | | | | Update Swedish strings
| | * | | Update Swedish stringsErik Lundin2014-11-251-778/+785
| | | | |
| | * | | Update Swedish stringsErik Lundin2014-11-251-3170/+3195
| | |/ /
* | / / revupfriendica2014-11-271-1/+1
|/ / /
* | | revupfriendica2014-11-261-1/+1
| | |
* | | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-26129-28979/+31328
|\| |
| * | Make events export track the current calendar. Turn it and 'new event' into ↵friendica2014-11-242-3/+13
| | | | | | | | | | | | buttons
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-241-1/+0
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 16:07:57 +0000