aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* prepare for using a master theme_init()friendica2012-04-081-0/+7
|
* provide theme_init() functionsfriendica2012-04-089-0/+20
|
* rev updatesfriendica2012-04-082-3/+3
|
* Merge pull request #214 from annando/masterfriendica2012-04-0812-22/+272
|\ | | | | API, Locking, some changes to "vier"
| * Merge commit 'upstream/master'Michael Vogel2012-04-0815-30/+43
| |\ | |/ |/|
* | Merge pull request #213 from simonlnu/masterSimon2012-04-077-30/+35
|\ \ | | | | | | minor dispy* fixes
| * | minor dispy* fixesSimon L'nu2012-04-077-30/+35
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0744-153/+1476
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: small fix changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section ignore utf8 offset error for unit tests had arg order backwards try assertContains tag tests cont. fix autonamenegativelength test some work on tests * master:
* | | diabook-themes: small fixtommy tomson2012-04-078-0/+8
| | |
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-07180-231/+365
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: ignore removed plugins fix messed up config tables w/ duplicate entries small fixes for the German strings fix bad sql update revert config changes, we're getting duplicate keys new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox... * master:
| * \ \ 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:
| * | | | 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:
| | | | * API: API is now enhanced. mentions, repeat and destroy now works.Michael Vogel2012-04-081-9/+142
| | | | |
| | | | * "vier": Some design stuffMichael Vogel2012-04-071-0/+1
| | | | |
| | | | * Merge commit 'upstream/master'Michael Vogel2012-04-071393-1443/+3554
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #212 from tomtom84/mastertomtom842012-04-0737-79/+1373
|\ \ \ \ \ | | | | | | | | | | | | fixes in diabook-themes
| * | | | | changelog 1.014 :tommy tomson2012-04-0737-79/+1373
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section css-fixes: tabs youtube-iframe title-bar in jot-wrapper blockquote & .oembed
* | | | | ignore utf8 offset error for unit testsfriendica2012-04-071-1/+3
| | | | |
* | | | | had arg order backwardsfriendica2012-04-071-1/+1
| | | | |
* | | | | try assertContainsfriendica2012-04-071-1/+1
| | | | |
* | | | | tag tests cont.friendica2012-04-072-5/+15
| | | | |
* | | | | fix autonamenegativelength testfriendica2012-04-071-1/+1
| | | | |
* | | | | some work on testsfriendica2012-04-077-68/+77
| |_|/ / |/| | |
* | | | ignore removed pluginsfriendica2012-04-061-2/+9
| | | |
* | | | Merge branch 'pull'friendica2012-04-06176-73/+154
|\ \ \ \
| * \ \ \ Merge pull request #211 from tomtom84/mastertomtom842012-04-060-0/+0
| |\ \ \ \ | | | | | | | | | | | | small fix
| | * \ \ \ Merge remote-tracking branch 'origin/master'tommy tomson2012-04-060-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #210 from tomtom84/mastertomtom842012-04-06174-54/+135
| |\ \ \ \ \ | | | | | | | | | | | | | | fixes in diabook-derivates
| | | * \ \ \ Merge remote-tracking branch 'origin/master'tommy tomson2012-04-064-24/+29
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-04-063-156/+157
| |\ \ \ \ \ \
| * | | | | | | small fixes for the German stringsTobias Diekershoff2012-04-062-19/+19
| | |_|_|_|/ / | |/| | | | |
| | | | * | | Merge remote-tracking branch 'origin/master'tommy tomson2012-04-061-151/+147
| | | |/| | |
| | | * | | | new-contacts-introductions in contacts-drop-down and new-messages in ↵tommy tomson2012-04-06174-54/+135
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
* | | | | | fix messed up config tables w/ duplicate entriesfriendica2012-04-063-6/+51
| |/ / / / |/| | | |
* | | | | fix bad sql updatefriendica2012-04-062-5/+10
| |/ / / |/| | |
* | | | Merge branch 'pull'friendica2012-04-062-1216/+1850
|\| | |
| * | | update to the German stringsTobias Diekershoff2012-04-062-1216/+1850
| | | |
* | | | revert config changes, we're getting duplicate keysfriendica2012-04-061-151/+147
|/ / /
* | | 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
| |/ / |/| |
| | * "vier": Bookmarks now look better.Michael Vogel2012-04-072-0/+10
| | |
| | * Merge commit 'upstream/master'Michael Vogel2012-04-06102-4851/+1753
| | |\ | |_|/ |/| |
* | | 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: