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 |
|
Christian Vogeley
|
b5fbee67b1
|
Do the same thang for webpage blocks
|
2014-01-12 02:06:59 +01:00 |
|
cvogeley
|
3e54ccde08
|
Merge pull request #266 from cvogeley/master
Fix webpage layout title editing
|
2014-01-11 16:55:06 -08:00 |
|
Christian Vogeley
|
7a9ea83382
|
Fix webpage layout title editing
|
2014-01-12 01:51:30 +01:00 |
|
cvogeley
|
3dfcb7510c
|
Merge pull request #265 from cvogeley/master
Fix page layout selector
|
2014-01-11 15:58:57 -08:00 |
|
Christian Vogeley
|
6403875f26
|
remove debug loggers
|
2014-01-12 00:53:28 +01:00 |
|
Christian Vogeley
|
5fd3ca36f8
|
Fix page layout selector
|
2014-01-12 00:49:23 +01:00 |
|
friendica
|
362e4060e1
|
Merge https://github.com/friendica/red into zpull
|
2014-01-11 12:59:45 -08:00 |
|
friendica
|
cff7056f8f
|
mod_attach: output stream wasn't working
|
2014-01-11 12:58:00 -08:00 |
|
Paolo T
|
c30d637b08
|
Merge pull request #264 from tuscanhobbit/master
Italian translation of reddav
|
2014-01-11 10:59:30 -08:00 |
|
tuscanhobbit
|
59a396ac75
|
Italian translation of reddav
|
2014-01-11 19:57:28 +01:00 |
|
friendica
|
f125be846c
|
DAV put() issues
|
2014-01-10 19:18:30 -08:00 |
|
friendica
|
ed9a72ecbe
|
preserve mid on edits
|
2014-01-10 19:01:24 -08:00 |
|
friendica
|
74e099b135
|
fix cloud path in filestorage edit page
|
2014-01-10 18:33:46 -08:00 |
|
friendica
|
0ce3e7235a
|
other reddav issues, but probably won't fix the empty file
|
2014-01-10 13:47:56 -08:00 |
|
friendica
|
daec9b8767
|
Merge https://github.com/friendica/red into zpull
|
2014-01-10 13:11:23 -08:00 |
|
friendica
|
ffa86dfea8
|
this may fix filesize 0 issues
|
2014-01-10 13:10:50 -08:00 |
|
friendica
|
069ea5fee9
|
Merge https://github.com/friendica/red into zpull
|
2014-01-10 12:38:23 -08:00 |
|
friendica
|
c9879edb3e
|
break delivery loop if an item is deleted twice
|
2014-01-10 12:37:48 -08:00 |
|
Thomas Willingham
|
865f7aef1c
|
Prevent whitespace breaking copy-paste of reset passwords.
|
2014-01-10 20:37:25 +00:00 |
|