Sam Tuke
fefa4412c4
added phpdoc comment
2012-05-16 15:17:51 +01:00
Sam Tuke
2afd516ee9
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
2012-05-16 15:03:51 +01:00
Sam Tuke
c0df40084a
added recognition of which version is 'current' - which is currently live and in use on history page
2012-05-16 15:00:36 +01:00
Sam Tuke
0a46ae4f6d
added recognition of which version is 'current' - which is currently live and in use on history page
2012-05-16 14:59:00 +01:00
Sam Tuke
a00c5ac78c
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-15 18:21:51 +01:00
Sam Tuke
2ad6b5048e
fixed 'delete' label so it doesn't break translations
2012-05-15 16:24:06 +01:00
Bart Visscher
97233b77cd
Remove DOCUMENTROOT static var, and make SUBURI var private
2012-05-11 21:31:51 +02:00
Bart Visscher
9a66b869c0
Gallery: Use App storage instead of contructing our own path
2012-05-10 09:14:27 +02:00
Bart Visscher
c2230580c1
Remove unused OC static variable CONFIG_DATADIRECTORY_ROOT
2012-05-10 09:14:27 +02:00
Bart Visscher
b022ccb863
Whitespace fixes
2012-05-10 09:14:26 +02:00
Bart Visscher
e77ba0280a
Implement default functions in OC_Group backend
...
Simplifies calling these functions, and makes code simpler
functions:
inGroup
getUserGroups
getGroups
usersInGroup
2012-05-10 09:14:26 +02:00
Bart Visscher
ac2e0cd6e4
Implement default functions in OC_User backend
...
Simplifies calling these functions, and makes code simpler
functions:
deleteUser
getUsers
userExists
2012-05-10 09:14:26 +02:00
Bart Visscher
a9d7c67bf2
The log message is not always shown in html
...
The log message can also be logged with syslog, here we don't want to have html-entities. Also the log messages through json are displayed as text not html.
2012-05-10 09:13:09 +02:00
Bart Visscher
94803dc222
Gallery: No short tags
2012-05-10 09:04:10 +02:00
Bart Visscher
2062ebacef
Gallery: Show thumbnails after document is ready
2012-05-10 09:04:10 +02:00
Michael Gapczynski
798e6aa40b
Merge commit 'refs/merge-requests/100' of git://gitorious.org/owncloud/owncloud into merge-requests/100
2012-05-09 17:50:14 -04:00
Michael Gapczynski
93c0e8b3bf
Fix unsharing files also deleting private link, bug fix for oc-251
2012-05-09 17:38:35 -04:00
Brice Maron
de6aa0f88c
Use a clean uri param constructor to get files
2012-05-09 21:35:59 +00:00
Michael Gapczynski
98cd98e2e5
Skip over users that have already been shared with when sharing with a group
2012-05-09 17:16:31 -04:00
Michael Gapczynski
d4636f4b86
Fix renaming of shared files if target already exists, bug fix for oc-81
2012-05-09 17:01:46 -04:00
Michael Gapczynski
2e826fa82a
Go back to updating mtime of shared folder to invoke a file cache rescan
2012-05-09 16:20:38 -04:00
Robin Appelman
3e57e76c48
fix creating the shared folder when the user home folder is not in the root mount
2012-05-09 20:36:08 +02:00
Robin Appelman
03f66c6351
also scan new folders when checking for updates
...
it might cause long load times but seems the best for now
2012-05-09 20:35:12 +02:00
Michael Gapczynski
14b240a3f4
Still trying to fix some sharing use cases
2012-05-09 13:51:52 -04:00
Georg Ehrke
a589a700e1
revert 000d7ba975
2012-05-09 18:34:44 +02:00
Georg Ehrke
bc60b8d87a
fix bug in public api
2012-05-09 18:33:40 +02:00
Georg Ehrke
99db3c01ee
fix bug in events.php
2012-05-09 17:36:48 +02:00
Michiel de Jong
890c57bad5
fix requires in apps/remoteStorage/ajax/revoke.php
2012-05-09 15:40:39 +02:00
Michiel de Jong
4de182c7af
bearer token should be the whole thing, not the http basic pass
2012-05-09 15:28:30 +02:00
Michiel de Jong
9d443e021d
new requires in WebDAV.php
2012-05-09 15:28:30 +02:00
Michiel de Jong
2cf5bb6849
new requires now necessary
2012-05-09 15:28:30 +02:00
Michiel de Jong
7d090a45d2
attempt at reusing access tokens
2012-05-09 15:28:30 +02:00
Michael Gapczynski
63cc1ccacd
Sanitize group in togglegroups
2012-05-09 09:23:19 -04:00
Philipp Roggan
bba434ca37
fixed typo in lib/public/util.php:106 (varname to )
2012-05-09 15:17:40 +02:00
Robin Appelman
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
Georg Ehrke
000d7ba975
fix bug in calendar
2012-05-09 11:53:16 +02:00
Arthur Schiwon
eb7e2d7d35
Sharing: even if a user has more groups in common, he should appear only once in the dropdown list
2012-05-09 11:35:36 +02:00
Brice Maron
fae1ce4ea7
Correct file move by dropping on folder
2012-05-08 22:07:14 +00:00
Arthur Schiwon
c1490239e5
LDAP group: support for memberUid, fix for oc-594
2012-05-08 23:49:33 +02:00
Michael Gapczynski
051442bc76
Sanitize redirect urls
2012-05-08 17:41:50 -04:00
Tom Needham
7dcf38c40f
Better checking of ajax paramters and better logging
2012-05-08 19:48:28 +00:00
Tom Needham
9c47346373
Protect admin from evil log messages
2012-05-08 19:41:31 +00:00
Brice Maron
41d0308806
Change label for saving bookmark button
2012-05-08 19:04:06 +00:00
Bart Visscher
4f88fadbc1
Add remote for media/tomahawk.php
2012-05-08 18:40:40 +02:00
Bart Visscher
da1da8197e
Calendar: Resize content after creating calendar layout
...
The calendar can be higher than the window, this corrects for the scrollbar
2012-05-08 18:40:40 +02:00
Brice Maron
fa4a52260f
Try to correct query string url for search in bookmark
2012-05-08 16:22:35 +00:00
Georg Ehrke
52717d2a1b
remove comments
2012-05-08 17:07:50 +02:00
Michael Gapczynski
f6df71b74d
Set Content-Disposition to attachment for shared private links
2012-05-08 10:27:02 -04:00
Arthur Schiwon
9dee2a6b2c
LDAP: settings for group filter, fixes oc-587
2012-05-08 14:44:29 +02:00
Arthur Schiwon
c067cfc3b5
, not .
2012-05-08 14:09:38 +02:00
