aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-146-30/+26
|\
| * css fixes and remove expert mode for block page content typeMario Vavti2015-04-144-13/+5
| |
| * dont suggest anything here it explains itselfMario Vavti2015-04-141-1/+1
| |
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-04-144-7/+13
| |\
| * | some more on webpagesMario Vavti2015-04-144-18/+22
| | |
* | | default perms not being set in some casesfriendica2015-04-141-0/+10
| |/ |/|
* | Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-141-2/+3
|\ \
| * | unquote binaryHabeas Codice2015-04-131-2/+3
| | |
* | | comanche preview is probably importantfriendica2015-04-142-1/+2
|/ /
* | item_check_service_class wasn't returning correct resultsfriendica2015-04-131-4/+8
| |
* | rev updatefriendica2015-04-131-1/+1
|/
* webpages appearenceMario Vavti2015-04-137-39/+111
|
* add bs classes to design tools menuMario Vavti2015-04-133-24/+2
|
* remove superfluous view/preview buttonsMario Vavti2015-04-131-2/+0
|
* remove widget class from webpage blocks and make titles h2 to match the rest ↵Mario Vavti2015-04-132-2/+2
| | | | of the matrix
* Merge pull request #312 from unary/pagedisplayredmatrix2015-04-131-1/+1
|\ | | | | only add the h3 tag to the page if there is a title
| * only add the h3 tag to the page if there is a titleMichael Johnston2015-04-121-1/+1
|/
* bring ajax delete to filesMario Vavti2015-04-122-3/+3
|
* make dropItem more universal and move delete up in the dropdown menuMario Vavti2015-04-124-12/+10
|
* make fs deletion of directories workMario Vavti2015-04-121-2/+2
|
* reverse file activity logicMario Vavti2015-04-125-33/+18
|
* rev update, string updatefriendica2015-04-112-851/+843
|
* move style to style.cssMario Vavti2015-04-102-3/+9
|
* make r# work better with different font sizesMario Vavti2015-04-101-3/+3
|
* bring ajax item delete to conv listMario Vavti2015-04-101-1/+1
|
* don't warn folks about the webaddress observer tag. We need it in ↵friendica2015-04-091-1/+1
| | | | constructed urls.
* Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-092-382/+557
|\
| * Merge pull request #311 from dawnbreak/docuredmatrix2015-04-102-382/+557
| |\ | | | | | | Some documentation and whitespaces at line endings.
| | * Some documentation and whitespaces at line endings.Klaus Weidenbach2015-04-102-382/+557
| | |
* | | program the affinity slider labelsfriendica2015-04-094-15/+48
|/ /
* | Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-094-26/+9
|\|
| * update bugreport appMario Vavti2015-04-091-1/+1
| |
| * make jRange behave againMario Vavti2015-04-093-25/+8
| |
* | make sure we redirect to a sane place after deleting a webpage elementfriendica2015-04-094-1/+7
|/
* that didn't work out well - let's do this insteadfriendica2015-04-081-27/+16
|
* fix selector when sys channel activefriendica2015-04-081-0/+13
|
* system channel always has allow_code privilegesfriendica2015-04-082-7/+20
|
* jRange: width is innacurate depending on box model, padding and margins. ↵friendica2015-04-082-2/+2
| | | | Using css width instead.
* update features, allow sys account page deletionfriendica2015-04-085-16/+26
|
* delete conv items on the fly in backgroundMario Vavti2015-04-082-1/+16
|
* update jquery to 1.11.2Mario Vavti2015-04-081-5/+5
|
* this is easier on the eyes when collapsing a long post/commentMario Vavti2015-04-081-1/+2
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-071-191/+211
|\
| * Merge pull request #310 from dawnbreak/masterredmatrix2015-04-081-191/+211
| |\ | | | | | | Renamed some functions to match other names in bbcode.php.
| | * Renamed some functions to match other names in bbcode.php.Klaus Weidenbach2015-04-071-191/+211
| | | | | | | | | | | | | | | | | | Some documentation. Removed unused variables. Removed empty spaces at line endings.
* | | add common connection count to suggestionsfriendica2015-04-072-1/+2
|/ /
* | Merge https://github.com/redmatrix/redmatrix into pending_mergefriendica2015-04-071-4/+5
|\|
| * missed oneHabeas Codice2015-04-071-1/+1
| |
| * "PHP Strict Standards: Only variables should be passed by reference"Habeas Codice2015-04-071-3/+4
| |
* | separate the hub query since it changes the logic default and cannot easily ↵friendica2015-04-072-5/+8
|/ | | | be grouped