Commit Graph

4096 Commits (a9690dfe2d9358fcbb156644df2d12099ff798c4)
 

Author SHA1 Message Date
fabrixxm a9690dfe2d Merge pull request #93 from fabrixxm/master
11 years ago
friendica eec4cff84b remove "smilie" expansion for Diaspora logo
11 years ago
friendica 23718bfc25 prevent duplicate likes
11 years ago
friendica c0e0034f06 Merge branch 'pull'
11 years ago
Fabio Comuni 607ee1ff9c quattro: theme settings (a bit hackish)
11 years ago
Fabio Comuni be9985a3ae Merge remote-tracking branch 'friendica/master'
11 years ago
tomtom84 d04fba7048 Merge pull request #92 from tomtom84/master
11 years ago
tommy tomson 8b0dd349f5 add img
11 years ago
tommy tomson eaaf030c18 Merge remote-tracking branch 'origin/master'
11 years ago
tommy tomson b64b1d13a4 fixes in diabook
11 years ago
friendica 3da97e2393 finalise spam storage model, begin driver changes.
11 years ago
friendica 321b651635 Merge branch 'pull'
11 years ago
friendica 23460302f5 some admin page fixes and cleanup
11 years ago
Simon d49dc1434f Merge pull request #91 from unary/darkzero
11 years ago
Michael Johnston 9f44dbbb48 changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
11 years ago
friendica 8473444242 string update
11 years ago
friendica e5de03040e Merge branch 'pull'
11 years ago
friendica 7b3349f38a some testbubble stuff
11 years ago
Simon b6765ad742 Merge pull request #90 from simonlnu/master
11 years ago
Simon L'nu 1aa2367469 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
Simon L'nu 190650060a forgot a small change in .field_help
11 years ago
friendica c47bae7a5f Merge branch 'pull'
11 years ago
friendica c37ffd2999 can_write_wall documentation
11 years ago
Simon 4b456e2273 Merge pull request #89 from simonlnu/master
11 years ago
Simon L'nu 50824bddd0 implement more of the changes requested
11 years ago
Simon L'nu 6a0729d5a4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica 0d9c2ca06f Merge branch 'pull'
11 years ago
friendica c6dce8dd6b revup
11 years ago
tommy tomson a406c16581 fixes
11 years ago
Simon 092115ca44 Merge pull request #88 from simonlnu/master
11 years ago
Simon L'nu 9d461846e2 multiple fixes; the jot-header works as standalone, not sure what's up.
11 years ago
Simon L'nu 7f894794e4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
Simon 1772037c98 Merge pull request #87 from simonlnu/master
11 years ago
Simon L'nu 02f825ca3c tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar
11 years ago
Simon L'nu e05313f88f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
Simon fd240687b9 Merge pull request #86 from simonlnu/master
11 years ago
Simon L'nu ef1d02e7bd still working on jot-header. amending <aside> and other elements
11 years ago
Simon L'nu 8cce12f28a Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
Simon e786e4253d Merge pull request #85 from simonlnu/master
11 years ago
Simon L'nu 65b6ec79ed hopefully fix the overflow issue everywhere this time
11 years ago
Simon L'nu 3ab7132b64 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica 965e657c20 $name appearing on testbubble items
11 years ago
friendica 31f192bb57 Merge branch 'pull'
11 years ago
friendica 0d97799324 testbubble notifications
11 years ago
Simon 49d9dd374c Merge pull request #84 from simonlnu/master
11 years ago
Simon L'nu 7de79a8c49 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
Simon L'nu fe7a6b070d yet more ui things, and bug fixing
11 years ago
tomtom84 9c541dbd67 Merge pull request #83 from tomtom84/master
11 years ago
tommy tomson fe614b4e7c like dislike button
11 years ago
Simon L'nu 290fdefa82 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago