redmatrix
|
36ef1d1bc6
|
move the instance stuff to abook where it belongs
|
2015-12-05 13:24:58 -08:00 |
|
redmatrix
|
10db51e6c2
|
Merge branch 'master' into dev
|
2015-12-05 12:48:46 -08:00 |
|
redmatrix
|
61aa33af1d
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-12-05 12:41:08 -08:00 |
|
redmatrix
|
d8dc055dce
|
version and string update
|
2015-12-05 12:40:35 -08:00 |
|
redmatrix
|
ce686d2c06
|
Merge pull request #209 from HaakonME/master
Updated Norwegian strings for Hubzilla 1.0
|
2015-12-06 07:35:31 +11:00 |
|
Haakon Meland Eriksen
|
7119976199
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-05 11:26:07 +01:00 |
|
Haakon Meland Eriksen
|
dd7edc8ced
|
Updated Norwegian translation
|
2015-12-05 11:25:36 +01:00 |
|
redmatrix
|
4428f70ea2
|
Merge pull request #208 from anaqreon/mail-text-height
Enlarge the default mail composition text area.
|
2015-12-05 07:47:15 +11:00 |
|
Andrew Manning
|
0bb7589418
|
Enlarge the default mail composition text area.
|
2015-12-04 15:29:57 -05:00 |
|
Mario Vavti
|
8a9d743f6f
|
fix rendering of unseen forum posts count
|
2015-12-04 10:17:13 +01:00 |
|
redmatrix
|
4cab74c18c
|
use the channel blacklist for items and mail, still todo: directory and stuff
|
2015-12-03 21:05:48 -08:00 |
|
redmatrix
|
615c97132d
|
add hubzilla.nl as fallback
|
2015-12-03 19:18:12 -08:00 |
|
redmatrix
|
4b707db4b3
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-12-03 18:28:32 -08:00 |
|
redmatrix
|
70c5f347c4
|
remove non-working directory server from the project fallback list.
|
2015-12-03 18:27:49 -08:00 |
|
ken restivo
|
5217d89543
|
srand() is for seeding the PRNG. You want rand() here.
|
2015-12-03 18:21:25 -08:00 |
|
redmatrix
|
ca55bbdaed
|
use the std_version where applicable instead of matching to the git.
|
2015-12-03 17:09:05 -08:00 |
|
redmatrix
|
366e735ad8
|
time to tag the sucker
|
2015-12-03 14:44:03 -08:00 |
|
Haakon Meland Eriksen
|
c363fc71eb
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-03 18:14:52 +01:00 |
|
redmatrix
|
9f3ea71d5d
|
non-functional changes (changes to comments, etc.)
|
2015-12-02 20:45:21 -08:00 |
|
redmatrix
|
75058e54b8
|
provide correct error if a directory server requires a realm_token and one wasn't provided
|
2015-12-02 18:37:22 -08:00 |
|
redmatrix
|
ed5405d4f7
|
prevent function name re-declaration in widget space
|
2015-12-02 18:25:09 -08:00 |
|
redmatrix
|
8dd4270a6a
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-12-02 16:23:28 -08:00 |
|
redmatrix
|
c29f622b90
|
introduce STD_VERSION and get_std_version() [in include/plugin.php], we begin with 0.11.1 since it is an incompatible interface change to 0.11.
|
2015-12-02 16:21:15 -08:00 |
|
jeroenpraat
|
bc0e415926
|
es+nl and bluegrid update
|
2015-12-03 00:01:51 +01:00 |
|
Mario Vavti
|
c48965ea2f
|
fix nav search popup active background color
|
2015-12-02 22:58:38 +01:00 |
|
Mario Vavti
|
bb995f1bb6
|
fix mail attachment and photo permissions. issue #202
|
2015-12-02 11:34:40 +01:00 |
|
Mario Vavti
|
857e13e9b8
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-12-02 09:44:42 +01:00 |
|
Mario Vavti
|
593423434c
|
fix attachment rendering for mail
|
2015-12-02 09:44:25 +01:00 |
|
redmatrix
|
25caeee854
|
issue #204
|
2015-12-01 20:21:44 -08:00 |
|
redmatrix
|
20ce7a2d9f
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-12-01 15:51:39 -08:00 |
|
redmatrix
|
1ba74d824b
|
usercache is no longer used
|
2015-12-01 15:51:15 -08:00 |
|
redmatrix
|
be7b706486
|
Merge pull request #200 from anaqreon/update-addon-script
Update addon script
|
2015-12-02 09:08:25 +11:00 |
|
Mario Vavti
|
78e18fcdcf
|
fix badge padding in narrow navbar
|
2015-12-01 13:28:50 +01:00 |
|
Mario Vavti
|
706598313e
|
make narrow navbar setting work again
|
2015-12-01 13:18:08 +01:00 |
|
Haakon Meland Eriksen
|
b96f09bb3a
|
Merge remote-tracking branch 'upstream/master'
|
2015-12-01 00:35:01 +01:00 |
|
redmatrix
|
4b191fb558
|
version
|
2015-11-30 14:54:34 -08:00 |
|
Wave
|
de1abf9981
|
Merge pull request #201 from wave72/master
Updated Italian strings
|
2015-11-30 16:29:16 +01:00 |
|
Paolo Tacconi
|
c69f6ca1f4
|
Updated Italian strings
|
2015-11-30 16:25:24 +01:00 |
|
Andrew Manning
|
d4b04d22ed
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla into update-addon-script
|
2015-11-30 07:50:21 -05:00 |
|
Andrew Manning
|
b1f4b9759b
|
Abort addon update if repo does not exist
|
2015-11-30 07:49:56 -05:00 |
|
redmatrix
|
650f882265
|
generalise the site black|white allow lists, also add a channel black|white list for future use
|
2015-11-29 20:26:00 -08:00 |
|
redmatrix
|
a2747403f2
|
report correct directory mode for standalone directories in siteinfo
|
2015-11-29 19:45:29 -08:00 |
|
redmatrix
|
3f9412add2
|
create get_site_info() function so we can have a siteinfo.json module instead of or actually in addition to siteinfo/json
|
2015-11-29 19:37:03 -08:00 |
|
redmatrix
|
29877963be
|
issue #189
|
2015-11-29 18:07:59 -08:00 |
|
redmatrix
|
302c5afdee
|
don't try to pull public content from dead sites
|
2015-11-29 16:28:35 -08:00 |
|
redmatrix
|
9f90806027
|
log whatever is showing up in the delivery hash array since it seems that one site has something unusual there and it is throwing errors.
|
2015-11-29 15:23:29 -08:00 |
|
Haakon Meland Eriksen
|
519862115c
|
Merge remote-tracking branch 'upstream/master'
|
2015-11-29 11:56:47 +01:00 |
|
Haakon Meland Eriksen
|
4d97ea106c
|
Resolving merge conflict
|
2015-11-29 11:55:39 +01:00 |
|
redmatrix
|
d3aa50c9c3
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-11-28 19:17:28 -08:00 |
|
redmatrix
|
1708769d42
|
version
|
2015-11-28 19:16:55 -08:00 |
|