Commit graph

12063 commits

Author SHA1 Message Date
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
Paolo Tacconi
c3c5f9a0fb Italian translation 2014-11-24 14:38:23 +01:00
Paolo T
bef8879cb1 Merge pull request #7 from friendica/master
Merge from main project
2014-11-24 14:19:22 +01:00
Jeroen
5b7124f0da and update Dutch 2014-11-24 13:05:31 +00:00
zzottel
54efbb6c7f Merge pull request #708 from zzottel/master
German update
2014-11-24 12:00:59 +01:00
zottel
becb6bf226 update to German strings 2014-11-24 11:58:47 +01:00
zottel
22340d105b update to Germanmain help file 2014-11-24 11:56:15 +01:00
friendica
756abd6678 add event export (this month) to event UI 2014-11-24 02:50:14 -08:00
friendica
53dc9cf2eb basic vcalendar formatting support 2014-11-23 20:29:34 -08:00
friendica
79e5c2456b add link to search forums in the directory 2014-11-23 18:54:33 -08:00
friendica
5bb794cc28 allow directory searches to be filtered by (public forums) and/or (! public forums) 2014-11-23 18:22:19 -08:00
friendica
746e4860fa more roadmap 2014-11-23 15:09:07 -08:00
friendica
38aa8204cc Merge https://github.com/friendica/red into pending_merge 2014-11-23 14:51:20 -08:00
friendica
d191e7c348 project roadmap 2014-11-23 14:51:04 -08:00
Haakon Meland Eriksen
1f613350a5 Updated Norwegian bokmål translation 2014-11-23 12:20:27 +01:00
RedMatrix
bda3346b69 Merge pull request #706 from f03el/master
Update Swedish translations
2014-11-23 17:42:28 +11:00