aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-0512-454/+852
|\
| * Merge pull request #325 from annando/masterfriendica2012-06-051-8/+10
| |\ | | | | | | API: Repeating items only when there is content
| | * Merge remote branch 'upstream/master'Michael Vogel2012-06-0462-2383/+3290
| | |\
| | * | API: Only repeat items if there is a contentMichael Vogel2012-06-041-8/+10
| | | |
| * | | DE: update for the stringsTobias Diekershoff2012-06-052-398/+408
| | | |
| * | | quattro: added editor buttons to commentsTobias Diekershoff2012-06-045-6/+380
| | |/ | |/|
| * | quattro: cleanup the less fileTobias Diekershoff2012-06-043-38/+50
| | |
| * | Merge pull request #324 from simonlnu/masterSimon2012-06-034-6/+6
| |\ \ | | | | | | | | really odd error fixed in the mini photo-menu
| | * | fix mini photo-menu bugSimon L'nu2012-06-034-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-0324-1275/+1858
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update database updates Debugged implementation of Diaspora relayable_retractions cleanup and logging first shot at getting like/unlike functions to work consistently Fix bugs in the retraction code prepare to implement database update Implement relaying of relayable_retractions Support relayable_retractions that are relayed to us by the top-level post owner quattro: admin panel styling and 1st buttons for addon/theme overview privacy settings: make submit button translateable DE: update to the strings prv messages: make submit translateable * master:
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-0322-459/+607
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: zrl's when visiting public photos at the source site doco cleanup turn "follow" into a function add hometown to profiles bug #439 - remove web port number from notification email "from" address webfinger profile linker "howlong" added to marital status. fewer "bob smith to bob smith via wall-to-wall". [quote=somebody] was appearing as an extended spoiler tag. * master:
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-016-176/+186
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: registration issue after re-factor install: fix bug #436 and small typo Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url(). admin: remove update link in admin menu * master:
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-3124-717/+856
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: turn registration code into a standalone function for re-use query using both `id` and `parent` prevent email from leaking in feeds y didn't i think of this b4? some zero theming on settings page missing delimiter transition to beta for private forums rev update Friendicaland - you can't 'live' on a demo server. Create a "potential default group" called "Friends" on registration. fix private photos that also have a size specification private group tests, cont. hide private group if desired prvgroup should see intros private group fix possible sql injection in search bugfixes: private photo embeds and search for strings with % * master:
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Add two hooks, event_created and event_updated. One Bugfix for the <id>...</id> tag ($uri was never defined). Commented out the parse_event() function - its never called and would lead to a program abortion due to a broken require_once at the beginning MySQL-Fulltext search option is disabled by default Disabled logging of SQL statements Doing negative caching for config values, special logfile for database optmisations Saved searches now can search for tags as well Deactivating the test output in db engine Speed optimisation by enabling the posibility of the MySQL fulltext engine Performance tests API: RSS-Feeds are now shortened to 1000 characters. (With added link) * master:
* | | | | | | rev updatefriendica2012-06-052-42/+37
| | | | | | |
* | | | | | | named anchors on display pagefriendica2012-06-043-0/+3
|/ / / / / /
* | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-0323-990/+1565
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #323 from ↵friendica2012-06-0312-77/+371
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fermionic/add-relayable-retraction-support-for-diaspora Add relayable retraction support for diaspora
| | * | | | | | database updatesZach Prezkuta2012-06-033-8/+7
| | | | | | | |
| | * | | | | | Debugged implementation of Diaspora relayable_retractionsZach Prezkuta2012-06-033-28/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diaspora "relayable_retraction" is now supported by Friendica. The following should now work: Friendica top-level post: Diaspora comment deleted, disappears in Friendica Friendica comment deleted, disappears in Diaspora Diaspora like retracted, disappears in Friendica Friendica like retracted, disappears in Diaspora Diaspora top-level post: Same There are still exceptions, however. First, Friendica and Diaspora seem to frequently reject comments with an "invalid signature" error. This can probably be fixed. Also, some comments/likes/retractions seem to just disappear on the Diaspora side. In the Diaspora log these seem to be accompanied by a "not a valid object" error, often preceeded by a "received a comment but no corresponding post" error. These seem to be purely internal, since sometimes it works for some Diaspora contacts but not others.
| | * | | | | | cleanup and loggingZach Prezkuta2012-06-031-22/+20
| | | | | | | |
| | * | | | | | first shot at getting like/unlike functions to work consistentlyZach Prezkuta2012-06-035-22/+142
| | | | | | | |
| | * | | | | | 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
| | |_|_|/ / | |/| | | |
* / | | | | rev updatefriendica2012-06-032-285/+293
|/ / / / /
* | | | | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 19:08:42 +0000