aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #881 from cvogeley/masterRedMatrix2015-01-301-1/+2
|\ | | | | Add allowed and not allowed emails to the UI in the
| * Add allowed and not allowed emails to the UI in theChristian Vogeley2015-01-291-1/+2
| | | | | | | | admin menu
* | how did that stuff merge? grrrr....friendica2015-01-291-2/+2
| |
* | Merge branch 'master' into pocoratefriendica2015-01-292-2/+2
|\ \
| * | small autocomplete fix adding space to the outputRedSwede2015-01-291-1/+1
| | | | | | | | | | | | provides: the ability to press enter after pressing enter during the mention-js-popup (this second enter should behave as a normal one) FF35
| * | non-tested fix for issue 847RedSwede2015-01-291-1/+1
| |/
* | Merge branch 'master' into pocoratefriendica2015-01-292-66/+66
|\|
| * local_user => local_channelfriendica2015-01-282-66/+66
| |
* | Merge branch 'master' into pocoratefriendica2015-01-282-4/+4
|\|
| * fix /view/de/lostpass_eml.tplmarijus2015-01-281-4/+2
| |
| * show shared button only to local usermarijus2015-01-281-0/+2
| |
* | first cut at direntry template, right now just provide a mockup with a ↵friendica2015-01-271-0/+12
|/ | | | slider and rating count to look at.
* tpl and css cleanupmarijus2015-01-272-12/+5
|
* move userReadableSize() and getIconFromType() from ↵marijus2015-01-273-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.friendica2015-01-251-0/+2
|
* don't hide the scary stuff when editing self permissions.friendica2015-01-251-2/+8
|
* Hide all the scary decision making stuff that sends intellectually ↵friendica2015-01-251-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 ↵friendica2015-01-251-4/+4
| | | | changed but not saved" message.
* move connection approval checkbox to top of page (above the sliders) - ↵friendica2015-01-251-11/+8
| | | | instead of being in between rating and rating text.
* this will require more fixing in include/enotifymarijus2015-01-231-1/+1
|
* couple of hubloc manager issuesfriendica2015-01-211-3/+3
|
* bring back nav-search spinnermarijus2015-01-212-7/+11
|
* More styling for poco reputation page. Note: the reason this isn't yet ↵friendica2015-01-201-0/+4
| | | | linked to the UI is because we need to age some old '1' values that are bogus.
* css fixes - hopefullymarijus2015-01-204-15/+24
|
* satisfy the floated imagesmarijus2015-01-203-3/+3
|
* as a workaround make nav-search dropdown behave a little bettermarijus2015-01-203-11/+11
|
* Merge pull request #870 from pafcu/autocomplete_fixRedMatrix2015-01-201-1/+1
|\ | | | | Fix autocomplete with groups
| * Fix autocomplete with groupsStefan Parviainen2015-01-191-1/+1
| |
* | Merge pull request #868 from pafcu/autocomplete_fixgit-marijus2015-01-191-1/+1
|\| | | | | Fix issue #865.
| * Fix issue #865.Stefan Parviainen2015-01-191-1/+1
| |
* | Merge pull request #863 from einervonvielen/Fix_bbcode_toc_for_help_pagesRedMatrix2015-01-191-1/+1
|\ \ | | | | | | Fixed bbode element toc for webpages
| * | Fixed bbode element toc for webpagesEiner von Vielen2015-01-181-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 ↵marijus2015-01-182-3/+9
|/ / | | | | | | filestorage module and via attach_delete()
* | Merge pull request #859 from einervonvielen/Issue_846_view_calendar_eventpafcu2015-01-182-1/+2
|\ \ | | | | | | Fixed #846 Viewing event from calendar displays event
| * | Fixed #846 Viewing event from calendar displays eventEiner von Vielen2015-01-182-1/+2
| | | | | | | | | See https://github.com/friendica/red/issues/846
* | | Merge pull request #858 from pafcu/masterpafcu2015-01-171-0/+1
|\ \ \ | |/ / |/| / | |/ Fix bug with groups and autocomplete
| * Remove accidental loggingStefan Parviainen2015-01-171-1/+0
| |
| * Fix bug with groups and autocompleteStefan Parviainen2015-01-171-0/+2
| |
* | more heavy lifting on poco repfriendica2015-01-154-17/+22
| |
* | poco rating - add a test module for pulling out ratingsfriendica2015-01-152-1/+38
| |
* | editing stuff for poco reputationfriendica2015-01-153-1/+18
| |
* | more backend work on poco ratingfriendica2015-01-153-0/+13
|/
* Merge remote-tracking branch 'upstream/master' into tocEiner von Vielen2015-01-141-0/+2
|\
| * hide friends broken, add parameter for item search by verbfriendica2015-01-131-0/+2
| |
* | Added a table of content as bbcode element [toc] for webpages2015-01-142-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
* | TestEiner von Vielen2015-01-132-0/+3
|/ | | | ...with table of content. jquery.tableofconent.js works bunt not properly
* Refactor mention code to make it more reusableStefan Parviainen2015-01-121-1/+1
|
* another attempt to explain default permissions on connedit pagefriendica2015-01-113-14/+42
|
* Update Swedish strings from TransifexErik Lundin2015-01-102-2691/+2704
|
* Updated Italian translationPaolo Tacconi2015-01-092-2696/+2709
|