 Tobias Diekershoff
|
dd3f21b98a
|
Merge branch 'master' of git://github.com/friendika/friendika
|
2011-02-06 08:48:07 +01:00 |
|
Friendika
|
d322bb4613
|
Merge branch 'fabrixxm-master'
|
2011-02-05 13:06:20 -08:00 |
|
|
Friendika
|
8a55168d4f
|
Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into fabrixxm-master
|
2011-02-05 13:05:57 -08:00 |
|
|
Friendika
|
c26463b65b
|
Merge branch 'omigeot-master'
Conflicts:
view/fr/strings.php
|
2011-02-05 13:01:28 -08:00 |
|
|
Friendika
|
c4ddee005e
|
Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
|
2011-02-05 12:59:04 -08:00 |
|
olivierm
|
4e913d59ea
|
Fixed some typo (prevented Friendika to load with french locale)
|
2011-02-05 15:19:28 +01:00 |
|
|
Tobias Diekershoff
|
0c83fb4d80
|
Merge branch 'master' of git://github.com/friendika/friendika
|
2011-02-05 09:19:03 +01:00 |
|
|
Tobias Diekershoff
|
acd5f49d43
|
wording
|
2011-02-04 21:56:43 +01:00 |
|
Fabio Comuni
|
ebbdb7b301
|
Upload profile photo page it title
|
2011-02-04 10:32:29 +01:00 |
|
|
Fabio Comuni
|
fb7959cfc0
|
Add a link to user photos in Upload Profile Photo page
|
2011-02-04 10:30:56 +01:00 |
|
|
fabrixxm
|
9cf04b6110
|
small fix to IT strings
|
2011-02-04 07:36:57 +01:00 |
|
|
Friendika
|
e2c8bedfe5
|
allow changing album name in photo edit page
|
2011-02-03 15:13:38 -08:00 |
|
|
Friendika
|
a4cbdc2414
|
remove self
|
2011-02-03 03:58:47 -08:00 |
|
|
Friendika
|
01c83f0e93
|
Merge branch 'tobiasd-master'
|
2011-02-02 23:55:16 -08:00 |
|
|
Tobias Diekershoff
|
5e73f9da86
|
double $ in de/strings.php corrected
|
2011-02-03 08:35:23 +01:00 |
|
|
Friendika
|
1558cd8085
|
Merge branch 'tobiasd-master'
|
2011-02-02 23:27:12 -08:00 |
|
|
Friendika
|
33b2490a91
|
Merge branch 'fabrixxm-master'
|
2011-02-02 23:24:04 -08:00 |
|
|
Tobias Diekershoff
|
73c2ccbc78
|
updates to the German strings.php file
|
2011-02-03 08:17:07 +01:00 |
|
|
Friendika
|
2a4d1fa858
|
append jotplugin tools to current toolbar row
|
2011-02-02 23:07:01 -08:00 |
|
|
fabrixxm
|
2f6ef7b5eb
|
IT string update
|
2011-02-03 07:42:40 +01:00 |
|
|
fabrixxm
|
670dba6666
|
update jot-headers
|
2011-02-01 18:52:16 +01:00 |
|
|
Friendika
|
9d561d4471
|
oembed contsant name, fix dfrnpubdeliver, add 'code' editor button
|
2011-01-31 23:06:45 -08:00 |
|
|
Friendika
|
7dbdf8e6fa
|
let there be purple! ;-)
|
2011-01-31 20:52:23 -08:00 |
|
|
Friendika
|
837cce8a75
|
email cc recipients (front end)
|
2011-01-31 19:07:13 -08:00 |
|
|
Friendika
|
fc20fb17c2
|
force text paste in editor
|
2011-01-31 14:21:23 -08:00 |
|
|
Friendika
|
3eefe8b500
|
more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors
|
2011-01-30 19:38:03 -08:00 |
|
|
Friendika
|
33037754d8
|
removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default.
|
2011-01-27 18:45:19 -08:00 |
|
|
Friendika
|
58309829a1
|
Merge branch 'omigeot-master'
|
2011-01-27 13:10:43 -08:00 |
|
|
Friendika
|
1d9f677438
|
Merge branch 'master' of https://github.com/omigeot/friendika into omigeot-master
|
2011-01-27 13:09:58 -08:00 |
|
|
olivierm
|
bfe6380d90
|
More translation
|
2011-01-27 16:50:39 +01:00 |
|
|
olivierm
|
8c6319394c
|
Done head.tpl
|
2011-01-27 16:48:54 +01:00 |
|
|
olivierm
|
e93385a355
|
French translation : Done strings.php, started template files.
|
2011-01-27 16:44:55 +01:00 |
|
|
Friendika
|
620aae5b50
|
still not quite ready for the big photos rollover
|
2011-01-27 03:55:40 -08:00 |
|
|
Friendika
|
076c25e103
|
Revert "Revert "roll version - now in alpha 2.1""
This reverts commit e8a3166fa9.
|
2011-01-27 03:52:18 -08:00 |
|
|
Friendika
|
e8a3166fa9
|
Revert "roll version - now in alpha 2.1"
This reverts commit df4f77dadd.
|
2011-01-27 03:50:56 -08:00 |
|
|
Friendika
|
df4f77dadd
|
roll version - now in alpha 2.1
|
2011-01-27 03:46:09 -08:00 |
|
|
Friendika
|
d2dddd995a
|
set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form.
|
2011-01-26 20:29:32 -08:00 |
|
|
Friendika
|
b4642ca650
|
search icons (?)
|
2011-01-26 14:25:36 -08:00 |
|
|
Friendika
|
05350082fa
|
Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed
|
2011-01-26 13:59:20 -08:00 |
|
|
Fabio Comuni
|
6ca1e2ddfe
|
remove fixed width from wall-item-content
|
2011-01-26 17:11:56 +01:00 |
|
|
Fabio Comuni
|
4a2c0fcc36
|
Add 'jot_tool' hook, plugins can add tool icons.
|
2011-01-26 16:17:28 +01:00 |
|
|
Friendika
|
b23de4fa90
|
greenzero stripped to bare essentials, imported from duepuntozero
|
2011-01-25 04:30:46 -08:00 |
|
|
Friendika
|
167ab039ab
|
renamed theme - it was a bit too long
|
2011-01-25 04:03:47 -08:00 |
|
|
Tobias Diekershoff
|
5eacc57800
|
Merge git://github.com/tobiasd/friendika
|
2011-01-25 12:47:02 +01:00 |
|
|
Tobias Diekershoff
|
529b036dbe
|
some more strings translated into German
|
2011-01-25 12:44:14 +01:00 |
|
|
Fabio Comuni
|
1f95ba5c34
|
Merge remote branch 'friendika-master/master'
|
2011-01-25 10:16:47 +01:00 |
|
|
Fabio Comuni
|
f2789132ce
|
fixed width on wall-item-wrapper
|
2011-01-25 10:16:15 +01:00 |
|
|
Tobias Diekershoff
|
ce6a2c83f9
|
a green variation of the duepuntozero theme
for this variation of the theme the header image and the link colors
were set to some tone of green that fit my current likings.
|
2011-01-25 09:04:08 +01:00 |
|
|
Tobias Diekershoff
|
bb1afd867d
|
Merge branch 'master' of git://github.com/friendika/friendika
|
2011-01-25 08:53:39 +01:00 |
|
|
Friendika
|
b0ab3e468b
|
leave room for vertical scrollbar (when needed)
|
2011-01-24 23:08:39 -08:00 |
|