Commit graph

9683 commits

Author SHA1 Message Date
friendica
36e823e5b5 Merge pull request #346 from git-marijus/master
css fixes
2014-03-02 12:45:51 +11:00
friendica
c402f39cf8 first draft of creating templates documentation 2014-03-01 17:44:18 -08:00
friendica
9a5a2146a2 Merge https://github.com/friendica/red into zpull 2014-02-28 16:01:25 -08:00
friendica
429022e116 allow one to ignore pending connections 2014-02-28 16:00:29 -08:00
marijus
6b6052d5a9 Revert "a little fix against bootstrap 3.1.1"
This reverts commit e82c9eb176.
2014-02-28 23:34:52 +01:00
marijus
e82c9eb176 a little fix against bootstrap 3.1.1 2014-02-28 23:23:19 +01:00
marijus
b390336016 add hover effect to usermenu caret 2014-02-28 23:04:38 +01:00
zzottel
745f20ccbf Merge pull request #345 from zzottel/master
correct bbcode link in German docs
2014-02-28 14:04:32 +01:00
zottel
8ae986b9c6 correct bbcode link in German docs 2014-02-28 14:00:50 +01:00
friendica
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. 2014-02-28 01:53:39 -08:00
friendica
2d487f306d more doc 2014-02-28 01:31:08 -08:00
friendica
096cc726b7 dang - you really have to bludgeon this thing to get youtube to use https 2014-02-28 01:30:05 -08:00
friendica
46f0de7120 try to fix youtube mixed content warnings 2014-02-28 00:57:35 -08:00
friendica
2a7e43c08f more to-to 2014-02-27 23:25:23 -08:00
zottel
d2304cf168 trying to get back to upstream state 2014-02-28 08:22:23 +01:00
zottel
0144ac1662 Merge remote-tracking branch 'upstream/master' 2014-02-28 08:19:40 +01:00
zottel
4bb8e294a1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/help.php
2014-02-28 08:16:56 +01:00
friendica
019781f626 more tasks 2014-02-27 23:10:21 -08:00
friendica
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. 2014-02-27 20:55:25 -08:00
friendica
102521844b put schemas in Comanche (this requires theme support (!)) 2014-02-27 20:48:10 -08:00
friendica
d2bc7c606a minor fixes to suggested chatrooms 2014-02-27 17:10:26 -08:00
friendica
642da17b86 chatroom suggestions 2014-02-27 17:07:11 -08:00
friendica
402d44e2f4 fix photos in private mail 2014-02-27 16:01:44 -08:00
Thomas Willingham
5cf0e74501 Capitalise $a->page['title'] in doco pages. 2014-02-27 17:50:36 +00:00
zottel
f8b3f032a9 change page title for bbcode help files 2014-02-27 18:50:14 +01:00
zzottel
05882df43a Merge pull request #342 from zzottel/master
German help
2014-02-27 18:35:54 +01:00
zottel
6c0fdbebeb some new German files 2014-02-27 18:35:03 +01:00
Thomas Willingham
c66313af88 Merge pull request #343 from beardy-unixer/master
Doc update  (just formatting and typos)
2014-02-27 16:35:46 +00:00
Thomas Willingham
ac383cf07b Can't type today 2014-02-27 16:33:36 +00:00
Thomas Willingham
9488bc0631 Who reverted that? 2014-02-27 16:31:25 +00:00
Thomas Willingham
46a3c4d804 Doc update 2014-02-27 16:28:29 +00:00
zottel
77e087a380 convert existing German help files to BBCode 2014-02-27 15:01:44 +01:00
cvogeley
7cdca97654 Typo 2014-02-27 09:54:07 +01:00
Thomas Willingham
ba41d4a461 If we leave this any longer, it'll be 2015 before anyone remembers. 2014-02-27 06:49:46 +00:00
friendica
efb77774b5 Merge https://github.com/friendica/red into zpull 2014-02-26 14:51:51 -08:00
friendica
c8f1bf89a9 vsprintf error 2014-02-26 14:51:29 -08:00
friendica
3b24d921b6 Merge pull request #341 from git-marijus/master
properly fix profile edit dropdown menu
2014-02-27 09:37:29 +11:00
marijus
8860d80bd4 Revert "little correction"
This reverts commit 496a5a556f.
2014-02-26 23:34:36 +01:00
marijus
496a5a556f little correction 2014-02-26 23:31:35 +01:00
marijus
c5b8224dcc properly fix profile edit dropdown menu 2014-02-26 23:20:40 +01:00
friendica
364fc9f163 comanche: provide an option to add a menu class for different theming choices on some menus (e.g. horizontal, tabbed, etc.) 2014-02-25 20:58:20 -08:00
friendica
1857036a99 I'll have to fix this someday. 2014-02-25 20:36:56 -08:00
friendica
3fb26e06ab Merge https://github.com/friendica/red into zpull 2014-02-25 19:48:57 -08:00
friendica
e7e97e578b put bookmarked chatrooms into poco 2014-02-25 19:48:13 -08:00
friendica
c1f3c892b0 Merge pull request #340 from beardy-unixer/master
Fix the weirdness of messages appearing in the middle of the screen
2014-02-26 13:04:16 +11:00
Thomas Willingham
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.
2014-02-26 01:57:29 +00:00
friendica
2c72e49d1f more chatroom discovery 2014-02-25 17:55:30 -08:00
friendica
9a2e73ae15 move bootstrap to theme and out of core. 2014-02-25 16:29:00 -08:00
friendica
8fd12eb122 Merge https://github.com/friendica/red into zpull 2014-02-25 14:13:26 -08:00
friendica
08313bac6c allow personalised page layouts for modules. 2014-02-25 14:12:51 -08:00