aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* move call to ping before call to update_*Fabio Comuni2011-10-031-8/+9
|
* fix typoFabio Comuni2011-10-032-13/+14
|
* quattro: add comment boxFabio Comuni2011-10-035-67/+83
|
* Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-10-0354-2355/+331
|\
| * Merge branch 'pull'Friendika2011-10-023-14/+25
| |\
| | * Merge pull request #13 from duthied/masterduthied2011-10-023-14/+25
| | |\ | | | | | | | | message tab styling - to set as active depending on url
| | | * added activetab var to message.php for templatesDevlon Duthie2011-10-023-14/+25
| | | | | | | | | | | | | | | | | | | | (testbubble only) added logic to photo header to make tab 'sticky' (active class for styling) (testbubble only) css fix for avatars in wallitems
| | | * Merge branch 'master' of http://github.com/friendika/Free-FriendikaDevlon Duthie2011-10-0247-2292/+188
| | | |\
| * | | | Merge branch 'pull'Friendika2011-10-023-26/+54
| |\| | |
| | * | | Merge pull request #12 from duthied/masterduthied2011-10-023-26/+54
| | |\| | | | | |/ | | |/| testbubble photo album image tweaks
| | | * aspect ratio fixes for photos in testbubble themeDevlon Duthie2011-10-023-26/+54
| | | | | | | | | | | | | | | | some other testbubble styling tweaks
| * | | basic support for AS friend requestsFriendika2011-10-022-10/+38
| |/ /
| * | attack of the zombie orphansFriendika2011-10-022-0/+5
| | |
| * | fix notifications duepuntozeroFriendika2011-10-022-1/+11
| | |
| * | malformed xml in pingFriendika2011-10-021-1/+1
| | |
| * | Merge pull request #11 from duthied/masterFriendika2011-10-012-14/+25
| |\| | | | | | | Aspect ratio improvement for photos in album, implemented only in testbubble theme
| | * class and wrapper div added to photo for aspect ratio displayDevlon Duthie2011-10-012-14/+25
| | | | | | | | | | | | testbubble theme styling for aspect ratio on photos
| * | db updates for server batch key caching, group visibilityFriendika2011-10-013-2/+25
| | |
| * | zot protocol updateFriendika2011-10-012-33/+93
| | |
| * | option to not post photos to status streamFriendika2011-10-013-8/+16
| | |
| * | darkbubble - event legibilityFriendika2011-10-011-3/+7
| | |
| * | legibility improvements to darkbubble, mark as a derived themeFriendika2011-10-0134-2248/+26
| | |
| * | override pragmaFriendika2011-10-012-0/+8
| |/
| * typo last checkinFriendika2011-09-301-1/+1
| |
| * restore photo cacheFriendika2011-09-302-1/+3
| |
* | Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-09-3088-693/+2651
|\|
| * Merge pull request #10 from duthied/masterFriendika2011-09-309-84/+55
| |\ | | | | | | UI work on testbubble theme + core tpl files
| | * 1. added button class to tpl filesDevlon Duthie2011-09-309-84/+55
| |/ | | | | | | | | | | | | 2. messages - moved delete X into message div and new message form div 3. began work on creating thumbnail versions of albums - needs aspect ratio correction (javascript) 4. changed font-size and font-variation on vcard for better readability. 5. streamlining continued with the CSS file
| * possible sql errorsFriendika2011-09-292-2/+2
| |
| * do not poll for abandoned accountsFriendika2011-09-296-4/+26
| |
| * add display_item hook to 'search|new' message displayFriendika2011-09-291-1/+6
| |
| * Merge branch 'pull'Friendika2011-09-292-117/+120
| |\
| | * Merge pull request #9 from tobiasd/6cf5da1e4bc43d8446f5789bc93f82673ec64c2etobiasd2011-09-292-117/+120
| | |\ | | | | | | | | German strings
| | | * update to the German stringsTobias Diekershoff2011-09-292-117/+120
| | | |
| * | | added back for photos page until we can get rid of it cleanlyFriendika2011-09-292-1/+6
| |/ /
| * | reverting wall_item.tplFriendika2011-09-281-41/+60
| | |
| * | Merge pull request #8 from duthied/masterFriendika2011-09-2827-522/+175
| |\ \ | | |/ | |/| | | | Classes added to core and testbubble theme It looks to me as if view/wall_item.tpl is an earlier version that somehow didn't get merged. I don't think testbubble is using it, so I'm going to merge and then revert that one file, as I don't see any changes you made to it specifically for this body of work.
| | * classes added to core + testbubble themeDevlon Duthie2011-09-2927-522/+175
| |/ | | | | | | some fixes to testbubble theme related to tab styling
| * fix nav-selected duepuntozeroFriendika2011-09-283-9/+9
| |
| * path for country.js - now in js directoryFriendika2011-09-281-1/+1
| |
| * missing uploads on testbubbleFriendika2011-09-282-2/+2
| |
| * basic darkbubble - improve as neededFriendika2011-09-2833-0/+2255
| |
| * just hostname not url in hm:host - host xrd documentFriendika2011-09-283-3/+3
| |
| * fixes for statusnet/identi.ca empty vcard page - which appears to be ↵Friendika2011-09-281-1/+1
| | | | | | | | deprecated. Scrape the feed for everything we used to get from the vcard.
| * apps broken in all themes, apps link misplaced in testbubbleFriendika2011-09-283-3/+2
| |
| * create zot batch keysFriendika2011-09-282-7/+32
| |
| * Merge pull request #6 from fabrixxm/masterfabrixxm2011-09-2832-567/+1070
| |\ | | | | | | more work on ui
| * | move connect button down a smidginFriendika2011-09-281-0/+1
| | |
* | | fix star icon viewing profile page as unlogged userFabio Comuni2011-09-301-1/+1
| |/ |/|
* | fix search_item.tpl, fix 'new' view in network page, fix walltowall template ↵Fabio Comuni2011-09-287-307/+552
| | | | | | | | in 'quattro' theme