Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-08-03 | 4 | -4/+142 |
|\ | |||||
| * | belongs to previous commit | jeroenpraat | 2016-08-03 | 1 | -0/+1 |
| | | |||||
| * | Improved a few schemas - context help fix - dark schemas now have dark text ↵ | jeroenpraat | 2016-08-03 | 4 | -4/+141 |
| | | | | | | | | areas (et al.) | ||||
* | | issue #473 - unable to delete privacy groups | redmatrix | 2016-08-03 | 1 | -1/+1 |
|/ | |||||
* | missing comma in atoken update sql | redmatrix | 2016-08-02 | 1 | -1/+1 |
| | |||||
* | comment policy permissions typo | redmatrix | 2016-08-02 | 1 | -1/+1 |
| | |||||
* | this should sort out likes showing up as wall-to-wall posts on diaspora | redmatrix | 2016-08-01 | 1 | -0/+2 |
| | |||||
* | This checkin should make all permission modes work correctly with atokens ↵ | redmatrix | 2016-08-01 | 6 | -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/ | redmatrix | 2016-08-01 | 3 | -4/+4 |
| | |||||
* | allow individual permissions on atokens | redmatrix | 2016-07-31 | 3 | -12/+98 |
| | |||||
* | add a few more path macros to portable menu elements (channelurl, pageurl, ↵ | redmatrix | 2016-07-31 | 5 | -15/+25 |
| | | | | storeurl and baseurl) | ||||
* | make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ↵ | redmatrix | 2016-07-31 | 3 | -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-import | hubzilla | 2016-08-01 | 15 | -1/+877 |
|\ | | | | | Website import tool | ||||
| * | Added help content for webpages app. Corrected apparent bug with capitalized ↵ | Andrew Manning | 2016-07-31 | 4 | -0/+106 |
| | | | | | | | | Webpages.md | ||||
| * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-31 | 3 | -3/+3 |
| |\ | |/ |/| | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-30 | 10 | -5092/+5417 |
|\ \ | |||||
* | | | issue #466, sql typo | redmatrix | 2016-07-28 | 3 | -3/+3 |
| | | | |||||
| | * | Remove scanned element column for existing element information which we are ↵ | Andrew Manning | 2016-07-31 | 1 | -3/+9 |
| | | | | | | | | | | | | not yet populating. | ||||
| | * | Improved UI. Removed logger statements. | Andrew Manning | 2016-07-31 | 5 | -45/+58 |
| | | | |||||
| | * | Import element selection page added to allow selective importing. | Andrew Manning | 2016-07-30 | 4 | -94/+307 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-30 | 38 | -12337/+12863 |
| | |\ | | |/ | |/| | |||||
| * | | Updating es-es strings | jeroenpraat | 2016-07-29 | 2 | -5059/+5299 |
| | | | |||||
| * | | catch all input fields (in preparation for acl in this place) and display ↵ | Mario Vavti | 2016-07-29 | 2 | -4/+9 |
| | | | | | | | | | | | | the files to upload in the right order | ||||
| * | | Merge pull request #467 from anaqreon/multiple-attach | hubzilla | 2016-07-29 | 1 | -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 Manning | 2016-07-28 | 1 | -3/+3 |
| |/ / | | | | | | | | | | added to the post content. | ||||
| * | | missing space | Mario Vavti | 2016-07-28 | 1 | -1/+1 |
| | | | |||||
| * | | missing semicolon | Mario Vavti | 2016-07-28 | 1 | -1/+1 |
| | | | |||||
| * | | add more info on what is happening after we are at 100% and minor fixes | Mario Vavti | 2016-07-28 | 3 | -5/+21 |
| | | | |||||
| * | | re-implement progress-bar to work with all browsers | Mario Vavti | 2016-07-28 | 2 | -5/+15 |
| | | | |||||
| * | | reusing the original form did not work so well via xhr upload - let us ↵ | Mario Vavti | 2016-07-28 | 2 | -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 Vavti | 2016-07-28 | 1 | -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 Vavti | 2016-07-28 | 1 | -6/+7 |
| | | | | | | | | | | | | implement a simple progressbar | ||||
| * | | translate mime types to icons, update some icons, move file preview (upload ↵ | Mario Vavti | 2016-07-28 | 3 | -21/+70 |
|/ / | | | | | | | progress) below table header | ||||
* | | github didn't accept the last push. Touching the files to force a git revision | redmatrix | 2016-07-27 | 3 | -2/+1 |
| | | |||||
* | | fix italian strings (messed up by rtl variable); and finish removing openid ↵ | redmatrix | 2016-07-27 | 3 | -2324/+2313 |
| | | | | | | | | from core | ||||
* | | Merge pull request #464 from anaqreon/hover-visuals | hubzilla | 2016-07-28 | 2 | -6/+5 |
|\ \ | | | | | | | Enhanced visual feedback for file drag hover | ||||
| * | | Enhanced visual feedback for file drag hover | Andrew Manning | 2016-07-27 | 2 | -6/+5 |
|/ / | |||||
* | | add the hidden flag also | redmatrix | 2016-07-27 | 1 | -1/+2 |
| | | |||||
* | | rework drag and drop to drag directly into files area, implement the default ↵ | Mario Vavti | 2016-07-27 | 6 | -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_merge | redmatrix | 2016-07-26 | 3 | -2/+77 |
|\ \ | |||||
| * \ | Merge pull request #463 from git-marijus/dev | hubzilla | 2016-07-27 | 3 | -2/+77 |
| |\ \ | | | | | | | | | allow multiple-file cloud upload | ||||
| | * | | fix drag and drop | Mario Vavti | 2016-07-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | allow multiple-file cloud upload | Mario Vavti | 2016-07-26 | 2 | -1/+76 |
| | | | | |||||
* | | | | don't include deleted or orphaned xchans in ratings search | redmatrix | 2016-07-26 | 1 | -1/+2 |
|/ / / | |||||
* | | | restrict url cache to 254 maxlen | redmatrix | 2016-07-26 | 1 | -0/+5 |
| | | | |||||
* | | | missing s | redmatrix | 2016-07-26 | 2 | -2/+2 |
| | | | |||||
* | | | set App::$error on 404 so we don't get two 'Page not found.' page bodies. | redmatrix | 2016-07-26 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-26 | 3 | -6472/+6713 |
|\| | | |||||
| * | | Merge pull request #462 from wave72/dev | Wave | 2016-07-26 | 2 | -6471/+6711 |
| |\ \ | | | | | | | | | Updated Italian strings | ||||
| | * | | Updated Italian strings | Wave72 | 2016-07-26 | 2 | -6471/+6711 |
| | | | |