| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-08-02 | 10 | -27/+142 |
| |\ |
|
| | * | 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 (th... | redmatrix | 2016-08-01 | 6 | -23/+136 |
| | * | /storeurl/cloudurl/ | redmatrix | 2016-08-01 | 3 | -4/+4 |
| * | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-08-01 | 25 | -3212/+4151 |
| |\| |
|
| | * | allow individual permissions on atokens | redmatrix | 2016-07-31 | 3 | -12/+98 |
| | * | add a few more path macros to portable menu elements (channelurl, pageurl, st... | redmatrix | 2016-07-31 | 5 | -15/+25 |
| | * | make guest access tokens work with PERMS_NETWORK, PERMS_SITE, PERMS_PENDING, ... | redmatrix | 2016-07-31 | 3 | -3184/+3151 |
| | * | Merge pull request #469 from anaqreon/website-import | hubzilla | 2016-08-01 | 15 | -1/+877 |
| | |\ |
|
| | | * | Added help content for webpages app. Corrected apparent bug with capitalized ... | Andrew Manning | 2016-07-31 | 4 | -0/+106 |
| | | * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-31 | 3 | -3/+3 |
| | | |\
| | |/
| |/| |
|
| | | * | Remove scanned element column for existing element information which we are n... | Andrew Manning | 2016-07-31 | 1 | -3/+9 |
| | | * | 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 |
| | | |\ |
|
| | | * \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-21 | 52 | -796/+1516 |
| | | |\ \ |
|
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -3/+3 |
| | | |\ \ \ |
|
| | | * \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 9 | -15/+52 |
| | | |\ \ \ \ |
|
| | | * | | | | | Starting to make the import selection page after element scan. | Andrew Manning | 2016-07-20 | 3 | -80/+176 |
| | | * | | | | | Importing webpage elements from manually entered cloud file path work. All de... | Andrew Manning | 2016-07-17 | 3 | -7/+26 |
| | | * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-17 | 5 | -21/+48 |
| | | |\ \ \ \ \ |
|
| | | * | | | | | | Added functions to check cloud files path and return path with hashed names | Andrew Manning | 2016-07-17 | 4 | -56/+91 |
| | | * | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 34 | -2397/+2326 |
| | | |\ \ \ \ \ \ |
|
| | | * | | | | | | | Stash changes to merge from dev | Andrew Manning | 2016-07-16 | 3 | -30/+52 |
| | | * | | | | | | | Postpone remote folder import until filesystem mirroring matures. | Andrew Manning | 2016-07-16 | 3 | -6/+55 |
| | | * | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-14 | 7 | -32/+80 |
| | | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Refactored the scan and import functions to reduce redundant code and simplif... | Andrew Manning | 2016-07-14 | 2 | -373/+223 |
| | | * | | | | | | | | Blocks, pages, and layouts import from zip file. Layouts are not applied to p... | Andrew Manning | 2016-07-13 | 1 | -9/+190 |
| | | * | | | | | | | | Updated import_blocks for database calls | Andrew Manning | 2016-07-13 | 1 | -5/+3 |
| | | * | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-13 | 3 | -20/+12 |
| | | |\ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 27 | -56/+54 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | Import blocks from zip file, but needs updates as detailed in https://gitlab.... | Andrew Manning | 2016-07-12 | 2 | -2/+224 |
| | | * | | | | | | | | | | Clearer import control interface | Andrew Manning | 2016-07-10 | 2 | -8/+28 |
| | | * | | | | | | | | | | First draft of website import tools | Andrew Manning | 2016-07-10 | 4 | -0/+46 |
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into dev | zottel | 2016-07-31 | 19 | -7589/+7848 |
| |\| | | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-30 | 10 | -5092/+5417 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|/
| | |/| | | | | | | | | |
|
| | | * | | | | | | | | | | Updating es-es strings | jeroenpraat | 2016-07-29 | 2 | -5059/+5299 |
| | | * | | | | | | | | | | catch all input fields (in preparation for acl in this place) and display the... | Mario Vavti | 2016-07-29 | 2 | -4/+9 |
| | | * | | | | | | | | | | 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 being ad... | Andrew Manning | 2016-07-28 | 1 | -3/+3 |
| | | |/ / / / / / / / / / |
|
| | | * | | | | | | | | | | 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 create... | Mario Vavti | 2016-07-28 | 2 | -9/+13 |
| | | * | | | | | | | | | | make progressbar slightly more transparent and give it a default width of 3px... | Mario Vavti | 2016-07-28 | 1 | -1/+1 |
| | | * | | | | | | | | | | use single quote for js and double quote for html with proper escapes and imp... | Mario Vavti | 2016-07-28 | 1 | -6/+7 |
| | | * | | | | | | | | | | translate mime types to icons, update some icons, move file preview (upload p... | Mario Vavti | 2016-07-28 | 3 | -21/+70 |
| | * | | | | | | | | | | | issue #466, sql typo | redmatrix | 2016-07-28 | 3 | -3/+3 |
| | |/ / / / / / / / / / |
|
| | * | | | | | | | | | | github didn't accept the last push. Touching the files to force a git revision | redmatrix | 2016-07-27 | 3 | -2/+1 |
