aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* zfinger - return all additional hubsfriendica2012-08-211-2/+15
* zfingerfriendica2012-08-212-0/+49
* upstreamfriendica2012-08-214-1/+20
* NaCl passwords - (db update)friendica2012-08-213-11/+40
* upstream fixesfriendica2012-08-205-28/+33
* don't count ignored events in notificationsfriendica2012-08-162-3/+18
* new contact edit mockup - verdict: too complicated, must simplifyfriendica2012-08-167-21/+627
* invitation cleanupfriendica2012-08-162-22/+20
* reversed error logicfriendica2012-08-161-3/+3
* zregister, cont.friendica2012-08-163-5/+27
* add invitiation logic to registrations - this is starting to look goodfriendica2012-08-162-20/+43
* That's betterfriendica2012-08-164-6/+3
* more zregister cleanup and theme separationfriendica2012-08-166-50/+74
* registration dangling code fragment that should've been removedfriendica2012-08-153-40/+45
* item table rename parent-uri, target-type, object-type (more to come later)friendica2012-08-1521-144/+144
* cleanup of mod_zregister, basic functionality working - new accounts getting ...friendica2012-08-153-59/+75
* merge from upstreamfriendica2012-08-155-6/+13
* improvements in js localisation/translationfriendica2012-08-139-176/+196
* add jquery.i18n for client side translationsfriendica2012-08-1310-0/+6868
* reduce duplication - only provide one system language settingfriendica2012-08-128-49/+36
* fix events ping notification backendfriendica2012-08-111-2/+2
* cleanup all the theme include stuff - this could make Friendica themes work o...friendica2012-08-112-39/+42
* merge upstreamfriendica2012-08-1131-129/+252
* Dr. Theme-instein - It Lives!friendica2012-08-094-165/+369
* where did that !@#$ "lang" come from? Get rid of it (again).friendica2012-08-091-1/+1
* hubloc schema changesfriendica2012-08-091-5/+11
* zot basic comm structure (real basic)friendica2012-08-093-4/+147
* more theme modularisation and css/js managementfriendica2012-08-0934-63/+562
* merge comment threading, provide plugin/theme functions to handle css/js incl...friendica2012-08-0921-55/+529
* Merge https://github.com/friendica/red into zpullfriendica2012-08-0818-15/+847
|\
| * Merge pull request #2 from beardy-unixer/masterfriendica2012-08-0818-15/+847
| |\
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2012-08-0915-49/+316
| | |\ | | |/ | |/|
| | * More wrong linksThomas Willingham2012-08-071-2/+2
| | * Port Comix-plain - also needs some CSS-fu, but works.Thomas Willingham2012-08-067-0/+414
| | * Port Comix - needs some CSS-fu, but works.Thomas Willingham2012-08-067-0/+418
| | * Bloody hell, this touches a lot of code.Thomas Willingham2012-08-061-2/+2
| | * Theme admin menu.Thomas Willingham2012-08-061-2/+2
| | * get_theme_config_fileThomas Willingham2012-08-061-5/+5
| | * Bring get_theme_screenshot and get_theme_info up to date.Thomas Willingham2012-08-061-4/+4
* | | moving forward againfriendica2012-08-087-69/+32
|/ /
* | rev updatefriendica2012-08-081-1/+1
* | the dynamic "show more" sort of works - but with a nagging delay. But I need ...friendica2012-08-0615-49/+316
|/
* updatesfriendica2012-08-0518-21/+56
* Merge pull request #1 from beardy-unixer/masterfriendica2012-08-0544-467/+47
|\
| * That's the zeros done. The others need more fiddling with.Thomas Willingham2012-08-068-27/+27
| * Port GreenzeroThomas Willingham2012-08-069-7/+7
| * Port EasterbunnyThomas Willingham2012-08-067-5/+5
| * Kill NS themesThomas Willingham2012-08-0612-420/+0
| * Port darkzeroThomas Willingham2012-08-068-8/+8
|/
* major theme re-org, only duepuntozero and slackr working atmfriendica2012-08-01237-67/+108