Commit graph

12049 commits

Author SHA1 Message Date
friendica
af3bf10d2f doc updates 2014-11-28 18:47:59 -08: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
Habeas Codice
8ac3b938fd added dbdriver to siteinfo json to better track affected sites 2014-11-22 13:27:52 -08:00
Erik Lundin
57dcdd4cf9 Update Swedish translations 2014-11-22 22:11:43 +01:00
friendica
86b6861aae Merge https://github.com/friendica/red into pending_merge 2014-11-22 12:26:33 -08:00
friendica
b16f938830 random block widget 2014-11-22 12:26:04 -08:00
friendica
c785b5a90c doc updates 2014-11-22 12:25:49 -08:00
Habeas Codice
ab5bf1b7d6 prevent database hackery from leaking over the wire 2014-11-22 11:54:40 -08:00
Habeas Codice
ecb86dd6b2 somehow missed this one
was causing problems with pickup messages originating from postgres servers
2014-11-22 09:26:46 -08:00
Habeas Codice
cf739c0361 Merge remote-tracking branch 'upstream/master' 2014-11-21 15:39:14 -08:00
Habeas Codice
b224f8056c new system config reserved_channels
prevents members from creating channels in a reserved list
2014-11-21 15:35:59 -08:00
Habeas Codice
db29dc6bff implicit type conversion 2014-11-21 15:33:21 -08:00
friendica
f17ef6aa90 allow the photo_rand widget to access photos from any channel (useful if the widget is used in sys-generated pages). You still need permission. 2014-11-20 19:33:08 -08:00
friendica
03a457ed83 more logging for zot_feed anomalies 2014-11-20 18:44:16 -08:00
friendica
bf04568ef0 more directory tuning to ignore things we already know we can't possibly update 2014-11-20 18:36:48 -08:00
friendica
695abdcbd0 directory: don't try and sync a directory update that points to a hubloc we already know is dead and buried. 2014-11-20 18:29:28 -08:00