aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' into contactsFriendika2011-11-097-34/+52
|\
| * fix to overlapping tabs on testbubble when width too smallFriendika2011-11-091-3/+4
| * revupFriendika2011-11-091-1/+1
| * reset theme_info when a profile is loaded (without a theme cookie the default...Friendika2011-11-091-0/+8
| * various testbubble fixesFriendika2011-11-095-30/+39
* | vcard position - dpzeroFriendika2011-11-091-1/+3
* | more work on new contact edit page - plus first port to testbubbleFriendika2011-11-095-178/+69
* | more contact edit page stuffFriendika2011-11-083-71/+50
* | first checkin - updated contact_edit, more work remainsFriendika2011-11-084-58/+82
|/
* cleanup and loose endsFriendika2011-11-083-6/+8
* strip duplicate code blocks bb2d*Friendika2011-11-082-68/+109
* some doc updatesFriendika2011-11-0833-128/+337
* Merge pull request #2 from fabrixxm/masterfabrixxm2011-11-0828-10/+3197
|\
| * fix db updatefabrixxm2011-11-071-1/+1
| * oauth: fix add new appFabio Comuni2011-11-071-1/+1
| * oauth: db updateFabio Comuni2011-11-073-3/+15
| * Merge branch 'oauthapi'Fabio Comuni2011-11-0726-8/+3183
| |\
| | * statusnet-friendika post permalink compatibilityFabio Comuni2011-11-071-0/+20
| | * oauth apps/authorization management in settings pageFabio Comuni2011-11-073-2/+160
| | * minimal page layout for oauth authorizeFabio Comuni2011-11-071-0/+14
| | * add hidden fields in login templateFabio Comuni2011-11-071-0/+5
| | * api: login with oauthFabio Comuni2011-11-071-2/+19
| | * oauth: authorizeFabio Comuni2011-11-075-33/+133
| | * New icon 'plugin'Fabio Comuni2011-11-076-1/+2
| | * allow hidden fields in login formFabio Comuni2011-11-071-1/+2
| | * oauth: authorize view, wrong verifier.Fabio Comuni2011-11-026-13/+48
| | * oauthapi: authorize appFabio Comuni2011-10-265-8/+125
| | * Initial work adding oauth to apiFabio Comuni2011-10-208-1/+2709
* | | D* scaled images not containing link to original sizeFriendika2011-11-071-1/+1
* | | Merge branch 'pull'Friendika2011-11-071-0/+2
|\| |
| * | Merge pull request #1 from fabrixxm/masterfabrixxm2011-11-071-0/+2
| |\ \
| | * | Add missing $nav_sel in class AppFabio Comuni2011-11-071-0/+2
| |/ /
* / / fix friend suggest link in testbubbleFriendika2011-11-073-2/+43
|/ /
* | try and fix diaspora multiple items queued issueFriendika2011-11-063-7/+38
* | darkzero pager links washed outFriendika2011-11-061-0/+4
* | button text not closedFriendika2011-11-061-1/+1
* | @ completion is a bit too greedyFriendika2011-11-052-5/+7
* | implement signed_retractionsFriendika2011-11-052-4/+55
* | add diaspora signed_retraction templateFriendika2011-11-051-0/+10
* | reduce polling loadFriendika2011-11-042-5/+10
* | Merge branch 'atcomplete'Friendika2011-11-042-21/+57
|\ \
| * | tinymce autocompleteFriendika2011-11-041-12/+21
| * | tinymce tag complete stuffFriendika2011-11-032-13/+40
* | | bbcode listsFriendika2011-11-031-1/+4
|/ /
* | add js events to ignore buttonFriendika2011-11-031-1/+1
* | move ignore linkFriendika2011-11-031-1/+1
* | ignore suggestionsFriendika2011-11-036-5/+59
* | plugin check returning 0 vs falseFriendika2011-11-034-13/+4
* | fix "do not show status post for photo" setting when used with js_upload (val...Friendika2011-11-021-2/+2
* | fix for multiple consecutive @ tagsFriendika2011-11-022-1/+2