aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ...redmatrix2016-07-313-3184/+3151
* Merge pull request #469 from anaqreon/website-importhubzilla2016-08-0115-1/+877
|\
| * Added help content for webpages app. Corrected apparent bug with capitalized ...Andrew Manning2016-07-314-0/+106
| * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-313-3/+3
| |\ | |/ |/|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-3010-5092/+5417
|\ \
* | | issue #466, sql typoredmatrix2016-07-283-3/+3
| | * Remove scanned element column for existing element information which we are n...Andrew Manning2016-07-311-3/+9
| | * Improved UI. Removed logger statements.Andrew Manning2016-07-315-45/+58
| | * Import element selection page added to allow selective importing.Andrew Manning2016-07-304-94/+307
| | * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-3038-12337/+12863
| | |\ | | |/ | |/|
| * | Updating es-es stringsjeroenpraat2016-07-292-5059/+5299
| * | catch all input fields (in preparation for acl in this place) and display the...Mario Vavti2016-07-292-4/+9
| * | Merge pull request #467 from anaqreon/multiple-attachhubzilla2016-07-291-3/+3
| |\ \
| | * | Fixed bug where multiple post attachements by drag-and-drop were not being ad...Andrew Manning2016-07-281-3/+3
| |/ /
| * | missing spaceMario Vavti2016-07-281-1/+1
| * | missing semicolonMario Vavti2016-07-281-1/+1
| * | add more info on what is happening after we are at 100% and minor fixesMario Vavti2016-07-283-5/+21
| * | re-implement progress-bar to work with all browsersMario Vavti2016-07-282-5/+15
| * | reusing the original form did not work so well via xhr upload - let us create...Mario Vavti2016-07-282-9/+13
| * | make progressbar slightly more transparent and give it a default width of 3px...Mario Vavti2016-07-281-1/+1
| * | use single quote for js and double quote for html with proper escapes and imp...Mario Vavti2016-07-281-6/+7
| * | translate mime types to icons, update some icons, move file preview (upload p...Mario Vavti2016-07-283-21/+70
|/ /
* | github didn't accept the last push. Touching the files to force a git revisionredmatrix2016-07-273-2/+1
* | fix italian strings (messed up by rtl variable); and finish removing openid f...redmatrix2016-07-273-2324/+2313
* | Merge pull request #464 from anaqreon/hover-visualshubzilla2016-07-282-6/+5
|\ \
| * | Enhanced visual feedback for file drag hoverAndrew Manning2016-07-272-6/+5
|/ /
* | add the hidden flag alsoredmatrix2016-07-271-1/+2
* | rework drag and drop to drag directly into files area, implement the default ...Mario Vavti2016-07-276-175/+121
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-263-2/+77
|\ \
| * \ Merge pull request #463 from git-marijus/devhubzilla2016-07-273-2/+77
| |\ \
| | * | fix drag and dropMario Vavti2016-07-261-1/+1
| | * | allow multiple-file cloud uploadMario Vavti2016-07-262-1/+76
* | | | don't include deleted or orphaned xchans in ratings searchredmatrix2016-07-261-1/+2
|/ / /
* | | restrict url cache to 254 maxlenredmatrix2016-07-261-0/+5
* | | missing sredmatrix2016-07-262-2/+2
* | | set App::$error on 404 so we don't get two 'Page not found.' page bodies.redmatrix2016-07-261-0/+1
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-263-6472/+6713
|\| |
| * | Merge pull request #462 from wave72/devWave2016-07-262-6471/+6711
| |\ \
| | * | Updated Italian stringsWave722016-07-262-6471/+6711
| | * | Merge pull request #6 from redmatrix/devWave2016-07-224855-289863/+312221
| | |\ \
| * | | | URLUtil path has changed since sabredav 1.8 - fixes renaming issue in dav cli...Mario Vavti2016-07-261-1/+2
* | | | | issue #460 - remove reference to $a which was passed by value since it doesn'...redmatrix2016-07-261-53/+53
|/ / / /
* | | | check for new permissions and update channels and connections with defaults i...redmatrix2016-07-251-0/+64
* | | | move openid to addonredmatrix2016-07-252-517/+0
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-252-1/+2
|\ \ \ \
| * | | | revert multiple testMario Vavti2016-07-251-1/+1
| * | | | css fixesMario Vavti2016-07-252-1/+2
* | | | | issue #460redmatrix2016-07-251-1/+3
|/ / / /
* | | | revert cloud acl selector (branched so as to continue development)redmatrix2016-07-252-20/+8
* | | | make drag/drop work with acl, which bypassed the formredmatrix2016-07-242-2/+4