Commit graph

10699 commits

Author SHA1 Message Date
friendica
4e8d10e269 update the update records for all addresses attached to this channel, not just the primary. 2014-06-30 03:34:37 -07:00
friendica
bb26dce293 one more... 2014-06-30 01:12:07 -07:00
friendica
4c669be2ef minor changes 2014-06-29 20:09:06 -07:00
friendica
b1e887209d very minor, we don't like the word "user" - it's downgrading. Everybody here is a "member". 2014-06-29 19:55:35 -07:00
friendica
436b44cb19 log the offending dir server 2014-06-29 18:24:34 -07:00
friendica
a1b8e5b445 Merge https://github.com/friendica/red into pending_merge 2014-06-29 18:20:02 -07:00
friendica
33034bc9b6 limit updates from new dir servers to avoid exhausting memory. 2014-06-29 18:18:29 -07:00
friendica
cc22c1da50 keep dirsync from exhausting memory 2014-06-29 18:11:10 -07:00
jeroenpraat
f3b1868005 Merge branch 'master' of https://github.com/friendica/red 2014-06-29 23:27:55 +00:00
friendica
1a715adb34 add zottel dir server 2014-06-29 16:27:37 -07:00
jeroenpraat
52adbb6504 update nl 2014-06-29 23:26:04 +00:00
RedMatrix
0bd2dbaf64 Merge pull request #518 from tluther/master
Doco work
2014-06-30 09:24:45 +10:00
RedMatrix
3e0f1fe065 Merge pull request #517 from tokudan/master
Some german translations
2014-06-30 09:20:15 +10:00
RedMatrix
0926c2d849 Merge pull request #516 from dawnbreak/master
Fixed a wrong timestamp update when adding a file.
2014-06-30 09:19:52 +10:00
RedMatrix
362009959e Merge pull request #519 from cvogeley/master
Remove Remove Account link from account settings
2014-06-30 09:12:57 +10:00
Klaus Weidenbach
ffea675240 Add rename support for DAV directories.
This works only over DAV right now, no GUI yet.
2014-06-30 01:08:29 +02:00
Christian Vogeley
eb41b0ba7c Remove Remove Account link from account settings
because it doesn’t remove the account. Move channel removal link to
channel page
2014-06-29 22:19:45 +02:00
Tobias Luther
f1d5ffda69 delete my original doc working backup folder 2014-06-29 21:20:43 +02:00
Klaus Weidenbach
aacb293f2e Return a correct timestamp when a folder is empty.
If a folder was empty a zero timestamp was returned. Now it will
return the timestamp of the folder itself.
2014-06-29 21:15:37 +02:00
Tobias Luther
1a118a0828 Tidied the folder from old backups
created new files for a quick explanation of the use of accounts, profiles, channels
added FAQ for users, admins and developers (the last one might not be exactly necessary?)
created a file to explain posting for new users
created new file to explain nomadic identities for users
modified main.bb
2014-06-29 21:07:42 +02:00
root
a47971aefd Some doco work. Changed main.bb and added a return link to all .bb files and began planning new entries for user orientated documentation. 2014-06-29 18:32:40 +02:00
root
5df50c4a0b Merge remote-tracking branch 'upstream/master' 2014-06-29 18:30:59 +02:00
Klaus Weidenbach
322091cd12 Fixed some more timestamp bugs in RedDAV.
Fixed an SQL-query in RedFile::put(), where parameters where in wrong order.
2014-06-29 17:49:46 +02:00
Daniel Frank
e7857879fb German translation for channels.md 2014-06-29 17:14:17 +02:00
Daniel Frank
6a76c0a775 Update Profile.md
added missing word
2014-06-29 16:25:59 +02:00
Klaus Weidenbach
5be3ba8436 Fixed a wrong timestamp update when adding a file.
When a file was uploaded the timestamp of the containing folder
should get updated, but the timestamp of the first file in the
folder was mistakenly updated.
There are some more wrong timestamps, but still looking for the bug.
2014-06-29 16:00:21 +02:00
Paolo T
628f121804 Merge pull request #515 from tuscanhobbit/master
IT:updated strings
2014-06-29 12:43:24 +02:00
tuscanhobbit
98324cb277 IT:updated strings 2014-06-29 12:41:19 +02:00
Thomas Willingham
d956b70370 Doco - update dav2fs instructions. That should never have worked,
but now it actually doesn't work.
2014-06-29 02:51:47 +01:00
RedMatrix
e228c2ed32 Merge pull request #513 from dawnbreak/master
Some documentation for include/reddav.php and a new tpl-file.
2014-06-29 10:16:51 +10:00
RedMatrix
f29f8a1b40 Merge pull request #514 from tuscanhobbit/master
Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl
2014-06-29 10:15:55 +10:00
Klaus Weidenbach
03b31d113e Update SabreDAV from 1.8.9 to 1.8.10. 2014-06-29 01:17:07 +02:00
Klaus Weidenbach
f49b74c5f6 Some documentation for include/reddav.php and a new tpl-file.
Documented include/reddav.php a bit more to understand what it is
about to try to clean up some parts. Still a lot to be done here.
I put serveral @todo markers that need to be checked.

Moved some more HTML to template file.

Changed getETag() return format according to documentation. (ETag MUST
be surrounded by double-quotes)
2014-06-29 01:17:06 +02:00
tuscanhobbit
dfe45342f6 Checkboxes were not aligned in connedit, added a table 2014-06-28 23:14:34 +02:00
Thomas Willingham
e6a29c7cea Doco - yeah, it really took four bloody checkins to finally get this right. 2014-06-28 19:53:31 +01:00
friendica
4e3c560bdb remove the feature setting until the community decides what to do and makes it happen 2014-06-28 05:12:29 -07:00
friendica
0074ef0bf3 rule of snakes #1, kill the snake.
tinymce is gone. if you want a visual editor, figure out what you want and make it happen.
If you don't want a visual editor, do nothing.
This is in the community's hands. I don't need a visual editor.
2014-06-28 05:05:34 -07:00
friendica
532b6f7fce doc update 2014-06-28 05:05:09 -07:00
root
79dc4b8370 Corrected minor typo 2014-06-27 09:55:22 +02:00
friendica
253f2cde9f Merge https://github.com/friendica/red into pending_merge 2014-06-26 17:19:15 -07:00
friendica
6d05d502e3 still trying to sort out the liveupdate issues. This was getting overly complicated with all the different ways we've tried to fix this issue so let's step back and simplify it a bit. 2014-06-26 17:17:24 -07:00
jeroenpraat
aeab6431d2 update nl 2014-06-27 00:13:22 +00:00
friendica
fea4eac17a Merge https://github.com/friendica/red into pending_merge 2014-06-26 16:26:33 -07:00
friendica
8b545d91db notification being sent for comments from blocked connections on same site. 2014-06-26 16:24:53 -07:00
Thomas Willingham
0db4b55223 Invite app 2014-06-26 19:33:10 +01:00
marijus
0128615835 also change to div for the with brackets option which we dont actually use... 2014-06-26 19:33:38 +02:00
marijus
c6cae8e0c2 make it a div to prevent extra borders in some browsers after click 2014-06-26 19:08:16 +02:00
RedMatrix
4d093e0e6d Merge pull request #509 from solstag/master
Let's have a global default startpage before falling back to apps
2014-06-26 14:41:06 +10:00
Alexandre Hannud Abdo
aed07dddce Let's have a global default startpage before falling back to apps 2014-06-26 01:30:21 -03:00
friendica
6d891fbb9d Merge https://github.com/friendica/red into pending_merge 2014-06-25 21:22:36 -07:00