This website requires JavaScript.
8853e53e29
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-12 18:50:53 -04:00
72d8e0459d
Merge pull request #294 from mschmitt/master
2012-05-12 15:01:05 -07:00
89df33f0a8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-12 15:55:03 -04:00
ae300bceb9
Ĝisdatigis la esperantlingvan tradukaĵon al 100%.
2012-05-12 16:56:31 +02:00
3a45d4f9e0
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-12 20:20:26 +05:30
9699d9cd01
diabook-theme: fix in earthlayers
2012-05-12 16:11:46 +02:00
2882012e1b
diabook-theme: some fixes
2012-05-12 13:50:22 +02:00
f434bd7f0a
Merge pull request #293 from simonlnu/master
2012-05-12 04:32:55 -07:00
c6897d0dc4
finished migrating dispy light - maybe
2012-05-12 07:29:36 -04:00
62727012d3
language detection library
2012-05-12 01:55:18 -07:00
99e4ea19e7
Merge https://github.com/friendica/friendica into pull
2012-05-12 01:28:04 -07:00
aa83198611
rev update
2012-05-12 01:27:33 -07:00
10db2f00f9
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-12 12:10:09 +05:30
534a93f81c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-11 20:39:06 -04:00
2454028ef6
Darkzero - fixed notifications bar.
2012-05-12 00:32:47 +01:00
48c48d644f
diabook-theme: update mapquery and small fix
2012-05-11 16:41:16 +02:00
74e79a06a8
diabook-theme: add "population density 2010"-layer to EarthLayers-box
2012-05-11 14:56:59 +02:00
4e0b0d4e43
fix search/new against possible email leakage
2012-05-11 05:19:29 -07:00
20229ce187
better test of email reply visibility
2012-05-11 05:11:53 -07:00
49cd3f615d
Merge https://github.com/friendica/friendica into pull
2012-05-11 04:05:25 -07:00
f9d5e602ac
diabook-theme:small fix
2012-05-11 13:04:25 +02:00
7600b9b1ee
Merge https://github.com/friendica/friendica into pull
2012-05-11 03:42:05 -07:00
496782e468
moderated comment templates
2012-05-11 03:41:29 -07:00
e13e5070a7
diabook-theme: small fix
2012-05-11 09:01:58 +02:00
a81faead6e
diabook-theme: include prv_message autocomplete
2012-05-11 08:39:39 +02:00
c43a03e21b
Merge remote branch 'upstream/master'
2012-05-11 08:36:24 +02:00
8a5dcf64d8
fix PM replies after autocomplete changes
2012-05-10 20:01:13 -07:00
547007e199
add photos to PM autocomplete, improved appearance
2012-05-10 19:29:01 -07:00
01b5136007
Merge https://github.com/friendica/friendica into pull
2012-05-10 18:50:37 -07:00
8600afafe2
rev update
2012-05-10 18:50:11 -07:00
b2bd25a470
Merge remote-tracking branch 'origin/master'
2012-05-11 02:40:09 +02:00
ccc825ccbc
diabook-theme: small fix
2012-05-11 02:39:54 +02:00
9c53a311de
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-10 19:53:11 -04:00
e7b8e839ae
Diabook-dark. More touchups.
2012-05-10 17:14:27 +01:00
c5f6755bdd
specified background image does not exist
2012-05-10 05:49:48 -07:00
3ac5d19b92
diabook-theme: some fixes
2012-05-10 12:19:51 +02:00
c9bb888611
priv mail autocomplete, improved contrast for darkzero, etc.
2012-05-10 02:01:08 -07:00
93ae6ee97b
Merge https://github.com/friendica/friendica into pull
2012-05-10 01:46:29 -07:00
774c51cc19
email autocomplete
2012-05-10 01:45:51 -07:00
4709960189
Merge remote branch 'upstream/master'
2012-05-10 09:58:52 +02:00
7b41c0a555
Merge remote-tracking branch 'origin/master'
2012-05-10 09:54:47 +02:00
69b43582d0
diabook-theme: some css/bug-fixes
2012-05-10 09:54:16 +02:00
da4c4c0c03
Merge pull request #292 from simonlnu/master
2012-05-09 23:32:59 -07:00
a077e63fa5
don't make -desc so obnoxious looking
2012-05-10 02:27:48 -04:00
25d5eae955
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-10 02:16:49 -04:00
4a42414135
rev update
2012-05-09 18:15:27 -07:00
8be8db39de
rev update
2012-05-09 17:56:05 -07:00
39a7926015
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-09 14:00:54 -04:00
f2e648d62f
Merge remote branch 'upstream/master'
2012-05-09 14:56:48 +02:00
53157bb954
send browser back to correct page (with query args) after posting
2012-05-09 04:18:01 -07:00
d92be9d93c
Merge remote branch 'upstream/master'
2012-05-09 09:27:23 +02:00
70a07086ad
slight improvement in a couple of queries
2012-05-08 22:46:40 -07:00
89d3ce7b5d
Diabook-dark - do things the right way instead of the stupid way.
2012-05-09 04:54:17 +01:00
d2bbd92889
Fix TinyMCE, but needs adding to theme.php
2012-05-09 03:42:09 +01:00
8a1f8515ca
Fix jquery.fancybox, but still needs adding to theme.php
2012-05-09 03:31:56 +01:00
a0293ae442
Diabook-dark cleaned up a bit.
2012-05-09 03:21:26 +01:00
a048fd806a
don't provide 'show more' on remote friends in common unless there are actually more
2012-05-08 17:40:56 -07:00
10812e0c19
make it optional to optimize the item table after expire
2012-05-08 15:33:01 -07:00
da4a360a6e
Merge https://github.com/friendica/friendica into pull
2012-05-08 01:15:19 -07:00
c141909f33
wrap private message autocomplete in an ifdef to make it easier to test/develop
2012-05-08 01:14:24 -07:00
d2c2063084
DE update for the strings
2012-05-08 09:56:05 +02:00
78429926bc
Merge remote branch 'upstream/master'
2012-05-08 09:05:38 +02:00
df35746639
make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation
2012-05-07 23:09:57 -07:00
34d3d45589
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-07 21:53:57 -04:00
b128a37cee
Merge https://github.com/friendica/friendica into pull
2012-05-07 18:48:26 -07:00
f0b7a8ae35
finished dry run - now for real test
2012-05-07 18:36:28 -07:00
88443ed3fb
diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.
2012-05-08 03:29:25 +02:00
8a4e3cc370
don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration
2012-05-07 16:51:09 -07:00
189a31e628
If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly.
2012-05-07 15:54:49 -07:00
e8b9b8a403
separate poll_interval from delivery_interval - default is the same.
2012-05-07 04:21:54 -07:00
dbbcddf845
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-07 04:40:54 -04:00
a2ea560bf3
Merge remote branch 'upstream/master'
2012-05-07 09:11:45 +02:00
c7f3e626d0
Merge https://github.com/friendica/friendica into pull
2012-05-06 23:07:41 -07:00
8c26640835
reset permissions to forum default when adding forum delivery chain
2012-05-06 23:06:21 -07:00
fb05cd6f18
Merge pull request #291 from simonlnu/master
2012-05-06 22:22:29 -07:00
e554530430
more css tweaks. nothing major
2012-05-07 01:20:32 -04:00
c36e39b18e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-07 00:55:53 -04:00
b3b303f037
Merge branch 'ac'
2012-05-06 20:08:20 -07:00
b74a776162
I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
2012-05-06 20:06:39 -07:00
8a10af3bce
Merge https://github.com/friendica/friendica into pull
2012-05-06 19:56:27 -07:00
851264161f
mail autcomplete testing
2012-05-06 19:55:39 -07:00
57920849c4
email recip autocomplete
2012-05-06 19:53:34 -07:00
8e46c43ee1
rev update
2012-05-06 19:52:22 -07:00
e417f083b5
diabook-theme: small fix
2012-05-07 02:49:44 +02:00
3d0a0b6abf
diabook-theme: add "Earth Layers"-box at right_side
2012-05-07 02:24:43 +02:00
66b9b60792
diabook-theme: twitterbox-bugfix
2012-05-06 23:26:44 +02:00
f09b3cfbf8
diabook: small fix
2012-05-06 12:25:09 +02:00
8bdbfdc853
Merge remote-tracking branch 'origin/master'
2012-05-06 12:09:22 +02:00
abbb4c2f36
diabook-theme: bugfix
2012-05-06 12:08:46 +02:00
b4bd8258e2
Merge pull request #290 from simonlnu/master
2012-05-06 03:08:08 -07:00
f32c3d74a4
fixing widths to be more dynamic where possible. font size fixes. add README.md
2012-05-06 06:05:31 -04:00
7e7372fc5a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-06 04:51:15 -04:00
47c3b43afd
Merge https://github.com/friendica/friendica into pull
2012-05-05 17:54:19 -07:00
49ccefd6c7
bad sql left after the mailbox in/out merge
2012-05-05 17:53:23 -07:00
0c4099966a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-05 20:08:19 -04:00
e1ab3a93cc
diabook-theme: small fix
2012-05-06 00:36:46 +02:00
c421f35da7
diabook-theme: twitter-box-update at right_aside
2012-05-06 00:10:35 +02:00
f297751437
diabook-theme: can now set the twitter search term in theme-settings & small fixes
2012-05-05 20:01:38 +02:00
b5e857c0e7
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-05 20:48:16 +05:30
8ae83201cf
consolidate item deletion so we can fix orphaned categories and file_as tags.
2012-05-05 07:05:32 -07:00
Simon L'nu
friendica
Martin Schmitt
Vasudev Kamath
tommy tomson
Simon
Thomas Willingham
zottel
Michael Vogel
Tobias Diekershoff