aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into newuifabrixxm2011-08-2224-1254/+2720
|\
| * added Czech translation of mail messagesMichal Supler2011-08-2117-0/+359
| * Merge pull request #158 from fabrixxm/masterfabrixxm2011-08-191-0/+5
| |\
| | * API: missing template and small fix for hototfabrixxm2011-08-191-0/+5
| * | darkzero - friend request - identity address invisibleFriendika2011-08-181-0/+4
| |/
| * Merge pull request #155 from tobiasd/mastertobiasd2011-08-182-204/+225
| |\
| | * update DE stringsTobias Diekershoff2011-08-182-204/+225
| * | fix several probe related issuesFriendika2011-08-171-1/+2
| |/
| * Update IT stringsfabrixxm2011-08-172-1049/+2125
* | remove javascript to set selectect nav item. enanche img template prefetch ig...fabrixxm2011-08-171-9/+10
* | Merge remote-tracking branch 'friendika/master' into newuifabrixxm2011-08-1725-1098/+2242
|\|
| * cleanupFriendika2011-08-161-1/+2
| * hopefully fix statusnet bug by altering our feed format slightlyFriendika2011-08-122-2/+30
| * pt-br strings.php update from messages.po changeFriendika2011-08-091-1/+1
| * small typo - pt-br localizationAbinoam P. Marques Jr.2011-08-091-1/+1
| * fixed some typosTobias Diekershoff2011-08-092-4/+4
| * update of the German localizationTobias Diekershoff2011-08-092-1027/+2097
| * use separate hcard from profile urlFriendika2011-08-071-1/+1
| * fix statusnet_html timelines on apiFriendika2011-08-052-1/+2
| * move public profile warning to top of pageFriendika2011-08-052-4/+4
| * more api tweaksFriendika2011-08-051-3/+3
| * salmon protocol changes magicsig draft-experimental, fixes to hostxrdFriendika2011-08-041-1/+1
| * diaspora structuresFriendika2011-08-037-0/+76
| * api compatibility fixesFriendika2011-08-021-1/+1
| * some more zot changes migrating back to f9a mainlineFriendika2011-08-011-1/+1
| * merge diaspora/friendika vcard formats - not yet completeFriendika2011-08-011-0/+2
| * some api enhancementsFriendika2011-07-311-41/+6
| * api/statusnet/config.xmlFriendika2011-07-281-10/+9
| * make profile-jot-desc track lock state changesFriendika2011-07-281-0/+1
| * revupFriendika2011-07-281-1/+1
| * auto focus jot editorFriendika2011-07-251-0/+1
* | add missing link to navbarFabio Comuni2011-07-293-5/+39
* | style updateFabio Comuni2011-07-292-24/+93
* | Fix nav template and add missing stringsFabio Comuni2011-07-291-9/+14
* | change to some nav ids, notice in empty notifications popupFabio Comuni2011-07-253-8/+20
* | update styleFabio Comuni2011-07-252-140/+213
* | move <header> and <nav> tag into nav.tpl. add notification popup items templateFabio Comuni2011-07-252-26/+30
* | Merge branch 'newacl' into newuiFabio Comuni2011-07-255-183/+320
|\|
| * Remove "share" greyed text in jot editor when user reshare an itemFabio Comuni2011-07-252-10/+17
| * added link to community page to dispy theme menuTobias Diekershoff2011-07-241-0/+3
| * dispy theme hide editor if without focusTobias Diekershoff2011-07-243-81/+114
| * Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-07-231-71/+79
| |\
| | * fix "resend" function when editor is disabledFabio Comuni2011-07-221-71/+79
| * | dispy ACL into the fancyboxTobias Diekershoff2011-07-233-31/+117
| |/
* / Initial work on new UIFabio Comuni2011-07-228-12/+758
|/
* Use new ACL selector in photo editFabio Comuni2011-07-203-6/+17
* Use popup ACL selector in photo upload. js_upload use new acl selector.Fabio Comuni2011-07-203-6/+16
* Load tinyMCE on post editor only if needed.Fabio Comuni2011-07-204-64/+93
* Merge remote-tracking branch 'friendika/master' into newaclFabio Comuni2011-07-2013-27/+131
|\
| * diaspora encryption xml templateFriendika2011-07-191-0/+8