Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks | friendica | 2012-03-20 | 296 | -10368/+17048 |
| | | |||||
| * | lost changes to tinymce/bbcode | friendica | 2012-03-17 | 1 | -61/+136 |
| | | |||||
| * | remove admin view of local directory | friendica | 2012-03-17 | 1 | -136/+61 |
| | | |||||
* | | added Vijay's theme from facepark.in | tony baldwin | 2012-03-21 | 1 | -0/+0 |
|/ | |||||
* | In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ↵ | Tobias Hößl | 2012-03-13 | 1 | -122/+140 |
| | | | | 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. | ||||
* | finalise spam storage model, begin driver changes. | friendica | 2012-03-05 | 1 | -5/+29 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' | Alexander Kampmann | 2012-03-01 | 1 | -52/+2 |
|\ | |||||
| * | update globaldir when page-type changes, add spam date field | friendica | 2012-02-27 | 1 | -52/+2 |
| | | |||||
* | | Enabled automated doc building. Changes: | Alexander Kampmann | 2012-03-01 | 1 | -2/+2 |
|/ | | | | | | | | -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them | ||||
* | fixed syntax errors | Alexander Kampmann | 2012-02-27 | 1 | -3/+3 |
| | |||||
* | waitman gobble fix for escaping code blocks in tinymce | friendica | 2012-02-24 | 1 | -8/+65 |
| | |||||
* | Merge pull request #45 from annando/master | friendica | 2012-02-22 | 1 | -497/+387 |
|\ | | | | | New HTML to BBCode converter, changes to BBCode, nginx support, ... | ||||
| * | New version of markdown. Playing with stylesheet. Testing line breaks. | root | 2012-02-19 | 1 | -497/+387 |
| | | |||||
* | | library/OAuth1 - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -1/+1 |
|/ | |||||
* | Documentation on Friendica changes to B8 and notice of source availability ↵ | friendica | 2012-02-15 | 1 | -0/+12 |
| | | | | in accordance with LGPL | ||||
* | Merge pull request #36 from fabrixxm/master | fabrixxm | 2012-02-15 | 8 | -0/+6745 |
|\ | | | | | Missing icons in 'quattro' and ajax events calendar | ||||
| * | events: first test for full-javascript events calendar | Fabio Comuni | 2012-02-14 | 8 | -0/+6745 |
| | | |||||
* | | make hr bbtag shareable, stray quote in duepuntozero wall_item | friendica | 2012-02-13 | 1 | -0/+2 |
|/ | |||||
* | modified: library/slinky.php Set up tabs in code correctly. | Keith Fernie | 2012-02-09 | 1 | -16/+16 |
| | |||||
* | modified: library/slinky.php Added a custom YourLS shortener to the ↵ | Keith Fernie | 2012-02-09 | 1 | -1/+31 |
| | | | | available shorteners | ||||
* | more work on Friendica db driver for b8 | friendica | 2012-02-01 | 2 | -46/+39 |
| | |||||
* | add uid variable to b8 classes | friendica | 2012-02-01 | 5 | -26/+1276 |
| | |||||
* | add spam engine | friendica | 2012-01-31 | 13 | -0/+4048 |
| | |||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 757 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | symbolic bbcode icon | friendica | 2012-01-11 | 1 | -0/+0 |
| | |||||
* | Switch to jquery 1.7.1 | zottel | 2011-12-12 | 3 | -3/+219 |
| | |||||
* | diaspora reshared lists rendering as html | friendica | 2011-11-23 | 1 | -0/+19 |
| | |||||
* | check all attribute names for validity | friendica | 2011-11-16 | 1 | -3/+7 |
| | |||||
* | html5 - don't set empty attribute either | friendica | 2011-11-12 | 1 | -1/+1 |
| | |||||
* | html5 parser - numeric attribute names chucking a wobbly. | Friendika | 2011-11-11 | 1 | -2/+2 |
| | |||||
* | Merge branch 'oauthapi' | Fabio Comuni | 2011-11-07 | 7 | -3/+2502 |
|\ | |||||
| * | oauth: authorize | Fabio Comuni | 2011-11-07 | 1 | -0/+5 |
| | | |||||
| * | oauthapi: authorize app | Fabio Comuni | 2011-10-26 | 1 | -3/+12 |
| | | |||||
| * | Initial work adding oauth to api | Fabio Comuni | 2011-10-20 | 6 | -0/+2485 |
| | | |||||
* | | oembed. fix html2bbcode when oembed html contains span and utf8 chars | Fabio Comuni | 2011-10-21 | 1 | -6/+11 |
| | | |||||
* | | fix various html parse errors | Friendika | 2011-10-20 | 1 | -0/+2 |
|/ |