This website requires JavaScript.
5ecaeb8e5c
catch more places to apply default group
2012-05-18 01:03:46 -07:00
1d157fc747
make it difficult to setup a private forum with no privacy
2012-05-17 23:05:41 -07:00
7b0ded3f14
more private forums, default privacy group for new contacts
2012-05-17 22:44:52 -07:00
c024c17b5f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-17 23:01:46 -04:00
7cfa7a7671
tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work
2012-05-17 19:59:46 -07:00
d5d853f37f
setup delivery chain for private groups (work in progress)
2012-05-17 19:35:24 -07:00
4f0e26759c
bring in the *much better* xml parser from the original zot branch
2012-05-16 21:29:57 -07:00
764ac240a9
Merge remote branch 'upstream/master'
2012-05-17 01:24:37 +02:00
f5f345d388
Merge https://github.com/friendica/friendica into pull
2012-05-16 13:55:00 -07:00
6744b5975c
rev update
2012-05-16 13:52:11 -07:00
296c84d822
Merge pull request #301 from simonlnu/master
2012-05-16 10:34:30 -07:00
331013f281
fix admin links...
2012-05-16 13:33:20 -04:00
d6add82b32
merged from wrong project
2012-05-16 05:08:15 -07:00
18f638c93e
Merge https://github.com/friendica/friendica into pull
2012-05-16 04:59:15 -07:00
becfe1f6f7
Merge pull request #300 from simonlnu/master
2012-05-16 02:52:35 -07:00
a8a3732f05
*sigh*. fix dark *again*
2012-05-16 05:51:29 -04:00
423864dc23
Merge pull request #299 from simonlnu/master
2012-05-16 02:33:10 -07:00
7eb73bc600
get rid of the monstrosity for .button. need to find alternate solution
2012-05-16 05:32:08 -04:00
2d6c6255f9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-16 05:29:34 -04:00
f2c0c40f6e
Merge remote branch 'upstream/master'
2012-05-16 08:24:46 +02:00
1900f4dd5b
Merge https://github.com/friendica/friendica into pull
2012-05-15 23:15:29 -07:00
2b8c4df544
Merge branch 'master' of github.com:annando/friendica
2012-05-16 08:10:28 +02:00
a65bd73bf3
Merge pull request #298 from simonlnu/master
2012-05-15 23:01:20 -07:00
fca09c9d4c
slight re-design of wall stuff and css/font cleaning
2012-05-16 01:58:55 -04:00
1872cf2b2d
Merge https://github.com/friendica/dir into dpull
2012-05-15 22:30:47 -07:00
a3137eec11
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-15 23:40:35 -04:00
e39014a3a7
update tinymce to 3.5.0.1
2012-05-15 17:18:46 -07:00
205c09e4f0
rev update
2012-05-15 17:05:28 -07:00
1a1d950eb4
initial commit
2012-05-15 05:09:26 -07:00
68dc7c3568
DE strings
2012-05-15 10:44:01 +02:00
e9aeafbe13
Merge remote branch 'upstream/master'
2012-05-15 08:45:19 +02:00
0faa0c2ab1
slackr drop shadows extended
2012-05-14 21:45:37 -07:00
c53674d367
Merge https://github.com/friendica/friendica into pull
2012-05-14 20:36:27 -07:00
bd32693a90
Merge pull request #297 from mexon/upstream
2012-05-14 18:57:55 -07:00
e574514e21
Allow plugins to modify the contact photo menu
2012-05-13 10:15:54 +02:00
2b471d6df3
rev update
2012-05-14 16:32:21 -07:00
2687f4377c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-14 19:29:06 -04:00
584b15aaec
Merge remote branch 'upstream/master'
2012-05-14 13:59:37 +02:00
59aefd9346
Merge pull request #296 from simonlnu/master
2012-05-13 21:33:07 -07:00
db5fe14241
finish dipsy light colour fixes
2012-05-14 00:30:25 -04:00
fcf6d10efd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-14 00:26:34 -04:00
c12ec1116b
Merge https://github.com/friendica/friendica into pull
2012-05-13 16:40:46 -07:00
2bd4ff5705
rev update
2012-05-13 16:40:02 -07:00
39c042f4ea
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-13 18:50:04 -04:00
303856ce01
diabook-theme: small fixes
2012-05-13 20:51:39 +02:00
3811fe288f
rename get_language() to get_browser_language()
2012-05-13 04:52:29 -07:00
eaf028c9fb
Merge https://github.com/friendica/friendica into pull
2012-05-12 22:20:03 -07:00
e7813f22af
slackr drop shadows
2012-05-12 22:19:29 -07:00
f267a283b4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-12 18:56:13 -04:00
b506c6f073
Merge pull request #295 from simonlnu/master
2012-05-12 15:55:37 -07:00
93dc96e2cf
css fixes; new screenshots
2012-05-12 18:53:01 -04:00
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
friendica
Simon L'nu
zottel
Simon
Michael Vogel
Tobias Diekershoff
Matthew Exon
tommy tomson
Martin Schmitt
Vasudev Kamath
Thomas Willingham