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
|
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 |
|
Andrew Manning
|
e5f4d80bbe
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-06-16 19:45:02 -04:00 |
|
redmatrix
|
aa77b04860
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-06-16 05:08:26 -07: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
|
2b7f114c2d
|
Merge branch 'dev' into sabre32
|
2016-06-16 11:22:52 +02:00 |
|
Mario Vavti
|
951bf5ec2e
|
update 3rd party lib fullcalendar to version 2.7.3
|
2016-06-16 11:22:08 +02: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 |
|
redmatrix
|
427badcae9
|
improve readability of comments
|
2016-06-15 20:09:40 -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 |
|
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 |
|
redmatrix
|
476116a972
|
translate already imported system apps
|
2016-06-15 16:24:45 -07:00 |
|
Andrew Manning
|
f2dda646ec
|
Merge remote-tracking branch 'upstream/dev' into dev
|
2016-06-15 19:15:47 -04:00 |
|
Mario Vavti
|
05ed20d336
|
Merge branch 'dev' into sabre32
|
2016-06-15 17:34:03 +02: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 |
|
redmatrix
|
47fc0c7958
|
add new connection to default group when auto-accepted
|
2016-06-15 05:28:16 -07:00 |
|
Jeroen van Riet Paap
|
a9f690260a
|
Merge pull request #420 from phellmes/de20160615
Update DE translation strings
|
2016-06-15 13:53:02 +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
|
9a0dff08bc
|
Merge branch 'dev' into sabre32
|
2016-06-15 08:42:51 +02:00 |
|
redmatrix
|
77dedf6648
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-06-14 20:31:10 -07:00 |
|
redmatrix
|
212d8b6cfd
|
support cookie auth in Sabre DAV
|
2016-06-14 20:30:34 -07:00 |
|
hubzilla
|
9eb23a1208
|
Merge pull request #419 from anaqreon/wiki
Wiki context help translations IT and ES-ES
|
2016-06-15 10:06:08 +10:00 |
|
redmatrix
|
ccfd028919
|
readme for the module directory, also provide an undocumented way to reset the timestamp on connection photos to force a refresh without messing with the database directly.
|
2016-06-14 17:04:29 -07:00 |
|
Andrew Manning
|
e5a919c32e
|
Fix Spanish wiki translation
|
2016-06-14 19:58:33 -04:00 |
|
Andrew Manning
|
eeaafe9f39
|
Merge remote-tracking branch 'upstream/dev' into wiki
|
2016-06-14 19:56:04 -04:00 |
|
Andrew Manning
|
6430a232f8
|
Add Italian wiki context help translation
|
2016-06-14 19:55:31 -04:00 |
|
Mario Vavti
|
24569a18db
|
css fix
|
2016-06-14 23:21:26 +02: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 |
|
hubzilla
|
8e5948716e
|
Merge pull request #418 from anaqreon/wiki
Wiki context help translations DE and ES-ES
|
2016-06-14 13:03:30 +10: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 |
|
Andrew Manning
|
1bec739195
|
Missing space in Spanish translation
|
2016-06-13 21:59:51 -04:00 |
|