Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | use our own CA bundle as authoritative for backend communications. This ↵ | friendica | 2013-02-13 | 1 | -0/+3895 |
| | | | | avoids OS dependent CA validity mismatches. | ||||
* | distributed directory search from the navbar | friendica | 2013-01-19 | 1 | -0/+2 |
| | |||||
* | alternate wysiwyg bbcode editor | friendica | 2012-12-10 | 30 | -0/+953 |
| | |||||
* | DB: do the mail table again. Mail almost working onsite, still needs to zot ↵ | friendica | 2012-12-04 | 1 | -2/+2 |
| | | | | though | ||||
* | usability improvements | friendica | 2012-11-13 | 1 | -2/+4 |
| | |||||
* | more file cleanup | friendica | 2012-10-22 | 7 | -0/+2921 |
| | |||||
* | add jquery.i18n for client side translations | friendica | 2012-08-13 | 10 | -0/+6868 |
| | |||||
* | Added urlify to try and create webbie auto-suggestions out of whatever ↵ | friendica | 2012-07-30 | 8 | -0/+340 |
| | | | | unicode stuff gets thrown in as a name. Currently this will only work for latin/european/cyrillic/russian, but possible to extend to ideographic forms. | ||||
* | At this moment, of the content pages only the network page partially works ↵ | friendica | 2012-07-25 | 1 | -0/+0 |
| | | | | and not all that well as the ajax loading gets sorted. This checkin is just to push the current state of the code, good bad and ugly. | ||||
* | see if this works for getting rid of scrollbars | friendica | 2012-07-24 | 3 | -0/+136 |
| | |||||
* | zentity is currently just a screen mockup until the page spec is complete | friendica | 2012-07-24 | 1 | -0/+221 |
| | |||||
* | realtime updates of "6 minutes ago" with fallback to iso8601 timestamps ↵ | friendica | 2012-07-23 | 1 | -1/+1 |
| | | | | (available on tooltip) | ||||
* | add js relative date calculator so that "3 minutes ago" will be updated when ↵ | friendica | 2012-07-22 | 1 | -0/+152 |
| | | | | it gets to 4 minutes. | ||||
* | simplify | friendica | 2012-07-21 | 23 | -16337/+0 |
| | |||||
* | merge upstream, slider work, refactor ping module, language selection work | friendica | 2012-07-13 | 28 | -0/+11506 |
| | |||||
* | fix !@#$ tinymce linebreaks for the thousandth time | friendica | 2012-07-04 | 2 | -6/+26 |
| | |||||
* | add smarty engine, remove some obsolete zot1 stuff | friendica | 2012-07-03 | 137 | -0/+28796 |
| | |||||
* | iframes were getting stripped at the rss/atom parser level. We can preserve ↵ | friendica | 2012-06-20 | 1 | -3/+3 |
| | | | | these because we will strip them in the purifier after checking for supported video sources | ||||
* | update tinymce to 3.5.0.1 | friendica | 2012-05-15 | 26 | -4805/+5696 |
| | |||||
* | language detection library | friendica | 2012-05-12 | 11 | -0/+4713 |
| | |||||
* | add photos to PM autocomplete, improved appearance | friendica | 2012-05-10 | 1 | -0/+395 |
| | |||||
* | mail autcomplete testing | friendica | 2012-05-06 | 6 | -0/+430 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 497 | -3/+7 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | document tinymce fixes/workarounds | friendica | 2012-04-01 | 1 | -1/+5 |
| | | |||||
| * | translate br with extra elements | friendica | 2012-03-26 | 2 | -2/+2 |
|/ | |||||
* | private file in repository | friendica | 2012-03-21 | 1 | -0/+0 |
| | |||||
* | Merge remote branch 'upstream/master' | tony baldwin | 2012-03-21 | 297 | -10368/+17052 |
|\ | |||||
| * | added README to mcefixes to explain what is going on. | friendica | 2012-03-20 | 1 | -0/+4 |
| | |