Commit Graph
16910 Commits
Author SHA1 Message Date
redmatrix 3cf6f1f79c merge conflict 2016-06-19 21:47:04 -07:00
redmatrix 953ca2c21e zot_revision should be string, not float 1.8 2016-06-19 19:15:26 -07:00
redmatrix 8b42834c3f recreate link from the merge kerfuffle 2016-06-19 19:13:23 -07:00
redmatrix fb61c4fb34 Merge branch '1.8RC' 2016-06-19 19:12:33 -07:00
redmatrix bfaabfb7b5 hebrew hstrings.php was empty 2016-06-18 20:27:10 -07:00
redmatrix 4578649f75 hebrew hstrings.php was empty 2016-06-18 20:26:36 -07:00
redmatrix 53e4713932 hebrew update 2016-06-18 20:09:52 -07:00
hubzillaandGitHub 310f370b55 Merge pull request #426 from eduoda/master
When picktime is false, close date selector on date select
2016-06-19 12:45:47 +10:00
Oda 5b92922516 When picktime is false, close date selector on date select 2016-06-18 23:03:06 -03:00
hubzillaandGitHub 08f108e6cf Merge pull request #424 from BlaBlaNet/master
hebrew translation
2016-06-19 07:31:43 +10:00
root 5c947c7519 hebrew translation 2016-06-18 13:57:40 +00:00
redmatrix 99e8499722 changelog update for 1.8 2016-06-17 22:41:45 -07:00
redmatrix 22edd00211 "thing" always showing default url, not that supplied by the thing. 2016-06-17 21:26:25 -07:00
redmatrix d9aa16aa82 Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge 2016-06-15 16:25:39 -07:00
redmatrix 976e32d3ae translate already imported system apps 2016-06-15 16:25:24 -07:00
jeroenpraat b0476be36f All languages up to date as far as they are updated. Added Hebrew (I saw no RTL on my browser, but maybe that's a locale setting or else it's not yet implemented in HZ). Removed Esperanto and Czech (they where old ones from Friendica and are not on Transifex (yet)). 2016-06-15 17:26:44 +02:00
redmatrix a005088228 Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge 2016-06-15 05:30:19 -07:00
redmatrix ef1c01d968 add new connection to default group when auto-accepted 2016-06-15 05:30:03 -07:00
Jeroen van Riet PaapandGitHub a9f690260a Merge pull request #420 from phellmes/de20160615
Update DE translation strings
2016-06-15 13:53:02 +02:00
phellmes a16dcc877c Update DE translation strings 2016-06-15 12:12:18 +02:00
redmatrix 7abfe716b4 DB schema issue with import 2016-06-12 16:35:17 -07:00
hubzillaandGitHub 290a14d29e Merge pull request #414 from anaqreon/1.8RC
Add filter to wiki content to prevent JavaScript code injection
2016-06-13 08:16:26 +10:00
Andrew Manning e109abbef7 Apply purify_html to page content before preview and save to prevent JavaScript code injection. 2016-06-12 07:17:23 -04:00
Mario Vavti 0cada39c8a css fixes 2016-06-11 20:31:37 +02:00
jeroenpraat a1241daa41 es_ES and NL string for 1.8RC. Hopefully I'm doing it right. 2016-06-11 17:58:37 +02:00
jeroenpraat 1f43da2ade Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC 2016-06-11 17:54:26 +02:00
redmatrix 1614dbf6ae iconfig sharing not set correctly 2016-06-10 22:42:59 -07:00
redmatrix 96cd63cf1a iconfig sharing not set correctly 2016-06-10 22:41:58 -07:00
redmatrix 974ca9d526 move dev forward 2016-06-10 14:26:14 -07:00
redmatrix c55a7b5f36 changelog update 2016-06-10 03:16:15 -07:00
hubzillaandGitHub beb55235c6 Merge pull request #410 from anaqreon/wiki
Wiki module: first iteration
2016-06-10 20:03:08 +10:00
redmatrix cf415a4312 strings update 2016-06-10 01:18:52 -07:00
redmatrix bb3d56a0b2 foreach: invalid argument 2016-06-09 22:07:27 -07:00
redmatrix 8f181bb188 change loglevel 2016-06-09 20:28:37 -07:00
redmatrix 135d84ba37 several "to-do" updates 2016-06-09 19:06:31 -07:00
redmatrix 77442dfcdc add safemode tool 2016-06-09 18:34:25 -07:00
redmatrix ed597146fa Create the initial 1.8 changelog entry (subject to further changes) 2016-06-09 18:31:42 -07:00
Andrew Manning 7a242f829f Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-09 20:07:09 -04:00
redmatrix ee5372784e remove the automatic ajax page load on pgdn key; it can load content much faster than you can page and potentially lead to memory exhaustion. 2016-06-09 16:45:53 -07:00
redmatrix 0dcea87b99 namespace issue with openid reverse auth 2016-06-09 16:20:16 -07:00
redmatrix a10f5e9e06 allow an exclusion for transmitting hidden file activities. There may be a better way to do this, but it was pointed out recently that transmitting some hidden activities might cause a problem. I cannot locate the conversation at the moment to summarise the exact issue. 2016-06-09 16:11:58 -07:00
redmatrix 2ad5010dc3 issue #59 2016-06-08 20:00:36 -07:00
redmatrix 40bba93a31 potential fix to hubzilla-addons issue 16 2016-06-08 19:34:11 -07:00
Andrew Manning 9410b63bbc Revised permissions checks across API and enabled collaborative editing using the write_pages per-channel permission. 2016-06-08 06:26:27 -04:00
Andrew Manning d43a814385 Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-08 05:41:13 -04:00
redmatrix e46e7002a8 block random_profile from accessing sys channels 2016-06-07 22:55:24 -07:00
redmatrix e6d20877b8 whitespace 2016-06-07 18:27:37 -07:00
redmatrix 5ef8199dae Finish the config family 2016-06-07 18:17:39 -07:00
Andrew Manning e86e666c22 Javascript only allows saving a page if the content has changed. 2016-06-07 20:58:14 -04:00
Andrew Manning cf180f6142 Merge remote-tracking branch 'upstream/dev' into wiki 2016-06-07 20:43:49 -04:00