Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | update jquery to 1.7.2; fix some dispy templates to be more in sync with view/ | Simon L'nu | 2012-06-23 | 8 | -39/+49 | |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | liking comments backend | friendica | 2012-06-23 | 3 | -4/+8 | |
| | | ||||||
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-23 | 28 | -4480/+4967 | |
|\| | ||||||
| * | minor tweaks to some tpl files | Simon L'nu | 2012-06-22 | 3 | -3/+4 | |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | allow rotation either CW or CCW | Zach Prezkuta | 2012-06-20 | 1 | -2/+6 | |
| | | ||||||
| * | Darkzero-NS fix weeks old BBIcon error | Thomas Willingham | 2012-06-21 | 1 | -2/+2 | |
| | | ||||||
| * | Darkzero/NS - make the archives font the same colour as the other widgets. | Thomas Willingham | 2012-06-21 | 2 | -0/+8 | |
| | | ||||||
| * | icon change; tweak button in toolbar; move site-location | Simon L'nu | 2012-06-20 | 7 | -3812/+3898 | |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | Merge pull request #342 from fabrixxm/master | tobiasd | 2012-06-19 | 1 | -0/+16 | |
| |\ | | | | | | | quattro: auto scroll and flash comment in display page | |||||
| | * | quattro: in post display page, scroll to and flash selected comment | Fabio Comuni | 2012-06-19 | 1 | -0/+16 | |
| | | | ||||||
| * | | position tweak | friendica | 2012-06-19 | 1 | -0/+5 | |
| | | | ||||||
| * | | [DE] strings | Tobias Diekershoff | 2012-06-19 | 2 | -655/+964 | |
| |/ | ||||||
| * | make subdued elements jump out at you on hover | friendica | 2012-06-17 | 1 | -0/+15 | |
| | | ||||||
| * | highlight the lost contact message | friendica | 2012-06-14 | 1 | -1/+1 | |
| | | ||||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-14 | 1 | -1/+4 | |
| |\ | ||||||
| | * | quattro theme: show uncollapsed comments on display page | fabrixxm | 2012-06-14 | 1 | -1/+4 | |
| | | | ||||||
| * | | better handling of dead contacts | friendica | 2012-06-14 | 1 | -0/+3 | |
| |/ | ||||||
| * | ajax append placeholder, fix some html warnings | friendica | 2012-06-13 | 8 | -3/+13 | |
| | | ||||||
| * | archive widget | friendica | 2012-06-12 | 5 | -1/+28 | |
| | | ||||||
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-11 | 11 | -460/+485 | |
|\| | ||||||
| * | minor template update | Simon L'nu | 2012-06-09 | 2 | -7/+10 | |
| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | better events-reminder theming | friendica | 2012-06-07 | 2 | -4/+13 | |
| | | ||||||
| * | fix a random profile error message | fabrixxm | 2012-06-07 | 1 | -1/+1 | |
| | | ||||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-06 | 2 | -54/+48 | |
| |\ | ||||||
| | * | A few corrections in German translations. | zottel | 2012-06-07 | 2 | -54/+48 | |
| | | | ||||||
| * | | admin page untranslated strings, remove empty list element for update | friendica | 2012-06-06 | 1 | -3/+5 | |
| |/ | ||||||
| * | rev update | friendica | 2012-06-06 | 1 | -0/+4 | |
| | | ||||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-05 | 11 | -446/+842 | |
| |\ | ||||||
| | * | DE: update for the strings | Tobias Diekershoff | 2012-06-05 | 2 | -398/+408 | |
| | | | ||||||
| * | | named anchors on display page | friendica | 2012-06-04 | 3 | -0/+3 | |
| | | | ||||||
* | | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-04 | 5 | -6/+380 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | quattro: added editor buttons to comments | Tobias Diekershoff | 2012-06-04 | 5 | -6/+380 | |
| | | | ||||||
* | | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-04 | 70 | -2656/+3911 | |
|\| | | ||||||
| * | | quattro: cleanup the less file | Tobias Diekershoff | 2012-06-04 | 3 | -38/+50 | |
| | | | ||||||
| * | | fix mini photo-menu bug | Simon L'nu | 2012-06-03 | 4 | -6/+6 | |
| |/ | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | |||||
| * | Fix bugs in the retraction code | Zach Prezkuta | 2012-06-03 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the following seems to be the functional status: For a Diaspora top-level post: Friendica comments show up AND delete Diaspora comments show up AND delete for top-level owner Diaspora comments show up for non-owner Diaspora comments sometimes don't delete for non-owner -> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora) Diaspora likes show up Diaspora non-owner can't unlike -> Same as comments, seems to be Diaspora's fault For a Friendica top-level post: Friendica comments show up AND delete Diaspora comments show up AND delete Friendica likes don't show up in Diaspora sometimes Friendica doesn't even message Diaspora for unlikes (sometimes?) Diaspora likes and unlikes work | |||||
| * | Implement relaying of relayable_retractions | Zach Prezkuta | 2012-06-03 | 2 | -0/+21 | |
| | | | | | | | | Also: some whitespace cleanup, fix Diaspora parent DB query | |||||
| * | quattro: admin panel styling and 1st buttons for addon/theme overview | Tobias Diekershoff | 2012-06-03 | 6 | -65/+281 | |
| | | ||||||
| * | privacy settings: make submit button translateable | Tobias Diekershoff | 2012-06-03 | 1 | -1/+1 | |
| | | ||||||
| * | DE: update to the strings | Tobias Diekershoff | 2012-06-03 | 2 | -845/+909 | |
| | | ||||||
| * | prv messages: make submit translateable | Tobias Diekershoff | 2012-06-03 | 1 | -1/+1 | |
| | | ||||||
| * | add hometown to profiles | friendica | 2012-06-02 | 3 | -2/+17 | |
| | | ||||||
| * | "howlong" added to marital status. | friendica | 2012-06-02 | 2 | -1/+4 | |
| | | ||||||
| * | some zero theming on settings page | friendica | 2012-05-30 | 3 | -5/+18 | |
| | | ||||||
| * | transition to beta for private forums | friendica | 2012-05-30 | 1 | -2/+0 | |
| | | ||||||
| * | private group tests, cont. | friendica | 2012-05-29 | 1 | -0/+1 | |
| | | ||||||
| * | hide private group if desired | friendica | 2012-05-29 | 1 | -0/+4 | |
| | | ||||||
| * | Merge pull request #316 from annando/master | Simon | 2012-05-29 | 1 | -0/+5 | |
| |\ | | | | | | | Speed improvements | |||||
| | * | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-29 | 15 | -300/+205 | |
| | |\ | ||||||
| | * \ | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-25 | 33 | -1173/+1697 | |
| | |\ \ |