aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-082-338/+369
|\
| * DE update for the stringsTobias Diekershoff2012-05-082-338/+369
* | wrap private message autocomplete in an ifdef to make it easier to test/developfriendica2012-05-081-7/+14
|/
* make mod-follow hookable (e.g. service class limits) and also begin to prepar...friendica2012-05-071-17/+28
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-075-127/+298
|\
| * diabook-themes: state of the boxes at right_aside are now stored in db, inste...tommy tomson2012-05-085-127/+298
* | finished dry run - now for real testfriendica2012-05-071-1/+3
|/
* don't throw "did not contain xml" error if it's a valid rss that doesn't have...friendica2012-05-071-1/+1
* If a contact has had delivery issues in the last 15 minutes, send new posts s...friendica2012-05-076-231/+290
* separate poll_interval from delivery_interval - default is the same.friendica2012-05-073-1/+7
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-063-48/+54
|\
| * Merge pull request #291 from simonlnu/masterSimon2012-05-063-48/+54
| |\
| | * more css tweaks. nothing majorSimon L'nu2012-05-073-48/+54
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-070-0/+0
| |/
* / reset permissions to forum default when adding forum delivery chainfriendica2012-05-062-3/+14
|/
* Merge branch 'ac'friendica2012-05-067-14/+454
|\
| * I'll leave the private mail recipient autocomplete partially done. Need a goo...friendica2012-05-061-3/+10
| * mail autcomplete testingfriendica2012-05-067-15/+448
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-0618-236/+1321
|\ \ | |/ |/|
| * diabook-theme: small fixtommy tomson2012-05-071-1/+1
| * diabook-theme: add "Earth Layers"-box at right_sidetommy tomson2012-05-076-24/+269
| * diabook-theme: twitterbox-bugfixtommy tomson2012-05-066-15/+701
| * diabook: small fixtommy tomson2012-05-061-5/+8
| * Merge remote-tracking branch 'origin/master'tommy tomson2012-05-068-185/+320
| |\
| | * Merge pull request #290 from simonlnu/masterSimon2012-05-068-185/+320
| | |\
| | | * fixing widths to be more dynamic where possible. font size fixes. add README.mdSimon L'nu2012-05-068-185/+320
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-063-25/+29
| | | |\ | | | |/ | | |/|
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0517-262/+4358
| | | |\
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-040-0/+0
| * | | | diabook-theme: bugfixtommy tomson2012-05-061-18/+34
| |/ / /
* | | | email recip autocompletefriendica2012-05-061-0/+25
* | | | rev updatefriendica2012-05-062-79/+105
|/ / /
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-058-37/+4046
|\ \ \ | | |/ | |/|
| * | diabook-theme: small fixtommy tomson2012-05-061-2/+2
| * | diabook-theme: twitter-box-update at right_asidetommy tomson2012-05-063-5/+34
| * | diabook-theme: can now set the twitter search term in theme-settings & small ...tommy tomson2012-05-058-33/+4013
* | | bad sql left after the mailbox in/out mergefriendica2012-05-053-25/+29
|/ /
* | consolidate item deletion so we can fix orphaned categories and file_as tags.friendica2012-05-051-27/+32
* | Merge pull request #289 from cvogeley/masterfriendica2012-05-053-8/+87
|\ \
| * | Option to set theme width added. Minor layout changesChristian Vogeley2012-05-053-8/+87
| |/
* | DE: new email templates translatedTobias Diekershoff2012-05-052-28/+27
* | workaround to clean up orphaned filetagsfriendica2012-05-041-1/+1
* | only show remove category to item ownerfriendica2012-05-043-161/+165
|/
* Merge pull request #288 from simonlnu/masterSimon2012-05-046-787/+795
|\
| * fix lightbox; finished dark, now on to lightSimon L'nu2012-05-046-787/+795
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0410-686/+970
| |\ | |/ |/|
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-042-656/+876
|\ \
| * \ Merge pull request #287 from mschmitt/masterfriendica2012-05-042-656/+876
| |\ \
| | * | Esperanto 100%Martin Schmitt2012-05-042-656/+876
| |/ /
* / / category removalfriendica2012-05-042-5/+16
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 12:46:03 +0000