Commit Graph

993 Commits

Author SHA1 Message Date
Tom Needham e04951f8fd Fixed keyboard shortcuts 2011-12-31 12:28:25 +00:00
Tom Needham 215cb1e6e0 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-31 12:21:40 +00:00
Thomas Tanghus 1b146b85d2 Removed redundant DB queries. 2011-12-31 01:34:22 +01:00
Thomas Tanghus 97471b5c2a Thumbnails was overwriting default style so hover and active didn't work. Moved them to the 'a' element instead. 2011-12-30 23:39:31 +01:00
Thomas Tanghus 830a34a10a Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts 2011-12-30 21:09:42 +01:00
Thomas Tanghus 4793d25c57 Added license and waiver of conditions for jquery.inview.
CSS fix on contact list.
Query contacts from multiple address books.
2011-12-30 21:07:16 +01:00
Bartek Przybylski 31663cfff5 contacts entry duplication fix 2011-12-30 17:47:14 +01:00
Bartek Przybylski 96dc279e8e Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-12-30 17:06:48 +01:00
Bartek Przybylski 2ea20862fc gallery fixes 2011-12-30 17:06:29 +01:00
Georg Ehrke 3bb11db943 Merge branch 'master' into calendar 2011-12-29 19:16:33 +01:00
Tom Needham 8afb2e98fa Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-28 16:16:35 +00:00
Thomas Tanghus a70fbcea28 More missing js. 2011-12-28 10:31:45 +01:00
Thomas Tanghus 5a99310cdf Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
Fixed some conflicts.
Conflicts:
	apps/contacts/css/styles.css
	apps/contacts/templates/index.php
2011-12-28 10:14:59 +01:00
Bart Visscher 16e4e6dcc3 Contacts: small merge cleanups 2011-12-27 22:44:52 +01:00
Bart Visscher 3e2e5196d2 Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
Conflicts:
	apps/calendar/export.php
	apps/contacts/index.php
2011-12-27 22:18:01 +01:00
Bart Visscher 5fd595c0bf Calendar: add loading indicator 2011-12-27 21:50:31 +01:00
Robin Appelman 5bff1c8ad1 some coding style fixes for the pdf viewer 2011-12-27 14:19:07 +01:00
Robin Appelman f009ede753 some styling changes for the pdf viewer 2011-12-27 14:09:22 +01:00
Robin Appelman 1efb4a0c61 remove debug messages in console 2011-12-27 13:41:22 +01:00
Bartek Przybylski f7674d06d3 pdf viewer from Google Code-In program 2011-12-27 12:36:51 +01:00
Georg Ehrke ffa835c56f fix the default setting for yearly repeating events 2011-12-26 19:59:15 +01:00
Thomas Tanghus 16c8f62658 Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails 2011-12-26 13:27:53 +01:00
Georg Ehrke 9eef57faed make repeating events editable 2011-12-25 23:19:49 +01:00
Georg Ehrke 8ee53708ae use pre-decrement instead of post-decrement 2011-12-25 15:07:53 +01:00
Georg Ehrke 5e6fa608eb use OC_JSON::checkLoggedIn() in all ajax files 2011-12-22 16:31:01 +01:00
Georg Ehrke 469e983a02 fix merge conflicts 2011-12-21 22:16:46 +01:00
Bartek Przybylski 1383cb51e7 removing and renaming albums 2011-12-21 21:55:52 +01:00
Bartek Przybylski 6a1a7fcd26 merged with stash 2011-12-21 18:40:43 +01:00
Bartek Przybylski 25fa9bf8ec merged with stash 2011-12-21 18:37:17 +01:00
Bartek Przybylski 3c42867109 merged 2011-12-21 18:35:29 +01:00
Bart Visscher d5e9c7d572 Gallery: fix calculation of folder thumbnail selection 2011-12-18 23:10:43 +01:00
Bart Visscher fbad1da9e2 Contacts: check if PREF parameter is set before useing it 2011-12-18 23:10:43 +01:00
Bart Visscher dff9585f64 Contacts: add missing property_options template var 2011-12-18 23:10:43 +01:00
Bart Visscher ff346ad135 Calendar: small for loop fix 2011-12-18 23:10:43 +01:00
Bart Visscher 4eb36b0ecf Calendar: refactor common ajax functions to OC_Calendar_App 2011-12-18 23:10:42 +01:00
Michael Gapczynski 9e50cecf27 Fix shared status for files inside a shared folder 2011-12-17 21:13:54 -05:00
Thomas Tanghus 092c41f375 Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js 2011-12-17 20:38:52 +01:00
Thomas Tanghus a7b048dc05 Added thumbnails to contact list. The contacts have a default thumbnail when the page is
first loaded. Once the page is loaded the thumbnails will be lazy-loaded to the contacts
viewable.
2011-12-17 20:05:54 +01:00
Georg Ehrke f6ed7a19be Merge branch 'master' into calendar 2011-12-16 21:21:34 +01:00
Thomas Tanghus f3e8776dc6 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-16 17:43:06 +01:00
Thomas Tanghus feeb0c742a Misc. changes after review by bartv. 2011-12-16 17:42:07 +01:00
Robin Appelman 65214bed0c make the sharing app return the corrrect result for is_writable on the shared folder 2011-12-16 17:31:31 +01:00
Thomas Tanghus 59ad0a6c9c Update README 2011-12-13 10:39:31 +01:00
Thomas Tanghus d55e689261 Added readme.tanghus 2011-12-11 21:17:10 +01:00
Tom Needham 3f44a28e28 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-12-11 18:16:14 +00:00
Thomas Tanghus 39430c837f Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup 2011-12-11 16:29:53 +01:00
Thomas Tanghus c7b7758816 Updating of contact list when activating/adding/deleting address books now works. 2011-12-11 16:26:00 +01:00
Georg Ehrke 56f12cbfb1 delete unused files 2011-12-10 17:54:42 +01:00
Georg Ehrke 33caa64cce check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs 2011-12-10 15:11:41 +01:00
Georg Ehrke b7c754cb32 Merge branch 'master' into calendar 2011-12-10 15:03:33 +01:00
Bart Visscher 1746cba249 Some small changes 2011-12-09 22:36:39 +01:00
Bart Visscher a3cb04013e Update OC_VObject 2011-12-09 21:56:03 +01:00
Bart Visscher 2e951c0ce5 Gallary: Fix alignment of album thumbnails 2011-12-09 21:44:13 +01:00
Thomas Tanghus 5cb10548b3 Resolved conflict 2011-12-09 15:28:51 +01:00
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 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
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
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
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 4a57728ddd Bookmarks: make a soft-requirement of php-curl 2011-11-24 21:36:34 +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
Bart Visscher bae6c1167c Merge branch 'fullcalendar' 2011-11-23 21:08:26 +01:00
Bart Visscher ee549dfb38 Fix scrolling through months 2011-11-23 21:07:49 +01:00
Bart Visscher 5e037bfd54 Contacts: remove redundant li in setpropertyform template 2011-11-23 21:07:32 +01:00
Bart Visscher a2ecdfcac1 Contacts: support multiple phone type parameter 2011-11-23 21:07:32 +01:00
Bart Visscher ad390d5e42 Add type selects to editing ADR & TEL contact property types 2011-11-23 21:07:32 +01:00
Georg Ehrke a38778f911 fix timeformat setting for fullcalendar 2011-11-20 14:23:26 +01:00
Georg Ehrke 6c4692380f Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar 2011-11-20 11:41:58 +01:00
Robin Appelman 4bebf419d1 use oc_appconfig instead of oc_config for the external apps 2011-11-18 20:19:55 +01:00
Markus Kalkbrenner 48ae18a733 - fixed translateable strings in template
- added explaination about ldap filter and display name
- bugfix: keys in ldap response are lower case => lower display name filed before searching
2011-11-18 14:08:30 +01:00
Markus Kalkbrenner bf84aa23f4 - provide a setting for the ldap user display name instead of hardcoded value 'uid' which is not common for Active Directory
- provide a sorted list of ldap users
- replaced double quotes by single quotes and spaces by tabs according to coding standards
- replaced hardcoded strings in template by translatable ones
2011-11-18 14:08:30 +01:00
Markus Kalkbrenner cff6a41e2b fixed copy&paste error: store ldap_tls setting in user_ldap, not
user_tls
2011-11-18 14:07:11 +01:00
Markus Kalkbrenner 0155effdb7 - bugfix: allow anonymous bind for search, then bind with users credentials.
- added explaination how to setup anonymous bind for search to template
- make usage of TLS configurable
2011-11-18 14:07:11 +01:00
krzaczek 7454af0c79 apps files_sharing - fix in share.js to check the "can edit" checkbox -
there was a bug in share.js so the checbox was always unchecked
2011-11-18 14:05:38 +01:00
krzaczek 82f30c709c apps file_sharing - remove "$RUNTIME_NOAPPS = true" from all ajax file
to enable other user backend
2011-11-18 14:05:38 +01:00
krzaczek a70c2b3cb9 apps file_sharing
changed
 $RUNTIME_NOAPPS = true;
to
 $RUNTIME_NOAPPS = false;
 
in ajax/userautocomplete.php - to fetch users also from different user
backends - not only database backend
2011-11-18 14:05:37 +01:00
krzaczek 28cd41a2a4 users_ldap - added getUsers() method to fetch all existing users from
LDAP server
2011-11-18 14:05:37 +01:00
Weng Xuetian 96b91e5b0b fix ampache encoding problem. use htmlentities encoding parameter directly. 2011-11-18 14:03:26 +01:00
Weng Xuetian 0d274b0268 fix id3 tag resolve. should use utf8 from getID3 directly but not
to convert them from ISO8859-1 to utf8 after analyze.
2011-11-18 14:03:26 +01:00
Georg Ehrke 3d498002d0 first implementation of the search function 2011-11-14 22:52:34 +01:00
Georg Ehrke 89b3a395df fix timezone for repeating events 2011-11-12 22:30:09 +01:00
Georg Ehrke a303992d78 support for repeating events 2011-11-12 22:02:04 +01:00
Georg Ehrke eea20e51d8 another fix of caldav url 2011-11-12 16:13:27 +01:00
Georg Ehrke 7fd52de2d3 fix merge conflicts 2011-11-12 15:13:44 +01:00
Georg Ehrke e5a3ab8aad Merge branch 'master' into fullcalendar 2011-11-12 15:09:37 +01:00
Georg Ehrke 03d9fab3c0 fix caldav url 2011-11-12 14:06:14 +01:00
Tom Needham 88de9e4050 Keyboard shortcuts for saving. Refined code. 2011-11-11 20:46:06 +00:00
Georg Ehrke 26272c4252 automatic timezone detection 2011-11-11 15:51:44 +01:00
Bart Visscher ef124c3e21 Use a function to generate select options 2011-11-09 22:19:52 +01:00
Bart Visscher b095859a92 Use Last-Modified property to check for changed events 2011-11-09 22:17:09 +01:00
Bart Visscher c65e417666 Use parse function in Calendar_Object 2011-11-09 22:16:24 +01:00
Jakob Sack 938c5ef21c contacts: every card needs a version! 2011-11-09 11:35:50 +01:00
Jakob Sack 4b424e12df contacts: put property key in background, the value is important! 2011-11-09 11:35:50 +01:00
Jakob Sack 841be90939 Improve style in contacts 2011-11-09 11:35:50 +01:00
Tom Needham c33884779d Fixed problem closing the editor. 2011-11-07 22:45:26 +00:00
Tom Needham 059ab889bd Fixed error where saving message appears twice. 2011-11-07 22:27:49 +00:00
Tom Needham 7a8c762e48 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-11-07 17:16:56 +00:00
Brice Maron 97291fda58 Add allow_url_fopen directive to admin_dependencies_chk 2011-11-06 16:54:05 +01:00
Brice Maron cc35cb74e1 Try to avoid closing the share box too soon on multiple selections 2011-11-06 15:29:51 +01:00
Brice Maron ce2b39b398 Merge commit 'refs/merge-requests/69' of git://gitorious.org/owncloud/owncloud into merge-requests/69 2011-11-04 00:31:35 +01:00
Robin Appelman 8eda6f8feb make webfinger work properly if owncloud is installed in a subdirectory 2011-11-03 13:09:51 +01:00
Robin Appelman e2907eb99d no longer rely on PEAR::isError since we can use PDO now 2011-11-03 13:09:51 +01:00
Brice Maron c7d1737d47 attempt to manage some special chars in file list
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
Brice Maron e533e82bc9 Add sequence name in insertid to be more portable 2011-10-29 11:40:48 +02:00
Brice Maron eaad3ab45f Be consistent with licencing 2011-10-29 10:15:29 +02:00
Brice Maron a21908cf18 Change name and fix a typo 2011-10-29 10:07:01 +02:00
Brice Maron a809fe9a04 Add a dependencies check apps 2011-10-29 00:27:25 +02:00
Bart Visscher 8dd2f463f8 Cleanup tipsy popups on more actions 2011-10-27 22:56:22 +02:00
Bart Visscher 1e8e2ae353 Move unselect call to after the dialog starts 2011-10-27 22:54:39 +02:00
Bart Visscher 6d4d15b221 Fix html id's in part.addcardform.php 2011-10-27 22:47:56 +02:00
Bart Visscher c0e9c805ec Disable loading non-existing settings script in bookmark app 2011-10-27 22:46:52 +02:00
Bartek Przybylski 865be6064a adjusting to new db "api", merge with master 2011-10-27 21:16:04 +02:00
Bartek Przybylski 0d022de0f4 Merge branch 'master' into gallery 2011-10-27 20:27:57 +02:00
Tom Needham 6eee638482 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-25 20:48:59 +01:00
Bart Visscher 715e376cd2 Fix setproperty form 2011-10-25 20:01:40 +02:00
Bart Visscher d0e9c81399 Quickfix hanging tipsy popups 2011-10-25 20:01:04 +02:00
Bart Visscher 55d957489d Fix fromtime/totime warnings 2011-10-25 19:59:23 +02:00