Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Many small changes | Michael | 2012-02-19 | 1 | -23/+0 |
| | |||||
* | Merge remote branch 'upstream/master' | Michael | 2012-02-19 | 161 | -7793/+23085 |
|\ | | | | | | | | | Conflicts: view/theme/vier/style.css | ||||
| * | Merge pull request #40 from simonlnu/newsmilies | Abinoam P. Marques Jr. | 2012-02-19 | 3 | -1/+3 |
| |\ | | | | | | | add :headdesk and fix doc/Pages.md to remove the absolute URL to / | ||||
| | * | add :headdesk and fix doc/Pages.md to remove the absolute URL to / | Simon L'nu | 2012-02-19 | 3 | -1/+3 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | Merge pull request #39 from abinoam/logfile | Abinoam P. Marques Jr. | 2012-02-19 | 1 | -14/+27 |
| |\ \ | | |/ | |/| | Logfile | ||||
| | * | Fixed log file issues on a freshly installed Friendica. | Abinoam P. Marques Jr | 2012-02-18 | 1 | -14/+27 |
| |/ | | | | | | | | | | | * Check to see if log file exists. * After trying to open it, check to see if it went ok. * So, check to see if the file size != 0 (fread error with size = 0) | ||||
| * | change notify messages for web | friendica | 2012-02-18 | 1 | -3/+12 |
| | | |||||
| * | new notifications - implement storage | friendica | 2012-02-18 | 5 | -6/+34 |
| | | |||||
| * | deprecating two-char smilies | friendica | 2012-02-17 | 1 | -10/+10 |
| | | |||||
| * | support plaintext on editpost, editorinit called before all buttons laid out | friendica | 2012-02-17 | 7 | -8/+11 |
| | | |||||
| * | Merge branch 'pull' | friendica | 2012-02-17 | 1 | -5/+0 |
| |\ | |||||
| | * | Merge pull request #38 from fabrixxm/master | fabrixxm | 2012-02-17 | 1 | -5/+0 |
| | |\ | | | | | | | | | Revert changes to oembed | ||||
| | | * | oembed: revert changes from 48f5bd492d | Fabio Comuni | 2012-02-17 | 1 | -5/+0 |
| | |/ | |||||
| * / | revup | friendica | 2012-02-17 | 1 | -1/+1 |
| |/ | |||||
| * | a couple more items to make sure forum delegates can't access if the forum ↵ | friendica | 2012-02-16 | 2 | -1/+3 |
| | | | | | | | | login is shared with the site admin account | ||||
| * | do not under any circumstances allow a delegated forum admin to access the ↵ | friendica | 2012-02-16 | 1 | -0/+7 |
| | | | | | | | | site admin page. | ||||
| * | naked link with no protocol being passed from Diaspora | friendica | 2012-02-16 | 2 | -18/+5 |
| | | |||||
| * | a few fixes for offsite community members | friendica | 2012-02-16 | 3 | -6/+35 |
| | | |||||
| * | Merge branch 'pull' | friendica | 2012-02-16 | 3 | -4553/+4528 |
| |\ | |||||
| | * | Merge pull request #37 from abinoam/oex | Abinoam P. Marques Jr. | 2012-02-16 | 1 | -1/+1 |
| | |\ | | | | | | | | | Oexchange Small Fix | ||||
| | | * | oexchange small fix [_POST -> _REQUEST] | Abinoam P. Marques Jr | 2012-02-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | de strings | Tobias Diekershoff | 2012-02-16 | 2 | -4552/+4527 |
| | | | | |||||
| * | | | facepalm smiley | friendica | 2012-02-16 | 3 | -1/+3 |
| |/ / | |||||
| * / | improvements in newmember page | friendica | 2012-02-16 | 2 | -13/+17 |
| |/ | |||||
| * | another sql typo | friendica | 2012-02-16 | 1 | -1/+1 |
| | | |||||
| * | sql typo in auto-friend with D* | friendica | 2012-02-15 | 2 | -2/+2 |
| | | |||||
| * | Documentation on Friendica changes to B8 and notice of source availability ↵ | friendica | 2012-02-15 | 1 | -0/+12 |
| | | | | | | | | in accordance with LGPL | ||||
| * | quick comments | friendica | 2012-02-15 | 10 | -14/+109 |
| | | |||||
| * | encode email headers on message deliveries | friendica | 2012-02-15 | 3 | -9/+11 |
| | | |||||
| * | Merge branch 'pull' | friendica | 2012-02-15 | 44 | -49/+7031 |
| |\ | |||||
| | * | Merge pull request #36 from fabrixxm/master | fabrixxm | 2012-02-15 | 44 | -49/+7031 |
| | |\ | | | | | | | | | Missing icons in 'quattro' and ajax events calendar | ||||
| | | * | enable ajax calendar with $a->config['experimentals']['new_calendar']=1 | Fabio Comuni | 2012-02-15 | 4 | -4/+35 |
| | | | | |||||
| | | * | quattro: icons for attachments | Fabio Comuni | 2012-02-15 | 29 | -3/+69 |
| | | | | |||||
| | | * | events js: pass only first line of desc as title; item.desc and ↵ | Fabio Comuni | 2012-02-14 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | item.location as html | ||||
| | | * | events js: don't modify rendered item if not autor specified | Fabio Comuni | 2012-02-14 | 1 | -7/+8 |
| | | | | |||||
| | | * | events: first test for full-javascript events calendar | Fabio Comuni | 2012-02-14 | 13 | -44/+6925 |
| | | | | |||||
| * | | | revup | friendica | 2012-02-15 | 1 | -1/+1 |
| |/ / | |||||
| * | | starred/bookmark searches only returning conversation head without comments | friendica | 2012-02-14 | 1 | -5/+1 |
| | | | |||||
| * | | preliminary qcomment support, [nosmile] tag to disable smiley processing | friendica | 2012-02-14 | 7 | -4/+45 |
| | | | |||||
| * | | localise links to private photos inside messages | friendica | 2012-02-14 | 1 | -0/+22 |
| | | | |||||
| * | | refactor smilie code to allow for extensions and generation of a table of ↵ | friendica | 2012-02-14 | 1 | -13/+58 |
| | | | | | | | | | | | | the entire list | ||||
| * | | Merge branch 'pull' | friendica | 2012-02-14 | 1 | -2/+7 |
| |\ \ | |||||
| | * \ | Merge pull request #35 from copyninja/master | Vasudev Kamath | 2012-02-14 | 1 | -2/+7 |
| | |\ \ | | | | | | | | | | | :'( :-! :-/ 8-) :-[ smiley's are mapped. | ||||
| | | * | | cry, foot in mouth, cool, undecided and embarassed smiley's are mapped | Vasudev Kamath | 2012-02-14 | 1 | -2/+7 |
| | |/ / | |||||
| * | | | revup | friendica | 2012-02-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | delete mail message icon not brightening on hover | friendica | 2012-02-14 | 1 | -1/+1 |
| |/ / | |||||
| * | | more contacts categorisation, page cleanup | friendica | 2012-02-13 | 2 | -5/+21 |
| | | | |||||
| * | | proper tab selection when network or search is in effect | friendica | 2012-02-13 | 1 | -1/+1 |
| | | | |||||
| * | | tabs and total count for contacts page | friendica | 2012-02-13 | 3 | -26/+63 |
| | | | |||||
| * | | updates to plugin docs | friendica | 2012-02-13 | 1 | -10/+30 |
| | | |