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

• 5c5a14c4df this is basic but perhaps that's what we really need. friendica 2014-02-05 20:43:43 -08:00
• 61f3ffc635 add chatrooms template friendica 2014-02-05 19:16:41 -08:00
• 05a70a8760 add chatroom links friendica 2014-02-05 19:16:12 -08:00
• cb6716a644 fix the xchan lookup tool friendica 2014-02-05 18:51:50 -08:00
• 1b406be544 allow bookmarks to use richtext friendica 2014-02-05 16:28:51 -08:00
• da8a79ebfa cleanup - nothing more friendica 2014-02-05 16:01:02 -08:00
• fdc0a7e95e fix auto-add of bookmarks to find sender correctly and optionally auto add bookmarks for self friendica 2014-02-05 15:56:18 -08:00
• 8595318089 Merge https://github.com/friendica/red into zpull friendica 2014-02-05 15:03:46 -08:00
• efa30f1b03 This would be about the 75th attempt to try and prevent duplicated email notifications for comments. Eventually we'll find something that works. friendica 2014-02-05 15:01:53 -08:00
• e525f045c1 Merge pull request #298 from cvogeley/master friendica 2014-02-06 06:44:41 +11:00
• 4a03ae09eb Merge pull request #302 from git-marijus/master friendica 2014-02-06 06:39:36 +11:00
• bd1849ddae Merge branch 'upstream' marijus 2014-02-05 14:50:38 +01:00
• 419e3b5024 Merge branch 'master' of https://github.com/friendica/red into upstream marijus 2014-02-05 14:48:42 +01:00
• a606fc0ba3 add a sanitized style tag to bbcode marijus 2014-02-05 14:34:25 +01:00
• 9e993bb4fd Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-05 13:43:16 +01:00
• 0844110f7b preserve system bit when editing menus friendica 2014-02-05 03:44:46 -08:00
• 24f32e55c8 bookmarking bugfix friendica 2014-02-05 03:29:02 -08:00
• f30a39f9df bookmark debug logging friendica 2014-02-05 03:15:10 -08:00
• 8a11c29413 make links in comments bookmark-able friendica 2014-02-04 19:39:56 -08:00
• 9f439c3248 add icon translation for new icon friendica 2014-02-04 17:14:22 -08:00
• aede006970 bookmarks - mop up and go home friendica 2014-02-04 17:12:13 -08:00
• 3665bc38ef bookmarking friendica 2014-02-04 16:06:56 -08:00
• 4253581733 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-04 16:19:35 +01:00
• 46b9352a84 fix the search for system bookmarks friendica 2014-02-04 01:42:43 -08:00
• 50a1ffd244 Merge https://github.com/friendica/red into zpull friendica 2014-02-04 00:53:04 -08:00
• d8f16442a1 bookmark permissions friendica 2014-02-04 00:52:34 -08:00
• 74298c44ae Merge pull request #301 from tobiasd/20140204 tobiasd 2014-02-03 22:52:21 -08:00
• 7ff2c018c5 DE: update to the strings Tobias Diekershoff 2014-02-04 07:50:32 +01:00
• 1572403e98 photo tagging somewhat working - but can't remove photo tags until we update tagrm friendica 2014-02-03 20:44:42 -08:00
• 9ce3dac479 some tagging fixes - including old bugs which were never reported friendica 2014-02-03 19:54:32 -08:00
• 876f5d4de0 transmit, receive, and parse bookmarks friendica 2014-02-03 19:38:15 -08:00
• c4d0884596 accept new connection broke yesterday friendica 2014-02-03 14:03:43 -08:00
• 2a9baa1f32 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-03 15:54:50 +01:00
• 6c91580716 code cleanup - remove some unused functions friendica 2014-02-03 02:21:06 -08:00
• 5c885e91a3 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-03 08:03:46 +01:00
• ee42079685 The problem with a lot of packages is that it's easier to re-write them than to re-use them. friendica 2014-02-02 21:25:52 -08:00
• c7cad26b41 more wordsmithing friendica 2014-02-02 20:22:41 -08:00
• 5cc6efe21f changed order of the privacy macros so that the dangerous settings come last and the preferred settings come first friendica 2014-02-02 20:14:57 -08:00
• 54acf5aeac cleanup in preparation for new page friendica 2014-02-02 18:57:21 -08:00
• baf3b052f6 don't load any configs from DB if installing - especially in style.pcss friendica 2014-02-02 18:18:22 -08:00
• 38bce48f28 wordsmithing friendica 2014-02-02 18:06:15 -08:00
• ee1580427e don't draw attention to advanced permissions and their corresponding complexity and clearly mark the simple permissions which people are encouraged to use. friendica 2014-02-02 17:54:36 -08:00
• 732a4b898a Merge pull request #300 from tazmandevil/master friendica 2014-02-02 17:09:25 -08:00
• d2b55f5eea added Thomas' additional navbar colours from APW to redbasic Tazman DeVille 2014-02-03 02:06:07 +01:00
• 3eed73d519 minor text change "can" -> "may" friendica 2014-02-02 16:51:11 -08:00
• 2768262f93 Add switch to allow menus to be used as bookmark collections friendica 2014-02-02 16:49:09 -08:00
• abb68e846d remove the text "requires compatible chat plugin" friendica 2014-02-02 16:02:04 -08:00
• 67899677db make chat honour the pause key (but we still need to ping the server to maintain the in_room status), also the recent change to pull css out of the template file used classes instead of ids so none of the styles were sticking friendica 2014-02-02 15:50:07 -08:00
• 11efafb5d2 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-02 23:50:21 +01:00
• 02e4527de6 better check for setup module friendica 2014-02-02 14:09:09 -08:00
• cf85fec919 Merge https://github.com/friendica/red into zpull friendica 2014-02-02 14:07:33 -08:00
• b39c0d54c0 some windows fixes friendica 2014-02-02 14:06:36 -08:00
• 211dc4edd2 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-02 23:02:34 +01:00
• b7c4f033b5 Merge pull request #299 from toclimb/smilies-fix friendica 2014-02-02 11:49:52 -08:00
• 8568eb2873 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-02 17:50:24 +01:00
• 96e423dcfc Merge pull request #297 from tazmandevil/master Thomas Willingham 2014-02-02 08:33:26 -08:00
• 9fcc2a18df Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-02 17:31:25 +01:00
• 5846dc105a Move CSS out of chat template Thomas Willingham 2014-02-02 16:28:58 +00:00
• ba6178bef3 More efficient smilie replacing toclimb 2014-02-02 14:52:00 +01:00
• 16e818def7 link hover colour remains user set link_colour (w/o change default, Mike) Tazman DeVille 2014-02-02 14:01:12 +01:00
• a2fa1a162d Other not so elegant way of detecting touch screen devices Christian Vogeley 2014-02-02 13:59:20 +01:00
• e83419b53e add links to change chat status and leave room friendica 2014-02-02 03:43:52 -08:00
• 6b15e57cdb add epub mimetype (application/epub+zip) friendica 2014-02-02 02:43:36 -08:00
• 17436f060f fix default link color friendica 2014-02-01 21:12:26 -08:00
• 34850289ff Merge https://github.com/friendica/red into zpull friendica 2014-02-01 21:03:46 -08:00
• 61cc4de225 provide donation options on siteinfo page friendica 2014-02-01 21:03:21 -08:00
• a9ceeff988 Merge pull request #296 from tazmandevil/master friendica 2014-02-01 20:47:19 -08:00
• 8e8b49d18c Merge pull request #294 from git-marijus/master friendica 2014-02-01 20:46:52 -08:00
• de412abe88 user configured link colour Tazman DeVille 2014-02-02 05:19:29 +01:00
• 255190205b Merge https://github.com/friendica/red into zpull friendica 2014-02-01 20:08:36 -08:00
• 2c75210fdb config: don't try to unserialise an array friendica 2014-02-01 20:07:47 -08:00
• bd83783391 link colours Tazman DeVille 2014-02-02 04:32:43 +01:00
• a2761213e0 link colour options Tazman DeVille 2014-02-02 04:26:56 +01:00
• 3b1346c143 Merge pull request #295 from cvogeley/master cvogeley 2014-02-01 14:43:33 -08:00
• 30aeb42bed Press return to post chat posts- SHIFT-RETURN creates line break Christian Vogeley 2014-02-01 23:28:27 +01:00
• b3f819d52a Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-01 13:49:53 +01:00
• 94d874c0b2 Doc - Make TOS include work. Thomas Willingham 2014-02-01 11:55:36 +00:00
• 94e59d4770 status indication friendica 2014-02-01 01:00:26 -08:00
• d14afc0ee4 provide the room name for the room you're in. friendica 2014-02-01 00:54:20 -08:00
• 33f3cd3d4a chat formatting/style improvements friendica 2014-01-31 20:48:26 -08:00
• bd691300a7 provide some interesting new options to channel sources friendica 2014-01-31 20:02:59 -08:00
• 902c9b1585 doc updates friendica 2014-01-31 20:02:45 -08:00
• af75b77253 comment out since it is not clear if this is not implemented yet or obsolete marijus 2014-01-31 18:31:14 +01:00
• d7d2fff24b comment out since it is not clear if this is not implemented yet or obsolete marijus 2014-01-31 18:27:58 +01:00
• aaa3c62efa keep presence updated - typo was causing it to logout friendica 2014-01-30 21:09:02 -08:00
• deaf93db71 missing string delimiters (quotes) friendica 2014-01-30 21:01:09 -08:00
• a1d40431f2 chat expiration (default 2 hours) - but can be set on a per-chatroom basis friendica 2014-01-30 20:10:47 -08:00
• 49f07bd90f mod/ping should only update basic_presence - and clearing stale entries. otherwise let rooms handle presence for themselves. friendica 2014-01-30 19:01:03 -08:00
• f69bf5e598 more chat work - this time the ajax bits to actually show chats on the page friendica 2014-01-30 18:57:46 -08:00
• 2f876334d5 Merge https://github.com/friendica/red into zpull friendica 2014-01-30 14:37:50 -08:00
• 0fae8acdef fix basic auth with account (not channel) login friendica 2014-01-30 14:36:56 -08:00
• 70de97fca1 Merge pull request #293 from MicMee/master friendica 2014-01-30 14:21:32 -08:00
• f2f1857876 Merge pull request #292 from git-marijus/master friendica 2014-01-30 14:21:03 -08:00
• c0f02d774a started analysis of ping response and clean up more logger Michael Meer 2014-01-30 20:41:40 +01:00
• da1e7cc211 Merge branch 'master' of https://github.com/friendica/red Michael Meer 2014-01-30 19:54:12 +01:00
• 3bdbdbab53 dont show an empty link to profile creation if multi_profile is not enabled marijus 2014-01-30 19:44:50 +01:00
• 13a5dfacb6 Merge branch 'master' of https://github.com/friendica/red marijus 2014-01-30 13:25:07 +01:00
• 48bc9b546c typo and clear chattext after submission friendica 2014-01-30 03:51:25 -08:00
• c5ac5544cb clean up logger commands. Placed apostrophs at the end from some comments to keep the syntax highlighting in vi working Michael Meer 2014-01-30 11:04:20 +01:00
• 0a2b2a1390 attempt with fix URL for testing works Michael Meer 2014-01-30 10:39:09 +01:00