aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | "show more" friends in commonfriendica2012-05-046-25/+78
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-040-0/+0
|/
* DE stringsTobias Diekershoff2012-05-042-621/+847
* implement max load average before queuing/deferring delivery and poller proce...friendica2012-05-034-1/+28
* yet another bug in remote_friends_in_commonfriendica2012-05-032-1/+2
* string updatefriendica2012-05-031-2/+2
* use html symbols for double quotesfriendica2012-05-031-1/+1
* string updatefriendica2012-05-034-94/+91
* Merge pull request #284 from fabrixxm/masterfriendica2012-05-031-3/+3
|\
| * validate_url() and validate_email() validate also IP address.Fabio Comuni2012-05-031-3/+3
* | Merge pull request #286 from grossard/french_proofreadingfriendica2012-05-0314-60/+64
|\ \
| * | proofreading the mail templates in frLudovic Grossard2012-05-0314-60/+64
|/ /
* | Merge pull request #285 from simonlnu/masterSimon2012-05-0310-1927/+3306
|\ \ | |/ |/|
| * forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv ...Simon L'nu2012-05-032-1/+3
| * major reworking of dispy dark. light to followSimon L'nu2012-05-0310-1927/+3304
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 11:20:38 +0000