 friendica
|
f563ea4b39
|
Merge pull request #275 from MicMee/master
added buttons to perform later hubloc actions
|
2014-01-20 03:40:00 -08:00 |
|
 Michael Meer
|
a13593590b
|
added buttons to perform later hubloc actions
|
2014-01-20 12:12:40 +01:00 |
|
|
friendica
|
e68748afab
|
transifex didn't like plural-forms and now they don't like it commented out. So we'll try uncommenting the sucker and see if they like it again.
|
2014-01-20 03:11:45 -08:00 |
|
|
friendica
|
1fa8546d46
|
zidify audio/video links
|
2014-01-20 01:29:41 -08:00 |
|
|
friendica
|
fdfea0a8e9
|
catch auth exceptions
|
2014-01-20 01:03:58 -08:00 |
|
|
friendica
|
d5bf53c54c
|
bring photo tagging back which hasn't worked since forking from Friendica - this is untested and displaying photo tags will now be broken as we're now storing tags with the item attached to the photo and not in the photo. But the point is we've eliminated the OStatus/SWAP0 forced spam crap and can start fresh.
|
2014-01-19 23:37:46 -08:00 |
|
|
friendica
|
0250223438
|
revert 26dfcecf05
|
2014-01-19 22:34:28 -08:00 |
|
|
friendica
|
e54a501058
|
Merge https://github.com/friendica/red into zpull
|
2014-01-19 22:28:46 -08:00 |
|
 Thomas Willingham
|
26dfcecf05
|
Prevent zids messing up dav
|
2014-01-20 06:28:38 +00:00 |
|
|
friendica
|
82a5eb5d90
|
strip zid= from REQUEST_URI as well as QUERY_STRING - sabre uses both
|
2014-01-19 22:27:54 -08:00 |
|
|
Thomas Willingham
|
9fb36df8d9
|
Fix dav directory creation.
|
2014-01-20 01:54:52 +00:00 |
|
|
Thomas Willingham
|
e9ce68559e
|
Stop Google DDoSing me by providing block_public_search, which unlike
block_public will block *only* searching without an observer.
|
2014-01-19 23:48:26 +00:00 |
|
|
friendica
|
3459c717d4
|
don't allow the demo upload server to operate - otherwise one could find themselves with a bunch of unwanted uploads
|
2014-01-19 14:21:26 -08:00 |
|
|
friendica
|
f3a7bf913f
|
add the jquery file uploader. Have been suggesting this as a replacement for the valum uploaders for quite some time - as there is client resize ability and no license incompatibilities. It still requires integration.
|
2014-01-19 14:08:21 -08:00 |
|
|
friendica
|
724ad45056
|
add ajaxchat library - needs a lot of integration work to handle decentralisation (e.g. chatroom@website) and zotid w/permissions (e.g. ACL controlled chatrooms); we can also rip out a lot of stuff we don't need.
|
2014-01-18 23:49:39 -08:00 |
|
|
friendica
|
3f7032e542
|
Merge https://github.com/friendica/red into zpull
|
2014-01-18 21:46:16 -08:00 |
|
|
friendica
|
db67f08d3c
|
some more bookmark infrastructure plus a doc update
|
2014-01-18 21:45:42 -08:00 |
|
|
Thomas Willingham
|
331609cb87
|
vcard widget needs to include Contact if it's not included from the module that calls it.
|
2014-01-18 18:38:53 +00:00 |
|
|
Thomas Willingham
|
52d52a6a4f
|
Doco - s/chown/chmod
|
2014-01-18 05:24:51 +00:00 |
|
|
Thomas Willingham
|
2e83b78d70
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-01-17 23:32:03 +00:00 |
|
|
Thomas Willingham
|
a59b7c97f4
|
Missed these from git add...a year ago
|
2014-01-17 23:30:33 +00:00 |
|
|
friendica
|
c7585e4e58
|
Merge pull request #274 from zzottel/master
set jsAvailable cookie expire time to match PHPSESSID's
|
2014-01-17 12:55:01 -08:00 |
|
|
Thomas Willingham
|
1a76f1c659
|
Un-break dav auth.
|
2014-01-17 20:52:57 +00:00 |
|
 zottel
|
a0d6d3c7f9
|
set jsAvailable cookie expire time to match PHPSESSID's
|
2014-01-17 07:56:34 +01:00 |
|
|
friendica
|
359d798029
|
kill the ummagumma effect
|
2014-01-16 13:26:39 -08:00 |
|
|
friendica
|
be6a16139c
|
Merge pull request #273 from zzottel/master
prevent reload loop if JS is active, but no cookies accepted
|
2014-01-16 13:06:49 -08:00 |
|
|
zottel
|
1280a9abfa
|
prevent reload loop if JS is active, but no cookies accepted
|
2014-01-16 14:22:59 +01:00 |
|
 fabrixxm
|
5c606a19cf
|
Update messages.po
should make transifex happy
|
2014-01-16 10:31:14 +01:00 |
|
|
friendica
|
898049e14f
|
Merge https://github.com/friendica/red into zpull
|
2014-01-16 01:20:44 -08:00 |
|
|
friendica
|
18a40d0c37
|
prevent zid's from reaching the DAV core code.
|
2014-01-16 01:19:58 -08:00 |
|
|
Thomas Willingham
|
6920c203d1
|
Remove deprecated CSS - there is a dark schema now, and shadows and stuff are cofigurable.
|
2014-01-16 04:18:19 +00:00 |
|
|
Thomas Willingham
|
cd72fd3f01
|
Tweak "typical" perms macro
|
2014-01-16 02:53:05 +00:00 |
|
|
friendica
|
ec6b8e5cda
|
Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master
Conflicts:
view/ru/strings.php
|
2014-01-15 16:14:43 -08:00 |
|
|
friendica
|
f27d59a094
|
Merge pull request #272 from beardy-unixer/master
Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs.
|
2014-01-15 15:42:07 -08:00 |
|
|
Thomas Willingham
|
9f66e5aef3
|
Merge remote-tracking branch 'upstream/master'
|
2014-01-15 23:01:02 +00:00 |
|
|
Thomas Willingham
|
9addc83520
|
Log failed auth to it's own file so fail2ban doesn't have to parse MB of text
|
2014-01-15 22:54:51 +00:00 |
|
|
friendica
|
762a543249
|
allow menus to have special roles
|
2014-01-15 12:57:12 -08:00 |
|
|
friendica
|
e4217dc141
|
fix folder timestamps and change them when a child DAV file is written to
|
2014-01-15 04:02:15 -08:00 |
|
|
friendica
|
403b01da23
|
Merge https://github.com/friendica/red into zpull
|
2014-01-15 03:14:07 -08:00 |
|
|
friendica
|
47b8071ca7
|
dav: throw exception if channel for requested DAV directory is deleted
|
2014-01-15 03:12:47 -08:00 |
|
|
Thomas Willingham
|
a49704fdb6
|
Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs.
|
2014-01-14 03:50:32 +00:00 |
|
 cvogeley
|
d0e657f0f0
|
Merge pull request #271 from cvogeley/master
Confirm box: fall back to standard js confirm dialog if bootstrap isn't ...
|
2014-01-13 14:14:53 -08:00 |
|
|
Christian Vogeley
|
d9d894cbb3
|
Confirm box: fall back to standard js confirm dialog if bootstrap isn't available
|
2014-01-13 22:32:13 +01:00 |
|
 pixelroot
|
4fdd9c39c5
|
modified: view/ru/messages.po
modified: view/ru/strings.php
|
2014-01-13 18:29:37 +01:00 |
|
|
pixelroot
|
ecb125a47d
|
modified: view/ru/messages.po
|
2014-01-13 16:10:58 +01:00 |
|
 tobiasd
|
9e8ed133c3
|
Merge pull request #269 from tobiasd/de20140113
DE update to the strings
|
2014-01-12 22:30:15 -08:00 |
|
|
Tobias Diekershoff
|
87b99be785
|
DE: update to the strings
|
2014-01-13 07:28:16 +01:00 |
|
|
cvogeley
|
df9e628495
|
Merge pull request #268 from cvogeley/master
delete confirmation popup for blocks and layouts
|
2014-01-11 17:34:37 -08:00 |
|
|
Christian Vogeley
|
325c5e4e76
|
delete confirmation popup for blocks and layouts
|
2014-01-12 02:29:03 +01:00 |
|
|
cvogeley
|
134bb139dc
|
Merge pull request #267 from cvogeley/master
Do the same thang for webpage blocks
|
2014-01-11 17:09:34 -08:00 |
|