Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-02-23 | 2 | -22/+42 |
|\ | |||||
| * | green-quattro: applied a color for shiny class and preview | Tobias Diekershoff | 2012-02-23 | 2 | -22/+42 |
| | | |||||
* | | quattro: fix typos | Fabio Comuni | 2012-02-23 | 2 | -4/+5 |
|/ | |||||
* | quattro post preview, style contacts pages, style for "shiny" class, fix ↵ | Fabio Comuni | 2012-02-23 | 13 | -92/+221 |
| | | | | | | | contacts list in profile aside. remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts | ||||
* | Merge branch 'master' into notify | friendica | 2012-02-23 | 3 | -0/+153 |
|\ | |||||
| * | quattro: added styling to pivate message view | Tobias Diekershoff | 2012-02-23 | 3 | -0/+153 |
| | | |||||
* | | more theme notify fixes | friendica | 2012-02-23 | 1 | -0/+1 |
| | | |||||
* | | new notify sort of working in testbubble | friendica | 2012-02-22 | 2 | -0/+4 |
| | | |||||
* | | Merge branch 'master' into notify | friendica | 2012-02-22 | 8 | -9/+481 |
|\| | |||||
| * | Merge pull request #45 from annando/master | friendica | 2012-02-22 | 8 | -9/+481 |
| |\ | | | | | | | New HTML to BBCode converter, changes to BBCode, nginx support, ... | ||||
| | * | German translation more gender friendly. Some more logging in poller.php | Michael | 2012-02-22 | 6 | -6/+6 |
| | | | |||||
| | * | Fetched some missing styles from testbubble. | Michael | 2012-02-20 | 2 | -0/+395 |
| | | | |||||
| | * | New version of markdown. Playing with stylesheet. Testing line breaks. | root | 2012-02-19 | 1 | -0/+11 |
| | | | |||||
| | * | Many small changes | Michael | 2012-02-19 | 1 | -23/+0 |
| | | | |||||
| | * | Merge remote branch 'upstream/master' | Michael | 2012-02-19 | 48 | -4636/+6755 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: view/theme/vier/style.css | ||||
| | * | | New theme "vier" derives from "quattro" | ike | 2012-02-19 | 11 | -0/+4270 |
| | | | | |||||
* | | | | some cleanup of tb notifications | friendica | 2012-02-21 | 2 | -1/+6 |
|/ / / | |||||
* | | | view/admin_remoteupdate.tpl - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 1 | -2/+2 |
| | | | |||||
* | | | htconfig.tpl - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 7 | -14/+14 |
| | | | |||||
* | | | mod/dfrn_request.php and templates - Friendika -> Friendica | Abinoam P. Marques Jr | 2012-02-20 | 2 | -2/+2 |
| |/ |/| | |||||
* | | support plaintext on editpost, editorinit called before all buttons laid out | friendica | 2012-02-17 | 6 | -8/+7 |
| | | |||||
* | | de strings | Tobias Diekershoff | 2012-02-16 | 2 | -4552/+4527 |
| | | |||||
* | | quick comments | friendica | 2012-02-15 | 7 | -2/+95 |
| | | |||||
* | | Merge pull request #36 from fabrixxm/master | fabrixxm | 2012-02-15 | 7 | -5/+171 |
|\ \ | | | | | | | Missing icons in 'quattro' and ajax events calendar | ||||
| * | | enable ajax calendar with $a->config['experimentals']['new_calendar']=1 | Fabio Comuni | 2012-02-15 | 2 | -1/+25 |
| | | | |||||
| * | | quattro: icons for attachments | Fabio Comuni | 2012-02-15 | 2 | -0/+65 |
| | | | |||||
| * | | 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 | 4 | -5/+81 |
| | | | |||||
* | | | preliminary qcomment support, [nosmile] tag to disable smiley processing | friendica | 2012-02-14 | 3 | -0/+32 |
| | | | |||||
* | | | delete mail message icon not brightening on hover | friendica | 2012-02-14 | 1 | -1/+1 |
| | | | |||||
* | | | more contacts categorisation, page cleanup | friendica | 2012-02-13 | 1 | -2/+3 |
| | | | |||||
* | | | tabs and total count for contacts page | friendica | 2012-02-13 | 2 | -5/+6 |
| | | | |||||
* | | | more stray quotes | friendica | 2012-02-13 | 7 | -7/+7 |
| | | | |||||
* | | | make hr bbtag shareable, stray quote in duepuntozero wall_item | friendica | 2012-02-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'pull' | friendica | 2012-02-13 | 9 | -2/+1527 |
|\ \ \ | |||||
| * | | | green variation of the quattro theme | Tobias Diekershoff | 2012-02-13 | 5 | -0/+1503 |
| |/ / | |||||
| * | | Fix 'item not found' message | Fabio Comuni | 2012-02-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'friendica/master' into mobile | Fabio Comuni | 2012-02-13 | 19 | -3/+4309 |
| |\ \ | |||||
| * | | | quattro: pause icon | Fabio Comuni | 2012-02-13 | 2 | -0/+12 |
| | | | | |||||
| * | | | reshare in "display" view | Fabio Comuni | 2012-02-13 | 1 | -3/+2 |
| | | | | |||||
| * | | | hidden jot in "display" to allow reshare | Fabio Comuni | 2012-02-10 | 1 | -0/+3 |
| | | | | |||||
| * | | | quattro: add "view in context" link in search results | Fabio Comuni | 2012-02-10 | 1 | -1/+9 |
| | | | | |||||
* | | | | POST should be lowercase these days | friendica | 2012-02-13 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | fix link/bookmark reshares | friendica | 2012-02-11 | 1 | -0/+1 |
| | | | |||||
* | | | bug #278 show only blocked contacts | friendica | 2012-02-11 | 1 | -1/+2 |
| | | | |||||
* | | | show tags (pub_keywords) in advanced profile | friendica | 2012-02-11 | 1 | -0/+7 |
| | | | |||||
* | | | item tag notifications | friendica | 2012-02-09 | 1 | -0/+1 |
| | | | |||||
* | | | fix apps sub-menu on quattro and vier | friendica | 2012-02-08 | 2 | -1/+1 |
| | | | |||||
* | | | quattro: added delete button to mail list overview | Tobias Diekershoff | 2012-02-08 | 2 | -34/+13 |
| | | | |||||
* | | | quattro: added delete buttons to groups and contacts | Tobias Diekershoff | 2012-02-08 | 2 | -0/+44 |
| | | |