Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |\ \ | |||||
| | * | | | Performance tests | Michael Vogel | 2012-05-20 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | fix toolbar. more size dynamicism | Simon L'nu | 2012-05-29 | 5 | -28/+38 |
| | |_|/ | |/| | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | ability to only expire contacts, not self | friendica | 2012-05-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | more theme cleanup | friendica | 2012-05-28 | 3 | -2/+23 |
| | | | | |||||
| * | | | fixed font-size/line-height stuffs | Simon L'nu | 2012-05-28 | 11 | -294/+172 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | slackr - tone down the shadows a smidgin | friendica | 2012-05-27 | 1 | -4/+9 |
| | |/ | |/| | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-25 | 9 | -442/+446 |
| |\ \ | |||||
| | * | | DE update to strings and templates | Tobias Diekershoff | 2012-05-25 | 3 | -397/+419 |
| | | | | |||||
| | * | | Merge pull request #313 from fabrixxm/master | Simon | 2012-05-24 | 2 | -3/+3 |
| | |\ \ | | | | | | | | | | | install wizard: fix php executable path | ||||
| | | * | | fix small js error when user not logged in | root | 2012-05-24 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | install wizard: fix php executable path | root | 2012-05-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect | ||||
| | * | | | update dark a bit. i messed up some buttons | Simon L'nu | 2012-05-24 | 4 | -42/+24 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | | rev update | friendica | 2012-05-25 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | slackr: improve interactivity | friendica | 2012-05-23 | 1 | -0/+14 |
| | | | | |||||
| * | | | slackr: hide calendar when posting | friendica | 2012-05-23 | 1 | -0/+8 |
| | | | | |||||
| * | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-23 | 4 | -39/+70 |
| |\ \ \ | |||||
| | * | | | clean up and more fixing | Simon L'nu | 2012-05-23 | 4 | -39/+70 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | | more theme stuff | friendica | 2012-05-23 | 3 | -1/+56 |
| |/ / / | |||||
| * | | | slackr - better highlighting of current selections | friendica | 2012-05-23 | 1 | -1/+6 |
| | | | | |||||
| * | | | slackr - knock the sharp edges off the events calendar | friendica | 2012-05-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #309 from fabrixxm/master | Simon | 2012-05-23 | 2 | -3/+4 |
| |\| | | | | | | | | | | Update install wizard | ||||
| | * | | Update install wizard | root | 2012-05-23 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section | ||||
| * | | | clean up and make nice the dispy photo edit stuff | Simon L'nu | 2012-05-23 | 5 | -64/+164 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | add a placeholder attribute on search-text; dispy fixes | Simon L'nu | 2012-05-23 | 6 | -34/+57 |
| |/ / | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | photo rotation | friendica | 2012-05-23 | 2 | -3/+12 |
| | | | |||||
| * | | event calendar theming | friendica | 2012-05-22 | 1 | -0/+3 |
| | | | |||||
| * | | import quattro event reminder | friendica | 2012-05-22 | 2 | -0/+40 |
| | | | |||||
| * | | mark bubbles unsupported | friendica | 2012-05-22 | 2 | -0/+0 |
| | | | |||||
| * | | keep FB out of private notes | friendica | 2012-05-22 | 1 | -0/+1 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-22 | 2 | -4/+8 |
| |\ \ |