aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix bugs in the retraction codeZach Prezkuta2012-06-037-65/+41
| | | | | | | | | | | | | | | | | | | | | | | 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
* prepare to implement database updateZach Prezkuta2012-06-031-1/+11
|
* Implement relaying of relayable_retractionsZach Prezkuta2012-06-038-43/+194
| | | | Also: some whitespace cleanup, fix Diaspora parent DB query
* Support relayable_retractions that are relayed to us by the top-level post ownerZach Prezkuta2012-06-033-9/+39
|
* quattro: admin panel styling and 1st buttons for addon/theme overviewTobias Diekershoff2012-06-036-65/+281
|
* privacy settings: make submit button translateableTobias Diekershoff2012-06-031-1/+1
|
* DE: update to the stringsTobias Diekershoff2012-06-032-845/+909
|
* prv messages: make submit translateableTobias Diekershoff2012-06-032-2/+3
|
* zrl's when visiting public photos at the source sitefriendica2012-06-031-0/+6
|
* docofriendica2012-06-021-0/+12
|
* cleanupfriendica2012-06-021-1/+3
|
* turn "follow" into a functionfriendica2012-06-022-217/+236
|
* add hometown to profilesfriendica2012-06-028-4/+34
|
* bug #439 - remove web port number from notification email "from" addressfriendica2012-06-021-0/+3
|
* webfinger profile linkerfriendica2012-06-025-213/+246
|
* "howlong" added to marital status.friendica2012-06-028-5/+33
|
* fewer "bob smith to bob smith via wall-to-wall".friendica2012-06-026-21/+36
|
* Merge pull request #321 from beardy-unixer/masterfriendica2012-06-011-1/+1
|\ | | | | BB code [quote=somebody] fix.
| * [quote=somebody] was appearing as an extended spoiler tag.Thomas Willingham2012-06-011-1/+1
| |
* | registration issue after re-factorfriendica2012-06-014-164/+167
|/
* Merge pull request #320 from fabrixxm/masterfriendica2012-06-012-12/+19
|\ | | | | Fix bug 436, fix small typo, and incomplete feature removal
| * install: fix bug #436 and small typoroot2012-06-011-11/+18
| | | | | | | | | | Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url().
| * Merge remote branch 'friendica/master'root2012-06-0155-1416/+1667
| |\ | |/ |/|
* | turn registration code into a standalone function for re-usefriendica2012-05-315-436/+494
| |
* | Merge pull request #319 from fermionic/fix-diaspora-parent-queryfriendica2012-05-311-2/+10
|\ \ | | | | | | query using both `id` and `parent`
| * | query using both `id` and `parent`Zach Prezkuta2012-05-311-2/+10
|/ /
* | prevent email from leaking in feedsfriendica2012-05-301-0/+4
| |
* | y didn't i think of this b4?friendica2012-05-301-0/+4
| |
* | some zero theming on settings pagefriendica2012-05-304-12/+26
| |
* | missing delimiterfriendica2012-05-301-1/+1
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-301-1/+1
|\ \
| * | Friendicaland - you can't 'live' on a demo server.Thomas Willingham2012-05-301-1/+1
| | |
* | | transition to beta for private forumsfriendica2012-05-302-3/+0
| | |
* | | rev updatefriendica2012-05-303-168/+172
| | |
* | | Create a "potential default group" called "Friends" on registration.friendica2012-05-301-0/+5
| | |
* | | fix private photos that also have a size specificationfriendica2012-05-301-2/+2
|/ /
* | private group tests, cont.friendica2012-05-298-24/+54
| |
* | hide private group if desiredfriendica2012-05-292-6/+14
| |
* | prvgroup should see introsfriendica2012-05-291-1/+1
| |
* | private group fixfriendica2012-05-291-1/+1
| |
* | possible sql injection in searchfriendica2012-05-292-3/+3
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-2913-111/+197
|\ \ | | | | | | | | | | | | Conflicts: mod/search.php
| * \ Merge pull request #316 from annando/masterSimon2012-05-297-78/+148
| |\ \ | | | | | | | | Speed improvements
| | * | MySQL-Fulltext search option is disabled by defaultMichael Vogel2012-05-291-1/+1
| | | |
| | * | Disabled logging of SQL statementsMichael Vogel2012-05-291-4/+4
| | | |
| | * | Merge remote branch 'upstream/master'Michael Vogel2012-05-2927-655/+660
| | |\ \
| | * \ \ Merge branch 'master' of github.com:annando/friendicaMichael Vogel2012-05-268-46/+67
| | |\ \ \
| | | * \ \ Merge branch 'master' of github.com:annando/friendicaMichael2012-05-267-31/+76
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/network.php
| | | * \ \ \ Merge remote branch 'upstream/master'Michael2012-05-2665-1886/+2705
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of github.com:annando/friendicaMichael2012-05-19915-87935/+37921
| | | |\ \ \ \ \