5b42325b01
History dropdown clean-up
2012-05-17 18:57:52 -04:00
74d49920f2
Close history dropdown on success. Avoids confusion.
2012-05-17 21:22:48 +00:00
0aac70aaf1
Revert google webfont removal. Sadly this causes havoc with the editor!
2012-05-17 20:23:43 +00:00
38b93653a1
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
fbe0d0d4fd
Fix private links inside folders
2012-05-17 16:12:33 -04:00
b35c6b57a9
allow loading of css files even if a user isn't logged in
2012-05-17 21:56:33 +02:00
6146b6a131
fix paths to images and set height for calendar management dialog
2012-05-17 21:51:38 +02:00
57d41bb1f8
Merge branch 'merge-requests/115'
2012-05-17 15:39:39 -04:00
cbfbbe672c
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
...
Conflicts:
apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
2cc0515161
no use for double quotes here
2012-05-17 21:03:06 +02:00
f998ed331a
removing dead code
2012-05-17 21:01:42 +02:00
3e454d3459
oops! was hardcoding my test domain inadvertently
2012-05-17 21:00:11 +02:00
7a7c301d7d
LDAP: follow user- and groupname char limitations for LDAP display names
...
WARNING: may affect existing installations if display names included unallowed characters. Allowed are only a-zA-Z0-9._-@ This fix is however needed, because names with unallowed characters may cause conflicts
2012-05-17 17:17:40 +02:00
57cf0ae3d1
LDAP: remove unnecessary debug output
2012-05-17 17:17:40 +02:00
38c56388c1
LDAP: Fix case sensitivity issues with display name attribute
2012-05-17 17:17:40 +02:00
b9cd0ecc8a
Contacts: wrong name was set on initial load.
2012-05-17 16:46:39 +02:00
cf181e88bb
Try to setup a user's filesystem if the user hasn't logged in before and is shared a file
2012-05-17 09:24:54 -04:00
2f1e601809
Contacts: Disable in-app import if encryption is enabled, and make an attempt of supporting IE uploads too. Can't test it though...
2012-05-17 14:31:04 +02:00
9b3847f49b
Initial support for Amazon S3 storage backend
2012-05-16 21:52:05 -04:00
bfdb374a2c
allow reverting file from history dropdown
2012-05-17 02:16:33 +02:00
4ccfd27fa2
fix versioning for movable apps
2012-05-17 01:53:23 +02:00
c1ba4deb72
when scanning a folder that is a mountpoint, use the root of the mount for checking if a folder is writable instead of the folder
2012-05-17 01:47:58 +02:00
58adeaa80a
only check our own input fields when determining to show the login button
...
fixes a problem with browser plugins adding hidden inputs
2012-05-17 01:17:44 +02:00
aac9629e88
add support for custom ports for mysql/pgsql by adding :portnumber to the database host
2012-05-17 01:06:22 +02:00
5fe7200a7f
update documentation of oc_user::checkpassword
2012-05-17 00:57:43 +02:00
2c99924f7d
make sure the group exists in the backend before adding a user to it
2012-05-17 00:47:43 +02:00
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
d216678481
Contacts: removed check for empty FN field because Chrome/Chromium barfed.
2012-05-16 23:45:43 +02:00
9e83c3f823
add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav
2012-05-16 21:05:15 +02:00
22dd155e4d
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
2012-05-16 18:30:35 +01:00
9acd1065b0
made initial testing version of expireAll for version control \ngave some old vars new camelcase names
2012-05-16 18:30:26 +01:00
c645a7d0f8
Fix empty jsfiles and cssfiles in layout template
2012-05-16 18:53:46 +02:00
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
2faae817f1
Template: Fix var name
2012-05-16 18:53:46 +02:00
6d20fe4012
Template: Make getFormFactorExtension function public
2012-05-16 18:53:46 +02:00
b39f01fce6
Comment spelling fix
2012-05-16 18:52:40 +02:00
5d72681d10
Better place to check caching headers
2012-05-16 18:52:40 +02:00
ab18a0bfe8
ldap: unique index names for the database, fixes non-creating of indexes for the second table and potential issues in the app
2012-05-16 18:11:42 +02:00
eceed497b1
fix paths in apps/remoteStorage/ajax/revokeToken.php
2012-05-16 18:08:50 +02:00
fefa4412c4
added phpdoc comment
2012-05-16 15:17:51 +01:00
2afd516ee9
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
2012-05-16 15:03:51 +01:00
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
fbc2892083
try to remove deprecated files from /files on update
2012-05-16 15:59:36 +02:00
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
c04074692e
Fix incorrect toaddress being passed for emailing private links
2012-05-15 19:05:26 -04:00
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
0f66870470
Contacts: Corrected i18n call.
2012-05-15 18:49:38 +02:00
b619821f4a
Create a new OC_Share object instead of manually inserting rows when adding a user to a group share, prevents a couple of potential bugs
2012-05-15 12:03:20 -04:00
6673375eeb
No multiple file sharing in this next release, sharing UI isn't ready for it :(
2012-05-15 11:45:59 -04:00
Michael Gapczynski
Tom Needham
Georg Ehrke
Michiel de Jong
Arthur Schiwon
Thomas Tanghus
Robin Appelman
Sam Tuke
Bart Visscher
Sam Tuke