aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-061505-1390/+2052
|\ | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: update to the German strings add network_tabs hook pass autoname(0) test rev update added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit. * master:
| * update to the German stringsTobias Diekershoff2012-04-062-1216/+1850
| |
| * Merge branch 'pull'friendica2012-04-051503-158/+179
| |\
| | * Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-051809-6998/+48636
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: include/config.php update.php
| | * | added index to config and pconfig tableAlexander Kampmann2012-04-054-160/+178
| | | | | | | | | | | | | | | | changed config.php to use REPLACE instead of INSERT, this removes one db hit.
| * | | add network_tabs hookfriendica2012-04-051-2/+6
| | | |
| * | | pass autoname(0) testfriendica2012-04-051-0/+3
| | | |
| * | | rev updatefriendica2012-04-052-14/+14
| | |/ | |/|
* / | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-060-0/+0
|/ / | | | | | | | | | | | | * remotes/upstream/master: make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php * master:
* | make 'PHP "register_argc_argv"' easier to translate, may require fix for po2phpfriendica2012-04-052-1/+3
| |
* | Merge pull request #207 from simonlnu/masterSimon2012-04-042-4/+24
|\ \ | | | | | | styled cat tags and input
| * | finish styling category tags and category inputSimon L'nu2012-04-052-0/+20
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-052-0/+12
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | * remotes/upstream/master: also block outbound let's catch d* disabled at a higher level and not waste any resources on it. * master:
* | | also block outboundfriendica2012-04-041-0/+5
| | |
* | | let's catch d* disabled at a higher level and not waste any resources on it.friendica2012-04-041-0/+7
| | |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-040-0/+0
| |\ \ | |/ / |/| | | | | | | | | | | * remotes/upstream/master: * master:
* | | Merge pull request #206 from simonlnu/masterSimon2012-04-0419-131/+188
|\ \ \ | | | | | | | | update the template files
| | * | style categorytagsSimon L'nu2012-04-042-4/+4
| |/ / | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | update the dispy* templatesSimon L'nu2012-04-0419-131/+188
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-044-4/+13
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: correct some filer dialog weirdness caused by introduction of categories move alert box away from nav links log disabled requests fix config storage of booleans * master:
* | | Merge pull request #205 from unary/filerfixfriendica2012-04-041-1/+2
|\ \ \ | | | | | | | | correct some filer dialog weirdness caused by introduction of categories
| * | | correct some filer dialog weirdness caused by introduction of categoriesMichael Johnston2012-04-041-1/+2
|/ / /
* | | move alert box away from nav linksfriendica2012-04-041-1/+4
| | |
* | | log disabled requestsfriendica2012-04-041-2/+6
| | |
* | | fix config storage of booleansfriendica2012-04-041-0/+1
| | |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-040-0/+0
|/ / | | | | | | | | | | | | | | | | | | * remotes/upstream/master: well that was a stupid mistake... string update bug: diaspora_enabled setting turns it on but doesn't fully turn it off. better handling of reshares containing embeds * master:
* | well that was a stupid mistake...friendica2012-04-041-1/+1
| |
* | string updatefriendica2012-04-041-733/+1023
| |
* | bug: diaspora_enabled setting turns it on but doesn't fully turn it off.friendica2012-04-042-1/+10
| |
* | Merge branch 'pull'friendica2012-04-042-20/+38
|\ \
| * \ Merge pull request #204 from simonlnu/masterSimon2012-04-032-20/+38
| |\ \ | | | | | | | | many changes, all small
| | * | latest changes are the popup menu for notifs, fixesSimon L'nu2012-04-042-20/+38
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0472-3950/+404
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: display settings hooks re-opened bug #363 this is better include contact_widgets for categories_widget when doing updates remove loozah themes which fell too far behind to recover smal fix german translation for right_aside make right_aside translatable and provide german translation... and some css-fixes suppress duplicates in search make contact ssl_policy change a function since it is used in a few places more ssl policy fixes and prevent delivery to soapbox when using local delivery don't change ssl settings on local photos for remote contact * master:
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-022-2/+33
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bug #363 and a couple of other reported ssl link issues * master:
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0235-217/+378
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: css-fixes diabook-themes: fixes in js diabook-themes: fixed pageheader diabook-themes: bugfixes / css-fixes make the "new calendar" (javascript interactive) the default remove zrl from query string catch a couple more Oo smilies add page_content_top hook * master:
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0134-35/+340
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add title to D* posts allow users to set categories on their posts Modified peopleyouknow to handle sites without Facebook better diabook-themes: add link to global dir in "find friends" at right_aside modified: mod/newmember.php New user quick start. check for style.php existence before inclusion Moved Diaspora notes away from top, per user request * master:
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-010-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: slight improvement in handling of plaintext feeds css-fixes add new messages-layout in diabook fix the display of community-plugin in diabook-themes that didn't quite work out document tinymce fixes/workarounds various bugfixes and css-fixes qcomment overflow try slightly better detection of html in feeds send unverified private mail using zrl * master:
* | | | | | | better handling of reshares containing embedsfriendica2012-04-041-8/+8
|/ / / / / /
* | | | | | display settings hooksfriendica2012-04-031-1/+4
| | | | | |
* | | | | | re-opened bug #363friendica2012-04-031-0/+10
| | | | | |
* | | | | | this is betterfriendica2012-04-031-3/+2
| | | | | |
* | | | | | Merge branch 'pull'friendica2012-04-0324-120/+313
|\ \ \ \ \ \
| * | | | | | smal fixtommy tomson2012-04-031-1/+1
| | | | | | |
| * | | | | | Merge pull request #202 from tomtom84/mastertomtom842012-04-031-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | german translation for right_aside
| | * | | | | | german translation for right_asidetommy tomson2012-04-031-0/+8
| | | | | | | |
| * | | | | | | Merge pull request #201 from tomtom84/mastertomtom842012-04-0323-119/+304
| |\| | | | | | | | | | | | | | | | | | | | | | fixes in diabook-themes
| | * | | | | | make right_aside translatable and provide german translation...tommy tomson2012-04-0323-119/+304
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | and some css-fixes
* | | | | | | include contact_widgets for categories_widget when doing updatesfriendica2012-04-031-0/+2
| | | | | | |
* | | | | | | remove loozah themes which fell too far behind to recoverfriendica2012-04-0340-3763/+1
|/ / / / / /
* | | | | | suppress duplicates in searchfriendica2012-04-031-7/+7
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 20:56:16 +0000