Commit Graph

4195 Commits (e098147c24bd45bc15c14fc597bd101b66011458)
 

Author SHA1 Message Date
Michael Vogel e098147c24 New config options if ostatus polling should use the priority in the contacts 11 years ago
Michael Vogel 15916a2cb7 Mail: Removing signatures, gpg, unnecessary line breaks 11 years ago
Michael Vogel cb1ecf2c5a diabook: Moving the location between the icons 11 years ago
Michael Vogel 11c29e0cba Merge commit 'upstream/master' 11 years ago
friendica 2ce78253ae Merge branch 'pull' 11 years ago
friendica 3878b58f0d bug #324 - tinymce used for mail even if editplain being used. 11 years ago
friendica 312c175045 bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed 11 years ago
Simon d050762e4d Merge pull request #114 from simonlnu/master 11 years ago
Simon L'nu 81f5b0e2df [theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts. 11 years ago
friendica 2050f886cc keep tony from talking to himself 11 years ago
Simon 0188e2b3ee Merge pull request #113 from simonlnu/master 11 years ago
Simon L'nu dc8d060d4d i consider dispy pretty stable at this point, so i'm removing the experimental file 11 years ago
Simon L'nu 20b2090182 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
tomtom84 e25fb2b2f9 Merge pull request #112 from tomtom84/master 11 years ago
tommy tomson e06b941307 removed info 11 years ago
tomtom84 92ab98f8d8 Merge pull request #111 from tomtom84/master 11 years ago
tommy tomson 722f631d15 add info 11 years ago
friendica ab900eb59e Merge pull request #109 from beardy-unixer/6ae5962b009cfd88925eae721e24bf895e8b78d5 11 years ago
tomtom84 05561bd905 Merge pull request #110 from tomtom84/master 11 years ago
tommy tomson feda3cfc96 fixed star-bug 11 years ago
Thomas 6ae5962b00 More improved transparency for smilies 11 years ago
Simon L'nu 8d19baadff Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica b86a08166c theme info file for testbubble 11 years ago
friendica af9f7da449 catalan translation 11 years ago
friendica bacb3207ad Merge branch 'pull' 11 years ago
friendica 3b47626c15 Merge https://github.com/friendica/friendica into pull 11 years ago
friendica 3cfa83c3db revup 11 years ago
tommy tomson b9dda93f0c add theme diabook-blue, fix css 11 years ago
Simon L'nu b584b26323 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
Simon b52a6ea033 Merge pull request #108 from simonlnu/master 11 years ago
Simon L'nu 5fe8952c29 make svg from notifications.svg to ease future editing. more dispy tweaks 11 years ago
Simon L'nu bc3051e113 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
tomtom84 08b5ede5a1 Merge pull request #107 from tomtom84/master 11 years ago
tommy tomson 1fcbc7aa5a add links to /profiles, add some icons to diabook/icons, fixes in css 11 years ago
friendica b7bfff12b9 Update README 11 years ago
friendica 03b5e3aa0c reworked fix from unary for bug #323 (due to incorrect use of array_key_exists()) 11 years ago
Simon L'nu d90c830332 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica 395a9530dc still getting parent relays on remote systems 11 years ago
friendica 6525507a2f Merge branch 'pull' 11 years ago
friendica dd3b3c2454 revup 11 years ago
Simon 098c98f62a Merge pull request #105 from simonlnu/master 11 years ago
Simon L'nu 15d310e4c3 fix jot.tpl buttons. fix up subsequent styling breakage 11 years ago
Simon L'nu 4d58357b15 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
Simon 58c557b3ad Merge pull request #104 from simonlnu/master 11 years ago
Simon L'nu 66d2c52b5f push fix for funky menu action. the overflow-x might break again for some people 11 years ago
Simon L'nu 62fffdb018 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
tomtom84 dd2ff7c796 Merge pull request #103 from tomtom84/master 11 years ago
tommy tomson ec3ce05357 fix in navbar 11 years ago
Simon L'nu edfa7dbac2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 11 years ago
friendica 7ad2dd6565 fix photos after permissions_sql change 11 years ago