Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-04-18 | 2 | -2/+2 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-04-18 | 1 | -1/+1 |
| |\ | |||||
| | * | This should fix the preview allignment permantly. | jeroenpraat | 2014-04-18 | 1 | -1/+1 |
| | | | |||||
| * | | 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. | ||||
* / | move create a new collection below the actual collection list again. failed ↵ | friendica | 2014-04-18 | 1 | -4/+8 |
|/ | | | | experiment. | ||||
* | This preserves the alignment work done earlier but provides a more ↵ | friendica | 2014-04-17 | 1 | -1/+1 |
| | | | | aesthetically pleasing page. | ||||
* | a few more alignment issues | friendica | 2014-04-16 | 1 | -1/+1 |
| | |||||
* | Lots of positional changes on sidebar menus - reduce indented margins | friendica | 2014-04-16 | 3 | -6/+7 |
|\ | | | | | | | | | | | | | Merge branch 'master' into ruler Conflicts: view/css/widgets.css | ||||
| * | bug fixes after widget cleanup | friendica | 2014-04-16 | 1 | -1/+1 |
| | | |||||
| * | button cleanup directory page | friendica | 2014-04-16 | 1 | -3/+3 |
| | | |||||
* | | fixing widgets | friendica | 2014-04-16 | 3 | -6/+7 |
|/ | |||||
* | 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 | 1 | -1/+3 |
| | |||||
* | bootstrapify aclselector | marijus | 2014-04-11 | 8 | -68/+48 |
| | |||||
* | 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 | 1 | -2/+2 |
| | | | | 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 | 4 | -26/+31 |
|\ | |||||
| * | 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 | 3 | -9/+6 |
| | | |||||
| * | whitespace cleanup | marijus | 2014-04-08 | 1 | -6/+6 |
| | | |||||
| * | change the way jot tools are displayed/hidden | marijus | 2014-04-08 | 2 | -14/+22 |
| | | |||||
* | | issue #400 - lock not showing up for previews of private mentions (or ↵ | friendica | 2014-04-09 | 1 | -8/+5 |
|/ | | | | | | 'new/search' item view) also reformat the new/search template to pick up recent changes to conv_item.tpl | ||||
* | pass the original element title through the element stack so that it we ↵ | friendica | 2014-04-07 | 1 | -0/+4 |
| | | | | don't lose it in the ajaxuploader. | ||||
* | subdue archived connections in mod/connections | friendica | 2014-04-06 | 1 | -1/+1 |
| | |||||
* | more work on #395 | friendica | 2014-04-06 | 2 | -1/+10 |
| | |||||
* | jot and location style fixes | marijus | 2014-04-06 | 1 | -3/+3 |
| | |||||
* | Hope I have repaired the channel admin page. | sasiflo | 2014-04-06 | 1 | -13/+13 |
| | | | | | | | | | | Channel blocking and deleting was copied from user actions. This was not done to an end. Hope what I do is enough to enable channel blocking and deleting the correct way. On deletion all entities that belong to the channel are deleted. But the channel itself is just marked as deleted. Do not really understand why it is done this way. | ||||
* | provide the ability for rpost to post as another of your channels. This does ↵ | friendica | 2014-04-05 | 2 | -1/+12 |
| | | | | not yet work, so the functionality has not been enabled. | ||||
* | some work on jot, remove some deprecated js and some random style fixes | marijus | 2014-04-03 | 2 | -79/+78 |
| | |||||
* | snakebite: bring back some of the legacy XML discovery interfaces, update as ↵ | friendica | 2014-04-02 | 2 | -20/+2 |
| | | | | required. | ||||
* | save notes every ten seconds while focused, then save them once more on focusout | friendica | 2014-04-01 | 1 | -1/+16 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-03-30 | 1 | -1/+1 |
|\ | |||||
| * | Default discover to on. | Thomas Willingham | 2014-03-30 | 1 | -1/+1 |
| | | |||||
* | | notes widget: jquery.live is deprecated, replacing with jquery.on and ↵ | friendica | 2014-03-30 | 1 | -1/+1 |
|/ | | | | binding to focusout, as the input and paste callbacks are a bit wasteful - they are presumably called on every character typed, yet some of these events have gone missing (probably due to having a lot of network calls in quick succession) so hopefully a single save of the workspace on focusout should be more reliable. | ||||
* | Let the site admin choose whether to display the Discover tab. | Alexandre Hannud Abdo | 2014-03-30 | 1 | -0/+1 |
| | |||||
* | firehose testing (network?f=&fh=1) - some possible security bugs so testing ↵ | friendica | 2014-03-26 | 1 | -0/+2 |
| | | | | purposes only | ||||
* | add admin/channels | friendica | 2014-03-26 | 2 | -0/+51 |
| | |||||
* | improve scannability of content with per-item bottom border, but lighten the ↵ | friendica | 2014-03-25 | 1 | -1/+2 |
| | | | | per-item borders considerably so it isn't in your face. This is an experiment based on sound principles, but I'm not a UI expert. If this uglifies it too much - please revert. | ||||
* | fix lock permissions view and autoload not kicking in on touch devices under ↵ | marijus | 2014-03-25 | 3 | -5/+3 |
| | | | | certain conditions | ||||
* | provide 'style' option to archive widget to choose between 'select' and ↵ | friendica | 2014-03-23 | 1 | -1/+9 |
| | | | | 'list' format | ||||
* | Add color picker to theme settings | Christian Vogeley | 2014-03-23 | 1 | -0/+6 |
| | |||||
* | add expire setting, take out unknown mailers and max friend requests per day ↵ | friendica | 2014-03-19 | 1 | -2/+2 |
| | | | | which aren't implemented | ||||
* | bootstrapify common tabs and make show aside/tabs buttons only appear if ↵ | marijus | 2014-03-19 | 2 | -5/+10 |
| | | | | there is something to show | ||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-03-13 | 1 | -0/+3 |
| |\ | |||||
| * | | move region_1 to off instead of removing it and dont squelch region_2 when ↵ | marijus | 2014-03-13 | 1 | -1/+1 |
| | | | | | | | | | | | | region_1 moves in again | ||||
* | | | remove allowed friend domains and allowed email domains from admin settings ↵ | friendica | 2014-03-13 | 1 | -2/+0 |
| |/ |/| | | | | | - as they are not implemented | ||||
* | | Stick help in a template | Thomas Willingham | 2014-03-12 | 1 | -0/+3 |
|/ | |||||
* | get rid of fancybox for photos upload, not just photo edit | friendica | 2014-03-11 | 1 | -1/+1 |
| | |||||
* | fix lock position | marijus | 2014-03-10 | 1 | -6/+2 |
| |