Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into dev | redmatrix | 2016-04-11 | 5 | -3497/+3552 |
|\ | |||||
| * | revup | redmatrix | 2016-04-11 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge | redmatrix | 2016-04-10 | 4 | -3496/+3550 |
| |\ | |||||
| | * | Update Dutch and Spanish | jeroenpraat | 2016-04-10 | 4 | -3496/+3550 |
| | | | |||||
| * | | revup | redmatrix | 2016-04-10 | 1 | -1/+1 |
| |/ | |||||
* | | localise the opensearch link | redmatrix | 2016-04-10 | 3 | -6/+8 |
| | | |||||
* | | issue #331 use timeago.js for reshared publish date instead of ↵ | redmatrix | 2016-04-10 | 2 | -3/+8 |
| | | | | | | | | relative_date() which does not play well with other networks. | ||||
* | | move more session related stuff such as paranoia handling (IP address ↵ | redmatrix | 2016-04-10 | 2 | -38/+59 |
| | | | | | | | | changes) into the session object and extend remember_me cookies once a day so that they will never expire (theoretically). The DB session driver will extend its expiration on every session write (in the case of persistent sessions). | ||||
* | | when setting the session handler as an object using the auto register ↵ | redmatrix | 2016-04-10 | 2 | -2/+0 |
| | | | | | | | | shutdown flag, explicitly calling session_write_close() should no longer be required. It shouldn't cause any issues if it is called twice, but the session driver interface has been known to sometimes act in unexpected ways and there are lots of "subtleties" which can often be difficult to debug. The mentioned flag implies PHP 5.4 minimum but I believe we require that anyway. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-10 | 20 | -22/+67 |
|\ \ | |||||
| * | | fix autocomplete for /channel and /display | Mario Vavti | 2016-04-09 | 2 | -1/+5 |
| | | | |||||
| * | | some work on comanche autocomplete | Mario Vavti | 2016-04-09 | 14 | -19/+54 |
| | | | |||||
| * | | enable bbcode autocomplete for other places | Mario Vavti | 2016-04-09 | 5 | -2/+8 |
| | | | |||||
* | | | a few issues: block public not blocking mod_cal, typo in sql for one clone ↵ | redmatrix | 2016-04-10 | 7 | -15/+50 |
| | | | | | | | | | | | | file sync operation, fix_system_urls not catching cached contact photos, extend sessionhandler expiration when remember_me is enabled as the stored session is expiring long before the browser session. | ||||
* | | | log if the session handler fails and surface the ssl_cookie config setting | redmatrix | 2016-04-08 | 3 | -1/+5 |
|/ / | |||||
* | | objectify all the session management stuff | redmatrix | 2016-04-08 | 7 | -12/+181 |
| | | |||||
* | | Merge branch 'master' into dev | redmatrix | 2016-04-08 | 2 | -1281/+1303 |
|\| | |||||
| * | revup | redmatrix | 2016-04-08 | 2 | -1281/+1303 |
| | | |||||
* | | send file sync packets for all known file operations | redmatrix | 2016-04-07 | 7 | -47/+112 |
| | | |||||
* | | implement updates of attach data to sync'd clones. | redmatrix | 2016-04-07 | 1 | -18/+38 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-04-07 | 2 | -1/+22 |
|\ \ | |||||
| * | | translate the most common bbcodes to their *real name*. finally we should ↵ | Mario Vavti | 2016-04-07 | 2 | -1/+19 |
| | | | | | | | | | | | | probably use an array for each bbcode containing the bbcode the real name and possibly a template for use as a peview in the dropdown | ||||
| * | | some more autocompletion for bbcode tables - leave it open if we wanna use ↵ | Mario Vavti | 2016-04-07 | 1 | -0/+3 |
| | | | | | | | | | | | | th or td though | ||||
| * | | move li back in the list since it will be used far less than list | Mario Vavti | 2016-04-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into dev | redmatrix | 2016-04-07 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | revup issue #337 | redmatrix | 2016-04-07 | 1 | -1/+1 |
| | | |||||
* | | 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 |
| | | | |