aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* turn indexes back off (this is from an errant checkin a year or more ago)friendica2012-03-151-1/+1
|
* Merge branch 'pull'friendica2012-03-1515-32/+86
|\
| * Merge pull request #137 from tomtom84/mastertomtom842012-03-1515-32/+86
| |\ | | | | | | fixes in diabook-derivates
| | * added icons to profile_side, fixes in csstommy tomson2012-03-1615-32/+86
| |/
* / undo git stuffupfriendica2012-03-153-4/+8
|/
* Merge branch 'pull'friendica2012-03-1528-157/+448
|\
| * Merge pull request #136 from annando/masterfriendica2012-03-1512-71/+329
| |\ | | | | | | Mail improvements, item caching and so on
| | * html2bbcode: Disabled size conversionMichael Vogel2012-03-151-9/+9
| | |
| | * Merge commit 'upstream/master'Michael Vogel2012-03-15114-870/+2820
| | |\
| | * | Mail: Subject are now with working "Re:"Michael Vogel2012-03-122-43/+14
| | | |
| | * | Removing test exportsMichael Vogel2012-03-112-4/+4
| | | |
| | * | Missing field in database.sqlMichael Vogel2012-03-111-0/+1
| | | |
| | * | Removed changesMichael Vogel2012-03-112-19/+11
| | | |
| | * | Merge commit 'upstream/master'Michael Vogel2012-03-1162-555/+7192
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl
| | * | | Added config options for the item cache and the ostatus priorityMichael Vogel2012-03-111-0/+6
| | | | |
| | * | | Item cache now is one day.Michael Vogel2012-03-111-1/+1
| | | | |
| | * | | Corrected some git problemsMichael Vogel2012-03-112-89/+0
| | | | |
| | * | | Cache: item cache now has an autodelete of old files. The pages plugin now ↵Michael Vogel2012-03-113-3/+17
| | | | | | | | | | | | | | | | | | | | sets a link via redirection. So posting works.
| | * | | Pages: Show every community page - even from foreign servers (with caching)Michael Vogel2012-03-112-12/+61
| | | | |
| | * | | New plugin that shows community pages in the sidebarMichael Vogel2012-03-112-0/+42
| | | | |
| | * | | Caching improved.Michael Vogel2012-03-101-13/+11
| | | | |
| | * | | Enabled Caching for items. Changed color of tags in diabook.Michael Vogel2012-03-102-3/+18
| | | | |
| | * | | New config options if ostatus polling should use the priority in the contactsMichael Vogel2012-03-101-1/+4
| | | | |
| | * | | Mail: Removing signatures, gpg, unnecessary line breaksMichael Vogel2012-03-103-2/+240
| | | | |
| | * | | diabook: Moving the location between the iconsMichael Vogel2012-03-103-5/+7
| | | | |
| | * | | Merge commit 'upstream/master'Michael Vogel2012-03-09255-3476/+20733
| | |\ \ \
| | * | | | html2bbcode: don't convert sizes and fonts.Michael2012-03-021-3/+7
| | | | | |
| | * | | | Merge remote branch 'upstream/master'Michael2012-02-283-7/+9
| | |\ \ \ \
| | * \ \ \ \ Merge remote branch 'upstream/master'Michael2012-02-2722-55/+154
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'upstream/master'Michael2012-02-2713-36/+54
| | |\ \ \ \ \ \
| * | | | | | | | fixed the sidebar edit thingy. haven't synced dispy yet.Simon L'nu2012-03-152-24/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-150-0/+0
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | | | | | | Merge pull request #135 from simonlnu/masterSimon2012-03-1516-85/+115
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | commit latest to dispy-dark. fixes in html css and js
| | * | | | | | | commit latest to dispy-dark. fixes in html css and jsSimon L'nu2012-03-1516-85/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1511-22/+75
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: more recycle fixes for plaintext fix recycle symbol when using plaintext editor add links to wall, photos, events, etc to aside on networkpage, fixes in css * master:
| | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-1537-300/+1266
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts roll protocol version due to ssl_policy settings force login to ssl on SSL_POLICY_SELFSIGN basic ssl_policy for important modules ssl_policy stuff revup splitted tests into several files removed done TODO get_tags tests corrected. They test for the right things now. addon settings form error more work on filer, comment level and file tag removal added slack-NS, non-scrolly, slackr-based theme. get tags test improved splitted test cases. changed a test string added some tests added library and include to .htaccess excludes reports from git better tests added test blueprints, fixed? encoding issues * master:
| | * | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix in nav add links to home, profile, photos, events, notes to aside in network-stream * master:
* | | | | | | | | | track whether contact is a community page or notfriendica2012-03-156-7/+29
|/ / / / / / / / /
* | | | | | | | | more recycle fixes for plaintextfriendica2012-03-151-1/+1
| | | | | | | | |
* | | | | | | | | fix recycle symbol when using plaintext editorfriendica2012-03-151-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'pull'friendica2012-03-1510-21/+74
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-03-1510-21/+74
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add links to wall, photos, events, etc to aside on networkpage, fixes in csstommy tomson2012-03-1510-21/+74
| | | | | | | | | |
* | | | | | | | | | don't allow multiple friends with http/https same person, don't show mail2 ↵friendica2012-03-141-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | coming soon unless person is allowed to have email contacts
* | | | | | | | | | roll protocol version due to ssl_policy settingsfriendica2012-03-141-1/+1
| | | | | | | | | |
* | | | | | | | | | force login to ssl on SSL_POLICY_SELFSIGNfriendica2012-03-143-9/+13
| | | | | | | | | |
* | | | | | | | | | basic ssl_policy for important modulesfriendica2012-03-1411-130/+140
| | | | | | | | | |
* | | | | | | | | | ssl_policy stufffriendica2012-03-145-11/+103
| | | | | | | | | |
* | | | | | | | | | revupfriendica2012-03-141-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #132 from campino/masterfriendica2012-03-1411-119/+828
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Test cases