aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixed star-bugtommy tomson2012-03-0910-37/+19
|
* add theme diabook-blue, fix csstommy tomson2012-03-0851-6/+2967
|
* add links to /profiles, add some icons to diabook/icons, fixes in csstommy tomson2012-03-085-6/+101
|
* fix in navbartommy tomson2012-03-072-3/+8
|
* messages-menu translation, add scroll-to-top and theme-bug-report in themetommy tomson2012-03-075-21/+24
|
* Merge pull request #95 from simonlnu/masterSimon2012-03-062-38/+37
|\ | | | | styling fixes in dispy; typos fixed in settings.tpl
| * styling fixes in dispy. fix typos in settings.tplSimon L'nu2012-03-062-38/+37
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0614-16/+155
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: remove "smilie" expansion for Diaspora logo prevent duplicate likes quattro: theme settings (a bit hackish) add img fixes in diabook finalise spam storage model, begin driver changes. fixes template proc: add variable filters * master:
* | Merge pull request #93 from fabrixxm/masterfabrixxm2012-03-062-0/+57
|\ \ | | | | | | quattro: theme settings
| * | quattro: theme settings (a bit hackish)Fabio Comuni2012-03-062-0/+57
| | |
| * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-0698-2520/+7789
| |\ \
| * | | template proc: add variable filtersFabio Comuni2012-03-021-5/+15
| | | |
* | | | remove "smilie" expansion for Diaspora logofriendica2012-03-061-2/+2
| | | |
* | | | prevent duplicate likesfriendica2012-03-061-0/+25
| | | |
* | | | Merge branch 'pull'friendica2012-03-069-9/+42
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #92 from tomtom84/mastertomtom842012-03-059-9/+42
| |\ \ \ | | | | | | | | | | fixes in theme diabbook
| | * | | add imgtommy tomson2012-03-061-0/+0
| | | | |
| | * | | Merge remote-tracking branch 'origin/master'tommy tomson2012-03-0612-477/+648
| | |\ \ \ | | |/ / / | |/| | |
| | * | | fixes in diabooktommy tomson2012-03-066-4/+16
| | | | |
| | * | | fixestommy tomson2012-03-054-5/+26
| | | | |
* | | | | finalise spam storage model, begin driver changes.friendica2012-03-051-5/+29
|/ / / /
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: some admin page fixes and cleanup changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero) string update some testbubble stuff can_write_wall documentation * master:
* | | Merge branch 'pull'friendica2012-03-051-1/+2
|\ \ \
| * \ \ Merge pull request #91 from unary/darkzeroSimon2012-03-051-1/+2
| |\ \ \ | | | | | | | | | | changed bg color around comment box from white to match page background,...
| | * | | changed bg color around comment box from white to match page background, ↵Michael Johnston2012-03-051-1/+2
| |/ / / | | | | | | | | | | | | improved contrast on comment preview (darkzero)
* | | | 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: