aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 https://github.com/friendica/friendica into pullfriendica2012-05-058-37/+4046
| |\
| * | bad sql left after the mailbox in/out mergefriendica2012-05-053-25/+29
| | |
* | | 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:
| * | 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
| * 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 branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-040-0/+0
|/ | | | | | * remotes/upstream/master: * master:
* 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
|
* Merge pull request #284 from fabrixxm/masterfriendica2012-05-031-3/+3
|\ | | | | validate_url() and validate_email() validate also IP address.
| * 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 fr
| * | proofreading the mail templates in frLudovic Grossard2012-05-0314-60/+64
|/ / | | | | | | fixed typo, grammar, spelling…
* | Merge pull request #285 from simonlnu/masterSimon2012-05-0310-1927/+3306
|\ \ | |/ |/| dispy reworking, step 1
| * forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv ↵Simon L'nu2012-05-032-1/+3
| | | | | | | | | | | | (which it includes) Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * major reworking of dispy dark. light to followSimon L'nu2012-05-0310-1927/+3304
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-033-7/+37
| |\ | |/ |/| | | | | | | | | | | * remotes/upstream/master: diabook-theme: small fix Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely. * master:
* | diabook-theme: small fixtommy tomson2012-05-032-2/+4
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-0229-57/+123
|\ \
* | | Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert ↵friendica2012-05-021-5/+33
| | | | | | | | | | | | Johnson' was already matched, and '@Robert' might be somebody different entirely.
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-0336-82/+210
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-theme: small fix diabook-theme: made boxes at right_aside sortable use cid rather than uid in perms Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others. use mysql replace on cache items fixing common friends rev update Moved Meta Viewport from global head.tpl to diabook's header * master:
| * | diabook-theme: small fixtommy tomson2012-05-031-0/+1
| | |
| * | diabook-theme: made boxes at right_aside sortabletommy tomson2012-05-0329-57/+122
|/ /
* | use cid rather than uid in permsfriendica2012-05-021-3/+12
| |
* | Merge pull request #283 from fermionic/private-events-post-correctly-in-diasporafriendica2012-05-021-0/+19
|\ \ | | | | | | Fix private-events posts in Diaspora
| * | Modify events_post() in mod/events.php to set the `private` field to true ↵Zach Prezkuta2012-05-021-0/+19
|/ / | | | | | | when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
* | use mysql replace on cache itemsfriendica2012-05-021-12/+30
| |
* | fixing common friendsfriendica2012-05-021-6/+7
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-027-396/+418
|\ \