Commit Graph

4357 Commits (805087af678f922ad75535fa8dbe0fc86d9cd566)
 

Author SHA1 Message Date
friendica 805087af67 whitespace 11 years ago
friendica be1bd9ff4e notification for disapora comments 11 years ago
Simon 47e1b8d0c0 Merge pull request #139 from simonlnu/master 11 years ago
Simon L'nu d965f73ef1 missing close double quote in mail_list.tpl 11 years ago
Simon cecd62373b Merge pull request #138 from simonlnu/master 11 years ago
Simon L'nu 6bdb71f01c more changes in dispy-dark 11 years ago
Simon L'nu f727b44c08 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica be4e4dfb0d turn indexes back off (this is from an errant checkin a year or more ago) 11 years ago
friendica 33e03a8df0 Merge branch 'pull' 11 years ago
friendica 5a12383b78 undo git stuffup 11 years ago
tomtom84 0b509fd763 Merge pull request #137 from tomtom84/master 11 years ago
tommy tomson 02395c8af5 added icons to profile_side, fixes in css 11 years ago
friendica 41d595d5bc Merge branch 'pull' 11 years ago
friendica 7684f63ecd track whether contact is a community page or not 11 years ago
friendica 5d2c590fa9 Merge pull request #136 from annando/master 11 years ago
Simon L'nu 5c75d40c0b fixed the sidebar edit thingy. haven't synced dispy yet. 11 years ago
Simon L'nu eee2eed588 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
Michael Vogel b5120888cf html2bbcode: Disabled size conversion 11 years ago
Michael Vogel 9243c9fc14 Merge commit 'upstream/master' 11 years ago
Simon ab89aa90ca Merge pull request #135 from simonlnu/master 11 years ago
Simon L'nu 5b757e4e0e commit latest to dispy-dark. fixes in html css and js 11 years ago
Simon L'nu 1d2049a6d6 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica f96aff5518 more recycle fixes for plaintext 11 years ago
friendica 9cd1c35c22 fix recycle symbol when using plaintext editor 11 years ago
friendica a7fd3a8b24 Merge branch 'pull' 11 years ago
friendica 4cd3d5cd02 Merge https://github.com/friendica/friendica into pull 11 years ago
tommy tomson 6dbee45d92 add links to wall, photos, events, etc to aside on networkpage, fixes in css 11 years ago
Simon L'nu 6e133e75c3 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica b06c5983a4 don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts 11 years ago
friendica b44533e9fb roll protocol version due to ssl_policy settings 11 years ago
friendica 93a8907f43 force login to ssl on SSL_POLICY_SELFSIGN 11 years ago
friendica 110e8f2919 basic ssl_policy for important modules 11 years ago
friendica f0a62d8908 ssl_policy stuff 11 years ago
friendica 64e3e3590b revup 11 years ago
friendica 531201f2a1 Merge pull request #132 from campino/master 11 years ago
friendica 959aa13de0 Merge pull request #133 from tonybaldwin/master 11 years ago
friendica dcdfa96a1f Merge branch 'pull' 11 years ago
friendica 2dc527609e Merge https://github.com/friendica/friendica into pull 11 years ago
Simon L'nu ebccf13c4c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
Simon c95deb4839 Merge pull request #134 from simonlnu/master 11 years ago
Simon L'nu 0bf9595ab1 PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630 11 years ago
Alexander Kampmann 70709a8825 Merge branch 'master' of git://github.com/friendica/friendica 11 years ago
tommy tomson f03c57007a fix in nav 11 years ago
Alexander Kampmann 509ed2604f splitted tests into several files 11 years ago
tommy tomson 42462cc1f0 add links to home, profile, photos, events, notes to aside in network-stream 11 years ago
Alexander Kampmann c0c98206ef removed done TODO 11 years ago
Alexander Kampmann 509532d168 get_tags tests corrected. They test for the right things now. 11 years ago
friendica 9df67e5cfe Merge branch 'pull' 11 years ago
friendica 7e270b043c addon settings form error 11 years ago
Simon fb77bfa648 Merge pull request #131 from simonlnu/master 11 years ago