Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into dev | redmatrix | 2016-04-06 | 1 | -1/+1 |
|\ | |||||
| * | revup issue #337 | redmatrix | 2016-04-06 | 1 | -1/+1 |
| | | |||||
* | | reset profile photo and cover photo bits for existing photos if a new one ↵ | redmatrix | 2016-04-06 | 1 | -6/+50 |
| | | | | | | | | arrives from a clone | ||||
* | | missing profile photo in export data | redmatrix | 2016-04-06 | 1 | -1/+2 |
| | | |||||
* | | use the explicit form of build_sync_packet so that file/photo sync will work ↵ | redmatrix | 2016-04-06 | 3 | -1/+13 |
| | | | | | | | | even when the actual observer is a guest (with permission to upload). | ||||
* | | more work on file sync to clones, 60-70% test coverage, mostly working but ↵ | redmatrix | 2016-04-06 | 4 | -13/+63 |
| | | | | | | | | many changes made during testing which themselves have not yet been tested | ||||
* | | file sync testing continued | redmatrix | 2016-04-06 | 1 | -0/+4 |
| | | |||||
* | | file sync testing | redmatrix | 2016-04-06 | 2 | -2/+5 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-06 | 1 | -6/+64 |
|\ \ | |||||
| * | | automate bbcode list creation even further | Mario Vavti | 2016-04-07 | 1 | -0/+57 |
| | | | |||||
| * | | adjust the regex to also work with asteriks and use the simpler syntax for lists | Mario Vavti | 2016-04-06 | 1 | -6/+7 |
| | | | |||||
* | | | file sync work | redmatrix | 2016-04-06 | 4 | -7/+173 |
|/ / | |||||
* | | issue #340 | redmatrix | 2016-04-06 | 2 | -9/+15 |
| | | |||||
* | | getting file sync data - missed parent folder | redmatrix | 2016-04-06 | 1 | -1/+7 |
| | | |||||
* | | rework the "remember me" fix to be a bit less hackish | redmatrix | 2016-04-06 | 2 | -5/+1 |
| | | |||||
* | | provide function to collect file/photo sync data per help/filesync | redmatrix | 2016-04-05 | 2 | -0/+56 |
| | | |||||
* | | Merge branch 'master' into dev | redmatrix | 2016-04-05 | 2 | -1/+2 |
|\| | |||||
| * | undeclared static property App::$stringsave (push_lang() and pop_lang()) | redmatrix | 2016-04-05 | 2 | -1/+2 |
| | | |||||
* | | add some doco to getfile module | redmatrix | 2016-04-05 | 1 | -0/+20 |
| | | |||||
* | | server side of file/photo sync to deliver the file data. We'll sign it using ↵ | redmatrix | 2016-04-05 | 1 | -0/+76 |
| | | | | | | | | our channel_hash and the current time to make it difficult to forge a request; as the sync process is not going to have magic-auth ability. | ||||
* | | provide stream resource pointer option to z_fetch_url() and z_post_url() per ↵ | redmatrix | 2016-04-05 | 1 | -1/+13 |
| | | | | | | | | earlier doco commit on syncing files/photos across clones. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-05 | 1 | -1/+5 |
|\ \ | |||||
| * \ | Merge pull request #339 from anaqreon/autocomplete | redmatrix | 2016-04-06 | 1 | -1/+5 |
| |\ \ | | | | | | | | | Improve (un)ordered list autocompletion for list construction | ||||
| | * | | Improve (un)ordered list autocompletion for list construction | Andrew Manning | 2016-04-05 | 1 | -1/+5 |
| | | | | |||||
* | | | | add some doco on some of the issues and approaches to file/photo syncing and ↵ | redmatrix | 2016-04-05 | 1 | -0/+61 |
|/ / / | | | | | | | | | | cloning | ||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-05 | 14 | -78/+297 |
|\| | | |||||
| * | | fix contextual help | Mario Vavti | 2016-04-05 | 2 | -4/+3 |
| | | | |||||
| * | | use min version of justifiedGallery | Mario Vavti | 2016-04-05 | 1 | -1/+1 |
| | | | |||||
| * | | expand list of bbcode in autocomplete | Mario Vavti | 2016-04-05 | 1 | -3/+6 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-04-05 | 9 | -5/+190 |
| |\ \ | |||||
| | * \ | Merge pull request #338 from anaqreon/contextual-help | redmatrix | 2016-04-05 | 9 | -5/+190 |
| | |\ \ | | | | | | | | | | | Contextual help | ||||
| | | * \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵ | Andrew Manning | 2016-04-03 | 292 | -61382/+62954 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | contextual-help | ||||
| | | * | | | More help content for channel pages. Channel, photos, files, about. | Andrew Manning | 2016-03-26 | 4 | -1/+71 |
| | | | | | | |||||
| | | * | | | Search docs/context/ hierarchically for help.html files to reduce redundancy | Andrew Manning | 2016-03-26 | 6 | -42/+27 |
| | | | | | | |||||
| | | * | | | Added help for post permissions | Andrew Manning | 2016-03-26 | 2 | -3/+4 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into ↵ | Andrew Manning | 2016-03-23 | 31 | -3052/+2924 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | contextual-help | ||||
| | | * | | | | Network page help with auto-scroll and element highlighting | Andrew Manning | 2016-03-23 | 1 | -0/+26 |
| | | | | | | | |||||
| | | * | | | | Override navbar help button to open contextual help panel. Contextual help ↵ | Andrew Manning | 2016-03-21 | 8 | -5/+108 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | for mail written. | ||||
| * | | | | | | update upstream lib jusutifiedGallery | Mario Vavti | 2016-04-05 | 5 | -70/+102 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-05 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | revup issue #337 | redmatrix | 2016-04-05 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | explain the two aspects of federation which need to be handled in core to ↵ | redmatrix | 2016-04-04 | 1 | -2/+5 |
| |/ / / / |/| | | | | | | | | | | | | | | pass comments successfully amongst sites which optionally provide federation. Let's hope this list doesn't grow. | ||||
* | | | | | SECURITY: Do not link unknown and unverified code repositories to the ↵ | redmatrix | 2016-04-04 | 3 | -5/+36 |
| | | | | | | | | | | | | | | | | | | | | project without some form of confirmation that one accepts the significant risks involved. | ||||
* | | | | | Merge branch 'master' into dev | redmatrix | 2016-04-04 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-04 | 3 | -6/+10 |
| |\ \ \ \ | |||||
| * | | | | | revup - issue #337 | redmatrix | 2016-04-04 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-04 | 3 | -0/+43 |
|\ \ \ \ \ | |||||
| * | | | | | a simple autocomplete for bbcode or comanche - partly implemented | Mario Vavti | 2016-04-04 | 3 | -0/+43 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'master' into dev | Mario Vavti | 2016-04-04 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | do not use dropdown class if there is nothing to dropdown | Mario Vavti | 2016-04-04 | 1 | -1/+1 |
| | | | | |