aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* If a contact has had delivery issues in the last 15 minutes, send new posts ↵friendica2012-05-076-231/+290
| | | | | | | straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly.
* 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
| |\ | | | | | | minor css tweaks
| | * more css tweaks. nothing majorSimon L'nu2012-05-073-48/+54
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-070-0/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off. mail autcomplete testing email recip autocomplete rev update diabook-theme: small fix diabook-theme: add "Earth Layers"-box at right_side diabook-theme: twitterbox-bugfix diabook: small fix diabook-theme: bugfix * master:
* / 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 ↵friendica2012-05-061-3/+10
| | | | | | | | good UI/JS person to finish it off.
| * 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
| | |\ | | | | | | | | font and width tweaking
| | | * fixing widths to be more dynamic where possible. font size fixes. add README.mdSimon L'nu2012-05-068-185/+320
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-063-25/+29
| | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | * remotes/upstream/master: bad sql left after the mailbox in/out merge * master:
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0517-262/+4358
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-theme: small fix diabook-theme: twitter-box-update at right_aside diabook-theme: can now set the twitter search term in theme-settings & small fixes consolidate item deletion so we can fix orphaned categories and file_as tags. DE: new email templates translated workaround to clean up orphaned filetags only show remove category to item owner Option to set theme width added. Minor layout changes * master:
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | | | 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
| | | | | | | | | | | | fixes
* | | 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 changes
| * | 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
|\ | | | | multiple fixes
| * fix lightbox; finished dark, now on to lightSimon L'nu2012-05-046-787/+795
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0410-686/+970
| |\ | |/ |/| | | | | | | | | | | | | * remotes/upstream/master: category removal Esperanto 100% "show more" friends in common * master:
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-042-656/+876
|\ \
| * \ Merge pull request #287 from mschmitt/masterfriendica2012-05-042-656/+876
| |\ \ | | | | | | | | Update Esperanto to 100%
| | * | 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
|/ | | | | | | | | | | | | | * remotes/upstream/master: DE strings implement max load average before queuing/deferring delivery and poller processes yet another bug in remote_friends_in_common string update use html symbols for double quotes string update proofreading the mail templates in fr fixed typo, grammar, spelling… validate_url() and validate_email() validate also IP address. * master:
* DE stringsTobias Diekershoff2012-05-042-621/+847
|
* implement max load average before queuing/deferring delivery and poller ↵friendica2012-05-034-1/+28
| | | | processes
* 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
|