Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | correcting upstream | redmatrix | 2015-05-10 | 2 | -2/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-10 | 14 | -126/+186 |
|\ | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-10 | 18 | -5474/+5835 |
| |\ | |||||
| | * | uid > channel id to make submenus visible for observers | Mario Vavti | 2015-05-10 | 1 | -3/+3 |
| | | | |||||
| | * | provide drop down submenu suggestions in edit mode | Mario Vavti | 2015-05-10 | 2 | -3/+6 |
| | | | |||||
| | * | copy/paste typo | Mario Vavti | 2015-05-10 | 1 | -1/+1 |
| | | | |||||
| | * | provide ability to create submenus | Mario Vavti | 2015-05-10 | 8 | -11/+47 |
| | | | |||||
| | * | Merge pull request #318 from zzottel/master | zzottel | 2015-05-08 | 2 | -5226/+5453 |
| | |\ | | | | | | | | | update to German strings | ||||
| | | * | update to German strings | zottel | 2015-05-08 | 2 | -5226/+5453 |
| | |/ | |||||
| * | | rev update | redmatrix | 2015-05-10 | 3 | -47/+63 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-07 | 8 | -232/+301 |
|\ \ \ | | |/ | |/| | |||||
| * | | provide wrap variable for comanche menus | Mario Vavti | 2015-05-07 | 3 | -5/+23 |
| | | | |||||
| * | | Update Dutch | jeroenpraat | 2015-05-07 | 2 | -221/+232 |
| | | | |||||
| * | | provide a possibility to include js/css libs | Mario Vavti | 2015-05-07 | 1 | -0/+40 |
| | | | |||||
| * | | adjust icon size | Mario Vavti | 2015-05-07 | 3 | -6/+6 |
| | | | |||||
* | | | missed one... | redmatrix | 2015-05-06 | 3 | -2/+4 |
| | | | |||||
* | | | forgot to save | redmatrix | 2015-05-06 | 1 | -2/+0 |
| | | | |||||
* | | | Hopefully this will make item_cache the default | redmatrix | 2015-05-06 | 2 | -14/+54 |
| | | | |||||
* | | | change notification colour | redmatrix | 2015-05-06 | 1 | -1/+1 |
| | | | |||||
* | | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 29 | -90/+98 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 10 | -206/+274 |
|\| | | |||||
| * | | comanche doco | Mario Vavti | 2015-05-06 | 2 | -2/+10 |
| | | | |||||
| * | | avoid double slash after editing layout | Mario Vavti | 2015-05-06 | 1 | -1/+1 |
| | | | |||||
| * | | allow blocks to have custom classes and add a new template called zen which ↵ | Mario Vavti | 2015-05-06 | 2 | -2/+20 |
| |/ | | | | | | | gives you an empty page to work with | ||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-05 | 6 | -8102/+8003 |
| |\ | |||||
| * | | turn consensus items into diaspora polls for that network | redmatrix | 2015-05-05 | 5 | -201/+243 |
| | | | |||||
* | | | no need to obscure the diaspora signature if we're not obscuring the posts | redmatrix | 2015-05-06 | 2 | -6/+12 |
| | | | |||||
* | | | for hubzilla we won't be obscuring items, only private mail, this will allow ↵ | redmatrix | 2015-05-05 | 3 | -67/+1 |
| | | | | | | | | | | | | us to search and cache private posts | ||||
* | | | i think this is 100 | redmatrix | 2015-05-05 | 2 | -14/+6 |
| | | | |||||
* | | | update 99 | redmatrix | 2015-05-05 | 2 | -20/+20 |
| | | | |||||
* | | | second pass name change | redmatrix | 2015-05-05 | 93 | -372/+372 |
| | | | |||||
* | | | first pass name change | redmatrix | 2015-05-05 | 91 | -680/+680 |
| | | | |||||
* | | | iteration #97 | redmatrix | 2015-05-05 | 2 | -4/+4 |
| | | | |||||
* | | | this will settle down eventually. | redmatrix | 2015-05-05 | 2 | -6/+6 |
| | | | |||||
* | | | change name | redmatrix | 2015-05-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-05 | 4 | -4050/+4001 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #317 from tuscanhobbit/dev | Paolo T | 2015-05-04 | 2 | -4048/+3998 |
| |\ \ | | | | | | | | | Italian translation | ||||
| | * | | Italian translation | Paolo Tacconi | 2015-05-04 | 2 | -4048/+3998 |
| | | | | |||||
| * | | | fix center page content setting | Mario Vavti | 2015-05-04 | 1 | -1/+2 |
| | | | | |||||
| * | | | remove obsolete linebreak | Mario Vavti | 2015-05-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | are we there yet? | redmatrix | 2015-05-04 | 2 | -16/+16 |
| | | | | |||||
* | | | | readme, ad nauseum | redmatrix | 2015-05-04 | 2 | -6/+6 |
| | | | | |||||
* | | | | readme, yet again | redmatrix | 2015-05-04 | 2 | -16/+6 |
| | | | | |||||
* | | | | readme | redmatrix | 2015-05-04 | 2 | -2/+2 |
| | | | | |||||
* | | | | readme | redmatrix | 2015-05-04 | 2 | -21/+36 |
| | | | | |||||
* | | | | readme | redmatrix | 2015-05-04 | 2 | -14/+55 |
| | | | | |||||
* | | | | update readme | redmatrix | 2015-05-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | fine tuning | redmatrix | 2015-05-03 | 1 | -2/+4 |
| | | | | |||||
* | | | | try and update user variables | redmatrix | 2015-05-03 | 1 | -0/+2 |
| | | | | |||||
* | | | | update readme | friendica | 2015-05-03 | 2 | -10/+12 |
|/ / / |