aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix mini photo-menu bugSimon L'nu2012-06-034-6/+6
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-0324-1275/+1858
|\
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-0323-990/+1565
| |\
| | * Merge pull request #323 from fermionic/add-relayable-retraction-support-for-d...friendica2012-06-0312-77/+371
| | |\
| | | * database updatesZach Prezkuta2012-06-033-8/+7
| | | * Debugged implementation of Diaspora relayable_retractionsZach Prezkuta2012-06-033-28/+38
| | | * 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
| | | * prepare to implement database updateZach Prezkuta2012-06-031-1/+11
| | | * Implement relaying of relayable_retractionsZach Prezkuta2012-06-038-43/+194
| | | * 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
| |/
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-0322-459/+607
|\|
| * 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
| |\
| | * [quote=somebody] was appearing as an extended spoiler tag.Thomas Willingham2012-06-011-1/+1
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-016-176/+186
|\| |
| * | registration issue after re-factorfriendica2012-06-014-164/+167
| |/
| * Merge pull request #320 from fabrixxm/masterfriendica2012-06-012-12/+19
| |\
| | * install: fix bug #436 and small typoroot2012-06-011-11/+18
| | * Merge remote branch 'friendica/master'root2012-06-0155-1416/+1667
| | |\ | | |/ | |/|
| | * admin: remove update link in admin menuroot2012-05-251-1/+1
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-3124-717/+856
|\| |
| * | 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`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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 07:52:26 +0000