fabrixxm
733f830be4
fix url and network display
2012-02-28 19:10:27 +01:00
Simon L'nu
718c5ea23e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
update globaldir when page-type changes, add spam date field
clicking contact on contacts page broken link
* master:
2012-02-28 05:25:05 -05:00
friendica
53412dacd4
update globaldir when page-type changes, add spam date field
2012-02-27 23:27:16 -08:00
friendica
2b730ae86d
clicking contact on contacts page broken link
2012-02-27 18:46:11 -08:00
Simon L'nu
cf7e141055
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
cleanup notify subject lines
* master:
2012-02-27 21:08:19 -05:00
friendica
6c0fa7a166
Merge branch 'pull'
2012-02-27 17:18:53 -08:00
friendica
d7407f8daa
cleanup notify subject lines
2012-02-27 17:18:19 -08:00
Simon L'nu
8c2bda46f7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
revert 01a2791e3a
2012-02-27 13:34:19 -05:00
fabrixxm
e11b51aca1
Merge pull request #53 from fabrixxm/master
...
remove template filters support
2012-02-27 10:05:27 -08:00
Fabio Comuni
42d591d257
revert 01a2791e3a to avoid random preg internal errors. fix contact_template
2012-02-27 18:48:59 +01:00
Simon L'nu
b1cdc5a932
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fixed syntax errors
add plugin hooks to enotify
* master:
2012-02-27 09:08:48 -05:00
Simon
a33031634e
Merge pull request #52 from campino/master
...
Corrected syntax error
2012-02-27 06:07:46 -08:00
Alexander Kampmann
9986fc1910
fixed syntax errors
2012-02-27 14:12:44 +01:00
friendica
153e7beb19
add plugin hooks to enotify
2012-02-26 23:54:04 -08:00
Simon
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
Simon L'nu
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
Simon L'nu
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
friendica
fc036210fb
spam db
2012-02-26 18:53:48 -08:00
friendica
6bc48b29cc
fix tag icon size
2012-02-26 16:40:21 -08:00
friendica
e994b990eb
typo in css
2012-02-26 16:31:51 -08:00
friendica
a1861d1128
tagging missing from wallwall and a couple of themes, star missing from dispy
2012-02-26 16:29:06 -08:00
friendica
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
friendica
6ddd444afd
Merge pull request #49 from CatoTH/master
...
Bugfix for del_config
2012-02-26 14:49:56 -08:00
Michael
fe3dfbee56
Mail: New options for actions after importing mails.
2012-02-26 23:39:29 +01:00
friendica
b79380f906
Merge branch 'pull'
2012-02-26 14:34:58 -08:00
friendica
bdb14d5aad
relative link redirects
2012-02-26 14:34:01 -08:00
Michael
437e18d7a7
Merge remote branch 'upstream/master'
2012-02-26 21:47:47 +01:00
Tobias Hößl
4b1de0f538
Avoid some notices
2012-02-26 20:43:51 +00:00
Tobias Hößl
ac86407fdf
Bugfix
2012-02-26 20:43:35 +00:00
Tobias Hößl
b102a1d5ec
is not always defined; but if defined, then always of type integer
2012-02-26 20:43:23 +00:00
Tobias Hößl
cbc6ca642a
1 Bugfix (missing $ character) and avoid some notices
2012-02-26 20:41:41 +00:00
Tobias Hößl
792abc3a24
necessare fields not loaded from DB
2012-02-26 20:40:41 +00:00
Tobias Hößl
fd9c12128a
should probably be a->user['hidewall'] instead of profile['hidewall']
2012-02-26 20:39:37 +00:00
Michael
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
root
aa92901b11
Wrong variable name
2012-02-26 14:29:17 +00:00
friendica
5f7858a688
show experimental and unsupported theme status on theme admin page
2012-02-26 04:17:02 -08:00
friendica
fb8675f349
jumping divs with no scrolling
2012-02-26 01:20:43 -08:00
friendica
484426d3e2
imrpove contrast on darkzero blockquotes
2012-02-26 00:53:31 -08:00
friendica
828034ad23
darkzero-NS theme
2012-02-26 00:48:11 -08:00
Simon
896f97b31a
Merge pull request #48 from abinoam/thmail-5
...
Comment Notifications by Email - Threading Them
2012-02-25 18:01:09 -08:00
friendica
9b6afc2a38
one more attempt
2012-02-25 17:07:38 -08:00
friendica
35b5850af7
missed a spot
2012-02-25 17:04:31 -08:00
Abinoam P. Marques Jr
f3a225437b
Comment notifications by e-mail now are threaded
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
bcfac6c72f
include/items.php pass 'parent' to notification
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
2d5f8b4b48
mod/item.php pass 'parent' to notification
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
da52792d06
DB_UPDATE_VERSION incremented
2012-02-25 16:59:44 -08:00
Abinoam P. Marques Jr
edcc33ab5c
Added notify-threads to update.php
2012-02-25 16:59:42 -08:00
Abinoam P. Marques Jr
3d37a688c7
Added notify-threads to database.sql.
2012-02-25 16:59:42 -08:00
