4315 Commits (1d2049a6d6fe327340da2b1298f06f9fbde183c7)
 

Author SHA1 Message Date
Simon L'nu 1d2049a6d6 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 10 years ago
friendica f96aff5518 more recycle fixes for plaintext 10 years ago
friendica 9cd1c35c22 fix recycle symbol when using plaintext editor 10 years ago
friendica a7fd3a8b24 Merge branch 'pull' 10 years ago
friendica 4cd3d5cd02 Merge https://github.com/friendica/friendica into pull 10 years ago
tommy tomson 6dbee45d92 add links to wall, photos, events, etc to aside on networkpage, fixes in css 10 years ago
Simon L'nu 6e133e75c3 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 10 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 10 years ago
friendica b44533e9fb roll protocol version due to ssl_policy settings 10 years ago
friendica 93a8907f43 force login to ssl on SSL_POLICY_SELFSIGN 10 years ago
friendica 110e8f2919 basic ssl_policy for important modules 10 years ago
friendica f0a62d8908 ssl_policy stuff 10 years ago
friendica 64e3e3590b revup 10 years ago
friendica 531201f2a1 Merge pull request #132 from campino/master 10 years ago
friendica 959aa13de0 Merge pull request #133 from tonybaldwin/master 10 years ago
friendica dcdfa96a1f Merge branch 'pull' 10 years ago
friendica 2dc527609e Merge https://github.com/friendica/friendica into pull 10 years ago
Simon L'nu ebccf13c4c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 10 years ago
Simon c95deb4839 Merge pull request #134 from simonlnu/master 10 years ago
Simon L'nu 0bf9595ab1 PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630 10 years ago
Alexander Kampmann 70709a8825 Merge branch 'master' of git://github.com/friendica/friendica 10 years ago
tommy tomson f03c57007a fix in nav 10 years ago
Alexander Kampmann 509ed2604f splitted tests into several files 10 years ago
tommy tomson 42462cc1f0 add links to home, profile, photos, events, notes to aside in network-stream 10 years ago
Alexander Kampmann c0c98206ef removed done TODO 10 years ago
Alexander Kampmann 509532d168 get_tags tests corrected. They test for the right things now. 10 years ago
friendica 9df67e5cfe Merge branch 'pull' 10 years ago
friendica 7e270b043c addon settings form error 10 years ago
Simon fb77bfa648 Merge pull request #131 from simonlnu/master 10 years ago
Simon L'nu 975781d3e2 massive work done to both dispys, mostly -dark 10 years ago
friendica 4972d7ef6e more work on filer, comment level and file tag removal 10 years ago
Tony Baldwin 1ae740535d added slack-NS, non-scrolly, slackr-based theme. 10 years ago
Simon L'nu a2073bcfc0 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 10 years ago
friendica de017d1ed7 sort inbox by recently replied conversations first 10 years ago
friendica be48fff157 file as widget and basic filing implementation for duepuntozero,slackr 10 years ago
friendica 8a789a33d1 Merge branch 'pull' 10 years ago
friendica db80ffa0ff don't count self in number of contatcs 10 years ago
friendica 2173f418dd Merge pull request #130 from CatoTH/master 10 years ago
friendica 427362c324 Merge branch 'pull' 10 years ago
friendica dc84da520d invite potential connectees to the free social web 10 years ago
Tobias Hößl 7868e3897b In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better. 10 years ago
friendica acc4bbeb6e Merge pull request #129 from CatoTH/master 10 years ago
Simon L'nu 1763a6c9c2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 10 years ago
Tobias Hößl 43430ef561 Merge branch 'master' of git://github.com/friendica/friendica 10 years ago
friendica 5a41676465 initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming. 10 years ago
Simon L'nu 203fa94e17 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 10 years ago
friendica bf7425c591 click anywhere to close notifications -> zeros and bubbles 10 years ago
friendica e12706e825 Merge branch 'pull' 10 years ago
friendica acf75e85c8 revup 10 years ago
tomtom84 691f5b11f7 Merge pull request #128 from tomtom84/master 10 years ago