redmatrix
|
cc09f9a7a5
|
Added many of the recent schema changes to the database schema documentation
|
2016-06-19 22:50:41 -07:00 |
|
redmatrix
|
4b505948f0
|
update the bbcode doc
|
2016-06-19 22:04:08 -07:00 |
|
redmatrix
|
3cf6f1f79c
|
merge conflict
|
2016-06-19 21:47:04 -07:00 |
|
redmatrix
|
905374c86e
|
experimental rtl support; this will probably require a fair bit of work.
|
2016-06-19 21:10:57 -07:00 |
|
redmatrix
|
953ca2c21e
|
zot_revision should be string, not float
|
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
|
30841d9470
|
Don't use count() to check DB results
|
2016-06-19 18:57:56 -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
|
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
|
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 |
|
redmatrix
|
3dad4a9ff1
|
update the top level database doc, the individual schema pages are still out of date.
|
2016-06-18 19:57:44 -07:00 |
|
hubzilla
|
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 |
|
redmatrix
|
dbb0a0283f
|
schema changes needed for the caldav client bit
|
2016-06-18 15:33:47 -07:00 |
|
hubzilla
|
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 |
|
Mario Vavti
|
178b440f05
|
Merge branch 'dev' into sabre32
|
2016-06-18 11:10:40 +02:00 |
|
redmatrix
|
755dd67ec7
|
changelog update for 1.8
|
2016-06-17 22:42:17 -07:00 |
|
redmatrix
|
99e8499722
|
changelog update for 1.8
|
2016-06-17 22:41:45 -07: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
|
22edd00211
|
"thing" always showing default url, not that supplied by the thing.
|
2016-06-17 21:26:25 -07:00 |
|
redmatrix
|
c81f6b9f6f
|
"thing" always showing default url, not that supplied by the thing.
|
2016-06-17 16:28:36 -07:00 |
|
redmatrix
|
d0f0a99909
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2016-06-17 15:02:07 -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
|
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 |
|