This website requires JavaScript.
60adef2463
fix text-editor in theme
2012-03-03 13:27:39 +01:00
81a8d4f9db
Merge remote branch 'upstream/master'
2012-03-03 13:21:11 +01:00
9d885c4801
german strings as of 28th Feb from transilex
2012-03-03 12:17:32 +01:00
02a9fd5dc1
A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
2012-03-03 10:44:34 +00:00
b4361e37e0
Merge pull request #63 from tomtom84/master
2012-03-02 21:02:55 -08:00
83c25b4386
small fix in style.css
2012-03-03 06:00:46 +01:00
89f667ff76
fix star/unstar
2012-03-03 04:45:34 +01:00
2ae82ae3c2
Merge pull request #62 from tomtom84/master
2012-03-02 19:32:34 -08:00
d138d07c05
fixes in wall_item.tpl and style.css in theme diabook
2012-03-03 04:27:06 +01:00
8f72d95b0e
fix in wall_item.tpl new icon link.png
2012-03-03 01:52:53 +01:00
a66648356f
add diabook to default themes
2012-03-02 16:24:26 -08:00
7ef861907e
minor formatting issues
2012-03-02 19:09:17 -05:00
705b4a00ce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 19:05:41 -05:00
d32edf83d3
Merge pull request #61 from fabrixxm/master
2012-03-02 16:02:02 -08:00
d3f83c9375
fixed broken tags and notifications in theme
2012-03-03 00:41:02 +01:00
3339428987
fix @mention autocomplete in comments
2012-03-03 00:12:45 +01:00
ae79de3039
Merge remote-tracking branch 'friendica/master'
2012-03-03 00:06:44 +01:00
685686b3e8
template proc: fix variables regexp
2012-03-03 00:00:38 +01:00
f1efa0991a
Merge pull request #60 from simonlnu/master
2012-03-02 11:01:21 -08:00
81de5f7802
apply changes to templates to testbubble
2012-03-02 13:59:28 -05:00
02f8e95b1a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 12:28:28 -05:00
e2e9050d74
Merge pull request #58 from simonlnu/master
2012-03-02 09:28:04 -08:00
d61ee3760d
Merge pull request #59 from tomtom84/master
2012-03-02 09:25:42 -08:00
64a85b2507
deleted readme.txt from folder diabook
2012-03-02 18:01:21 +01:00
9c698b1a60
fix for comment-wwedit-wrapper CSS class in tpl had a stray $
2012-03-02 12:00:16 -05:00
ac1d758f6e
github finally working
2012-03-02 17:47:45 +01:00
d72520f5f1
adjust3
2012-03-02 17:45:21 +01:00
ccfe402fb0
Merge remote branch 'upstream/master'
2012-03-02 17:44:09 +01:00
8a51e29824
template proc: add variable filters
2012-03-02 17:22:16 +01:00
cb46e4a11f
Merge remote-tracking branch 'tomtom84_friendica/master' into master-2
2012-03-02 17:21:06 +01:00
c26787ab94
adjust2
2012-03-02 15:57:32 +01:00
725daf2a5d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 10:55:59 -05:00
a3dcf491f1
Merge pull request #57 from fabrixxm/master
2012-03-02 07:55:38 -08:00
e2798cee16
adjust
2012-03-02 15:57:32 +01:00
aef737f376
template proc: allow isolation of var name between [ and ]
2012-03-02 15:53:48 +01:00
5fc3c3ab85
group: fix create new group form
2012-03-02 15:40:17 +01:00
ef34847501
templates: fix tags
2012-03-02 12:41:34 +01:00
0bf087c895
template proc: remove unused function and commented out code
2012-03-02 12:36:22 +01:00
60e5dda1b5
template proc: first optimization
2012-03-02 12:24:35 +01:00
bcadd873ee
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 04:53:54 -05:00
20817b4b8e
Merge remote branch 'upstream/master'
2012-03-02 10:34:18 +01:00
52ea842e87
html2bbcode: don't convert sizes and fonts.
2012-03-02 10:33:39 +01:00
f1bf6dcdfb
expand multiple heart smilies e.g. <3333
2012-03-02 01:24:20 -08:00
f0fdd1a163
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-02 04:07:23 -05:00
90bdddca0d
Merge branch 'pull'
2012-03-02 00:10:05 -08:00
be231e3466
item table update for file feature
2012-03-02 00:09:10 -08:00
3a609adfb7
Merge pull request #55 from fabrixxm/master
2012-03-02 00:00:03 -08:00
f55ffcd48c
Merge pull request #56 from tomtom84/master
2012-03-01 20:03:18 -08:00
1fac47a247
Merge remote-tracking branch 'upstream/master'
2012-03-02 04:58:37 +01:00
8207272fbc
Merge branch 'pull'
2012-03-01 18:54:50 -08:00
58e3372b23
probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type
2012-03-01 18:49:23 -08:00
a5256b7996
Merge pull request #54 from campino/master
2012-03-01 17:54:41 -08:00
5183e737d0
diabook commit
2012-03-02 02:05:35 +01:00
dd9432903d
Merge remote-tracking branch 'upstream/master'
2012-03-01 11:49:22 +01:00
b6b7742579
Merge remote-tracking branch 'friendica/master' into randomerror
2012-03-01 11:47:45 +01:00
ed42fa7d59
conversation: remove templating items in code and move it to template.
2012-03-01 11:46:08 +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
c462ed9fc5
template proc: avoid a notice and allow template name to include to be passed with a variable value
2012-03-01 11:32:49 +01:00
a26ce7c56b
show relation in contact_template
2012-03-01 11:31:16 +01:00
f0b6e76293
admin: fix small string
2012-03-01 11:28:48 +01:00
b7ab2a2fc9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-02-29 23:26:49 -05: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
b71a3af457
Merge remote-tracking branch 'friendica/master' into randomerror
2012-02-29 14:58:37 +01:00
6855474146
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-02-29 06:56:59 -05: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
5bb8ed4b8b
Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
2012-02-28 21:56:42 +00:00
21d1dc48a8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-02-28 16:43:08 -05:00
3d249f0edd
Merge remote branch 'upstream/master'
2012-02-28 21:19:02 +00:00
733f830be4
fix url and network display
2012-02-28 19:10:27 +01:00
36a1a43f06
Avoid notices
2012-02-28 13:42:12 +00:00
f48556cbc0
contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
2012-02-28 13:40:41 +00:00
1204210c69
wasn't actually changed before
2012-02-28 13:01:58 +00:00
e55d13c2b4
Avoid a notice
2012-02-28 12:56:16 +00:00
718c5ea23e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-02-28 05:25:05 -05: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
cf7e141055
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-02-27 21:08:19 -05: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
b84ef3039c
Merge remote branch 'upstream/master'
2012-02-28 00:03:49 +01:00
7c30fca981
Avoid a Notice
2012-02-27 22:17:57 +00:00
e33c2b8f89
Avoid a Notice
2012-02-27 22:08:00 +00:00
35128ef2c9
Avoid a Notice
2012-02-27 22:01:17 +00:00
8c2bda46f7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-02-27 13:34:19 -05:00
e11b51aca1
Merge pull request #53 from fabrixxm/master
2012-02-27 10:05:27 -08:00
42d591d257
revert 01a2791e3a
2012-02-27 18:48:59 +01:00
cce69f0509
Merge remote branch 'upstream/master'
2012-02-27 16:31:58 +01:00
b1cdc5a932
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-02-27 09:08:48 -05:00
a33031634e
Merge pull request #52 from campino/master
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
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
2012-02-27 01:04:41 -05:00
tommy tomson
Michael
Tobias Diekershoff
Tobias Hößl
tomtom84
friendica
Simon L'nu
Simon
Fabio Comuni
Alexander Kampmann
Alexander Kampmann