| Commit message (Expand) | Author | Age | Files | Lines |
* | new composer.lock for red | zotlabs | 2017-03-16 | 225 | -1684/+5210 |
* | Comanche: allow widgets to be class based and stored appropriately in Zotlabs | zotlabs | 2017-03-15 | 3 | -16/+37 |
* | could not fix the merge conflicts in composer.lock so it will need to be rege... | zotlabs | 2017-03-15 | 15 | -750/+1077 |
|\ |
|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 15 | -234/+758 |
| |\ |
|
| | * | Merge pull request #569 from dawnbreak/QA_testing | zotlabs | 2017-03-16 | 15 | -234/+758 |
| | |\ |
|
| | | * | :construction_worker: Add Travis' GitHub deployment steps. | Klaus Weidenbach | 2017-03-14 | 2 | -50/+27 |
| | | * | :construction_worker: :arrow_up: :heavy_plus_sign: Update PHPUnit to current ... | Klaus Weidenbach | 2017-03-14 | 8 | -224/+372 |
| | | * | :construction_worker: Add old MySQL 5.5 to Travis CI again. | Klaus Weidenbach | 2017-03-14 | 3 | -4/+13 |
| | | * | :construction_worker: use PHP7.1 and add PostgreSQL9.6 | Klaus Weidenbach | 2017-03-14 | 3 | -28/+39 |
| | | * | :green_heart: Update Travis CI's Doxygen. | Klaus Weidenbach | 2017-03-14 | 3 | -14/+42 |
| | | * | [FEATURE] :construction_worker: Extend Travis CI integration. | Klaus Weidenbach | 2017-03-14 | 10 | -27/+378 |
* | | | | Merge branch 'dev' into red | zotlabs | 2017-03-15 | 0 | -0/+0 |
|\| | | |
|
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 2 | -18/+6 |
| |\| | |
|
| | * | | better handling of mimetype security | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
| | |/ |
|
* | | | ensure z_input_filter is called exactly once, since we now depend on the numb... | zotlabs | 2017-03-15 | 2 | -22/+55 |
* | | | more work related to attach/photo and os_path, display_path and general code ... | zotlabs | 2017-03-15 | 2 | -36/+40 |
* | | | add os_path and display_path to photos, fix some issues with multiple path se... | zotlabs | 2017-03-14 | 3 | -96/+12 |
* | | | store os_path and display_path with files | zotlabs | 2017-03-14 | 1 | -2/+3 |
* | | | use dim for the button border also | zotlabs | 2017-03-14 | 1 | -1/+1 |
* | | | dim class was un-themed | zotlabs | 2017-03-14 | 2 | -2/+2 |
* | | | input filter updates | zotlabs | 2017-03-14 | 6 | -103/+57 |
* | | | fix group by item query | zotlabs | 2017-03-14 | 1 | -17/+15 |
* | | | class MarkdownSoap to safely store markdown by purifying and preserving (esca... | zotlabs | 2017-03-14 | 1 | -0/+86 |
* | | | get rid of some cruft in boot.php | zotlabs | 2017-03-14 | 1 | -62/+17 |
* | | | make redbasic compatible with red 5.x | zotlabs | 2017-03-13 | 1 | -1/+1 |
* | | | remove the unimplemented upload limit site settings | zotlabs | 2017-03-13 | 1 | -3/+0 |
* | | | code_allowed is a real mess. Start the cleanup by remving the account level c... | zotlabs | 2017-03-13 | 7 | -79/+28 |
* | | | Merge branch 'dev' into red | zotlabs | 2017-03-13 | 1 | -1/+1 |
|\| | |
|
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-13 | 2 | -2/+2 |
| |\| |
|
| | * | Merge pull request #697 from anaqreon/dev | git-marijus | 2017-03-13 | 1 | -1/+1 |
| | |\ |
|
| | | * | Add id to app-menu for JS access | Andrew Manning | 2017-03-12 | 1 | -1/+1 |
| | * | | we need to have this even if we are not the owner. otherwise we loose the acl... | Mario Vavti | 2017-03-13 | 1 | -1/+1 |
| | |/ |
|
* | | | move oauth2 to vendor | zotlabs | 2017-03-14 | 132 | -3612/+1324 |
* | | | better handling of mimetype security | zotlabs | 2017-03-12 | 3 | -20/+7 |
* | | | remove more hardwired branding | zotlabs | 2017-03-12 | 3 | -65/+67 |
* | | | update license | zotlabs | 2017-03-12 | 1 | -1/+1 |
* | | | update readme | zotlabs | 2017-03-12 | 1 | -27/+3 |
* | | | grrr. stop making branding assumptions. | zotlabs | 2017-03-12 | 6 | -13/+8 |
* | | | more cleanup | zotlabs | 2017-03-12 | 1 | -29/+35 |
* | | | update std_version | zotlabs | 2017-03-12 | 1 | -1/+1 |
* | | | db issues | zotlabs | 2017-03-12 | 4 | -90/+8 |
* | | | Merge branch 'dev' into red | zotlabs | 2017-03-11 | 3 | -3/+27 |
|\| | |
|
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-11 | 2 | -2/+26 |
| |\| |
|
| | * | Login-box css-fix for Bluegrid scheme | jeroenpraat | 2017-03-11 | 1 | -1/+25 |
| | * | Merge pull request #693 from anaqreon/dev | git-marijus | 2017-03-11 | 1 | -1/+1 |
| | |\ |
|
| | | * | Take me home instead of get me home | Andrew Manning | 2017-03-09 | 1 | -1/+1 |
| | |/ |
|
| * | | strings | zotlabs | 2017-03-10 | 1 | -3838/+3824 |
| * | | Monday is a proper name and should be capitalised (except in private conversa... | zotlabs | 2017-03-08 | 1 | -1/+1 |
| |/ |
|
* | | strings | zotlabs | 2017-03-10 | 1 | -3838/+3824 |
* | | one role. | zotlabs | 2017-03-09 | 4 | -61/+5 |