a5256b7996
Merge pull request #54 from campino/master
...
Build documentation
This looks good. It may take me some time to get up to speed - and I'm not sure I have all the utilities available via my hosting provider.
2012-03-01 17:54:41 -08:00
dd9432903d
Merge remote-tracking branch 'upstream/master'
2012-03-01 11:49:22 +01:00
e0c659b34b
Enabled automated doc building. Changes:
...
-build.xml, phing build file
-@package tags at acl_selector.php and db_update.php
-added documentation and some IDE files to .gitignore
-automated tool to find files that corrupt the doc build process
-removed ansi characters from SSH1.php, docBlox could not handle them
2012-03-01 11:44:33 +01:00
bd2c8c92f1
yet more work on notifications
2012-02-29 19:23:01 -08:00
bbebb4c2a0
notification enhancements
2012-02-29 18:19:08 -08:00
84d5f495e6
better handling of multiple notifications for same item, and old notifications
2012-02-29 16:26:07 -08:00
fb33b4f2bc
Update LICENSE
2012-02-29 21:09:20 +11:00
aedb7c5f69
Update README
2012-02-29 21:07:33 +11:00
60ae0d8974
cleaned up mess created when both people request friendship and one approves as duplex
2012-02-28 17:32:44 -08:00
21803e0cd3
call time pass by reference deprecated
2012-02-28 14:54:17 -08:00
f40ef1bf46
Merge branch 'pull'
2012-02-28 14:53:41 -08:00
4dd4a22582
From Tobias H - catch some irregularities caused by cut/paste code
2012-02-28 14:52:23 -08:00
733f830be4
fix url and network display
2012-02-28 19:10:27 +01:00
53412dacd4
update globaldir when page-type changes, add spam date field
2012-02-27 23:27:16 -08:00
2b730ae86d
clicking contact on contacts page broken link
2012-02-27 18:46:11 -08:00
6c0fa7a166
Merge branch 'pull'
2012-02-27 17:18:53 -08:00
d7407f8daa
cleanup notify subject lines
2012-02-27 17:18:19 -08:00
e11b51aca1
Merge pull request #53 from fabrixxm/master
...
remove template filters support
2012-02-27 10:05:27 -08:00
42d591d257
revert 01a2791e3a to avoid random preg internal errors. fix contact_template
2012-02-27 18:48:59 +01:00
a33031634e
Merge pull request #52 from campino/master
...
Corrected syntax error
2012-02-27 06:07:46 -08:00
9986fc1910
fixed syntax errors
2012-02-27 14:12:44 +01:00
153e7beb19
add plugin hooks to enotify
2012-02-26 23:54:04 -08:00
6e76d9d3a3
Merge pull request #51 from simonlnu/master
...
RFC, request for comments: about the https for html5shiv
2012-02-26 22:20:46 -08:00
72e78046af
minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-27 01:04:41 -05:00
36d173ca98
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master: (29 commits)
spam db
fix tag icon size
typo in css
tagging missing from wallwall and a couple of themes, star missing from dispy
Mail: New options for actions after importing mails.
relative link redirects
Avoid some notices
Bugfix
is not always defined; but if defined, then always of type integer
1 Bugfix (missing $ character) and avoid some notices
necessare fields not loaded from DB
should probably be a->user['hidewall'] instead of profile['hidewall']
"Vier-Theme" Some more design stuff.
some revision to the German strings
German strings
Wrong variable name
show experimental and unsupported theme status on theme admin page
jumping divs with no scrolling
imrpove contrast on darkzero blockquotes
darkzero-NS theme
...
* master:
2012-02-27 00:56:41 -05:00
fc036210fb
spam db
2012-02-26 18:53:48 -08:00
6bc48b29cc
fix tag icon size
2012-02-26 16:40:21 -08:00
e994b990eb
typo in css
2012-02-26 16:31:51 -08:00
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
89560edde2
Merge pull request #50 from annando/master
...
massive changes in mail and design updates in "vier"
2012-02-26 15:07:34 -08:00
6ddd444afd
Merge pull request #49 from CatoTH/master
...
Bugfix for del_config
2012-02-26 14:49:56 -08:00
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
b79380f906
Merge branch 'pull'
2012-02-26 14:34:58 -08:00
bdb14d5aad
relative link redirects
2012-02-26 14:34:01 -08:00
437e18d7a7
Merge remote branch 'upstream/master'
2012-02-26 21:47:47 +01:00
4b1de0f538
Avoid some notices
2012-02-26 20:43:51 +00:00
ac86407fdf
Bugfix
2012-02-26 20:43:35 +00:00
b102a1d5ec
is not always defined; but if defined, then always of type integer
2012-02-26 20:43:23 +00:00
cbc6ca642a
1 Bugfix (missing $ character) and avoid some notices
2012-02-26 20:41:41 +00:00
792abc3a24
necessare fields not loaded from DB
2012-02-26 20:40:41 +00:00
fd9c12128a
should probably be a->user['hidewall'] instead of profile['hidewall']
2012-02-26 20:39:37 +00:00
edc44933a4
"Vier-Theme" Some more design stuff.
2012-02-26 21:16:29 +01:00
2081e6d507
some revision to the German strings
2012-02-26 17:12:14 +01:00
0877fbb42a
German strings
2012-02-26 15:41:27 +01:00
aa92901b11
Wrong variable name
2012-02-26 14:29:17 +00:00
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
fb8675f349
jumping divs with no scrolling
2012-02-26 01:20:43 -08:00
484426d3e2
imrpove contrast on darkzero blockquotes
2012-02-26 00:53:31 -08:00
828034ad23
darkzero-NS theme
2012-02-26 00:48:11 -08:00
896f97b31a
Merge pull request #48 from abinoam/thmail-5
...
Comment Notifications by Email - Threading Them
2012-02-25 18:01:09 -08:00
friendica
Alexander Kampmann
fabrixxm
Simon
Alexander Kampmann
Simon L'nu
Michael
Tobias Hößl
Tobias Diekershoff
root