friendica
5a12383b78
undo git stuffup
2012-03-15 19:55:58 -07:00
tomtom84
0b509fd763
Merge pull request #137 from tomtom84/master
...
fixes in diabook-derivates
2012-03-15 19:55:10 -07:00
tommy tomson
02395c8af5
added icons to profile_side, fixes in css
2012-03-16 03:49:43 +01:00
friendica
41d595d5bc
Merge branch 'pull'
2012-03-15 16:39:21 -07:00
friendica
7684f63ecd
track whether contact is a community page or not
2012-03-15 16:38:26 -07:00
friendica
5d2c590fa9
Merge pull request #136 from annando/master
...
Mail improvements, item caching and so on
2012-03-15 15:30:52 -07:00
Simon L'nu
5c75d40c0b
fixed the sidebar edit thingy. haven't synced dispy yet.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 17:27:06 -04:00
Simon L'nu
eee2eed588
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-15 17:25:22 -04:00
Michael Vogel
b5120888cf
html2bbcode: Disabled size conversion
2012-03-15 21:17:51 +01:00
Michael Vogel
9243c9fc14
Merge commit 'upstream/master'
2012-03-15 21:11:58 +01:00
Simon
ab89aa90ca
Merge pull request #135 from simonlnu/master
...
commit latest to dispy-dark. fixes in html css and js
2012-03-15 12:08:59 -07:00
Simon L'nu
5b757e4e0e
commit latest to dispy-dark. fixes in html css and js
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-15 15:07:17 -04:00
Simon L'nu
1d2049a6d6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
more recycle fixes for plaintext
fix recycle symbol when using plaintext editor
add links to wall, photos, events, etc to aside on networkpage, fixes in css
* master:
2012-03-15 15:03:31 -04:00
Alexander Kampmann
899701c3d3
integrated profiler
2012-03-15 12:55:49 +01:00
friendica
f96aff5518
more recycle fixes for plaintext
2012-03-15 03:47:02 -07:00
Alexander Kampmann
9796e99fa8
added simple build-in profiling
2012-03-15 11:45:06 +01:00
friendica
9cd1c35c22
fix recycle symbol when using plaintext editor
2012-03-15 03:44:41 -07:00
Alexander Kampmann
29ade1d9b9
another test for xmlify
2012-03-15 10:51:22 +01:00
zottel
69f4448ada
Merge remote branch 'upstream/master'
2012-03-15 10:18:06 +01:00
friendica
a7fd3a8b24
Merge branch 'pull'
2012-03-15 01:48:10 -07:00
friendica
4cd3d5cd02
Merge https://github.com/friendica/friendica into pull
2012-03-15 01:48:07 -07:00
zottel
282465edab
Merge remote branch 'upstream/master'
2012-03-15 08:36:05 +01:00
tommy tomson
6dbee45d92
add links to wall, photos, events, etc to aside on networkpage, fixes in css
2012-03-15 08:29:39 +01:00
Tobias Diekershoff
80b57e664a
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-15 06:31:47 +01:00
Simon L'nu
6e133e75c3
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
roll protocol version due to ssl_policy settings
force login to ssl on SSL_POLICY_SELFSIGN
basic ssl_policy for important modules
ssl_policy stuff
revup
splitted tests into several files
removed done TODO
get_tags tests corrected. They test for the right things now.
addon settings form error
more work on filer, comment level and file tag removal
added slack-NS, non-scrolly, slackr-based theme.
get tags test improved
splitted test cases.
changed a test string
added some tests
added library and include to .htaccess
excludes reports from git
better tests
added test blueprints, fixed? encoding issues
* master:
2012-03-15 01:02:44 -04:00
friendica
b06c5983a4
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
2012-03-14 21:58:54 -07:00
friendica
b44533e9fb
roll protocol version due to ssl_policy settings
2012-03-14 21:40:36 -07:00
friendica
93a8907f43
force login to ssl on SSL_POLICY_SELFSIGN
2012-03-14 21:29:44 -07:00
friendica
110e8f2919
basic ssl_policy for important modules
2012-03-14 21:20:20 -07:00
friendica
f0a62d8908
ssl_policy stuff
2012-03-14 20:36:23 -07:00
friendica
64e3e3590b
revup
2012-03-14 16:09:13 -07:00
friendica
531201f2a1
Merge pull request #132 from campino/master
...
Test cases
2012-03-14 15:16:30 -07:00
friendica
959aa13de0
Merge pull request #133 from tonybaldwin/master
...
slack-NS
2012-03-14 15:15:34 -07:00
friendica
dcdfa96a1f
Merge branch 'pull'
2012-03-14 14:34:52 -07:00
friendica
2dc527609e
Merge https://github.com/friendica/friendica into pull
2012-03-14 14:34:48 -07:00
zottel
2481758886
Merge remote branch 'upstream/master'
2012-03-14 16:29:22 +01:00
Simon L'nu
ebccf13c4c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
fix in nav
add links to home, profile, photos, events, notes to aside in network-stream
* master:
2012-03-14 11:02:14 -04:00
Simon
c95deb4839
Merge pull request #134 from simonlnu/master
...
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
2012-03-14 08:02:04 -07:00
Simon L'nu
0bf9595ab1
PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-14 11:00:20 -04:00
Alexander Kampmann
70709a8825
Merge branch 'master' of git://github.com/friendica/friendica
...
Conflicts:
view/de/strings.php
2012-03-14 12:57:35 +01:00
tommy tomson
f03c57007a
fix in nav
2012-03-14 12:56:59 +01:00
Alexander Kampmann
509ed2604f
splitted tests into several files
2012-03-14 12:54:49 +01:00
tommy tomson
42462cc1f0
add links to home, profile, photos, events, notes to aside in network-stream
2012-03-14 12:50:11 +01:00
Alexander Kampmann
c0c98206ef
removed done TODO
2012-03-14 12:31:25 +01:00
Alexander Kampmann
509532d168
get_tags tests corrected. They test for the right things now.
2012-03-14 12:30:52 +01:00
friendica
9df67e5cfe
Merge branch 'pull'
2012-03-13 23:53:33 -07:00
friendica
7e270b043c
addon settings form error
2012-03-13 23:52:13 -07:00
Tobias Diekershoff
4fcdada432
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-14 07:20:13 +01:00
Simon
fb77bfa648
Merge pull request #131 from simonlnu/master
...
massive work done to both dispys, mostly -dark
2012-03-13 22:10:02 -07:00
Simon L'nu
975781d3e2
massive work done to both dispys, mostly -dark
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-14 01:05:08 -04:00
