aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* some admin page fixes and cleanupfriendica2012-03-054-6/+17
|
* string updatefriendica2012-03-051-414/+568
|
* Merge branch 'pull'friendica2012-03-051-2/+2
|\
| * Merge pull request #90 from simonlnu/masterSimon2012-03-051-2/+2
| |\ | | | | | | field_help tweak
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| | |\ | | |/ | |/| | | | | | | | | | * remotes/upstream/master: * master:
| | * forgot a small change in .field_helpSimon L'nu2012-03-051-2/+2
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | some testbubble stufffriendica2012-03-053-31/+37
| | |
* | | Merge branch 'pull'friendica2012-03-051-22/+16
|\| |
| * | Merge pull request #89 from simonlnu/masterSimon2012-03-051-22/+16
| |\| | | | | | | implement more changes
| | * implement more of the changes requestedSimon L'nu2012-03-051-22/+16
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| |/ | | | | | | | | | | | | * remotes/upstream/master: revup * master:
* / can_write_wall documentationfriendica2012-03-051-1/+6
|/
* Merge branch 'pull'friendica2012-03-055-57/+67
|\
| * Merge pull request #88 from simonlnu/masterSimon2012-03-054-37/+49
| |\ | | | | | | multiple ui fixes
| | * multiple fixes; the jot-header works as standalone, not sure what's up.Simon L'nu2012-03-054-37/+49
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| |/ | | | | | | | | | | * remotes/upstream/master: * master:
| * Merge pull request #87 from simonlnu/masterSimon2012-03-052-3/+4
| |\ | | | | | | contact_block.tpl link fix and dispy page parts
| | * tweak sizing of <section> and <aside> more; fix link in 'view contacts' in ↵Simon L'nu2012-03-052-3/+4
| | | | | | | | | | | | | | | | | | sidebar Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| |/ | | | | | | | | | | * remotes/upstream/master: * master:
| * Merge pull request #86 from simonlnu/masterSimon2012-03-052-18/+14
| |\ | | | | | | more dispy
| | * still working on jot-header. amending <aside> and other elementsSimon L'nu2012-03-052-18/+14
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| |/ | | | | | | | | | | * remotes/upstream/master: * master:
| * Merge pull request #85 from simonlnu/masterSimon2012-03-051-2/+3
| |\ | | | | | | hopefully fix overflow issue now
| | * hopefully fix the overflow issue everywhere this timeSimon L'nu2012-03-051-2/+3
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| |/ | | | | | | | | | | | | | | * remotes/upstream/master: $name appearing on testbubble items testbubble notifications * master:
* / revupfriendica2012-03-051-1/+1
|/
* $name appearing on testbubble itemsfriendica2012-03-051-1/+1
|
* Merge branch 'pull'friendica2012-03-051-14/+23
|\
| * Merge pull request #84 from simonlnu/masterSimon2012-03-041-14/+23
| |\ | | | | | | more ui bugs fixed \o/
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-053-7/+7
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | * remotes/upstream/master: like dislike button fixes in diabook * master:
| | * yet more ui things, and bug fixingSimon L'nu2012-03-051-14/+23
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: wrap title and text for editplain in zero and TB themes correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode improved contrast in acl selector, and preview (darkzero) * master:
* | | testbubble notificationsfriendica2012-03-053-6/+13
|/ /
* | Merge pull request #83 from tomtom84/mastertomtom842012-03-043-7/+7
|\ \ | |/ |/| fixes in diabook theme
| * like dislike buttontommy tomson2012-03-052-0/+0
| |
| * fixes in diabooktommy tomson2012-03-053-21/+25
| |
* | Merge pull request #80 from unary/darkzeroSimon2012-03-041-0/+8
|\ \ | | | | | | improved contrast in acl selector, and preview (darkzero)
| * | improved contrast in acl selector, and preview (darkzero)Michael Johnston2012-03-041-0/+8
| | |
* | | Merge pull request #82 from simonlnu/masterSimon2012-03-041-6/+24
|\ \ \ | | | | | | | | say hello to dispy's younger brother
| * | | more ui thingies with dispy - we'll get you well dispy, we promiseSimon L'nu2012-03-041-6/+24
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-045-24/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fixes in diabook unused replacement variable displays %1 in all html2bbcode 'code' blocks revup style.css fix * master:
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
* | | | Merge branch 'pull'friendica2012-03-043-22/+25
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #81 from tomtom84/mastertomtom842012-03-043-22/+25
| |\ \ \ | | | | | | | | | | fixes in diabook theme
| | * | | fixes in diabooktommy tomson2012-03-053-14/+18
| | | |/ | | |/|
| | * | style.css fixtommy tomson2012-03-041-10/+9
| | | |
* | | | wrap title and text for editplain in zero and TB themesfriendica2012-03-043-5/+6
| | | |
* | | | correct owner info from misconfigured installs, duepuntozero title block ↵friendica2012-03-042-1/+25
|/ / / | | | | | | | | | misplaced in editplain mode
* | | unused replacement variable displays %1 in all html2bbcode 'code' blocksfriendica2012-03-041-1/+1
| | |
* | | Merge branch 'pull'friendica2012-03-043-44/+87
|\ \ \ | | |/ | |/|