aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* slight improvement in handling of plaintext feedsfriendica2012-04-012-3/+10
* that didn't quite work outfriendica2012-04-011-2/+2
* Merge branch 'pull'friendica2012-04-0111-46/+69
|\
| * Merge pull request #195 from tomtom84/mastertomtom842012-04-0111-46/+69
| |\
| | * various bugfixes and css-fixestommy tomson2012-04-0111-46/+69
| |/
* / document tinymce fixes/workaroundsfriendica2012-04-011-1/+5
|/
* qcomment overflowfriendica2012-04-011-0/+8
* try slightly better detection of html in feedsfriendica2012-04-011-3/+4
* Merge branch 'pull'friendica2012-04-016-12/+32
|\
| * Merge pull request #194 from simonlnu/masterSimon2012-04-015-11/+31
| |\
| | * latest fixes for dispys. tweaking/repairingSimon L'nu2012-04-015-11/+31
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-012-9/+6
| | |\ | | |/ | |/|
| * | line 86: s/Friendika/Friendica/Simon2012-04-011-1/+1
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-3145-94/+10852
| | |\
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-310-0/+0
* | | | send unverified private mail using zrlfriendica2012-04-0110-6/+387
|/ / /
* | / fix "between yourself and You" in mail listfriendica2012-03-311-8/+5
| |/ |/|
* | more error handlingfriendica2012-03-312-1/+4
* | ensure all new users get a timezone. We'll use UTC until they choose otherwise.friendica2012-03-312-2/+6
* | handle escaped file chars in display and searchfriendica2012-03-315-13/+10
* | Merge branch 'pull'friendica2012-03-3112-0/+10498
|\ \
| * \ Merge pull request #193 from tomtom84/mastertomtom842012-03-3112-47/+31
| |\ \
| | * | diabook-themes: move "common tabs" to left side on settings pagetommy tomson2012-03-3112-47/+31
| |/ /
| * | Merge pull request #192 from tomtom84/mastertomtom842012-03-3112-0/+10514
| |\ \
| | * | move the common tabs to right_aside in diabook-derivatestommy tomson2012-03-3112-0/+10514
| |/ /
* / / escape % in file_tag_query as it is ultimately embedded in a sprintffriendica2012-03-312-1/+5
|/ /
* | register hooks for a COPA pluginfriendica2012-03-311-0/+7
* | some js fixes - ignore backspace as history selector and cleanup errors closi...friendica2012-03-311-4/+13
* | Merge branch 'pull'friendica2012-03-3125-116/+355
|\ \
| * | bug fix in diabook-aerith and -redtommy tomson2012-03-316-22/+22
| * | Merge pull request #191 from tomtom84/mastertomtom842012-03-3117-40/+249
| |\ \ | | |/ | |/|
| | * bug-fixes in diabook-derivatestommy tomson2012-03-3117-40/+249
| |/
| * Merge pull request #190 from simonlnu/masterSimon2012-03-312-14/+2
| |\
| | * forgot the css changes for last pushSimon L'nu2012-03-312-14/+2
| * | Merge pull request #189 from simonlnu/masterSimon2012-03-314-44/+86
| |\|
| | * theme fixes; fix qcomment (finally)Simon L'nu2012-03-314-44/+86
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-312-9/+7
| | |\ | | |/ | |/|
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-3032-275/+423
| | |\
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-300-0/+0
* | | | settings for unknown private mail acceptancefriendica2012-03-315-18/+45
|/ / /
* | / warning cleanupfriendica2012-03-302-9/+7
| |/ |/|
* | Merge branch 'pull'friendica2012-03-3031-265/+398
|\ \
| * \ Merge pull request #188 from fabrixxm/masterfriendica2012-03-3022-218/+328
| |\ \
| | * | quattro: move quattro-green inside quattro folder.Fabio Comuni2012-03-3016-72/+87
| | * | allow themes to use "style.php" instead of "style.css".Fabio Comuni2012-03-302-5/+26
| | * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-306-14/+36
| | |\ \ | | |/ / | |/| |
| * | | css-fixes in diabook-derivatestommy tomson2012-03-306-14/+36
| | * | quattro-green: remove settings codeFabio Comuni2012-03-301-29/+0
| | * | quattro: add config.phpFabio Comuni2012-03-303-35/+35
| | * | settings: add "display settings" tab, with UI-related settings.Fabio Comuni2012-03-303-77/+180
| |/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 14:25:57 +0000