Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 97d1072f9b Make it clear that title and categories are optional Stefan Parviainen 2014-12-08 16:49:48 +01:00
• 81f3b20610 Merge pull request #726 from pafcu/tagsinotherchannels Thomas Willingham 2014-12-08 13:43:06 +00:00
• 934172c2fc Merge pull request #724 from pafcu/suggestionsindir Thomas Willingham 2014-12-08 13:34:56 +00:00
• 99b5bef68e Merge pull request #723 from pafcu/diropts Thomas Willingham 2014-12-08 13:31:34 +00:00
• a007426965 Merge pull request #727 from dawnbreak/docu Thomas Willingham 2014-12-08 13:19:46 +00:00
• 88cfdb864c Merge pull request #731 from zzottel/master zzottel 2014-12-08 11:13:11 +01:00
• 8ddf16f1ee add main_footer include to all .md files except TOS and README zottel 2014-12-08 11:06:37 +01:00
• ec1a8d4e10 Merge pull request #728 from cvogeley/master mrjive 2014-12-08 08:51:21 +01:00
• 10d5f0eed7 small change Christian Vogeley 2014-12-07 23:29:23 +01:00
• 406e97c9ad Remove channel cloud files from file system when Christian Vogeley 2014-12-07 21:20:52 +01:00
• 63646a1440 Some Doxygen comments and small cleanups. Klaus Weidenbach 2014-12-07 19:27:14 +01:00
• 62dabecf97 Show tags in other channels profile field to make it easier to navigate to the channels Stefan Parviainen 2014-12-07 16:17:45 +01:00
• f3789b1aeb merge Christian Vogeley 2014-12-07 16:09:03 +01:00
• 098eb66ba0 merge Christian Vogeley 2014-12-07 16:07:34 +01:00
• c8818d8349 Suggestions in dir redux. Suggestions are now showed in directory if suggest=1 parameter is given to directory. Stefan Parviainen 2014-12-07 13:38:38 +01:00
• 83ea120ac9 Revert "Revert "Directory shows channel suggestions by default"" Stefan Parviainen 2014-12-07 12:39:50 +01:00
• 647311db3e Directory sorting as a dropdown, forum filter as checkbox, option to sort oldest first Stefan Parviainen 2014-12-06 14:55:23 +01:00
• f1367cb9f9 Missing include if photo album widget called from not-the-photos page. Thomas Willingham 2014-12-04 21:52:22 +00:00
• 6df5c5a8e1 Merge pull request #721 from magicoli/master RedMatrix 2014-12-04 22:12:42 +11:00
• 82a4416dc7 update fr: 'to prod', better translated by 'encourager' Olivier van Helden 2014-12-04 01:20:38 -04:00
• d393f11dcb update fr: checked mail templates and another bunch of typoes in strings Olivier van Helden 2014-12-04 01:09:55 -04:00
• f362d40785 update fr: use prefixFromNow to display time delta in the most used, natural form ("Il y a 2 jours" and not "2 jours auparavant") Olivier van Helden 2014-12-04 00:46:22 -04:00
• 1391fdfa7c update fr - sorry for multiple posts, I will try to find time to check the whole french translation and submit once. Olivier van Helden 2014-12-04 00:31:58 -04:00
• 3848333172 update fr - 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. Olivier van Helden 2014-12-04 00:08:20 -04:00
• 4d1a0cd35e Merge pull request #2 from friendica/master Olivier van Helden 2014-12-03 23:49:28 -04:00
• 7ad022ef7a Merge pull request #720 from magicoli/master Thomas Willingham 2014-12-04 01:39:56 +00:00
• 78c37bc325 Put dir back - the fat lady didn't sing afterall. Thomas Willingham 2014-12-04 01:34:58 +00:00
• bbd5cb7367 update fr: fix typo and ambiguous changes in 1ea73a55e8 Olivier van Helden 2014-12-03 18:37:51 -04:00
• 1ea73a55e8 update fr typoes Olivier van Helden 2014-12-03 18:26:17 -04:00
• e523061b72 Merge pull request #1 from friendica/master Olivier van Helden 2014-12-03 17:54:07 -04:00
• b71b45aafc add comodo intermediate certs and a method to add other intermediate certs. friendica 2014-12-03 10:51:47 -08:00
• 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. friendica 2014-12-01 18:58:27 -08:00
• f3b92c0ef2 Merge https://github.com/friendica/red into pending_merge friendica 2014-12-01 18:53:49 -08:00
• 0b84ba1eab rev update friendica 2014-12-01 18:52:18 -08:00
• 460d379e7e Don't allow affinity of 0 in connedit. Thomas Willingham 2014-12-02 00:59:20 +00:00
• 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. Thomas Willingham 2014-12-01 19:09:50 +00:00
• c8db34806e Merge pull request #718 from tuscanhobbit/dev Paolo T 2014-12-01 16:24:29 +01:00
• 2eaf86b575 Italian translation Paolo Tacconi 2014-12-01 16:22:11 +01:00
• 2aaa33c135 The other half of 'any theme for any device'. Closes #71 Thomas Willingham 2014-11-30 18:57:58 +00:00
• 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... Thomas Willingham 2014-11-30 00:34:24 +00:00
• 5087d783b7 Whitespace. Stupid £#@£@$ editor. Thomas Willingham 2014-11-29 22:06:04 +00:00
• d4539b415a Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-11-29 22:01:45 +00:00
• bc5a4f19d0 Fix abook_toggle_flag from postgres stuff Thomas Willingham 2014-11-29 22:01:09 +00:00
• f5734582cd Merge branch 'master' of https://github.com/friendica/red marijus 2014-11-29 20:50:00 +01:00
• 7be6afd733 readd link_colour again marijus 2014-11-29 20:49:22 +01:00
• 698e6f00fc update nl (typo) Jeroen 2014-11-29 18:53:20 +00:00
• 306cb33a4a update nl Jeroen 2014-11-29 18:51:07 +00:00
• 43c2305ad2 Merge pull request #715 from f03el/master Thomas Willingham 2014-11-29 18:21:59 +00:00
• 3855be4910 bootstrap-3.3.1 and minor css fixes marijus 2014-11-29 14:33:36 +01:00
• 545d816093 Update Swedish strings Erik Lundin 2014-11-29 11:45:17 +01:00
• 80ed4193f7 Merge https://github.com/friendica/red into pending_merge friendica 2014-11-28 18:48:38 -08:00
• 123a778ae1 update mozilla cacert.pem friendica 2014-11-28 18:48:10 -08:00
• af3bf10d2f doc updates friendica 2014-11-28 18:47:59 -08:00
• f852a1f228 Issue #713 Arguably, we shouldn't allow poking yourself and stuff either but I like that, so... Thomas Willingham 2014-11-29 02:34:49 +00:00
• 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. Thomas Willingham 2014-11-28 18:02:58 +00:00
• e20c63949c Merge https://github.com/friendica/red into pending_merge friendica 2014-11-27 13:37:16 -08:00
• 1affc86b8e revup friendica 2014-11-27 13:37:01 -08:00
• cf3c4a091a Merge pull request #710 from anaqreon/features-doc RedMatrix 2014-11-28 08:36:34 +11:00
• 80d1e134f7 Merge pull request #712 from f03el/master RedMatrix 2014-11-28 08:35:58 +11:00
• 2f957aad51 revup friendica 2014-11-26 15:14:44 -08:00
• d3ffdbf2a4 Merge remote-tracking branch 'upstream/master' Habeas Codice 2014-11-26 11:02:30 -08:00
• 1a57f3ed51 fix true toggle Habeas Codice 2014-11-26 11:01:18 -08:00
• a6c9f64e4d Update Swedish strings Erik Lundin 2014-11-25 20:38:00 +01:00
• 6081972cb1 Update Swedish strings Erik Lundin 2014-11-25 20:33:52 +01:00
• d89d4630d0 Documentation wording Andrew Manning 2014-11-25 06:46:06 -05:00
• 3bb0ef8a82 Make events export track the current calendar. Turn it and 'new event' into buttons friendica 2014-11-24 20:40:00 -08:00
• 89c5ffd7c8 Merge https://github.com/friendica/red into pending_merge friendica 2014-11-24 18:46:56 -08:00
• 98b88d7d2f ical output wasn't using 24-hour time friendica 2014-11-24 18:46:14 -08:00
• 4ba8c744c4 Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-11-25 02:43:29 +00:00
• e9ba2ba600 theme the observer tags so they stick out like a sore thumb. Too much bad juju. friendica 2014-11-24 18:02:36 -08:00
• d9ac9df172 Update dir fallbacks. Thomas Willingham 2014-11-25 01:31:33 +00:00
• c279a8ad43 Merge https://github.com/friendica/red into pending_merge friendica 2014-11-24 15:36:42 -08:00
• ddc8557b69 hide online presence maps to DNT friendica 2014-11-24 15:36:11 -08:00
• c856b1d8d0 Merge pull request #707 from HaakonME/master RedMatrix 2014-11-25 06:46:00 +11:00
• a614d3eb8b Merge pull request #709 from tuscanhobbit/dev Paolo T 2014-11-24 14:40:10 +01:00
• c3c5f9a0fb Italian translation Paolo Tacconi 2014-11-24 14:38:23 +01:00
• bef8879cb1 Merge pull request #7 from friendica/master Paolo T 2014-11-24 14:19:22 +01:00
• 5b7124f0da and update Dutch Jeroen 2014-11-24 13:05:31 +00:00
• 54efbb6c7f Merge pull request #708 from zzottel/master zzottel 2014-11-24 12:00:59 +01:00
• becb6bf226 update to German strings zottel 2014-11-24 11:58:47 +01:00
• 22340d105b update to Germanmain help file zottel 2014-11-24 11:56:15 +01:00
• 756abd6678 add event export (this month) to event UI friendica 2014-11-24 02:50:14 -08:00
• 53dc9cf2eb basic vcalendar formatting support friendica 2014-11-23 20:29:34 -08:00
• 79e5c2456b add link to search forums in the directory friendica 2014-11-23 18:54:33 -08:00
• 5bb794cc28 allow directory searches to be filtered by (public forums) and/or (! public forums) friendica 2014-11-23 18:22:19 -08:00
• 746e4860fa more roadmap friendica 2014-11-23 15:09:07 -08:00
• 38aa8204cc Merge https://github.com/friendica/red into pending_merge friendica 2014-11-23 14:51:20 -08:00
• d191e7c348 project roadmap friendica 2014-11-23 14:51:04 -08:00
• 1f613350a5 Updated Norwegian bokmål translation Haakon Meland Eriksen 2014-11-23 12:20:27 +01:00
• bda3346b69 Merge pull request #706 from f03el/master RedMatrix 2014-11-23 17:42:28 +11:00
• 8ac3b938fd added dbdriver to siteinfo json to better track affected sites Habeas Codice 2014-11-22 13:27:52 -08:00
• 57dcdd4cf9 Update Swedish translations Erik Lundin 2014-11-22 22:11:43 +01:00
• 86b6861aae Merge https://github.com/friendica/red into pending_merge friendica 2014-11-22 12:26:33 -08:00
• b16f938830 random block widget friendica 2014-11-22 12:26:04 -08:00
• c785b5a90c doc updates friendica 2014-11-22 12:25:49 -08:00
• ab5bf1b7d6 prevent database hackery from leaking over the wire Habeas Codice 2014-11-22 11:54:40 -08:00
• ecb86dd6b2 somehow missed this one was causing problems with pickup messages originating from postgres servers Habeas Codice 2014-11-22 09:26:46 -08:00
• cf739c0361 Merge remote-tracking branch 'upstream/master' Habeas Codice 2014-11-21 15:39:14 -08:00
• b224f8056c new system config reserved_channels prevents members from creating channels in a reserved list Habeas Codice 2014-11-21 15:35:59 -08:00
• db29dc6bff implicit type conversion Habeas Codice 2014-11-21 15:33:21 -08:00