aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Michael2012-02-19161-7793/+23085
|\ | | | | | | | | Conflicts: view/theme/vier/style.css
| * Merge pull request #40 from simonlnu/newsmiliesAbinoam P. Marques Jr.2012-02-193-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'nu2012-02-193-1/+3
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge pull request #39 from abinoam/logfileAbinoam P. Marques Jr.2012-02-191-14/+27
| |\ \ | | |/ | |/| Logfile
| | * Fixed log file issues on a freshly installed Friendica.Abinoam P. Marques Jr2012-02-181-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 webfriendica2012-02-181-3/+12
| |
| * new notifications - implement storagefriendica2012-02-185-6/+34
| |
| * deprecating two-char smiliesfriendica2012-02-171-10/+10
| |
| * support plaintext on editpost, editorinit called before all buttons laid outfriendica2012-02-177-8/+11
| |
| * Merge branch 'pull'friendica2012-02-171-5/+0
| |\
| | * Merge pull request #38 from fabrixxm/masterfabrixxm2012-02-171-5/+0
| | |\ | | | | | | | | Revert changes to oembed
| | | * oembed: revert changes from 48f5bd492dFabio Comuni2012-02-171-5/+0
| | |/
| * / revupfriendica2012-02-171-1/+1
| |/
| * a couple more items to make sure forum delegates can't access if the forum ↵friendica2012-02-162-1/+3
| | | | | | | | login is shared with the site admin account
| * do not under any circumstances allow a delegated forum admin to access the ↵friendica2012-02-161-0/+7
| | | | | | | | site admin page.
| * naked link with no protocol being passed from Diasporafriendica2012-02-162-18/+5
| |
| * a few fixes for offsite community membersfriendica2012-02-163-6/+35
| |
| * Merge branch 'pull'friendica2012-02-163-4553/+4528
| |\
| | * Merge pull request #37 from abinoam/oexAbinoam P. Marques Jr.2012-02-161-1/+1
| | |\ | | | | | | | | Oexchange Small Fix
| | | * oexchange small fix [_POST -> _REQUEST]Abinoam P. Marques Jr2012-02-161-1/+1
| | | |
| | * | de stringsTobias Diekershoff2012-02-162-4552/+4527
| | | |
| * | | facepalm smileyfriendica2012-02-163-1/+3
| |/ /
| * / improvements in newmember pagefriendica2012-02-162-13/+17
| |/
| * another sql typofriendica2012-02-161-1/+1
| |
| * sql typo in auto-friend with D*friendica2012-02-152-2/+2
| |
| * Documentation on Friendica changes to B8 and notice of source availability ↵friendica2012-02-151-0/+12
| | | | | | | | in accordance with LGPL
| * quick commentsfriendica2012-02-1510-14/+109
| |
| * encode email headers on message deliveriesfriendica2012-02-153-9/+11
| |
| * Merge branch 'pull'friendica2012-02-1544-49/+7031
| |\
| | * Merge pull request #36 from fabrixxm/masterfabrixxm2012-02-1544-49/+7031
| | |\ | | | | | | | | Missing icons in 'quattro' and ajax events calendar
| | | * enable ajax calendar with $a->config['experimentals']['new_calendar']=1Fabio Comuni2012-02-154-4/+35
| | | |
| | | * quattro: icons for attachmentsFabio Comuni2012-02-1529-3/+69
| | | |
| | | * events js: pass only first line of desc as title; item.desc and ↵Fabio Comuni2012-02-141-6/+9
| | | | | | | | | | | | | | | | item.location as html
| | | * events js: don't modify rendered item if not autor specifiedFabio Comuni2012-02-141-7/+8
| | | |
| | | * events: first test for full-javascript events calendarFabio Comuni2012-02-1413-44/+6925
| | | |
| * | | revupfriendica2012-02-151-1/+1
| |/ /
| * | starred/bookmark searches only returning conversation head without commentsfriendica2012-02-141-5/+1
| | |
| * | preliminary qcomment support, [nosmile] tag to disable smiley processingfriendica2012-02-147-4/+45
| | |
| * | localise links to private photos inside messagesfriendica2012-02-141-0/+22
| | |
| * | refactor smilie code to allow for extensions and generation of a table of ↵friendica2012-02-141-13/+58
| | | | | | | | | | | | the entire list
| * | Merge branch 'pull'friendica2012-02-141-2/+7
| |\ \
| | * \ Merge pull request #35 from copyninja/masterVasudev Kamath2012-02-141-2/+7
| | |\ \ | | | | | | | | | | :'( :-! :-/ 8-) :-[ smiley's are mapped.
| | | * | cry, foot in mouth, cool, undecided and embarassed smiley's are mappedVasudev Kamath2012-02-141-2/+7
| | |/ /
| * | | revupfriendica2012-02-141-1/+1
| | | |
| * | | delete mail message icon not brightening on hoverfriendica2012-02-141-1/+1
| |/ /
| * | more contacts categorisation, page cleanupfriendica2012-02-132-5/+21
| | |
| * | proper tab selection when network or search is in effectfriendica2012-02-131-1/+1
| | |
| * | tabs and total count for contacts pagefriendica2012-02-133-26/+63
| | |
| * | updates to plugin docsfriendica2012-02-131-10/+30
| | |
| * | more stray quotesfriendica2012-02-137-7/+7
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 13:56:57 +0000