Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 2 | -66/+66 |
|\ | |||||
| * | local_user => local_channel | friendica | 2015-01-28 | 2 | -66/+66 |
| | | |||||
* | | Merge branch 'master' into pocorate | friendica | 2015-01-28 | 2 | -4/+4 |
|\| | |||||
| * | fix /view/de/lostpass_eml.tpl | marijus | 2015-01-28 | 1 | -4/+2 |
| | | |||||
| * | show shared button only to local user | marijus | 2015-01-28 | 1 | -0/+2 |
| | | |||||
* | | first cut at direntry template, right now just provide a mockup with a ↵ | friendica | 2015-01-27 | 1 | -0/+12 |
|/ | | | | slider and rating count to look at. | ||||
* | tpl and css cleanup | marijus | 2015-01-27 | 2 | -12/+5 |
| | |||||
* | move userReadableSize() and getIconFromType() from ↵ | marijus | 2015-01-27 | 3 | -0/+59 |
| | | | | /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme | ||||
* | we also don't need a profile selector when editing our default permissions. | friendica | 2015-01-25 | 1 | -0/+2 |
| | |||||
* | don't hide the scary stuff when editing self permissions. | friendica | 2015-01-25 | 1 | -2/+8 |
| | |||||
* | Hide all the scary decision making stuff that sends intellectually ↵ | friendica | 2015-01-25 | 1 | -0/+3 |
| | | | | challenged beings into siezures and brain melt-downs and online freak-outs. | ||||
* | rework the new connection stuff so we don't need a "permissions have been ↵ | friendica | 2015-01-25 | 1 | -4/+4 |
| | | | | changed but not saved" message. | ||||
* | move connection approval checkbox to top of page (above the sliders) - ↵ | friendica | 2015-01-25 | 1 | -11/+8 |
| | | | | instead of being in between rating and rating text. | ||||
* | this will require more fixing in include/enotify | marijus | 2015-01-23 | 1 | -1/+1 |
| | |||||
* | couple of hubloc manager issues | friendica | 2015-01-21 | 1 | -3/+3 |
| | |||||
* | bring back nav-search spinner | marijus | 2015-01-21 | 2 | -7/+11 |
| | |||||
* | More styling for poco reputation page. Note: the reason this isn't yet ↵ | friendica | 2015-01-20 | 1 | -0/+4 |
| | | | | linked to the UI is because we need to age some old '1' values that are bogus. | ||||
* | css fixes - hopefully | marijus | 2015-01-20 | 4 | -15/+24 |
| | |||||
* | satisfy the floated images | marijus | 2015-01-20 | 3 | -3/+3 |
| | |||||
* | as a workaround make nav-search dropdown behave a little better | marijus | 2015-01-20 | 3 | -11/+11 |
| | |||||
* | Merge pull request #870 from pafcu/autocomplete_fix | RedMatrix | 2015-01-20 | 1 | -1/+1 |
|\ | | | | | Fix autocomplete with groups | ||||
| * | Fix autocomplete with groups | Stefan Parviainen | 2015-01-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #868 from pafcu/autocomplete_fix | git-marijus | 2015-01-19 | 1 | -1/+1 |
|\| | | | | | Fix issue #865. | ||||
| * | Fix issue #865. | Stefan Parviainen | 2015-01-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #863 from einervonvielen/Fix_bbcode_toc_for_help_pages | RedMatrix | 2015-01-19 | 1 | -1/+1 |
|\ \ | | | | | | | Fixed bbode element toc for webpages | ||||
| * | | Fixed bbode element toc for webpages | Einer von Vielen | 2015-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | - At the moment webpages can contain empty headings if the textarea "Title" is left empty in the webpage creator (https://hostname/webpages/username) | ||||
* | | | basic proof of concept file activity support - will send activity via the ↵ | marijus | 2015-01-18 | 2 | -3/+9 |
|/ / | | | | | | | filestorage module and via attach_delete() | ||||
* | | Merge pull request #859 from einervonvielen/Issue_846_view_calendar_event | pafcu | 2015-01-18 | 2 | -1/+2 |
|\ \ | | | | | | | Fixed #846 Viewing event from calendar displays event | ||||
| * | | Fixed #846 Viewing event from calendar displays event | Einer von Vielen | 2015-01-18 | 2 | -1/+2 |
| | | | | | | | | | See https://github.com/friendica/red/issues/846 | ||||
* | | | Merge pull request #858 from pafcu/master | pafcu | 2015-01-17 | 1 | -0/+1 |
|\ \ \ | |/ / |/| / | |/ | Fix bug with groups and autocomplete | ||||
| * | Remove accidental logging | Stefan Parviainen | 2015-01-17 | 1 | -1/+0 |
| | | |||||
| * | Fix bug with groups and autocomplete | Stefan Parviainen | 2015-01-17 | 1 | -0/+2 |
| | | |||||
* | | more heavy lifting on poco rep | friendica | 2015-01-15 | 4 | -17/+22 |
| | | |||||
* | | poco rating - add a test module for pulling out ratings | friendica | 2015-01-15 | 2 | -1/+38 |
| | | |||||
* | | editing stuff for poco reputation | friendica | 2015-01-15 | 3 | -1/+18 |
| | | |||||
* | | more backend work on poco rating | friendica | 2015-01-15 | 3 | -0/+13 |
|/ | |||||
* | Merge remote-tracking branch 'upstream/master' into toc | Einer von Vielen | 2015-01-14 | 1 | -0/+2 |
|\ | |||||
| * | hide friends broken, add parameter for item search by verb | friendica | 2015-01-13 | 1 | -0/+2 |
| | | |||||
* | | Added a table of content as bbcode element [toc] for webpages | 2015-01-14 | 2 | -2/+2 | |
| | | | | | | | | | | - Included jquery.toc.js (http://www.apache.org/licenses/LICENSE-2.0) - Modified jquery.toc.js to work with the webpages of the red#matrix - Added info to the help | ||||
* | | Test | Einer von Vielen | 2015-01-13 | 2 | -0/+3 |
|/ | | | | ...with table of content. jquery.tableofconent.js works bunt not properly | ||||
* | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 1 | -1/+1 |
| | |||||
* | another attempt to explain default permissions on connedit page | friendica | 2015-01-11 | 3 | -14/+42 |
| | |||||
* | Update Swedish strings from Transifex | Erik Lundin | 2015-01-10 | 2 | -2691/+2704 |
| | |||||
* | Updated Italian translation | Paolo Tacconi | 2015-01-09 | 2 | -2696/+2709 |
| | |||||
* | Fix saved searches on network page, fix caching mith multiple autocompleters | Stefan Parviainen | 2015-01-08 | 2 | -7/+14 |
| | |||||
* | Fix issue with case sensitive filtering in autocomplete, put autocomplete ↵ | Stefan Parviainen | 2015-01-08 | 1 | -9/+24 |
| | | | | dropdown on top of navbar, show entry to leave the text unchanged | ||||
* | Merge autocomplete caching, show more results in navbar search | Stefan Parviainen | 2015-01-07 | 3 | -8/+36 |
|\ | |||||
| * | also style the collapse link | marijus | 2015-01-07 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #826 from pafcu/cache_autocomplete | RedMatrix | 2015-01-07 | 1 | -0/+17 |
| |\ | | | | | | | Cache autocomplete results locally (the one in the editor) | ||||
| | * | Cache autocomplete results locally (the one in the editor) | Stefan Parviainen | 2015-01-06 | 1 | -0/+17 |
| | | |