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

• c028d9b1d0 Partially revert 895c9411d9 Thomas Willingham 2014-03-03 17:16:25 +00:00
• 7baeb45183 some anomolies found when viewing connections in various cases. friendica 2014-03-02 19:40:59 -08:00
• b98ddc69de disable the right_aside on choklet two-column layouts friendica 2014-03-02 17:21:06 -08:00
• 7cdfe48bb4 add choklet to the comanche docs friendica 2014-03-02 17:15:33 -08:00
• 895c9411d9 add choklet template with several defined flavours, two and three column fluid layouts with optional side margins and a region for a blog-style header photo friendica 2014-03-02 16:46:34 -08:00
• e931af8307 first cut at choklet template friendica 2014-03-02 15:47:01 -08:00
• eb2b2f504c Merge pull request #350 from git-marijus/master friendica 2014-03-03 09:25:37 +11:00
• 57cc77f6d5 make navbar themable again marijus 2014-03-02 22:50:53 +01:00
• 2313736e92 Merge branch 'master' of https://github.com/friendica/red marijus 2014-03-02 10:27:08 +01:00
• bf401a5afa allow templates to have multiple styles - this would be a bit like having a schema for a template file. At first you'll think this is insane and overly complicated, you'll just have to wait and see what I'm up to. Then it will start to make sense. friendica 2014-03-02 00:24:29 -08:00
• 1920873c34 s/layout/template/g *.pdl friendica 2014-03-01 19:28:21 -08:00
• 4c2224e952 Merge https://github.com/friendica/red into zpull friendica 2014-03-01 17:55:15 -08:00
• cc77538c69 change the docs for template tag friendica 2014-03-01 17:53:57 -08:00
• 247cb85c94 it's unfortunate that we use the term "layout" to refer both to a template file and to Comanche .PDL files. I think we should probably refer to the template file as "template" just to avoid confusion. For the moment we'll provide both, since the 'layout' is already in the wild. But please use "template" going forward. friendica 2014-03-01 17:49:28 -08:00
• 52c2085176 Merge pull request #347 from solstag/master friendica 2014-03-02 12:46:14 +11:00
• 36e823e5b5 Merge pull request #346 from git-marijus/master friendica 2014-03-02 12:45:51 +11:00
• c402f39cf8 first draft of creating templates documentation friendica 2014-03-01 17:44:18 -08:00
• db266958c4 Merge branch 'master' of https://github.com/friendica/red marijus 2014-03-01 11:35:02 +01:00
• 1bdea24238 Update pt-br translation. Alexandre Hannud Abdo 2014-03-01 03:00:35 -03:00
• 9a5a2146a2 Merge https://github.com/friendica/red into zpull friendica 2014-02-28 16:01:25 -08:00
• 429022e116 allow one to ignore pending connections friendica 2014-02-28 16:00:29 -08:00
• 6b6052d5a9 Revert "a little fix against bootstrap 3.1.1" marijus 2014-02-28 23:34:52 +01:00
• e82c9eb176 a little fix against bootstrap 3.1.1 marijus 2014-02-28 23:23:19 +01:00
• b390336016 add hover effect to usermenu caret marijus 2014-02-28 23:04:38 +01:00
• 745f20ccbf Merge pull request #345 from zzottel/master zzottel 2014-02-28 14:04:32 +01:00
• 8ae986b9c6 correct bbcode link in German docs zottel 2014-02-28 14:00:50 +01:00
• ed1e975faf It's no longer simply "Red" and the jury is still out on whether or not it's a "project". Most of the time it doesn't seem like one or act like one. It doesn't seem to be anything cohesive that you can put your finger on and everybody involved is mostly doing their own thing and marching to their own drummer. It is however the RedMatrix, whatever that means to you. friendica 2014-02-28 01:53:39 -08:00
• 2d487f306d more doc friendica 2014-02-28 01:31:08 -08:00
• 096cc726b7 dang - you really have to bludgeon this thing to get youtube to use https friendica 2014-02-28 01:30:05 -08:00
• 46f0de7120 try to fix youtube mixed content warnings friendica 2014-02-28 00:57:35 -08:00
• 2a7e43c08f more to-to friendica 2014-02-27 23:25:23 -08:00
• d2304cf168 trying to get back to upstream state zottel 2014-02-28 08:22:23 +01:00
• 0144ac1662 Merge remote-tracking branch 'upstream/master' zottel 2014-02-28 08:19:40 +01:00
• 4bb8e294a1 Merge remote-tracking branch 'upstream/master' zottel 2014-02-28 08:16:56 +01:00
• 019781f626 more tasks friendica 2014-02-27 23:10:21 -08:00
• 7cb295bbe6 over-ride code tags within pre blocks as bootstrap which puts a border around pre tags, which messes up markdown code blocks which have yet another border. friendica 2014-02-27 20:55:25 -08:00
• 102521844b put schemas in Comanche (this requires theme support (!)) friendica 2014-02-27 20:48:10 -08:00
• d2bc7c606a minor fixes to suggested chatrooms friendica 2014-02-27 17:10:26 -08:00
• 642da17b86 chatroom suggestions friendica 2014-02-27 17:07:11 -08:00
• 402d44e2f4 fix photos in private mail friendica 2014-02-27 16:01:44 -08:00
• 5cf0e74501 Capitalise $a->page['title'] in doco pages. Thomas Willingham 2014-02-27 17:50:36 +00:00
• f8b3f032a9 change page title for bbcode help files zottel 2014-02-27 18:50:14 +01:00
• 05882df43a Merge pull request #342 from zzottel/master zzottel 2014-02-27 18:35:54 +01:00
• 6c0fdbebeb some new German files zottel 2014-02-27 18:35:03 +01:00
• c66313af88 Merge pull request #343 from beardy-unixer/master Thomas Willingham 2014-02-27 16:35:46 +00:00
• ac383cf07b Can't type today Thomas Willingham 2014-02-27 16:33:36 +00:00
• 9488bc0631 Who reverted that? Thomas Willingham 2014-02-27 16:31:25 +00:00
• 46a3c4d804 Doc update Thomas Willingham 2014-02-27 16:28:29 +00:00
• 77e087a380 convert existing German help files to BBCode zottel 2014-02-27 15:01:44 +01:00
• 7cdca97654 Typo cvogeley 2014-02-27 09:54:07 +01:00
• 0850a5d63d Typo cvogeley 2014-02-27 09:39:07 +01:00
• ba41d4a461 If we leave this any longer, it'll be 2015 before anyone remembers. Thomas Willingham 2014-02-27 06:49:46 +00:00
• efb77774b5 Merge https://github.com/friendica/red into zpull friendica 2014-02-26 14:51:51 -08:00
• c8f1bf89a9 vsprintf error friendica 2014-02-26 14:51:29 -08:00
• 3b24d921b6 Merge pull request #341 from git-marijus/master friendica 2014-02-27 09:37:29 +11:00
• 8860d80bd4 Revert "little correction" marijus 2014-02-26 23:34:36 +01:00
• 496a5a556f little correction marijus 2014-02-26 23:31:35 +01:00
• c5b8224dcc properly fix profile edit dropdown menu marijus 2014-02-26 23:20:40 +01:00
• 364fc9f163 comanche: provide an option to add a menu class for different theming choices on some menus (e.g. horizontal, tabbed, etc.) friendica 2014-02-25 20:58:20 -08:00
• 1857036a99 I'll have to fix this someday. friendica 2014-02-25 20:36:56 -08:00
• 3fb26e06ab Merge https://github.com/friendica/red into zpull friendica 2014-02-25 19:48:57 -08:00
• e7e97e578b put bookmarked chatrooms into poco friendica 2014-02-25 19:48:13 -08:00
• c1f3c892b0 Merge pull request #340 from beardy-unixer/master friendica 2014-02-26 13:04:16 +11:00
• 04e6cb515b Fix the weirdness of messages appearing in the middle of the screen and working their way downwards one comment at a time as the ping runs when joining an active chat room. Thomas Willingham 2014-02-26 01:57:29 +00:00
• 2c72e49d1f more chatroom discovery friendica 2014-02-25 17:55:30 -08:00
• 9a2e73ae15 move bootstrap to theme and out of core. friendica 2014-02-25 16:29:00 -08:00
• 8fd12eb122 Merge https://github.com/friendica/red into zpull friendica 2014-02-25 14:13:26 -08:00
• 08313bac6c allow personalised page layouts for modules. friendica 2014-02-25 14:12:51 -08:00
• 36085bc608 Also update database.sql Thomas Willingham 2014-02-25 21:12:19 +00:00
• 8e3a16bcdd Update channel permissions to full ints Thomas Willingham 2014-02-25 21:06:47 +00:00
• 4e8c0933c0 Merge pull request #339 from tuscanhobbit/master friendica 2014-02-26 06:21:08 +11:00
• 8cf59c2e1b assets dir had the old logo tuscanhobbit 2014-02-25 18:46:04 +01:00
• 0a98f6b878 Merge pull request #1 from friendica/master Paolo T 2014-02-25 16:33:40 +01:00
• b1021df485 provide ability to bookmark chatrooms using rbmark friendica 2014-02-24 21:34:49 -08:00
• 51a895471b Merge pull request #338 from solstag/master friendica 2014-02-25 15:50:19 +11:00
• 2becbae402 remote "add bookmark" - like rpost but saves a bookmark from a remote hub into one of your own bookmark folders (or a new one if desired). friendica 2014-02-24 20:46:52 -08:00
• 5691a609c4 Fix typo that broke jquery.divgrow. Sorry I should have tested. Alexandre Hannud Abdo 2014-02-25 01:12:27 -03:00
• fdb25f3450 string 'null' showing up in timeago since last modify friendica 2014-02-24 15:27:39 -08:00
• 29ebfc25ca take a p friendica 2014-02-24 15:07:00 -08:00
• b2372c0c8f Merge https://github.com/friendica/red into zpull friendica 2014-02-24 14:19:53 -08:00
• 5bd71e4e4d set theme for un-viewable profile friendica 2014-02-24 14:19:21 -08:00
• 9a097dc80c Merge pull request #337 from solstag/master friendica 2014-02-25 09:17:11 +11:00
• 59211e0ac8 Translation for jQuery.divgrow strings. Fix mismatch in jQuery.timeago strings Alexandre Hannud Abdo 2014-02-24 17:47:57 -03:00
• e4eeb9d101 Updates to pt-br translation, including some email templates. Alexandre Hannud Abdo 2014-02-24 15:29:56 -03:00
• fea3422b46 Doco - just a friendicared => [baseurl] Thomas Willingham 2014-02-24 17:34:40 +00:00
• b2dc95f383 Merge pull request #335 from beardy-unixer/master friendica 2014-02-24 20:34:51 +11:00
• 5cc70f75a4 The string replacement missed that little blighter. Thomas Willingham 2014-02-24 05:20:27 +00:00
• 29f6975715 Import doco from [email protected] Thomas Willingham 2014-02-24 05:13:28 +00:00
• 8284901f9e Make bbcode the default doco ready for the next commit Thomas Willingham 2014-02-24 05:11:56 +00:00
• 2ccff45221 In case a page has overloaded a module, see if we already have a layout defined. Otherwise, if a pdl file exists for this module, use it. friendica 2014-02-23 18:40:43 -08:00
• b78d423a54 Merge https://github.com/friendica/red into zpull friendica 2014-02-22 14:59:16 -08:00
• 5b4e3f46bc minor stuff, some doco, auth cleanup, and make "unknown" more translateable by context. friendica 2014-02-22 14:58:12 -08:00
• f6be815c31 more tweaks Christian Vogeley 2014-02-22 22:54:09 +01:00
• f0a361a7c1 Merge pull request #334 from cvogeley/master friendica 2014-02-23 08:50:55 +11:00
• 5dc35bb7f0 Merge https://github.com/friendica/red into zpull friendica 2014-02-22 13:34:07 -08:00
• 075b7fa9c8 This should resolve the dav authentication loop (correctly) friendica 2014-02-22 13:33:18 -08:00
• a5f70f6c10 little tweaks Christian Vogeley 2014-02-22 20:30:41 +01:00
• f9eddb89ef Add option for narrow navbar instead of the bootstrap default Christian Vogeley 2014-02-22 16:10:46 +01:00
• bbea85f809 Merge pull request #333 from tobiasd/20140222 tobiasd 2014-02-22 14:12:37 +01:00
• 65d5fae324 DE: update to the strings Tobias Diekershoff 2014-02-22 14:10:21 +01:00