redmatrix
|
acf26d5c63
|
code cleanup for profile_photos
|
2016-06-23 01:17:44 -07:00 |
|
Mario Vavti
|
39b14b6b81
|
Merge branch 'dev' into sabre32
|
2016-06-23 10:14:13 +02:00 |
|
Ben Roberts
|
ab628eb2a3
|
microformats 2 for posts
|
2016-06-22 23:59:27 -04:00 |
|
redmatrix
|
ec8091a102
|
use the normal html escape for '@' in addresses rather than the high-plane unicode variant. This makes it copy-able, but not easily scrape-able.
|
2016-06-22 18:00:18 -07:00 |
|
Mario Vavti
|
5536df51f5
|
erge branch 'dev' into sabre32
|
2016-06-22 09:58:55 +02:00 |
|
redmatrix
|
2a840460dd
|
vcard spec changes
|
2016-06-21 19:25:14 -07:00 |
|
Mario Vavti
|
ecae0b3d97
|
Merge branch 'dev' into sabre32
|
2016-06-21 10:08:49 +02:00 |
|
hubzilla
|
670d12219b
|
Merge pull request #429 from anaqreon/wiki
Wiki page revision comparison viewer
|
2016-06-21 06:23:58 +10:00 |
|
Mario Vavti
|
545219b839
|
Merge branch 'dev' into sabre32
|
2016-06-20 21:47:49 +02:00 |
|
Mario Vavti
|
985fb44424
|
Merge branch 'master' into dev
|
2016-06-20 21:46:33 +02:00 |
|
Andrew Manning
|
8cd9a1e4fc
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-20 13:07:29 -04:00 |
|
Andrew Manning
|
20b4fc9198
|
Do not change active page commit until user reverts the page
|
2016-06-20 13:05:18 -04:00 |
|
Mario Vavti
|
e40112b40d
|
Merge branch 'dev' into sabre32
|
2016-06-20 09:31:27 +02:00 |
|
redmatrix
|
905374c86e
|
experimental rtl support; this will probably require a fair bit of work.
|
2016-06-19 21:10:57 -07:00 |
|
Mario Vavti
|
7a4efcf67f
|
return something so we can make a conclusion
|
2016-06-19 20:34:38 +02:00 |
|
Mario Vavti
|
6e0eb532a5
|
Merge branch 'dev' into sabre32
|
2016-06-19 11:04:02 +02:00 |
|
redmatrix
|
4578649f75
|
hebrew hstrings.php was empty
|
2016-06-18 20:26:36 -07:00 |
|
redmatrix
|
b6324246ff
|
hebrew hstrings.php was empty
|
2016-06-18 20:25:31 -07:00 |
|
redmatrix
|
53e4713932
|
hebrew update
|
2016-06-18 20:09:52 -07:00 |
|
root
|
76e11b46b7
|
hebrew translation
|
2016-06-18 20:03:38 -07: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 |
|
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
|
9749bbcedc
|
Merge branch 'dev' into sabre32
|
2016-06-17 11:58:14 +02:00 |
|
Mario Vavti
|
aa5ac9dc3f
|
only use height: auto for week and day view
|
2016-06-17 11:57:36 +02:00 |
|
Mario Vavti
|
5b479d63d6
|
Merge branch 'dev' into sabre32
|
2016-06-16 12:22:32 +02:00 |
|
Mario Vavti
|
8924f94d05
|
show month view in full height in fullscreen view
|
2016-06-16 12:21:59 +02:00 |
|
Mario Vavti
|
a873b7b6e8
|
mrge branch 'dev' into sabre32
|
2016-06-16 11:37:16 +02:00 |
|
Mario Vavti
|
7baa20d559
|
fix scrollbars
|
2016-06-16 11:36:51 +02:00 |
|
Mario Vavti
|
28a7458e48
|
Merge branch 'dev' into sabre32
|
2016-06-16 10:26:47 +02: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
|
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 |
|
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 |
|
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 |
|
phellmes
|
a16dcc877c
|
Update DE translation strings
|
2016-06-15 12:12:18 +02:00 |
|
Mario Vavti
|
24569a18db
|
css fix
|
2016-06-14 23:21:26 +02:00 |
|
Mario Vavti
|
b6d425838f
|
css fixes
|
2016-06-13 17:19:49 +02:00 |
|
Mario Vavti
|
e963714ad6
|
Merge branch 'dev' into sabre32
|
2016-06-13 09:18:39 +02:00 |
|
Andrew Manning
|
71d4f65cb2
|
Move javascript functions back to jot-header.tpl
|
2016-06-12 20:10:37 -04:00 |
|
Andrew Manning
|
b5933e9d44
|
Photo embed button with album browser works in new post editor.
|
2016-06-12 19:41:37 -04:00 |
|
Andrew Manning
|
a1183bf09a
|
Merge remote-tracking branch 'upstream/dev' into embedphotos
|
2016-06-12 14:38:48 -04:00 |
|
Mario Vavti
|
ef95c68b4f
|
Merge branch 'dev' into sabre32
|
2016-06-11 20:33:03 +02: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 |
|
Mario Vavti
|
86985b454f
|
Merge branch 'dev' into sabre32
|
2016-06-10 12:22:01 +02:00 |
|
Mario Vavti
|
9d5d3a9468
|
Merge branch 'dev' into sabre32
|
2016-06-10 10:45:09 +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 |
|
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 |
|