aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Leave Mike's nav.tpl as the default, stick mine in the theme /tpl for now, at...Thomas Willingham2012-12-191-0/+111
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-12-1912-477/+109
|\
| * send stuff to zothub as a fallback directory master for nowfriendica2012-12-183-18/+46
| * cleanup more obsolete stufffriendica2012-12-186-446/+13
| * modularise the notification popupsfriendica2012-12-185-11/+48
* | Ooops, made a shite of that - put redbasic back. Still need to put the mods ...Thomas Willingham2012-12-1811-0/+3872
* | FancyredThomas Willingham2012-12-1828-0/+4152
* | Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-12-1816-3893/+70
|\|
| * several small fixes and adjustmentsfriendica2012-12-1610-25/+79
| * some cleanup - Thomas we can put the radius/shadow stuff back later for the h...friendica2012-12-167-20/+40
* | More plodding along with redbasic, notably, adding some icons.Thomas Willingham2012-12-176-27/+65
* | Unplug the lifesupport, the background snake is dead.Thomas Willingham2012-12-171-0/+0
* | Some more redbasic progress.Thomas Willingham2012-12-161-13/+8
* | Un-screw-up misuse of mod_foo.css, add background, opacity based shiny.Thomas Willingham2012-12-1612-649/+641
|/
* fixing permissions_sql - may need more tweaksfriendica2012-12-162-86/+47
* typo - this keyboard is getting frustratingfriendica2012-12-161-1/+1
* there are now 2 permalinks - one is the remote original post (plink) and the ...friendica2012-12-162-1/+9
* typofriendica2012-12-162-2/+2
* add live page loading and and endless scroll to home (mod_channel)friendica2012-12-165-25/+55
* db query looping without bounds if group table wasn't manually updated to add...friendica2012-12-142-2/+2
* pass module name to build_cmd, so we can use it elsewherefriendica2012-12-142-4/+3
* converging on a workable crypto auth handshakefriendica2012-12-144-4/+55
* start of a framework for forward magic auth, need a lot more coffee to write ...friendica2012-12-131-57/+15
* Merge https://github.com/friendica/red into zpullfriendica2012-12-136-159/+155
|\
| * Some more CSS into mods.Thomas Willingham2012-12-136-159/+155
* | admittedly local magic-auth is easy so that's mostly done. Now it gets hard.friendica2012-12-134-9/+56
|/
* Merge https://github.com/friendica/red into zpullfriendica2012-12-131-3/+7
|\
| * redbasic - some more progress.Thomas Willingham2012-12-131-3/+7
* | get rid of undefined $ error by mangling theme specific JS include orderfriendica2012-12-134-19/+22
* | templatise the building of page queries so we can re-use it elsewherefriendica2012-12-133-53/+72
|/
* typofriendica2012-12-121-1/+1
* Merge https://github.com/friendica/red into zpullfriendica2012-12-126-475/+527
|\
| * Oops, we didn't use that in the end.Thomas Willingham2012-12-121-0/+0
| * Redbasic progression.Thomas Willingham2012-12-122-16/+53
| * Start moving CSS into modsThomas Willingham2012-12-126-459/+474
* | So what if Red could do more CMS types of things? And you could add arbitrary...friendica2012-12-123-1/+5
|/
* revamp permissions, blocking a contact takes priority over all other permissi...friendica2012-12-101-51/+65
* I've already told you repeatedly how much I despise endless scroll. But will ...friendica2012-12-101-1/+40
* alternate wysiwyg bbcode editorfriendica2012-12-1031-1/+954
* Any red site can be a global directory provider. By default we'll make them l...friendica2012-12-101-0/+15
* Allow forum/account delegation by anybody? On any site? But of course...friendica2012-12-104-4/+14
* get rid of more targeted windows and direct all profile view to local sitefriendica2012-12-093-24/+6
* start whipping the item photo menu into shapefriendica2012-12-092-42/+22
* start to whip the permissions into shape, also got rid of the mce drop shadow...friendica2012-12-098-137/+45
* revise auto_update system so as not to conflict with pre-existing Friendica s...friendica2012-12-094-1323/+19
* make permission quick links workfriendica2012-12-085-8/+44
* a bit of e_all cleanupfriendica2012-12-086-18/+19
* fix nav-menu border colourfriendica2012-12-081-1/+1
* upstream fixes, revision updated, and mail autocomplete was lost after a rece...friendica2012-12-085-3/+12
* Merge pull request #3 from beardy-unixer/masterfriendica2012-12-0813-66/+322
|\