Thomas Willingham
|
7ad022ef7a
|
Merge pull request #720 from magicoli/master
update fr
|
2014-12-04 01:39:56 +00:00 |
|
Thomas Willingham
|
78c37bc325
|
Put dir back - the fat lady didn't sing afterall.
|
2014-12-04 01:34:58 +00:00 |
|
Olivier van Helden
|
bbd5cb7367
|
update fr: fix typo and ambiguous changes in 1ea73a55e8
|
2014-12-03 18:37:51 -04:00 |
|
Olivier van Helden
|
1ea73a55e8
|
update fr typoes
|
2014-12-03 18:26:17 -04:00 |
|
Olivier van Helden
|
e523061b72
|
Merge pull request #1 from friendica/master
Merge master from friendica
|
2014-12-03 17:54:07 -04:00 |
|
friendica
|
b71b45aafc
|
add comodo intermediate certs and a method to add other intermediate certs.
|
2014-12-03 10:51:47 -08:00 |
|
friendica
|
8e4e56b566
|
can't reset public to false because it may have been passed in as true and this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
|
2014-12-01 18:59:38 -08:00 |
|
friendica
|
f3b92c0ef2
|
Merge https://github.com/friendica/red into pending_merge
Conflicts:
version.inc
|
2014-12-01 18:53:49 -08:00 |
|
friendica
|
0b84ba1eab
|
rev update
|
2014-12-01 18:52:18 -08:00 |
|
Thomas Willingham
|
460d379e7e
|
Don't allow affinity of 0 in connedit.
|
2014-12-02 00:59:20 +00:00 |
|
Thomas Willingham
|
def10df816
|
Somewhat subtle process_delivery() bug - $public was not being reset if a sys
channel is reached but then the loop iterated over another channel.
|
2014-12-01 19:09:50 +00:00 |
|
Paolo T
|
c8db34806e
|
Merge pull request #718 from tuscanhobbit/dev
Italian translation
|
2014-12-01 16:24:29 +01:00 |
|
Paolo Tacconi
|
2eaf86b575
|
Italian translation
|
2014-12-01 16:22:11 +01:00 |
|
Thomas Willingham
|
2aaa33c135
|
The other half of 'any theme for any device'. Closes #71
|
2014-11-30 18:57:58 +00:00 |
|
Thomas Willingham
|
d67c5a6ffd
|
Handle included txt files (ie, install doco) as BBCode, otherwise it strips all
white space. Was going to use Markdown, but lots of not-markdown gets parsed
then, so...
|
2014-11-30 00:36:30 +00:00 |
|
Thomas Willingham
|
5087d783b7
|
Whitespace. Stupid £#@£@$ editor.
|
2014-11-29 22:06:04 +00:00 |
|
Thomas Willingham
|
d4539b415a
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-11-29 22:01:45 +00:00 |
|
Thomas Willingham
|
bc5a4f19d0
|
Fix abook_toggle_flag from postgres stuff
|
2014-11-29 22:01:09 +00:00 |
|
marijus
|
f5734582cd
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-11-29 20:50:00 +01:00 |
|
marijus
|
7be6afd733
|
readd link_colour again
|
2014-11-29 20:49:22 +01:00 |
|
Jeroen
|
698e6f00fc
|
update nl (typo)
|
2014-11-29 18:53:20 +00:00 |
|
Jeroen
|
306cb33a4a
|
update nl
|
2014-11-29 18:51:07 +00:00 |
|
Thomas Willingham
|
43c2305ad2
|
Merge pull request #715 from f03el/master
Update Swedish strings
|
2014-11-29 18:21:59 +00:00 |
|
marijus
|
3855be4910
|
bootstrap-3.3.1 and minor css fixes
|
2014-11-29 14:33:36 +01:00 |
|
Erik Lundin
|
545d816093
|
Update Swedish strings
|
2014-11-29 11:45:17 +01:00 |
|
friendica
|
80ed4193f7
|
Merge https://github.com/friendica/red into pending_merge
|
2014-11-28 18:48:38 -08:00 |
|
friendica
|
123a778ae1
|
update mozilla cacert.pem
|
2014-11-28 18:48:10 -08:00 |
|
friendica
|
af3bf10d2f
|
doc updates
|
2014-11-28 18:47:59 -08:00 |
|
Thomas Willingham
|
f852a1f228
|
Issue #713 Arguably, we shouldn't allow poking yourself and stuff either
but I like that, so...
|
2014-11-29 02:34:49 +00:00 |
|
Thomas Willingham
|
728a0667c5
|
Doco - #710 flipped the colours. Unsurprisingly, they were the other
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.
|
2014-11-28 18:02:58 +00:00 |
|
friendica
|
e20c63949c
|
Merge https://github.com/friendica/red into pending_merge
|
2014-11-27 13:37:16 -08:00 |
|
friendica
|
1affc86b8e
|
revup
|
2014-11-27 13:37:01 -08:00 |
|
RedMatrix
|
cf3c4a091a
|
Merge pull request #710 from anaqreon/features-doc
Documentation wording
|
2014-11-28 08:36:34 +11:00 |
|
RedMatrix
|
80d1e134f7
|
Merge pull request #712 from f03el/master
Update Swedish strings
|
2014-11-28 08:35:58 +11:00 |
|
friendica
|
2f957aad51
|
revup
|
2014-11-26 15:14:44 -08:00 |
|
Habeas Codice
|
d3ffdbf2a4
|
Merge remote-tracking branch 'upstream/master'
|
2014-11-26 11:02:30 -08:00 |
|
Habeas Codice
|
1a57f3ed51
|
fix true toggle
|
2014-11-26 11:01:18 -08:00 |
|
Erik Lundin
|
a6c9f64e4d
|
Update Swedish strings
|
2014-11-25 20:38:00 +01:00 |
|
Erik Lundin
|
6081972cb1
|
Update Swedish strings
|
2014-11-25 20:33:52 +01:00 |
|
Andrew Manning
|
d89d4630d0
|
Documentation wording
Improved wording. Replaced white colored text with black because the
default theme makes the white invisible.
|
2014-11-25 06:46:06 -05:00 |
|
friendica
|
3bb0ef8a82
|
Make events export track the current calendar. Turn it and 'new event' into buttons
|
2014-11-24 20:40:00 -08:00 |
|
friendica
|
89c5ffd7c8
|
Merge https://github.com/friendica/red into pending_merge
|
2014-11-24 18:46:56 -08:00 |
|
friendica
|
98b88d7d2f
|
ical output wasn't using 24-hour time
|
2014-11-24 18:46:14 -08:00 |
|
Thomas Willingham
|
4ba8c744c4
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-11-25 02:43:29 +00:00 |
|
friendica
|
e9ba2ba600
|
theme the observer tags so they stick out like a sore thumb. Too much bad juju.
|
2014-11-24 18:02:36 -08:00 |
|
Thomas Willingham
|
d9ac9df172
|
Update dir fallbacks.
|
2014-11-25 01:31:33 +00:00 |
|
friendica
|
c279a8ad43
|
Merge https://github.com/friendica/red into pending_merge
|
2014-11-24 15:36:42 -08:00 |
|
friendica
|
ddc8557b69
|
hide online presence maps to DNT
|
2014-11-24 15:36:11 -08:00 |
|
RedMatrix
|
c856b1d8d0
|
Merge pull request #707 from HaakonME/master
Updated Norwegian bokmål translation
|
2014-11-25 06:46:00 +11:00 |
|
Paolo T
|
a614d3eb8b
|
Merge pull request #709 from tuscanhobbit/dev
Italian translation
|
2014-11-24 14:40:10 +01:00 |
|