redmatrix
|
fb61c4fb34
|
Merge branch '1.8RC'
|
2016-06-19 19:12:33 -07:00 |
|
redmatrix
|
30841d9470
|
Don't use count() to check DB results
|
2016-06-19 18:57:56 -07:00 |
|
Oda
|
5b92922516
|
When picktime is false, close date selector on date select
|
2016-06-18 23:03:06 -03:00 |
|
Mario Vavti
|
178b440f05
|
Merge branch 'dev' into sabre32
|
2016-06-18 11:10:40 +02:00 |
|
redmatrix
|
2e7606f569
|
the text link to a thing will take you to the local thing page, both as a link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL.
|
2016-06-17 21:44:08 -07:00 |
|
redmatrix
|
2793086c0d
|
1. string update, 2. pretty print json blobs
|
2016-06-17 14:58:03 -07:00 |
|
Andrew Manning
|
80d3a831f3
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-17 06:36:09 -04:00 |
|
Andrew Manning
|
961539258b
|
Wiki page revision comparison tool with diff displayed in modal dialog. Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode
|
2016-06-17 06:33:39 -04:00 |
|
Mario Vavti
|
0324bc5cf0
|
Merge branch 'dev' into sabre32
|
2016-06-17 10:04:27 +02:00 |
|
redmatrix
|
f6d7628254
|
core changes to better support media migrations
|
2016-06-16 20:16:39 -07:00 |
|
Mario Vavti
|
28a7458e48
|
Merge branch 'dev' into sabre32
|
2016-06-16 10:26:47 +02:00 |
|
redmatrix
|
a2a87fec54
|
code comments
|
2016-06-15 22:36:00 -07:00 |
|
redmatrix
|
d457f11717
|
custom request methods for curl
|
2016-06-15 21:25:26 -07:00 |
|
redmatrix
|
bc5f73e6c3
|
provide a default for undefined languages
|
2016-06-15 20:51:55 -07:00 |
|
redmatrix
|
1dc35db1fe
|
ignore case in language names and add 'js' as an alias for 'javascript'
|
2016-06-15 20:25:19 -07:00 |
|
hubzilla
|
e0b705fd54
|
Merge pull request #422 from anaqreon/wiki
Wiki rename page feature added. Bug fixes related to git commits.
|
2016-06-16 13:01:49 +10:00 |
|
redmatrix
|
854c23a751
|
This was the reason for the large line widths - an extra linefeed after each li element
|
2016-06-15 19:59:30 -07:00 |
|
redmatrix
|
fa48de33c2
|
provide syntax based [colour] highlighting on code blocks for popular languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins.
|
2016-06-15 19:44:15 -07:00 |
|
Andrew Manning
|
fc7c4e64ff
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-15 21:48:47 -04:00 |
|
Mario Vavti
|
05ed20d336
|
Merge branch 'dev' into sabre32
|
2016-06-15 17:34:03 +02:00 |
|
redmatrix
|
ef1c01d968
|
add new connection to default group when auto-accepted
|
2016-06-15 05:30:03 -07:00 |
|
redmatrix
|
47fc0c7958
|
add new connection to default group when auto-accepted
|
2016-06-15 05:28:16 -07:00 |
|
Andrew Manning
|
688171d016
|
Rename page feature added. Fixed bug in git commit function and other minor fixes.
|
2016-06-15 06:25:31 -04:00 |
|
Mario Vavti
|
5c458e9111
|
Merge branch 'dev' into sabre32
|
2016-06-14 09:42:43 +02:00 |
|
redmatrix
|
0ef2622621
|
some work to provide propagation and honouring of the item_notshown flag.
|
2016-06-13 22:09:22 -07:00 |
|
redmatrix
|
1ff9abe1b4
|
missing iconfig conversion
|
2016-06-13 21:16:36 -07:00 |
|
redmatrix
|
1e68d4fb75
|
deprecate the item_id table - replace with iconfig. A possibly useful function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication.
|
2016-06-13 19:58:24 -07:00 |
|
Mario Vavti
|
e963714ad6
|
Merge branch 'dev' into sabre32
|
2016-06-13 09:18:39 +02:00 |
|
hubzilla
|
b18b9464a4
|
Merge pull request #416 from anaqreon/embedphotos
Add embed photos button with album browser to new post editor
|
2016-06-13 10:15:09 +10:00 |
|
redmatrix
|
7abfe716b4
|
DB schema issue with import
|
2016-06-12 16:35:17 -07:00 |
|
redmatrix
|
81b3c59711
|
DB schema issue with import
|
2016-06-12 16:34:27 -07:00 |
|
Andrew Manning
|
410f5389ae
|
Apply purify_html to page content before preview and save to prevent JavaScript code injection.
|
2016-06-12 15:18:43 -07:00 |
|
Andrew Manning
|
a1183bf09a
|
Merge remote-tracking branch 'upstream/dev' into embedphotos
|
2016-06-12 14:38:48 -04: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 |
|
redmatrix
|
f41380de77
|
remove debugging
|
2016-06-11 15:28:52 -07:00 |
|
redmatrix
|
0e0a6f5f8d
|
Work supporting issue #411, add an optional priority (int) as a second arg to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other
ordering.
|
2016-06-11 15:23:13 -07:00 |
|
Mario Vavti
|
bdbbe00bdf
|
Merge branch 'dev' into sabre32
|
2016-06-11 20:12:41 +02:00 |
|
redmatrix
|
96cd63cf1a
|
iconfig sharing not set correctly
|
2016-06-10 22:41:58 -07:00 |
|
Mario Vavti
|
86985b454f
|
Merge branch 'dev' into sabre32
|
2016-06-10 12:22:01 +02:00 |
|
Andrew Manning
|
7a242f829f
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-09 20:07:09 -04:00 |
|
Andrew Manning
|
7fc2b13fe6
|
Stashing changes. Not a functional state.
|
2016-06-09 20:06:36 -04:00 |
|
Mario Vavti
|
85e82e919e
|
more style work
|
2016-06-09 22:05:52 +02: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
|
5ef8199dae
|
Finish the config family
|
2016-06-07 18:17:39 -07:00 |
|
Andrew Manning
|
cf180f6142
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-07 20:43:49 -04:00 |
|
redmatrix
|
a50e555515
|
'recent photos' query was buggered, also fix issue #163 by adding configurable sort order to the album widget - default is album name ascending
|
2016-06-07 16:23:14 -07:00 |
|
redmatrix
|
037cd74e8e
|
rename admin/users to admin/accounts, provide sortable columns in account and channel summaries - issue #255
|
2016-06-06 19:44:22 -07:00 |
|