Mario Vavti
|
af29822f04
|
override bs default margin
|
2015-12-07 15:45:21 +01:00 |
|
Mario Vavti
|
0df4f9c114
|
change album_id logic to make it work with ajax calls
|
2015-12-07 13:27:35 +01:00 |
|
Mario Vavti
|
69c9f4588c
|
make justify gallery work with more than one albums per page (eg album widget)
|
2015-12-07 12:13:51 +01:00 |
|
redmatrix
|
53627c89a7
|
Merge branch 'dev'
|
2015-12-06 20:50:02 -08:00 |
|
redmatrix
|
f7f0d2b265
|
provide plugin hooks for blacklist checking functions.
|
2015-12-06 20:45:21 -08:00 |
|
redmatrix
|
2d799f2c11
|
remove duplicated code
|
2015-12-06 19:59:46 -08:00 |
|
redmatrix
|
aa5b7eb98a
|
minor optimisation
|
2015-12-06 19:48:46 -08:00 |
|
redmatrix
|
1c22e8ae7e
|
whitespace
|
2015-12-06 19:32:39 -08:00 |
|
redmatrix
|
4d301bc5a6
|
comment order
|
2015-12-06 19:29:01 -08:00 |
|
redmatrix
|
4ccd9ae6da
|
start of v4
|
2015-12-06 19:16:38 -08:00 |
|
Mario Vavti
|
c8c9916b59
|
Merge branch 'master' of https://github.com/redmatrix/hubzilla
|
2015-12-07 00:01:03 +01:00 |
|
Mario Vavti
|
5490919557
|
css fixes for blockquote and code (use same padding)
|
2015-12-07 00:00:47 +01:00 |
|
redmatrix
|
3f920da413
|
update error
|
2015-12-06 14:25:47 -08:00 |
|
redmatrix
|
2393db3943
|
Merge branch 'dev'
|
2015-12-06 14:24:18 -08:00 |
|
redmatrix
|
a88ec1b1af
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-12-06 14:22:55 -08:00 |
|
redmatrix
|
553b3a5c6c
|
version
|
2015-12-06 14:22:36 -08:00 |
|
Mario Vavti
|
a6cb25020b
|
add missing smarty files
|
2015-12-06 23:12:37 +01:00 |
|
Mario Vavti
|
26c465ad0c
|
update smarty to 3.1.28-dev which fixes a bug where changes in a template are only visible on the second pageload which is annoying for developing
|
2015-12-06 21:09:58 +01:00 |
|
Mario Vavti
|
f2d7083183
|
remove more unneeded smarty files
|
2015-12-06 20:25:42 +01:00 |
|
Mario Vavti
|
ef09a29854
|
remove composer release notes
|
2015-12-06 20:14:12 +01:00 |
|
Mario Vavti
|
c23ce16caf
|
update smarty library - seems to bring some performance improvement
|
2015-12-06 20:12:05 +01:00 |
|
Mario Vavti
|
78a70fed2f
|
fix css issue in directory
|
2015-12-06 16:37:57 +01:00 |
|
redmatrix
|
9dfe5dee64
|
change text "Red developers" in update failed email
|
2015-12-05 13:56:32 -08:00 |
|
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 |
|
mrjive
|
0513463256
|
Merge pull request #9 from redmatrix/master
updating from original codebase
|
2015-12-04 10:32:14 +01: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 |
|