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
friendica
74fe151f96
bring back profile_tabs for unauthenticated visitors to /cloud page
2014-06-25 21:21:54 -07:00
Thomas Willingham
0f86e93884
Doco - update the right index this time, and only maintain one.
...
The doco needs cleaning up as we go along, We should keep the bbcode
despite the failed experiment because identity tags are just too useful
to be without.
2014-06-26 05:11:01 +01:00
friendica
fc7e782ba5
sql error
2014-06-25 20:32:24 -07:00
friendica
893c9419f4
fix bad translation of blockquote in wordpress ("post_to_red") plugin
2014-06-25 19:17:51 -07:00
RedMatrix
e6d7bfc8a3
Merge pull request #508 from dawnbreak/master
...
Templified cloud's directory listing.
2014-06-26 10:30:47 +10:00
Klaus Weidenbach
45dde16f3e
Templified cloud's directory listing.
...
Moved HTML for the directory listing from include/reddav.php to it's
own template file.
Still need to clean it up bit more, but should be useable already.
2014-06-26 02:01:53 +02:00
RedMatrix
37561a18bf
Merge pull request #507 from tuscanhobbit/master
...
Filestorage: display quota, friendly file size, translatable strings
(You're on a roll... :-)
2014-06-25 20:50:03 +10:00
Paolo Tacconi
dda949ee3b
Delete confirmation is translatable
2014-06-25 12:07:36 +02:00
Paolo Tacconi
a2629258ae
Merge branch 'master' of https://github.com/tuscanhobbit/red
2014-06-25 11:58:28 +02:00
Paolo T
695afefd4b
Merge pull request #1 from friendica/master
...
Updated fork
2014-06-25 11:57:42 +02:00
Paolo Tacconi
378aaf4a61
Display quota and translatable strings
2014-06-25 11:54:10 +02:00
friendica
423372c964
prevent mis-configured servers from leaking cookies
2014-06-24 19:59:37 -07:00
friendica
ecd472b7bb
Merge https://github.com/friendica/red into pending_merge
2014-06-24 17:27:35 -07:00
friendica
6848a5f9a7
Events show up as notifications about a week in advance so you know they're coming. But let's put an indicator next to the notification count when there's an event that is actually happening today -- so you don't have to look at the calendar or notification detail every day for a week to figure out if the day has finally arrived yet.
2014-06-24 17:23:58 -07:00
RedMatrix
44abcd83b3
Merge pull request #506 from dawnbreak/master
...
Set backlink to the parent folder, not cloud's root.
2014-06-25 08:38:54 +10:00
RedMatrix
fa1dc7aba2
Merge pull request #504 from HaakonME/master
...
Updated Norwegian bokmål translation
2014-06-25 08:37:48 +10:00
Klaus Weidenbach
a6403905ef
Set backlink to the parent folder, not cloud's root.
...
If you edit a file and click on the backlink you always returned to
the root folder of your cloud. This patch sets the correct parent
folder as backlink.
Bit messy, but looks like it works.
2014-06-24 21:05:00 +02:00
Haakon Meland Eriksen
c74e680ac0
Removed docs that were not translated
2014-06-24 20:51:22 +02:00
Paolo T
a2108570c1
Merge pull request #505 from tuscanhobbit/master
...
IT: updated strings & fixed readme img link
2014-06-24 20:25:57 +02:00
Haakon Meland Eriksen
19bc9b53c9
Updated Norwegian bokmål translation
2014-06-24 19:47:14 +02:00
Haakon Meland Eriksen
b8dc9e855a
Merge remote-tracking branch 'upstream/master'
2014-06-24 19:34:36 +02:00
tuscanhobbit
b8e8adcd51
IT: updated strings & fixed readme img link
2014-06-24 16:28:44 +02:00
RedMatrix
a92fb0b04c
Merge pull request #503 from tuscanhobbit/master
...
Fixes to links and forward URLs in filestorage
2014-06-24 21:32:31 +10:00
tuscanhobbit
4c78c3bdee
Oops I left some debug stuff around
2014-06-24 12:13:54 +02:00
tuscanhobbit
cc4001fce7
Fixes to links and forward URLs in filestorage
2014-06-24 12:05:11 +02:00
Thomas Willingham
b2b47dcd7c
Doco - oops, forgot the index
2014-06-24 04:41:33 +01:00
Thomas Willingham
f6ccb155a1
Doco - gnusocial doco from Randal
2014-06-24 04:35:25 +01:00
friendica
3878f1e69b
another one ticked off
2014-06-23 18:01:18 -07:00
RedMatrix
498d98395a
Merge pull request #501 from pixelroot/master
...
modified: view/ru/messages.po
2014-06-24 10:06:06 +10:00
friendica
b2feb26492
clean up the awful descriptive text on thing input
2014-06-23 17:05:03 -07:00
friendica
181623030b
move the reset of "in_progress" to after the page and structures have completed updating
2014-06-23 16:55:52 -07:00
friendica
177c33be10
block edit/delete ability for everybody but the owner
2014-06-23 16:05:00 -07:00
friendica
3106de208c
Merge branch 'master' of https://github.com/tuscanhobbit/red into tuscanhobbit-master
2014-06-23 15:47:14 -07:00
tuscanhobbit
f6959dd18b
Dav file browser on a single page
2014-06-24 00:04:13 +02:00
friendica
0cfcb02311
ability to like things
2014-06-23 05:19:28 -07:00
friendica
d43227a730
language selector app
2014-06-23 02:15:02 -07:00
friendica
223ed4a6c5
process profile like removals with normal low_level drop_item
2014-06-23 01:22:58 -07:00
pixelroot
9c94504156
modified: view/ru/messages.po
...
modified: view/ru/strings.php
2014-06-23 08:42:45 +02:00