Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | merge dev into bs4 | Mario Vavti | 2017-03-13 | 3 | -3/+27 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | font size and post title adjust | Mario Vavti | 2017-03-11 | 6 | -135/+65 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fixing classes | Mario Vavti | 2017-03-10 | 24 | -93/+73 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | some sed magic on button class names | Mario Vavti | 2017-03-10 | 75 | -256/+256 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | upgrade bs to latest git and some more progress | Mario Vavti | 2017-03-09 | 12 | -406/+254 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | remove navbar-toggler-left class | Mario Vavti | 2017-03-09 | 2 | -2/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | initial commit for the bootstrap version 4 branch - upgrade lib and make ↵ | Mario Vavti | 2017-03-09 | 22 | -7872/+10668 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nav.tpl kind of working again | |||||
* | | | | | | | | | | provide platform specific install script | zotlabs | 2017-03-25 | 1 | -3/+5 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | provide compatibility with old-style update system | zotlabs | 2017-03-25 | 1 | -6/+16 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | get rid of 'davguest' and allow for project specific DB updates (currently ↵ | zotlabs | 2017-03-25 | 4 | -2138/+2128 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db updates are common between all possible projects/subprojects/forks). | |||||
* | | | | | | | | | | move db_upgrade to zlib | zotlabs | 2017-03-23 | 6 | -199/+129 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | rev update | zotlabs | 2017-03-23 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | allow setting the system email name/address/reply | zotlabs | 2017-03-22 | 2 | -0/+20 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | add mascot | zotlabs | 2017-03-22 | 1 | -1/+3 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | red koala | zotlabs | 2017-03-22 | 4 | -0/+151 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | more cloud updates - upgrade the DAV structures as well. | zotlabs | 2017-03-22 | 3 | -41/+79 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | some more photo issues | zotlabs | 2017-03-22 | 3 | -32/+33 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | fix photo prvnxt after all the changes yesterday | zotlabs | 2017-03-22 | 1 | -6/+5 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | more work on the photo album mess | zotlabs | 2017-03-21 | 2 | -97/+71 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | photos_album_exists() requires an observer to work correctly; provide it. | zotlabs | 2017-03-21 | 2 | -4/+4 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | use the same host macro for sender address as for reply_to address | zotlabs | 2017-03-21 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-21 | 1 | -8/+49 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #705 from dawnbreak/dev | Klaus | 2017-03-22 | 1 | -8/+49 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | :white_check_mark: Some more tests for purify_html(). | |||||
| | * | | | | | | | | :white_check_mark: Some more tests for purify_html(). | Klaus Weidenbach | 2017-03-22 | 1 | -8/+49 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some generic HTML, JS, CSS expectations for purify_html(). Also cover our own configuration for HTMLPurifier. | |||||
* | | | | | | | | | begin the process of using the relevant attach directory/path for photo ↵ | zotlabs | 2017-03-21 | 4 | -48/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | albums instead of an album basename which may not be unique. Created an 'ellipsify()' function to shorten long names and keep the beginning and end intact | |||||
* | | | | | | | | | update license | zotlabs | 2017-03-21 | 1 | -17/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | more markdown purification | zotlabs | 2017-03-21 | 2 | -7/+6 | |
| | | | | | | | | | ||||||
* | | | | | | | | | perform attach_upgrade() | zotlabs | 2017-03-20 | 2 | -0/+26 | |
| | | | | | | | | | ||||||
* | | | | | | | | | after all of this, I would be very hesitant to use any multi-user system ↵ | zotlabs | 2017-03-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which uses markdown and which doesn't have a large security budget. | |||||
* | | | | | | | | | even more fine tuning of the markdown purifier - especially when used with ↵ | zotlabs | 2017-03-20 | 4 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the wiki | |||||
* | | | | | | | | | create channel_store_lowlevel() and remove more diaspora stuff from core. | zotlabs | 2017-03-20 | 3 | -45/+55 | |
| | | | | | | | | | ||||||
* | | | | | | | | | remove redundant and non-functional/broken check for successfully cloned ↵ | zotlabs | 2017-03-20 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | channel record which was left over from an earlier method of creating the table; which was deprecated a few months back. | |||||
* | | | | | | | | | add function attach_syspaths to calculate the contents of os_path and ↵ | zotlabs | 2017-03-19 | 1 | -2/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | display_path; add this to the rename function. We will also need it to populate existing file/photo structures as an upgrade task. | |||||
* | | | | | | | | | attach_folder_rpaths() providing incorrect results | zotlabs | 2017-03-19 | 1 | -3/+3 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-19 | 9 | -44/+865 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #703 from dawnbreak/oauth2 | zotlabs | 2017-03-20 | 128 | -6/+15850 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | :arrow_up: Update bshaffer/oauth2-server-php library. | |||||
| | * | | | | | | | | :arrow_up: Update bshaffer/oauth2-server-php library. | Klaus Weidenbach | 2017-03-20 | 128 | -6/+15850 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manage oauth2-server-php library with composer. Folder ./library/oauth2/ can be removed and includes removed with autoloading. | |||||
| * | | | | | | | | Merge pull request #702 from dawnbreak/dev | zotlabs | 2017-03-20 | 2 | -33/+37 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | :white_check_mark: Add unit test for purify_html(). | |||||
| | * | | | | | | | :white_check_mark: Add unit test for purify_html(). | Klaus Weidenbach | 2017-03-19 | 2 | -33/+37 | |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation to update HTMLPurifier library add a unit test. Please add more HTML that you need to have working and we can check against regressions. | |||||
* | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-19 | 1 | -1/+1 | |
|\| | | | | | | | ||||||
| * | | | | | | | fix php warning and remove logging | Mario Vavti | 2017-03-19 | 1 | -4/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'dev' into merge | zotlabs | 2017-03-18 | 1 | -0/+1 | |
|\| | | | | | | | ||||||
| * | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-18 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #698 from dawnbreak/dev | Klaus | 2017-03-18 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | Missed one old Markdown() | |||||
| | | * | | | | | Missed one old Markdown() | Klaus | 2017-03-18 | 1 | -2/+1 | |
| | |/ / / / / | ||||||
| * | | | | | | issue #699 | zotlabs | 2017-03-18 | 49 | -1651/+0 | |
| | | | | | | | ||||||
* | | | | | | | issue #699 | zotlabs | 2017-03-18 | 49 | -1651/+0 | |
| | | | | | | |