| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 497 | -3/+7 |
|\ |
|
| * | 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 ajax-... | Tobias Hößl | 2012-03-13 | 1 | -122/+140 |
* | 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 |
|/ |
|
* | 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 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 in... | friendica | 2012-02-15 | 1 | -0/+12 |
* | Merge pull request #36 from fabrixxm/master | fabrixxm | 2012-02-15 | 8 | -0/+6745 |
|\ |
|
| * | 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 availa... | Keith Fernie | 2012-02-09 | 1 | -1/+31 |
* | 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 permissions... | friendica | 2012-01-18 | 757 | -0/+0 |
* | 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 |
|/ |
|
* | Merge branch 'master' into newui | Fabio Comuni | 2011-09-26 | 1 | -1/+1 |
|\ |
|
| * | diaspora markdown changes, parse_url format change | Friendika | 2011-09-20 | 1 | -1/+1 |
* | | Load infos and notices via ping and show them with js popup | Fabio Comuni | 2011-09-05 | 4 | -0/+150 |
* | | Add tipTip js tooltips | Fabio Comuni | 2011-09-05 | 3 | -0/+164 |
|/ |
|
* | bookmarks + bug #140 | Friendika | 2011-09-04 | 1 | -0/+2 |
* | cleanup | Friendika | 2011-08-07 | 2 | -10/+0 |
* | several fixes for attachments | Friendika | 2011-08-03 | 1 | -1/+6 |
* | helper functions for Diaspora cert mangling | Friendika | 2011-07-25 | 1 | -0/+172 |