Thomas Tanghus
7aa8eb3427
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
...
Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
2011-12-09 15:25:26 +01:00
Thomas Tanghus
b3661adf02
Various fixes to multiple address books handling
2011-12-09 15:10:51 +01:00
Georg Ehrke
ac8177d83e
Merge branch 'master' into calendar
2011-12-09 14:45:41 +01:00
Georg Ehrke
bd68cee8cf
add resettimezone file for testing timezone detection
2011-12-09 14:36:43 +01:00
Georg Ehrke
add48b2657
optimize timezone detection
2011-12-09 14:35:59 +01:00
Bart Visscher
eeaf539a44
Gallery: splitout model code
2011-12-08 20:05:12 +01:00
Georg Ehrke
2103c331a0
Merge branch 'master' into calendar
2011-12-08 14:03:14 +01:00
Michiel de Jong
d4546cdf37
bump version number to force db rebuild
2011-12-08 17:19:38 +07:00
Bart Visscher
9ba59aee36
Sort apps on name and enabled status
2011-12-07 20:41:00 +01:00
Bart Visscher
0342b5fc43
Fix filename of log icon
2011-12-07 20:41:00 +01:00
Bart Visscher
a389d94e2b
Imageviewer: fix fancybox.png image url in fancybox css
2011-12-07 20:41:00 +01:00
Bart Visscher
546b7279a3
Contacts: Add "Preferred" before phone label for preferred numbers
2011-12-07 20:40:59 +01:00
Bart Visscher
1220edd4df
Contacts: Add direct link to details of a contact
2011-12-07 20:40:59 +01:00
Bart Visscher
36abf22a48
Contacts: Fix postname var spelling
2011-12-07 20:40:59 +01:00
Bart Visscher
7e990a8e5c
Contacts: refactor common ajax functions to OC_Contacts_App
2011-12-07 20:40:59 +01:00
Bart Visscher
247146f703
Contacts: refactor rendering of part.details template
2011-12-07 20:40:58 +01:00
Bart Visscher
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
Michiel de Jong
b9e6f5e42d
compliance with http://www.w3.org/community/unhosted/wiki/remoteStorage
2011-12-07 21:51:47 +07:00
Tom Needham
afa93c1f28
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-06 23:11:36 +00:00
Robin Appelman
a0548a416a
Don't trigger file action when renaming, stupid fix for stupid firefox behaviour
2011-12-05 23:52:14 +01:00
Thomas Tanghus
830efdccac
Fixed adding, editing and deleting address books. One minor UI flaw remains.
2011-12-05 03:38:06 +01:00
Thomas Tanghus
2b48b733a3
Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_backup
2011-12-04 20:42:30 +01:00
Thomas Tanghus
95ae0f23f1
Added UI for selecting/editing address books.
...
Export, CardDAV link and activation/deactivation of address books done.
2011-12-04 20:25:46 +01:00
Georg Ehrke
361d4ac13b
fix merge conflicts
2011-12-03 17:25:17 +01:00
Bart Visscher
31846141b0
Contacts: make name editable again
2011-12-02 21:24:48 +01:00
Tom Needham
25a6679c1e
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-02 16:12:29 +00:00
Thomas Tanghus
58d1a3516a
Removed some debug statements.
...
Changed double quotes to single quotes.
2011-12-01 16:06:27 +01:00
Thomas Olsen
21d613cbc6
Added export.php for contacts app. Works the same way as the one in the calendar app, except there is no UI for it.
...
Fixed indentation in /index.php
2011-12-01 02:02:45 +01:00
Bart Visscher
0bbeb13e26
Calendar: Also check if the enddate is in the requested range for events
2011-11-30 21:13:26 +01:00
Bart Visscher
e5fdc6013a
Calendar: Use the default timezone that is set in lib/base.php
2011-11-30 21:13:04 +01:00
Bart Visscher
2d391298fb
Contacts: Allow '/' in property name
...
Kaddressbook uses this in the messaging property. This is allowed in Version 2 of the vcard specification. Version 3 of the specification doesn't allow this any more but be lenient in what we accept.
2011-11-30 20:58:27 +01:00
Tom Needham
bf719d6670
Disable save button whilst saving. Refined code.
2011-11-29 22:54:51 +00:00
Tom Needham
ced944258a
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-11-29 22:45:26 +00:00
Tom Needham
dd7a411f9a
Disable save button while saving. Streamlined code.
2011-11-29 22:11:42 +00:00
Robin Appelman
153029a170
increase version to trigger database upgrade
2011-11-26 01:26:01 +01:00
Robin Appelman
a8e4d2946a
Merge branch 'database' into filesystem
2011-11-26 01:25:08 +01:00
Brice Maron
1d312cf070
Correct ldap check in dependencies_chk app
2011-11-25 23:43:24 +01:00
Bart Visscher
53ff85e2ad
Contacts: layout updates
2011-11-24 21:36:35 +01:00
Bart Visscher
6ce6cbf489
Contacts: better label for saving a property
2011-11-24 21:36:35 +01:00
Bart Visscher
9701145f83
Contacts: make type of phone property also multiselect in addproperty
2011-11-24 21:36:34 +01:00
Bart Visscher
43911d9a6f
Template: output better html for select options
2011-11-24 21:36:34 +01:00
Bart Visscher
4a57728ddd
Bookmarks: make a soft-requirement of php-curl
2011-11-24 21:36:34 +01:00
Bart Visscher
cea6561632
Update chosen to v0.9.5
2011-11-24 21:36:34 +01:00
Frank Karlitschek
fab70cb590
removed no longer used function and exec command
...
security++
2011-11-24 13:50:29 +01:00
Hendrik Langer
76bfc3b547
set http auth headers for apache+php-cgi work around if variable gets renamed by apache
2011-11-24 02:59:22 +01:00
Insanemal
c945989a70
Total rewite of fix.
...
This now re-looks up the username and returns that for use.
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
Insanemal
8d092434ed
Adjusted the check user function to lowercase the return.
...
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
Insanemal
18d8dc4757
Added option to lowercase all usernames.
...
This resolves bug with Windows AD servers as LDAP server.
Windows is case insensitve on logon requests.
If users are stored camel case and logon using all lower it causes issues
as OwnCloud is configured to be case sensitive.
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
Ignacio Daniel Rostagno
93502b3ef8
Music - Fix album and artist expand layout.
2011-11-24 02:55:51 +01:00
Robin Appelman
6c01175acd
fix ampache htmlentity calls
2011-11-24 02:53:44 +01:00