16314 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
jeroenpraat	f437705007	Update Dutch and Spanish	2016-04-10 20:58:00 +02:00
Mario Vavti	46ed79c87a	fix autocomplete for /channel and /display	2016-04-09 12:27:36 +02:00
Mario Vavti	e2b4d33627	some work on comanche autocomplete	2016-04-09 12:16:42 +02:00
Mario Vavti	7690dca67b	enable bbcode autocomplete for other places	2016-04-09 09:24:14 +02:00
redmatrix	c0bdcfedeb	log if the session handler fails and surface the ssl_cookie config setting	2016-04-08 05:10:36 -07:00
redmatrix	9b66b5eee3	objectify all the session management stuff	2016-04-08 04:44:10 -07:00
redmatrix	2db59f3b76	Merge branch 'master' into dev	2016-04-08 03:32:28 -07:00
redmatrix	44e21f6198	revup	2016-04-08 03:31:32 -07:00
redmatrix	279f32b13d	send file sync packets for all known file operations	2016-04-07 18:54:48 -07:00
redmatrix	3a6187af3d	implement updates of attach data to sync'd clones.	2016-04-07 16:44:53 -07:00
redmatrix	516f776c94	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-04-07 16:25:16 -07:00
redmatrix	cc62793d6f	Merge branch 'master' into dev	2016-04-07 16:24:59 -07:00
redmatrix	d87daaedd1	revup issue #337	2016-04-07 16:23:57 -07:00
Mario Vavti	cf84ff3344	translate the most common bbcodes to their *real name*. finally we should 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	2016-04-07 23:03:55 +02:00
Mario Vavti	e419b2c18c	some more autocompletion for bbcode tables - leave it open if we wanna use th or td though	2016-04-07 11:34:38 +02:00
Mario Vavti	58324473a9	move li back in the list since it will be used far less than list	2016-04-07 11:16:30 +02:00
redmatrix	62d842de31	Merge branch 'master' into dev	2016-04-06 22:23:07 -07:00
redmatrix	aa678ba0ff	reset profile photo and cover photo bits for existing photos if a new one arrives from a clone	2016-04-06 22:14:05 -07:00
redmatrix	e4391e6336	missing profile photo in export data	2016-04-06 21:36:47 -07:00
redmatrix	aa0412d83b	use the explicit form of build_sync_packet so that file/photo sync will work even when the actual observer is a guest (with permission to upload).	2016-04-06 20:25:52 -07:00
redmatrix	861f5232d3	more work on file sync to clones, 60-70% test coverage, mostly working but many changes made during testing which themselves have not yet been tested	2016-04-06 19:56:38 -07:00
redmatrix	9831ad515d	file sync testing continued	2016-04-06 18:46:29 -07:00
redmatrix	6650916435	file sync testing	2016-04-06 18:38:48 -07:00
redmatrix	64cc0b794a	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-04-06 18:08:06 -07:00
redmatrix	29363a185d	file sync work	2016-04-06 18:07:29 -07:00
Mario Vavti	e41082dccc	automate bbcode list creation even further	2016-04-07 00:46:45 +02:00
Mario Vavti	97ccbf1bfb	adjust the regex to also work with asteriks and use the simpler syntax for lists	2016-04-06 22:18:59 +02:00
redmatrix	a20ef706fd	issue #340	2016-04-06 05:44:40 -07:00
redmatrix	adad8f2ebc	getting file sync data - missed parent folder	2016-04-06 05:20:55 -07:00
redmatrix	0533db5d38	revup issue #337	2016-04-06 02:33:58 -07:00
redmatrix	fb9c12df15	rework the "remember me" fix to be a bit less hackish	2016-04-06 02:33:11 -07:00
redmatrix	5a2a8717e3	provide function to collect file/photo sync data per help/filesync	2016-04-05 23:11:24 -07:00
redmatrix	0d50d29538	Merge branch 'master' into dev	2016-04-05 22:15:29 -07:00
redmatrix	54aa998b52	undeclared static property App::$stringsave (push_lang() and pop_lang())	2016-04-05 22:13:56 -07:00
redmatrix	10f1e2d51b	add some doco to getfile module	2016-04-05 21:20:23 -07:00
redmatrix	9fd8634b62	server side of file/photo sync to deliver the file data. We'll sign it using 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.	2016-04-05 21:10:08 -07:00
redmatrix	fd07940b10	provide stream resource pointer option to z_fetch_url() and z_post_url() per earlier doco commit on syncing files/photos across clones.	2016-04-05 18:24:24 -07:00
redmatrix	6f6051f7e3	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-04-05 16:44:11 -07:00
redmatrix	f9778fda83	add some doco on some of the issues and approaches to file/photo syncing and cloning	2016-04-05 16:42:33 -07:00
redmatrix	ea3fb53e4b	Merge pull request #339 from anaqreon/autocomplete ... Improve (un)ordered list autocompletion for list construction	2016-04-06 06:07:32 +10:00
redmatrix	a7d5bf6854	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	2016-04-05 12:51:22 -07:00
redmatrix	0e7a963173	Merge branch 'master' into dev	2016-04-05 12:51:06 -07:00
redmatrix	4aa2733699	revup issue #337	2016-04-05 12:49:58 -07:00
Andrew Manning	1eb6067c31	Improve (un)ordered list autocompletion for list construction	2016-04-05 14:46:16 -04:00
Mario Vavti	bd29551f9a	fix contextual help	2016-04-05 16:59:32 +02:00
Mario Vavti	32ccdd1f57	use min version of justifiedGallery	2016-04-05 15:28:39 +02:00
Mario Vavti	deaf0e99fd	expand list of bbcode in autocomplete	2016-04-05 15:27:45 +02:00
Mario Vavti	d99a1d8de0	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	2016-04-05 15:24:42 +02:00
Mario Vavti	0012030826	update upstream lib jusutifiedGallery	2016-04-05 15:24:05 +02:00
redmatrix	ec41170121	Merge pull request #338 from anaqreon/contextual-help ... Contextual help	2016-04-05 22:43:15 +10:00