Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | cleanup after recent changes in mod photos | marijus | 2014-09-13 | 1 | -2/+3 | |
| | ||||||
* | Revert "Revert "Merge pull request #583 from git-marijus/master"" | marijus | 2014-09-11 | 4 | -0/+749 | |
| | | | | This reverts commit 08638f3ec88e86def618ff89bdedb9ae9696d218. | |||||
* | Revert "Merge pull request #583 from git-marijus/master" | friendica | 2014-09-10 | 4 | -749/+0 | |
| | | | | | | | autoload broken - even after clearing cache and retrying. This reverts commit 13e7a8f123b283a096af302b0366255355ba8439, reversing changes made to 4712b78e520ca10b34e3e9b99c2752b10d811b42. | |||||
* | photo justification | marijus | 2014-09-10 | 4 | -0/+749 | |
| | ||||||
* | make fuckin twitter plugin work by selling my soul to the devil for a fuckin ↵ | friendica | 2014-09-01 | 1 | -1/+1 | |
| | | | | api key. Are y'all fuckin happy? | |||||
* | update to bootstrap-3.2 and minor css adjustments | marijus | 2014-07-24 | 6 | -1006/+1678 | |
| | ||||||
* | provide os_mkdir to workaround permission issues with php mkdir | friendica | 2014-07-16 | 1 | -0/+38 | |
| | ||||||
* | also change to div for the with brackets option which we dont actually use... | marijus | 2014-06-26 | 1 | -1/+1 | |
| | ||||||
* | make it a div to prevent extra borders in some browsers after click | marijus | 2014-06-26 | 1 | -4/+4 | |
| | ||||||
* | adjust expand/collapse speed to match jquery default | marijus | 2014-06-16 | 1 | -1/+1 | |
| | ||||||
* | some work on jot, remove some deprecated js and some random style fixes | marijus | 2014-04-03 | 1 | -2/+2 | |
| | ||||||
* | Well, if you want to add a color picker it is indeed a good idea | Christian Vogeley | 2014-03-25 | 27 | -0/+3248 | |
| | | | | to include the color picker. | |||||
* | update cacert.pem , don't hide url link for rmagic | friendica | 2014-03-09 | 1 | -460/+350 | |
| | ||||||
* | update to bootstrap version 3.1.1 which is now completely MIT licensed | marijus | 2014-02-21 | 10 | -3105/+1666 | |
| | ||||||
* | update openid for snakebite | friendica | 2014-02-17 | 7 | -106/+1350 | |
| | ||||||
* | getting bookmark support in tinymce is left as a FIXME. I've got something ↵ | friendica | 2014-02-10 | 3 | -0/+224 | |
| | | | | that almost works, but not quite in editor_plugin_src.js2 | |||||
* | more bookmark fixes | friendica | 2014-02-10 | 2 | -2/+2 | |
| | ||||||
* | allow bookmarks to use richtext | friendica | 2014-02-05 | 2 | -2/+2 | |
| | ||||||
* | The problem with a lot of packages is that it's easier to re-write them than ↵ | friendica | 2014-02-02 | 1 | -4/+4 | |
| | | | | to re-use them. | |||||
* | Ajaxchat package has way too many incompatible assumptions - after a lot of ↵ | friendica | 2014-01-27 | 197 | -24152/+0 | |
| | | | | review, we can't work with it without re-writing huge chunks. Think I'll just start fresh. Ajax chat isn't that hard and we can do stuff with it that you just can't do with other chat clients because - well we've got zot. | |||||
* | photo tagging still broken - but at least don't create a new linked item ↵ | friendica | 2014-01-27 | 1 | -0/+2 | |
| | | | | every time a photo is edited. | |||||
* | In order to provide ajax chat accessible by remote visitors (xchans), we ↵ | friendica | 2014-01-27 | 1 | -5/+5 | |
| | | | | need to remove any core assumptions that userID is an int (which is a common centralised site assumption). Additionally we won't be able to provide guest logins, as this also assumes integer ID's; so that ability needs to be disabled by configuration. | |||||
* | get rid of bootstrap's blockqote margin css which is just bloody wrong and ↵ | friendica | 2014-01-25 | 1 | -1/+1 | |
| | | | | can't easily be over-ridden | |||||
* | Nobody seems to be using that anymore | Thomas Willingham | 2014-01-23 | 44 | -411/+0 | |
| | ||||||
* | don't allow the demo upload server to operate - otherwise one could find ↵ | friendica | 2014-01-19 | 1 | -0/+4 | |
| | | | | themselves with a bunch of unwanted uploads | |||||
* | add the jquery file uploader. Have been suggesting this as a replacement for ↵ | friendica | 2014-01-19 | 56 | -0/+10169 | |
| | | | | the valum uploaders for quite some time - as there is client resize ability and no license incompatibilities. It still requires integration. | |||||
* | add ajaxchat library - needs a lot of integration work to handle ↵ | friendica | 2014-01-18 | 197 | -0/+24150 | |
| | | | | decentralisation (e.g. chatroom@website) and zotid w/permissions (e.g. ACL controlled chatrooms); we can also rip out a lot of stuff we don't need. | |||||
* | qr code support | friendica | 2014-01-07 | 425 | -0/+10416 | |
| | ||||||
* | Merge remote-tracking branch 'upstream/master' into bootstrap | Christian Vogeley | 2013-12-22 | 3 | -1/+1378 | |
|\ | | | | | | | | | Conflicts: view/php/theme_init.php | |||||
| * | editor_plugin_src.js compressed at jscompress.com | marijus | 2013-12-09 | 1 | -1/+1 | |
| | | ||||||
| * | bootbox | Christian Vogeley | 2013-12-08 | 1 | -0/+6 | |
| | | ||||||
| * | Merge branch 'bootstrap' | Christian Vogeley | 2013-12-08 | 10 | -0/+9771 | |
| |\ | ||||||
| * | | will be doing some stuff for which handcrafting xmlrpc requests is too ↵ | friendica | 2013-11-26 | 1 | -0/+1371 | |
| | | | | | | | | | | | | bloody painful. xmlrpc is long dead, but it's the language of wordpress - which is far from dead. | |||||
* | | | New modal dialog for item expiry | Christian Vogeley | 2013-12-22 | 4 | -0/+7273 | |
| |/ |/| | ||||||
* | | Include bootstrap | Christian Vogeley | 2013-12-08 | 10 | -0/+9771 | |
|/ | ||||||
* | make autocomplete better themable by adding an id | marijus | 2013-11-14 | 1 | -1/+2 | |
| | ||||||
* | Wankers. | friendica | 2013-11-07 | 89 | -0/+6923 | |
| | ||||||
* | provide an html src converter | friendica | 2013-10-31 | 1 | -57/+2 | |
| | ||||||
* | add font_awesome | friendica | 2013-10-08 | 196 | -0/+26558 | |
| | ||||||
* | get rid of pink search bar when not using redbasic "red" | friendica | 2013-10-03 | 1 | -0/+0 | |
| | ||||||
* | Add colorpicker jquery plugin for themes | Stanislav Lechev [0xAF] | 2013-09-28 | 33 | -0/+1400 | |
| | ||||||
* | several oauth fixes - shred doesn't completely work yet, but it also doesn't ↵ | friendica | 2013-09-16 | 1 | -6/+7 | |
| | | | | completely NOT work, so at least there's some improvement | |||||
* | port to spin.js | git-marijus | 2013-07-13 | 1 | -2/+2 | |
| | ||||||
* | get rid of jquery.browser warnings by removing msie hacks in two places, ↵ | friendica | 2013-05-09 | 1 | -2/+3 | |
| | | | | live update and fancybox | |||||
* | Colorbox | Thomas Willingham | 2013-04-26 | 66 | -0/+4095 | |
| | ||||||
* | Upgraded jQuery to 1.9.1, including jQuery Migrate (for the sake of keeping ↵ | Olivier Migeot | 2013-04-10 | 7 | -597/+614 | |
| | | | | old code working) and upgrade Fullcalendar (because Migrate just wasn't enough for him). | |||||
* | Remove Twatter/Facebook shit. | Thomas Willingham | 2013-03-23 | 1 | -1/+1 | |
| | ||||||
* | Add prettyPhoto library. | Thomas Willingham | 2013-03-23 | 44 | -0/+411 | |
| | ||||||
* | tweaks | friendica | 2013-03-05 | 1 | -1/+1 | |
| | ||||||
* | cleanup affinity tool | friendica | 2013-03-03 | 2 | -3/+3 | |
| |