Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into zpull | friendica | 2013-01-06 | 1 | -0/+3 |
|\ | | | | | | | | | Conflicts: view/theme/redbasic/css/style.css | ||||
| * | Fix slider in Redbasic | Thomas Willingham | 2013-01-06 | 1 | -1/+5 |
| | | |||||
* | | get sliders working again | friendica | 2013-01-06 | 3 | -3/+3 |
|/ | |||||
* | make preview work fix some other nits | friendica | 2013-01-06 | 1 | -1/+3 |
| | |||||
* | some work bringing acl_selectors into the modern era | friendica | 2013-01-05 | 1 | -1/+1 |
| | |||||
* | structural cleanup of mod_message | friendica | 2013-01-05 | 1 | -0/+12 |
| | |||||
* | port "remember me" from Friendica | friendica | 2013-01-04 | 2 | -1/+18 |
| | |||||
* | remove the country autofill declaration | friendica | 2013-01-04 | 1 | -1/+1 |
| | |||||
* | Fix code boxes. | Thomas Willingham | 2013-01-04 | 2 | -3/+2 |
| | |||||
* | small tweaks to icon positions | friendica | 2013-01-03 | 1 | -7/+13 |
| | |||||
* | Aha, I anticipated that - event and message icons. | Thomas Willingham | 2013-01-04 | 6 | -0/+32 |
| | |||||
* | make the menu consistent and eliminate redundancy - though we need icons for ↵ | friendica | 2013-01-03 | 2 | -10/+11 |
| | | | | mail and events (sorry Thomas if this breaks your themes in a bad way, but at least the menus make sense now). | ||||
* | place holders for mail and event icons on nav bar | friendica | 2013-01-03 | 1 | -1/+9 |
| | |||||
* | import the toggle_mobile stuff to shut up some warnings | friendica | 2013-01-03 | 1 | -0/+2 |
| | |||||
* | Redbasic - floating wall-item-content sometimes causes massive top margins. | Thomas Willingham | 2013-01-01 | 1 | -1/+0 |
| | |||||
* | Add icons to redbasic, move delete button to the right, and sync nav.tpl | Thomas Willingham | 2013-01-01 | 3 | -124/+30 |
| | |||||
* | cleanup boot | friendica | 2012-12-31 | 1 | -3/+1 |
| | |||||
* | requeue failed deliveries | friendica | 2012-12-30 | 1 | -0/+1 |
| | |||||
* | fix connections page layout | friendica | 2012-12-28 | 2 | -0/+6 |
| | |||||
* | simplify, simplify. We don't need a photo menu on the connnections page. ↵ | friendica | 2012-12-28 | 1 | -10/+2 |
| | | | | Click a person, goto profile edit. We can put all other operations you might wish to perform on that page. | ||||
* | fix channel page permissions for public viewing | friendica | 2012-12-28 | 1 | -1/+1 |
| | |||||
* | More fancyred progress | Thomas Willingham | 2012-12-28 | 1 | -44/+49 |
| | |||||
* | Move like wrapper. Keep template theme specific while, at least while it's ↵ | Thomas Willingham | 2012-12-27 | 1 | -0/+117 |
| | | | | still in flux. | ||||
* | Another diaspora template | Thomas Willingham | 2012-12-27 | 1 | -3/+0 |
| | |||||
* | Pretty sure we don't need Diaspora templates. | Thomas Willingham | 2012-12-27 | 15 | -235/+0 |
| | |||||
* | provide a default directory configuration (client) | friendica | 2012-12-26 | 1 | -3/+6 |
| | |||||
* | remove the private keywords stuff to reduce directory and search complexity | friendica | 2012-12-26 | 2 | -11/+4 |
| | |||||
* | Merge pull request #7 from beardy-unixer/master | Thomas Willingham | 2012-12-24 | 11 | -628/+524 |
|\ | | | | | Un-mess up the Redbasic CSS | ||||
| * | Un-make a mess of Redbasic CSS. | Thomas Willingham | 2012-12-25 | 11 | -628/+524 |
| | | |||||
* | | Forgot dir separator | Olaf Conradi | 2012-12-25 | 2 | -2/+2 |
| | | |||||
* | | Fix theme config paths | Olaf Conradi | 2012-12-25 | 2 | -2/+2 |
| | | |||||
* | | add permission controls to "storage" objects such as attachments or other ↵ | friendica | 2012-12-22 | 1 | -0/+1 |
| | | | | | | | | stored files | ||||
* | | cleanup editpost | friendica | 2012-12-21 | 1 | -0/+1 |
|/ | |||||
* | Don't need these images anymore - we use opacity for shiny instead. | Thomas Willingham | 2012-12-20 | 3 | -0/+0 |
| | |||||
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-12-20 | 4 | -17/+43 |
|\ | |||||
| * | directory page still needs a lot of work, look up locally if local master or ↵ | friendica | 2012-12-19 | 2 | -12/+23 |
| | | | | | | | | standalone, need to put some basic profile info in discovery page and direct to local directory master | ||||
| * | add mod_profile_photo.css | friendica | 2012-12-19 | 1 | -0/+12 |
| | | |||||
| * | set_baseurl issue, more cleanup | friendica | 2012-12-19 | 1 | -5/+8 |
| | | |||||
* | | Make showmore irritating. | Thomas Willingham | 2012-12-20 | 1 | -0/+24 |
| | | |||||
* | | But...git add *all* the files. | Thomas Willingham | 2012-12-19 | 1 | -1/+1 |
| | | |||||
* | | Leave Mike's nav.tpl as the default, stick mine in the theme /tpl for now, ↵ | Thomas Willingham | 2012-12-19 | 1 | -0/+111 |
| | | | | | | | | at least. | ||||
* | | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-12-19 | 1 | -6/+13 |
|\| | | | | | | | | | Conflicts: view/tpl/nav.tpl | ||||
| * | modularise the notification popups | friendica | 2012-12-18 | 1 | -4/+11 |
| | | |||||
* | | Ooops, made a shite of that - put redbasic back. Still need to put the mods ↵ | Thomas Willingham | 2012-12-18 | 11 | -0/+3872 |
| | | | | | | | | back. | ||||
* | | Fancyred | Thomas Willingham | 2012-12-18 | 28 | -0/+4152 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-12-18 | 6 | -3871/+7 |
|\| | | | | | | | | | Conflicts: view/theme/redbasic/css/style.css | ||||
| * | several small fixes and adjustments | friendica | 2012-12-16 | 3 | -6/+20 |
| | | |||||
| * | some cleanup - Thomas we can put the radius/shadow stuff back later for the ↵ | friendica | 2012-12-16 | 4 | -17/+36 |
| | | | | | | | | hipster kids, it's quite distracting at the moment and makes it hard to get serious work done. Hmmm. Wonder if we could make radius/shadow configurable like colours.... and maybe even screen transparency.... that could be interesting. | ||||
* | | More plodding along with redbasic, notably, adding some icons. | Thomas Willingham | 2012-12-17 | 6 | -27/+65 |
| | | |||||
* | | Unplug the lifesupport, the background snake is dead. | Thomas Willingham | 2012-12-17 | 1 | -0/+0 |
| | |