Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-19 | 52 | -5493/+3826 | |
|\| | ||||||
| * | fix php warning and remove logging | Mario Vavti | 2017-03-19 | 1 | -4/+2 | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-18 | 1 | -2/+1 | |
| |\ | ||||||
| * | | issue #699 | zotlabs | 2017-03-18 | 49 | -1651/+0 | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 15 | -234/+758 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 2 | -18/+6 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-13 | 2 | -2/+2 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-11 | 2 | -2/+26 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | 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 | |
* | | | | | | | remove redundant css | Mario Vavti | 2017-03-19 | 1 | -20/+0 | |
* | | | | | | | css fixes | Mario Vavti | 2017-03-19 | 1 | -1/+12 | |
* | | | | | | | fix custom fontsize for app | Mario Vavti | 2017-03-19 | 4 | -19/+11 | |
* | | | | | | | bs4 fixes | Mario Vavti | 2017-03-19 | 7 | -144/+93 | |
* | | | | | | | bs4 fixes | Mario Vavti | 2017-03-18 | 8 | -13/+23 | |
* | | | | | | | more abook_edit and some css | Mario Vavti | 2017-03-18 | 3 | -6/+12 | |
* | | | | | | | more abook_edit | Mario Vavti | 2017-03-18 | 1 | -3/+3 | |
* | | | | | | | fix abook_edit and private mail | Mario Vavti | 2017-03-18 | 4 | -46/+31 | |
* | | | | | | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-18 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Merge pull request #698 from dawnbreak/dev | Klaus | 2017-03-18 | 1 | -2/+1 | |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||||
| | * | | | | | Missed one old Markdown() | Klaus | 2017-03-18 | 1 | -2/+1 | |
| |/ / / / / | ||||||
* | | | | | | bs4 fixes | Mario Vavti | 2017-03-18 | 9 | -290/+85 | |
* | | | | | | fix usermenu radius | Mario Vavti | 2017-03-17 | 1 | -1/+1 | |
* | | | | | | css fixes | Mario Vavti | 2017-03-17 | 2 | -6/+10 | |
* | | | | | | fix item_list and item_search templates. make item filer use a bootdtrap moda... | Mario Vavti | 2017-03-17 | 19 | -284/+276 | |
* | | | | | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-16 | 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 | |
| | | |_|/ | | |/| | | ||||||
* | | | | | re-add spaces between tags | Mario Vavti | 2017-03-15 | 2 | -4/+7 | |
* | | | | | js fixes | Mario Vavti | 2017-03-15 | 2 | -15/+4 | |
* | | | | | style hashtags, mentions and categories. hide expand-aside button if not need... | Mario Vavti | 2017-03-15 | 10 | -43/+35 | |
* | | | | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-15 | 2 | -18/+6 | |
|\| | | | | ||||||
| * | | | | better handling of mimetype security | Mario Vavti | 2017-03-15 | 2 | -18/+6 | |
| |/ / / | ||||||
* | | | | various fixes | Mario Vavti | 2017-03-15 | 3 | -4/+8 | |
* | | | | css fixes | Mario Vavti | 2017-03-14 | 3 | -15/+8 | |
* | | | | hide nav search behind a button, css fixes and cleanup | Mario Vavti | 2017-03-14 | 11 | -115/+47 | |
* | | | | css fixes | Mario Vavti | 2017-03-14 | 4 | -21/+13 | |
* | | | | many class fixes and revive shiny class for item titles in a new way | Mario Vavti | 2017-03-13 | 17 | -117/+85 | |
* | | | | merge dev into bs4 | Mario Vavti | 2017-03-13 | 3 | -3/+27 | |
|\| | | | ||||||
| * | | | 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 | |
| |/ / | ||||||
| * | | Login-box css-fix for Bluegrid scheme | jeroenpraat | 2017-03-11 | 1 | -1/+25 | |
* | | | fix help menu | Mario Vavti | 2017-03-12 | 2 | -37/+37 | |
* | | | many dropdown and class fixes. still a long way to go... | Mario Vavti | 2017-03-12 | 19 | -150/+148 |