Commit graph

7372 commits

Author SHA1 Message Date
friendica
5d757b0668 add sample nginx config from Olaf Conradi to mods directory 2012-12-12 15:54:13 -08:00
friendica
bc3a704e02 bug #517 - ensure wall owner can always comment on walltowall posts to their own wall, this seems to have been lost during the objectification of conversations 2012-12-09 13:44:48 -08:00
friendica
4793ebb141 change profile photo link on profile edit page 2012-12-07 16:02:40 -08:00
friendica
6e7e41360f rev update 2012-12-07 15:58:42 -08:00
friendica
376bf517a4 bug #516 - set writable on first poll 2012-12-06 13:59:20 -08:00
friendica
dacda667d9 Merge https://github.com/friendica/friendica into pull 2012-12-04 14:09:14 -08:00
friendica
d193093106 rev update 2012-12-04 14:08:55 -08:00
5a634f3d9b NB_NO: update to the strings 2012-12-04 11:09:48 +01:00
62d4034a5a RU: update to the strings 2012-12-04 11:06:02 +01:00
fc8c01750b PT-BR: update to the strings 2012-12-04 11:03:23 +01:00
friendica
8ab24858fb fix "insert web link" for those without richtext feature enabled 2012-12-03 16:31:28 -08:00
friendica
8b5288d0f7 Merge pull request #540 from Leberwurscht/master
Cross site request forgery hole
2012-12-03 13:40:29 -08:00
friendica
1ad4f5247c default bbcode - don't check editor pref 2012-12-03 01:05:10 -08:00
friendica
531fbff90b Merge https://github.com/friendica/friendica into pull 2012-12-03 00:44:37 -08:00
friendica
8bb0f08c6c default to bbcode format when uploading photos, since default editor is now plaintext 2012-12-03 00:43:06 -08:00
71054f1483 RU: update to the strings 2012-12-03 09:35:07 +01:00
23c873fc51 Merge pull request #542 from annando/master
Some minor changes to "vier"
2012-12-02 23:49:06 -08:00
108e77e1ed Merge pull request #541 from vn971/patch-1
added translations where they were empty
2012-12-02 23:47:32 -08:00
Michael Vogel
5635fe250c Merge remote-tracking branch 'upstream/master' 2012-12-03 08:30:49 +01:00
Michael Vogel
d548d1943f vier: maximum width of comments defined 2012-12-03 08:29:41 +01:00
friendica
fa90f27b53 Merge https://github.com/friendica/friendica into pull 2012-12-02 13:50:50 -08:00
friendica
79fb5509ed bug #511 - if birth year supplied but not a month or day, force a sane default. PHP datetime functions don't handle zero very well. 2012-12-02 13:47:41 -08:00
friendica
ee0def3ef5 rev update 2012-12-02 13:47:24 -08:00
Vasya Novikov
480af990ec added translations where they were empty 2012-12-03 00:14:34 +04:00
144200384f added do not register before import warning to DE move_account help 2012-12-02 07:49:25 +01:00
Thomas Willingham
a9675727b3 Move-account.md - add "do not create a new account first" hint, since this has already caught a couple of people out. 2012-12-01 22:30:03 +00:00
Leberwurscht
945afec656 fix CSRF hole in API 2012-12-01 01:26:54 +01:00
daa56a94d3 DE: update to the strings 2012-11-30 09:17:58 +01:00
af1ebc932f FR: update to the strings 2012-11-30 09:17:29 +01:00
friendica
d972ccc408 Merge https://github.com/friendica/friendica into pull 2012-11-28 19:25:47 -08:00
friendica
b130c892b2 features categories were un-translatable 2012-11-28 19:25:09 -08:00
Thomas Willingham
01179e3bb9 Update remove account doco. 2012-11-29 02:53:57 +00:00
Thomas Willingham
785fa1e070 Remove unsupported tag from Darkzero-NS since I have been supporting it. 2012-11-29 02:33:11 +00:00
fermionic
eb37c8cca6 Merge pull request #539 from fermionic/20121127-universal-altpager
universal altpager
2012-11-28 16:40:26 -08:00
Zach Prezkuta
eb964bbe08 put the correct function with the logic 2012-11-27 19:33:04 -07:00
Zach Prezkuta
aef96a1d5e add support for admin choice to force an entire hub to use alt-pager 2012-11-27 19:30:46 -07:00
Thomas Willingham
a6e7ad9771 Merge branch 'master' of https://github.com/friendica/friendica 2012-11-27 23:58:00 +00:00
friendica
32868dab79 catch stragglers in "chunked" delivery mode 2012-11-27 15:17:41 -08:00
Thomas Willingham
512729073b Unmark Diabook experimental 2012-11-27 17:14:13 +00:00
Thomas Willingham
8c3ea4b4d4 Add max_daily_registrations to admin panel. 2012-11-27 17:13:32 +00:00
Thomas Willingham
7de455602c Revert Diabook. 2012-11-27 16:28:12 +00:00
Thomas Willingham
5d1cbc2677 Remove German Pages.md (replaced with Forums.md) 2012-11-26 06:15:18 +00:00
cced235c04 Merge pull request #538 from balderino/master
renaming pages to forums (german doc-files)
2012-11-25 22:11:41 -08:00
Thomas Willingham
95322ff5f4 Diabook - of all the things to miss...wall-item-content. 2012-11-26 05:49:13 +00:00
Thomas Willingham
586acbe998 Merge branch 'master' of https://github.com/friendica/friendica 2012-11-26 04:39:08 +00:00
Thomas Willingham
fa5d25ec7a Diabook - better 1024 resolution support. 2012-11-26 04:38:19 +00:00
friendica
5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica
15ede093cf Merge https://github.com/friendica/friendica into pull 2012-11-25 19:21:24 -08:00
friendica
bb51be4ea8 rev update 2012-11-25 19:21:08 -08:00
Thomas Willingham
b0b4baa331 Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list. 2012-11-26 02:11:19 +00:00