Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Oeps | jeroenpraat | 2014-04-19 | 1 | -1/+0 |
| | |||||
* | Workaround alignment notify menu's | jeroenpraat | 2014-04-19 | 3 | -1/+11 |
| | |||||
* | remove whitespace at the top of widgets because bootstrap gives us 20 pixels ↵ | friendica | 2014-04-18 | 1 | -8/+1 |
| | | | | above an h3 element and we end up with way too much whitespace | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-18 | 3 | -5/+9 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-04-18 | 2 | -2/+5 |
| |\ | |||||
| | * | This should fix the preview allignment permantly. | jeroenpraat | 2014-04-18 | 2 | -2/+5 |
| | | | |||||
| * | | We know why third party zids didn't work now, so don't use hacky | Thomas Willingham | 2014-04-18 | 1 | -1/+1 |
| |/ | | | | | | | workarounds anymore. | ||||
| * | Little fix and previous fix on a different place | jeroenpraat | 2014-04-18 | 1 | -3/+4 |
| | | |||||
* | | move create a new collection below the actual collection list again. failed ↵ | friendica | 2014-04-18 | 2 | -4/+11 |
|/ | | | | experiment. | ||||
* | tiny fix hover preview button | jeroenpraat | 2014-04-17 | 1 | -0/+4 |
| | |||||
* | Last 3 dropdown menus fixed for dark schema. Dark schema completed (by now). | jeroenpraat | 2014-04-17 | 3 | -3/+28 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-17 | 4 | -9/+58 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | jeroenpraat | 2014-04-17 | 12 | -77/+109 |
| |\ | |||||
| * | | Dark schema: fixed code view, ACL window and preview | jeroenpraat | 2014-04-16 | 4 | -9/+58 |
| | | | |||||
* | | | This preserves the alignment work done earlier but provides a more ↵ | friendica | 2014-04-17 | 3 | -1/+17 |
| |/ |/| | | | | | aesthetically pleasing page. | ||||
* | | saved search adjustments | friendica | 2014-04-16 | 2 | -13/+9 |
| | | |||||
* | | a few more alignment issues | friendica | 2014-04-16 | 3 | -13/+16 |
| | | |||||
* | | clean up the group selector on the connedit page | friendica | 2014-04-16 | 1 | -1/+4 |
| | | |||||
* | | Lots of positional changes on sidebar menus - reduce indented margins | friendica | 2014-04-16 | 8 | -57/+326 |
|\ \ | | | | | | | | | | | | | | | | | | | Merge branch 'master' into ruler Conflicts: view/css/widgets.css | ||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-16 | 3 | -38/+289 |
| |\| | |||||
| | * | Merge pull request #414 from jeroenpraat/patch-2 | RedMatrix | 2014-04-16 | 3 | -38/+289 |
| | |\ | | | | | | | | | Large update dark schema | ||||
| | | * | Needed for large update dark schema and minor fixes default. | jeroenpraat | 2014-04-15 | 1 | -18/+98 |
| | | | | |||||
| | | * | Needed for large update dark schema. | jeroenpraat | 2014-04-15 | 1 | -4/+107 |
| | | | | |||||
| | | * | Large update dark schema | jeroenpraat | 2014-04-15 | 1 | -16/+84 |
| | | | | | | | | | | | | The new ACL and some minor things still needs to be done. Style.css and style.php will follow. | ||||
| * | | | bug fixes after widget cleanup | friendica | 2014-04-16 | 2 | -3/+3 |
| | | | | |||||
| * | | | button cleanup directory page | friendica | 2014-04-16 | 3 | -14/+18 |
| |/ / | |||||
* | | | fixing widgets | friendica | 2014-04-16 | 5 | -34/+32 |
| | | | |||||
* | | | this makes conversations look a lot better | friendica | 2014-04-16 | 1 | -1/+8 |
| | | | |||||
* | | | first cut - straighten out the margins | friendica | 2014-04-16 | 1 | -1/+8 |
|/ / | |||||
* / | The comment submit button seems to have drifted into some strange place | friendica | 2014-04-15 | 1 | -1/+1 |
|/ | |||||
* | minor css fix | marijus | 2014-04-15 | 2 | -10/+2 |
| | |||||
* | fixes rconnect button for bs-default scheme | marijus | 2014-04-14 | 1 | -3/+3 |
| | |||||
* | a small fix for bs-default scheme | marijus | 2014-04-14 | 1 | -0/+2 |
| | |||||
* | directory: make "connect" more prominent, but this ultimately needs more ↵ | friendica | 2014-04-14 | 2 | -2/+2 |
| | | | | theme work. | ||||
* | minor alignment issues | friendica | 2014-04-13 | 2 | -6/+13 |
| | |||||
* | this is looking better, call the forum version of a tag "foobar network", ↵ | friendica | 2014-04-12 | 1 | -6/+1 |
| | | | | besides altering the icon | ||||
* | use icons for identification | friendica | 2014-04-11 | 1 | -1/+6 |
| | |||||
* | Merge pull request #405 from beardy-unixer/master | RedMatrix | 2014-04-12 | 1 | -1/+0 |
|\ | | | | | A few little fixes | ||||
| * | Never set background or color unless you set both. If this is needed | Thomas Willingham | 2014-04-11 | 1 | -1/+0 |
| | | | | | | | | in future, it should probably be reimplmented with the class anyway. | ||||
* | | bootstrapify aclselector | marijus | 2014-04-11 | 10 | -156/+112 |
|/ | |||||
* | Merge pull request #403 from tuscanhobbit/master | Paolo T | 2014-04-11 | 2 | -1083/+1218 |
|\ | | | | | IT: strings updated | ||||
| * | IT: strings updated | Paolo Tacconi | 2014-04-11 | 2 | -1083/+1218 |
| | | |||||
* | | push notes widget updates to channel clones on focusout (final save). Don't ↵ | friendica | 2014-04-10 | 1 | -3/+5 |
| | | | | | | | | do this for the auto-save events (every ten seconds) which could generate superfluous network traffic. | ||||
* | | improve the appearance of the ACL selector in a hackish way on the short term - | friendica | 2014-04-09 | 2 | -4/+4 |
| | | | | | | | | it really needs to be re-worked for bootstrap but in any event the words "show" and "don't show" make a mess of it. We should probably just use icons (with a bit of padding) that people can select with a touchscreen and reformat the box accordingly. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-09 | 12 | -54/+44 |
|\ \ | |||||
| * \ | Merge pull request #399 from git-marijus/master | RedMatrix | 2014-04-10 | 12 | -54/+44 |
| |\ \ | | | | | | | | | change the way jot tools are displayed/hidden | ||||
| | * | | use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair ↵ | marijus | 2014-04-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | editblock and editlayout which still depended on it. | ||||
| | * | | replace lock icon with icon-{lock, unlock} | marijus | 2014-04-09 | 11 | -37/+19 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-04-09 | 1 | -0/+1 |
| | |\ \ | |||||
| | * | | | whitespace cleanup | marijus | 2014-04-08 | 1 | -6/+6 |
| | | | | |