aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-08-034-4/+142
|\
| * belongs to previous commitjeroenpraat2016-08-031-0/+1
| |
| * Improved a few schemas - context help fix - dark schemas now have dark text ↵jeroenpraat2016-08-034-4/+141
| | | | | | | | areas (et al.)
* | issue #473 - unable to delete privacy groupsredmatrix2016-08-031-1/+1
|/
* missing comma in atoken update sqlredmatrix2016-08-021-1/+1
|
* comment policy permissions typoredmatrix2016-08-021-1/+1
|
* this should sort out likes showing up as wall-to-wall posts on diasporaredmatrix2016-08-011-0/+2
|
* This checkin should make all permission modes work correctly with atokens ↵redmatrix2016-08-016-23/+136
| | | | (they should be able to post content if allowed to). It also removes the strict linkage between permissions and connections so any individual permission can be set for any xchan; even those for which you have no connections.
* /storeurl/cloudurl/redmatrix2016-08-013-4/+4
|
* allow individual permissions on atokensredmatrix2016-07-313-12/+98
|
* add a few more path macros to portable menu elements (channelurl, pageurl, ↵redmatrix2016-07-315-15/+25
| | | | storeurl and baseurl)
* make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ↵redmatrix2016-07-313-3184/+3151
| | | | and PERMS_CONTACTS; or everything but PERMS_SPECIFIC. PERMS_SITE could be contentious, but we're currently denying them as they are a guest and don't actually have a channel on this site. We can't easily make PERMS_SPECIFIC work without providing an abook entry for the guest since we would need to set specific permissions for the guest login, but unfortunately this could be the most desirable setting to use in many cases. There is also an update of hmessages.po in this commit.
* Merge pull request #469 from anaqreon/website-importhubzilla2016-08-0115-1/+877
|\ | | | | Website import tool
| * Added help content for webpages app. Corrected apparent bug with capitalized ↵Andrew Manning2016-07-314-0/+106
| | | | | | | | Webpages.md
| * 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 ↵Andrew Manning2016-07-311-3/+9
| | | | | | | | | | | | not yet populating.
| | * 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 ↵Mario Vavti2016-07-292-4/+9
| | | | | | | | | | | | the files to upload in the right order
| * | Merge pull request #467 from anaqreon/multiple-attachhubzilla2016-07-291-3/+3
| |\ \ | | | | | | | | Fixed bug where multiple post attachements by drag-and-drop were not …
| | * | Fixed bug where multiple post attachements by drag-and-drop were not being ↵Andrew Manning2016-07-281-3/+3
| |/ / | | | | | | | | | added to the post content.
| * | 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 ↵Mario Vavti2016-07-282-9/+13
| | | | | | | | | | | | create a new form for this action. revert progressbar- only works nice in firefox
| * | make progressbar slightly more transparent and give it a default width of ↵Mario Vavti2016-07-281-1/+1
| | | | | | | | | | | | 3px to indicate which files are to be uploaded
| * | use single quote for js and double quote for html with proper escapes and ↵Mario Vavti2016-07-281-6/+7
| | | | | | | | | | | | implement a simple progressbar
| * | translate mime types to icons, update some icons, move file preview (upload ↵Mario Vavti2016-07-283-21/+70
|/ / | | | | | | progress) below table header
* | 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 ↵redmatrix2016-07-273-2324/+2313
| | | | | | | | from core
* | Merge pull request #464 from anaqreon/hover-visualshubzilla2016-07-282-6/+5
|\ \ | | | | | | Enhanced visual feedback for file drag hover
| * | 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
| | | | | | | | upload button to work with the same mechanism as drag and drop, revert 560af7a5b8e30001ea6bf9a6d2ea36e94ae904d0 since it did not work so well with the new cloud upload mechanism
* | 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
| |\ \ | | | | | | | | allow multiple-file cloud upload
| | * | 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 strings
| | * | Updated Italian stringsWave722016-07-262-6471/+6711
| | | |