Commit Graph

2846 Commits

Author SHA1 Message Date
Bartek Przybylski c11f6cc3f9 fix variable name and undefined index notice 2012-06-10 17:25:50 +02:00
Bartek Przybylski 76f20eb57c fix first time image loading error 2012-06-10 13:05:00 +02:00
Thomas Tanghus f90c8738ab Contacts: Used non-existent var. 2012-06-10 12:48:39 +02:00
Bartek Przybylski 0838b4c225 gallery: removing search provider for now 2012-06-10 09:52:33 +02:00
Michiel de Jong 995f9c7348 sanitize scope and host 2012-06-09 21:08:24 +02:00
Michiel de Jong 322fd51261 avoid clickjacking 2012-06-09 21:08:24 +02:00
Michael Gapczynski ab41b57f62 Add Dropbox storage backend 2012-06-09 15:02:48 -04:00
Michiel de Jong b46903fa76 sanitize when logged in as another user 2012-06-09 20:39:24 +02:00
Robin Appelman d065b2d29e prevent opening non-music files through the media ajax api 2012-06-09 17:39:14 +02:00
Robin Appelman 601bac746d use absolute path for file proxies 2012-06-09 17:34:13 +02:00
Georg Ehrke e7f6f7e452 fix another XSS 2012-06-09 16:45:37 +02:00
Georg Ehrke c9214afff8 fix XSS in Calendar 2012-06-09 16:35:35 +02:00
Georg Ehrke 2862740674 increase height of event dialog 2012-06-09 15:38:03 +02:00
Georg Ehrke cfb9c764ca fix creation of monthly repeated events 2012-06-09 15:15:00 +02:00
Bartek Przybylski 001293a702 removing app access check, fix title for links in tiles 2012-06-09 15:12:50 +02:00
Thomas Tanghus 081e1874cb Contacts: Use POST instead of GET. 2012-06-09 15:00:44 +02:00
Thomas Tanghus 88341e5797 Code cleanup. 2012-06-09 15:00:44 +02:00
Georg Ehrke 28ab92ee76 make use of post instead of get 2012-06-09 14:41:26 +02:00
Bart Visscher 4aee5a7ce4 Tasks: Use POST for ajax calls that change data 2012-06-09 14:39:41 +02:00
Georg Ehrke c83f418a02 Merge branch 'master' into calendar_repeat 2012-06-09 12:30:39 +02:00
Georg Ehrke a9b561430a add hooks for events 2012-06-09 12:30:09 +02:00
Georg Ehrke 7ed30649bb add hooks for calendars 2012-06-09 12:18:25 +02:00
Georg Ehrke cac995ee9f some more work on repeating events caching 2012-06-09 11:49:25 +02:00
Georg Ehrke ac74d87e3e some work on repeating events caching 2012-06-08 22:22:16 +02:00
Bartek Przybylski 201a40a1a3 tabs for spaces, fix array key name 2012-06-08 21:55:28 +02:00
Bartek Przybylski 0c7431e57d hide share button until sharing wont be fixed 2012-06-08 21:44:33 +02:00
Bartek Przybylski 8bc22907b8 adding navigation bar to gallery 2012-06-08 21:44:33 +02:00
Bartek Przybylski 6b0a2ae60e remove old code 2012-06-08 21:44:32 +02:00
Bartek Przybylski 71b04717ab adding missing file 2012-06-08 21:44:31 +02:00
Bartek Przybylski 9e434dea60 tabs for spaces, removing thumbnail on file removal 2012-06-08 21:44:31 +02:00
Bart Visscher ac36512102 Don't use substr to get first char of string 2012-06-08 21:38:10 +02:00
Thomas Tanghus 0a49bae87a Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-) 2012-06-08 20:39:54 +02:00
Georg Ehrke e83e30a8a9 Merge branch 'master' into calendar_repeat 2012-06-08 19:54:42 +02:00
Michael Gapczynski 8fcdccdcdc Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage 2012-06-08 13:48:38 -04:00
Michael Gapczynski 4b3ae60558 Working UI for external storage mount configuration 2012-06-08 11:42:29 -04:00
Arthur Schiwon f70615106f typo in var 2012-06-08 14:57:27 +02:00
Arthur Schiwon 4d3b7574f3 Sharing, fix: connect to hooks from the correct classes 2012-06-08 11:55:16 +02:00
Georg Ehrke 65cd15ca15 fix merge conflicts 2012-06-08 11:21:55 +02:00
Georg Ehrke 1d93a8fcfe Merge branch 'master' into calendar_export 2012-06-08 11:20:17 +02:00
Robin Appelman 4768510923 split share and root config for smb backend, also sanitize config a bit more 2012-06-08 01:29:55 +02:00
Bart Visscher 4afcae8d56 Gallery: Fix database creation on update, also only from version less then 0.5 2012-06-07 23:38:50 +02:00
Brice Maron cf02f3c107 Merge branch 'master' into multi_app_dir 2012-06-07 19:11:55 +00:00
Thomas Tanghus d4f6f3e935 Contacts: Attempt to make file upload work in ICS Chrome. 2012-06-07 20:29:16 +02:00
Thomas Tanghus 33c802dcaa Break text to fit in dialog. 2012-06-07 20:29:15 +02:00
Arthur Schiwon c2f557f1dd LDAP: cache the results, reduce LDAP searches 2012-06-07 18:55:32 +02:00
Arthur Schiwon 6626598435 ldap: enable the destructor 2012-06-07 18:13:41 +02:00
Bartek Przybylski 14e1be56a0 pictures: update script and removal some all stuff 2012-06-07 17:08:04 +02:00
Thomas Tanghus d2a8746c49 Edited combobox to adhere to coding standards and added a dblclick handler. 2012-06-07 16:44:54 +02:00
Arthur Schiwon 44880ab3fa ldap: remove unused private functions 2012-06-07 13:39:42 +02:00
Arthur Schiwon 6894882ca9 ldap: correct query condition and determining of success 2012-06-07 13:39:42 +02:00
Arthur Schiwon 470cb17f90 ldap: check index carefully, can be 0 2012-06-07 13:39:42 +02:00
Thomas Tanghus 312536dbf9 Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511 2012-06-07 13:08:42 +02:00
Thomas Tanghus e1f4978150 Calendar: Added more explicit sync links and fixed indentation. 2012-06-07 12:21:24 +02:00
Thomas Tanghus 3804f68ff5 Contacts: Import upload button was obscured on Android browser. 2012-06-07 10:55:40 +02:00
Thomas Tanghus 9c84149119 A bit of pixel-pushing. 2012-06-07 10:55:40 +02:00
Bartek Przybylski 8fd6cdf407 adding title when fancybox is displayed 2012-06-06 23:29:23 +02:00
Bartek Przybylski 5417d803c4 replace spaces with tabs, use const and linkTo instead of static path 2012-06-06 23:23:49 +02:00
Brice Maron 5c2b2fc842 Change app path logic in templates 2012-06-06 20:24:16 +00:00
Brice Maron 6a812644e4 Correct remote and public, and last occurence of OC:: 2012-06-06 20:24:15 +00:00
Brice Maron cc494259d3 Unit path and webpath, correct some more 2012-06-06 20:24:15 +00:00
Bartek Przybylski a90089c792 hack for file download 2012-06-06 22:20:56 +02:00
Bartek Przybylski 7c88081acb removing test image 2012-06-06 22:13:49 +02:00
Bartek Przybylski aa0fc3c69a aviod incorrect image size returning in gallery listing 2012-06-06 22:13:49 +02:00
Bartek Przybylski 671fe49809 use fancybox to display image preview 2012-06-06 22:13:49 +02:00
Bartek Przybylski 76e7e361ae navigate on galleries 2012-06-06 22:13:49 +02:00
Bartek Przybylski 34a21a63ce new db scheme 2012-06-06 22:13:49 +02:00
Bartek Przybylski 6d211155ab git status 2012-06-06 22:13:48 +02:00
Bjoern Schiessle c960e42a17 fixed var name, $filename should be $foldername 2012-06-06 18:08:51 +02:00
Thomas Tanghus 5c17338ac7 Contacts: Make js a tad DRYer. Added URL property. 2012-06-06 15:29:33 +02:00
Thomas Tanghus ed950e3ba2 Correct mime type. 2012-06-06 15:29:33 +02:00
Arthur Schiwon 190fca1121 LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914 2012-06-06 12:29:48 +02:00
Thomas Tanghus ca0108aabf Corrected typos. 2012-06-06 11:50:49 +02:00
Bjoern Schiessle 6abe8f9e2e fixed wrong function call 2012-06-06 10:40:22 +02:00
Georg Ehrke 2fa19ce9a0 Merge branch 'master' into calendar_repeat 2012-06-06 10:12:11 +02:00
Georg Ehrke d8d558377c Merge branch 'master' into calendar_export 2012-06-06 10:11:34 +02:00
Thomas Tanghus fce614b82c Less aggressive caching on thumbnails too. 2012-06-06 01:06:13 +02:00
Thomas Tanghus 68670bcc66 Cleanup. 2012-06-06 01:06:13 +02:00
Thomas Tanghus 624f8ae36d Also use OC_Cache here. 2012-06-06 01:06:13 +02:00
Thomas Tanghus 80de23d08b Contacts: Removed temp dir cleanup after using OC_Cache. 2012-06-06 01:06:12 +02:00
Robin Appelman f7d221f5f0 update translations 2012-06-06 00:29:28 +02:00
Robin Appelman a3c1f70be4 dont show config option for file upload size if we cant write the new value 2012-06-06 00:24:15 +02:00
Robin Appelman e6c4e53486 prevent creating files with a / the name 2012-06-06 00:02:51 +02:00
Thomas Tanghus 20aee83d07 Use UID for cache key. 2012-06-05 21:20:10 +02:00
Thomas Tanghus cb941996c0 Contacts: Use OC_Cache for contact photo handling instead of temp dir. 2012-06-05 20:34:12 +02:00
Bjoern Schiessle 0d1a07d4ae show pictures in folder with special characters, e.g. '+' 2012-06-05 16:36:05 +02:00
Bjoern Schiessle d71c4db10a xss vulnerability fixed 2012-06-05 10:46:28 +02:00
Bjoern Schiessle 564b0358f9 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-05 10:38:42 +02:00
Bjoern Schiessle dcc5b5ca0a xss vulnerability fixed 2012-06-05 10:37:22 +02:00
Thomas Tanghus d194132b6f Contacts: Cache standard photo less aggressively 2012-06-05 10:32:26 +02:00
Frank Karlitschek 7e931575b4 comment out non working code 2012-06-05 09:28:51 +02:00
Bart Visscher 64f6534f51 Tasks: styling fixes 2012-06-04 23:04:31 +02:00
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Bart Visscher 091b343d5c Calendar & Contacts: Store import progress in OC_Cache
Convert calendar and contacts import to use a caching system
for storing the import progress percentage. OC_Cache can later
be made smarter about storing values.
2012-06-04 22:24:17 +02:00
Bjoern Schiessle f291a843bf prevent xss attacks by manipulating image file names 2012-06-04 16:22:25 +02:00
Bjoern Schiessle 1d6ca084a6 prevent xss attacks by manipulating text file names 2012-06-04 16:20:03 +02:00
Thomas Tanghus 3b9bf83fe7 Contacts: Make tmp file cleaup a bit safer. 2012-06-04 13:38:37 +02:00
Arthur Schiwon 782d82730a commited a bit too much before 2012-06-04 13:28:31 +02:00
Thomas Tanghus 2842088b75 Contacts: When editing photo on a newly created contact the name in the contact list was cleared. 2012-06-04 13:14:31 +02:00
Thomas Tanghus 855f404e5c Contacts: Temporary files weren't deleted if crop window was closed without saving. 2012-06-04 13:14:31 +02:00
Arthur Schiwon 59bbf0acee LDAP: link to documentation on settings page 2012-06-04 13:05:18 +02:00
Georg Ehrke 6560f1d894 don't change events timezone and remove the DTSTART value tag 2012-06-04 12:28:05 +02:00
Bjoern Schiessle 2d80c148ba Don't allow user to delete, rename and re-share the "Shared" directory 2012-06-04 10:42:09 +02:00
Georg Ehrke 4d1428db0f Merge branch 'master' into calendar_repeat 2012-06-03 19:17:05 +02:00
Georg Ehrke 865b7d6a7b Merge branch 'master' into calendar_export 2012-06-03 14:56:25 +02:00
Georg Ehrke c2a51d1f48 proper export for calendar app - doesn't work with apple ical yet - even though a ics validator says it's valid 2012-06-03 14:54:53 +02:00
Arthur Schiwon e58efd7877 LDAP group backend: Set configured true when it is... fixe oc-887 2012-06-01 16:02:38 +02:00
Arthur Schiwon a4f177d75d LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867 2012-06-01 13:49:11 +02:00
Georg Ehrke 46b3b30d46 add status
file for repeating events caching
2012-06-01 13:47:48 +02:00
Frank Karlitschek a2b41a140e correctly detect https 2012-06-01 11:46:18 +02:00
Georg Ehrke e75146a811 Merge branch 'master' into calendar_repeat 2012-06-01 11:40:39 +02:00
Georg Ehrke 7a8e322679 some work for repeating events caching 2012-06-01 11:30:54 +02:00
Frank Karlitschek 83c6714c72 don´t start a session here. I don´t think it´s needed. Let´s see if it breaks something 2012-06-01 11:12:50 +02:00
Frank Karlitschek baae4c741d fix the breadcrumb 2012-05-31 21:44:05 +02:00
Frank Karlitschek 5f4132d6ba more fixes 2012-05-31 21:16:36 +02:00
Frank Karlitschek 57a56299d8 more fixes
i don´t understand why this worked before.
2012-05-31 21:10:03 +02:00
Frank Karlitschek d4ea853fcf use our own serverHost call so that ownCloud works with reverse proxy servers 2012-05-31 20:26:09 +02:00
Georg Ehrke f0bd571866 fix potential XSS 2012-05-31 20:01:12 +02:00
Arthur Schiwon 3db28d7616 linkTo instead of hard links in Files and Files_Archive. Hope that makes sense. 2012-05-31 19:46:51 +02:00
Sam Tuke e93bb5135d Applied fix from kalassico for "Chiper text must be a string" bug (http://forum.owncloud.org/viewtopic.php?f=3&t=2586&p=5094) 2012-05-31 12:25:07 +01:00
Arthur Schiwon 3b36a9b704 LDAP: make queries compatible also with PostgreSQL 2012-05-31 13:07:49 +02:00
Bart Visscher a33f580db1 Remove OC_App::register function
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
2012-05-31 13:01:30 +02:00
Bart Visscher 2ae58ee6c0 Calendar: small cleanup of import progress writing 2012-05-31 13:01:30 +02:00
Bart Visscher 0934a975b2 Remove unused L10N variable 2012-05-31 13:01:30 +02:00
Georg Ehrke c5cc70c0e3 Merge branch 'master' into calendar_repeat 2012-05-31 12:20:56 +02:00
Arthur Schiwon 8b4e16ec77 LDAP: fix wrong value for input type 2012-05-30 22:34:51 +02:00
Frank Karlitschek 22a04d8e93 don´t hardcode /tmp 2012-05-30 14:14:32 +02:00
Thomas Tanghus dbcd26be68 Contacts: Rewrote import script. 2012-05-29 23:41:53 +02:00
Georg Ehrke f1a48aec73 Merge branch 'master' into calendar_repeat 2012-05-29 19:47:48 +02:00
Georg Ehrke 29b17672b4 a bit of work for repeating events caching 2012-05-29 19:46:17 +02:00
Michael Gapczynski d334f33eba Initial support for Amazon S3 storage backend
Conflicts:

	apps/files_external/tests/config.php
2012-05-29 12:19:29 -04:00
Thomas Tanghus c9df18ed8c Forgot a break. 2012-05-29 16:46:54 +02:00
Thomas Tanghus 51aa84e70a Contacts: NOTE wasn't saved properly. 2012-05-29 16:43:59 +02:00
Thomas Tanghus dff16e70a9 Contacts: Improve loading and cleanup of dialogs. 2012-05-29 16:43:59 +02:00
Georg Ehrke 29372677ae add lib collection and lib scanner to media's appinfo/app.php 2012-05-29 13:36:51 +02:00
Georg Ehrke 482caa04f9 add button to clear calendar's cache 2012-05-29 13:34:27 +02:00
Georg Ehrke a56f2dbce7 Merge branch 'master' into calendar_repeat 2012-05-29 13:16:08 +02:00
Georg Ehrke 75afc09b9d fix status
of timezone detection
2012-05-29 13:14:05 +02:00
Brice Maron 22cd0f1cda Correct typo in last_insert_id for calendar and pg fix #oc-731 2012-05-28 20:41:39 +00:00
Benjamin Diele 7b8664bbe5 Check for valid LDAP-resource before querying.
Check if we have get valid link identifier from
self::getConnectionResource() before using ldap_search() and
ldap_get_entries(), otherwise return an empty array.

Signed-off-by: Benjamin Diele <benjamin@diele.be>
2012-05-28 17:54:38 +04:00
Thomas Tanghus 817f9ff57d Contacts: Fix XSS. 2012-05-28 14:42:57 +02:00
Frank Karlitschek 1eebbaebdb Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-28 13:59:47 +02:00
Frank Karlitschek c79a529edd remove not needed includes 2012-05-28 13:57:45 +02:00
Thomas Tanghus df5bdc8e42 Contacts: Double check XSS, and fix a rookie error ;-) 2012-05-28 13:19:31 +02:00
Georg Ehrke 5e7b318e42 add urlencode for caldav link 2012-05-28 10:49:27 +02:00
Georg Ehrke 459114b994 Merge branch 'master' into calendar_repeat 2012-05-26 22:54:24 +02:00
Robin Appelman 143287738a allow longer paths for gallery 2012-05-26 21:50:54 +02:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Arthur Schiwon d2369b6e96 LDAP: support for 'member' as group-member-association 2012-05-26 16:38:37 +02:00
Georg Ehrke a1c9191006 fix share for users with a point within their name 2012-05-26 15:23:46 +02:00
Georg Ehrke bc9accd26e Merge branch 'master' into calendar_repeat 2012-05-25 10:30:00 +02:00
Brice Maron 9c2a6fb551 Add HEAD request management for files ajax/download.php 2012-05-24 22:48:10 +00:00
Brice Maron 5fa14806c8 Add translation for error message 2012-05-24 19:16:00 +00:00
Brice Maron 2c9311cf48 Add error message when uploading folder or null files. ref oc-739 2012-05-24 18:47:34 +00:00
Robin Appelman a1539dace7 share code between smb and ftp filestorage backends 2012-05-24 19:41:32 +02:00
Brice Maron f00a50c76a Add pending line in file list before trying to upload. Correct indentation 2012-05-24 16:56:19 +00:00
Robin Appelman 2f40f11c87 smb filestorage backend 2012-05-24 18:23:59 +02:00
Michael Gapczynski bee724c53e Initial work on UI for mounting external storage 2012-05-24 11:06:03 -04:00
Michael Gapczynski 970124a90b Fix private link sharing via email, fix for bug oc-750 2012-05-23 19:35:29 -04:00
Brice Maron 97d682dc13 Correct small style problem with task app fix #oc-689 2012-05-23 21:02:34 +00:00
Sam Tuke 3fee3a4633 Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable 2012-05-22 14:44:40 +01:00
Sam Tuke 27f7dae932 removed closing php tag 2012-05-22 13:42:55 +01:00
Frank Karlitschek 8cd7410447 encryption is not yet compatible with ldap 2012-05-22 12:15:51 +02:00
Thomas Tanghus a896da0d91 Contacts: XSS fix. Still some more to check. 2012-05-21 21:47:15 +02:00
Frank Karlitschek 2f8f7501ef add warning 2012-05-20 10:58:20 +02:00
Georg Ehrke ad66bb9c84 Merge branch 'calendar_dropimport' 2012-05-19 18:58:24 +02:00
Michael Gapczynski 5a48ade933 Make sure sharing and versions dropdowns come down in the same location for all files 2012-05-19 11:24:23 -04:00
Georg Ehrke d4072c82dd some fixes for contacts, gallery and openid 2012-05-19 15:22:21 +02:00
Georg Ehrke 07fa8da278 fix for calendar 2012-05-19 15:05:58 +02:00
Frank Karlitschek 7e49a33d64 getStorage belongs to files not to apps. 2012-05-19 10:44:08 +02:00
Michael Gapczynski 35bd601215 Fix check for when to store a new version of a file 2012-05-18 22:27:43 -04:00
Michael Gapczynski f750da1802 Fix revert link on history page of file versions 2012-05-18 22:07:48 -04:00
Michael Gapczynski 89f5701d1a Fix versioning of shared files 2012-05-18 22:07:48 -04:00
Michael Gapczynski ea7456a06a Forgot to actually call remove on the history dropdown 2012-05-18 10:53:58 -04:00
Michael Gapczynski fcb4d2aaee Remove the history dropdown before creating a new one 2012-05-18 10:42:49 -04:00
Michael Gapczynski 122d1efecf Don't show the select form in the history dropdown if a file has no other versions 2012-05-18 10:39:43 -04:00
Arthur Schiwon c1bb8139a0 LDAP: we're 0.2 now 2012-05-18 18:00:30 +02:00
Arthur Schiwon bae954a797 LDAP: only check once for name conflicts on update. Set a value on install as well 2012-05-18 18:00:30 +02:00
Thomas Tanghus 7922338050 Contacts: Added MS opacity mumbo-jumbo that I can't test myself to file form fields. 2012-05-18 17:39:19 +02:00
Arthur Schiwon e606213fa0 make upload work with IE again 2012-05-18 17:07:00 +02:00
Arthur Schiwon 0c7efc234b LDAP: update meta info 2012-05-18 17:07:00 +02:00
Frank Karlitschek 9e73524168 mark the apps as part of the shipped package and increase the requirement to ownCloud 4 2012-05-18 16:06:57 +02:00
Arthur Schiwon ea33b4aaa1 LDAP: don't make us of global constants (completing, was removed with latest additions to update.php) 2012-05-18 12:55:38 +02:00
Arthur Schiwon 253f101b39 LDAP: check wether applying naming rule would end up in conflicts on update, if so don't do it 2012-05-18 12:55:37 +02:00
Georg Ehrke 73a72054a3 fix call of all versions page 2012-05-18 12:00:35 +02:00
Georg Ehrke 7d49bf7f6e some changes in calendar repeat class 2012-05-18 11:48:18 +02:00
Michael Gapczynski b7aee58ef9 Hooks aren't working across different users' filesystems, so update the mtime of the Shared folder for all shared item events 2012-05-17 21:26:55 -04:00
Robin Appelman 48505c5626 improve tar archive backend 2012-05-18 01:54:59 +02:00
Michael Gapczynski 5b42325b01 History dropdown clean-up 2012-05-17 18:57:52 -04:00
Tom Needham 74d49920f2 Close history dropdown on success. Avoids confusion. 2012-05-17 21:22:48 +00:00
Tom Needham 0aac70aaf1 Revert google webfont removal. Sadly this causes havoc with the editor! 2012-05-17 20:23:43 +00:00
Georg Ehrke f7366de673 Merge branch 'master' into calendar_repeat 2012-05-17 22:17:23 +02:00
Georg Ehrke 38b93653a1 Merge branch 'master' into calendar_dropimport 2012-05-17 22:17:06 +02:00
Michael Gapczynski fbe0d0d4fd Fix private links inside folders 2012-05-17 16:12:33 -04:00
Georg Ehrke 6146b6a131 fix paths to images and set height for calendar management dialog 2012-05-17 21:51:38 +02:00
Michael Gapczynski 57d41bb1f8 Merge branch 'merge-requests/115' 2012-05-17 15:39:39 -04:00
Michael Gapczynski 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
Michiel de Jong 2cc0515161 no use for double quotes here 2012-05-17 21:03:06 +02:00
Michiel de Jong f998ed331a removing dead code 2012-05-17 21:01:42 +02:00
Michiel de Jong 3e454d3459 oops! was hardcoding my test domain inadvertently 2012-05-17 21:00:11 +02:00
Arthur Schiwon 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
Arthur Schiwon 57cf0ae3d1 LDAP: remove unnecessary debug output 2012-05-17 17:17:40 +02:00
Arthur Schiwon 38c56388c1 LDAP: Fix case sensitivity issues with display name attribute 2012-05-17 17:17:40 +02:00
Thomas Tanghus b9cd0ecc8a Contacts: wrong name was set on initial load. 2012-05-17 16:46:39 +02:00
Michael Gapczynski 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
Thomas Tanghus 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
Michael Gapczynski 9b3847f49b Initial support for Amazon S3 storage backend 2012-05-16 21:52:05 -04:00
Robin Appelman bfdb374a2c allow reverting file from history dropdown 2012-05-17 02:16:33 +02:00
Robin Appelman 4ccfd27fa2 fix versioning for movable apps 2012-05-17 01:53:23 +02:00
Robin Appelman ac8bfc218e update translations 2012-05-17 00:36:21 +02:00
Thomas Tanghus d216678481 Contacts: removed check for empty FN field because Chrome/Chromium barfed. 2012-05-16 23:45:43 +02:00
Georg Ehrke 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
Sam Tuke 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
Arthur Schiwon 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
Michiel de Jong eceed497b1 fix paths in apps/remoteStorage/ajax/revokeToken.php 2012-05-16 18:08:50 +02:00
Sam Tuke fefa4412c4 added phpdoc comment 2012-05-16 15:17: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
Arthur Schiwon fbc2892083 try to remove deprecated files from /files on update 2012-05-16 15:59:36 +02:00
Michael Gapczynski c04074692e Fix incorrect toaddress being passed for emailing private links 2012-05-15 19:05:26 -04: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
Thomas Tanghus 0f66870470 Contacts: Corrected i18n call. 2012-05-15 18:49:38 +02:00
Michael Gapczynski 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
Michael Gapczynski 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 7b92c27777 Check if a file is encrypted before sharing (encrypted files cannot be shared) 2012-05-15 11:29:02 -04:00
Sam Tuke 2ad6b5048e fixed 'delete' label so it doesn't break translations 2012-05-15 16:24:06 +01:00
Arthur Schiwon 35effbcd3f LDAP: convert all DNs to lowercase so to make comparisons and everything work 2012-05-15 11:12:29 +02:00
Michael Gapczynski 568b6a7f56 Make only writable files draggable 2012-05-14 20:41:06 -04:00
Michael Gapczynski a3b06e9658 Check if a private link points to a folder or file and change text accordingly 2012-05-14 20:21:31 -04:00
Michael Gapczynski cda9dcc7aa Fix private link emailing and clean up file name displayed in email 2012-05-14 20:21:31 -04:00
Michael Gapczynski 5cf42b88af Replace all %2F with a / in private link 2012-05-14 20:21:31 -04:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Michael Gapczynski d4271ed9df Use original source when resharing a file, fixes bug oc-210 2012-05-14 17:31:03 -04:00
Thomas Mueller 954d4e5200 No need to keep the 'source files' in here, because the latest 'git master' release can be pulled
from http://mozilla.github.com/pdf.js/build/pdf.js

README added to document the fact stated above
update.sh added for easy update of pdfjs

CAUTION:
Don't update before OC4! API has been changed and we need to adopt files_pdfviewer
2012-05-14 23:21:29 +02:00
Robin Appelman 6779f28af4 cache app types during install or update 2012-05-14 22:49:31 +02:00
Michael Gapczynski e03c5f39a8 Call is_writable explicitly on folders for readonly check 2012-05-14 16:31:00 -04:00
Thomas Tanghus e74f4b406f Remove logging. 2012-05-14 17:50:24 +02:00
Thomas Tanghus 9b3d8660eb Contacts: Had forgotten to call local function. 2012-05-14 17:49:33 +02:00
Thomas Tanghus de850dfa52 Contacts: Fix layout in contacts list that I had broken in an earlier fix :-P 2012-05-14 17:49:33 +02:00
Michiel de Jong 4c6d11e223 move auth.css and remoteStorage-big.png to assets folders From where they can be included 2012-05-14 17:05:35 +02:00
Georg Ehrke 18c8896b3c better user permission check for files in ajax/calendar/ 2012-05-14 15:59:06 +02:00
Georg Ehrke 84827ff992 some fixes for calendar's export.php 2012-05-14 15:52:24 +02:00
Georg Ehrke 9c8eb104b6 check user permissions in calendar's changepermission.php 2012-05-14 15:42:16 +02:00
Georg Ehrke 55eb318265 check user permissions in calendar's unshare.php 2012-05-14 15:42:16 +02:00
Arthur Schiwon 0c8740c1d5 LDAP: and don't forget the else part 2012-05-14 13:13:08 +02:00
Arthur Schiwon 82cfb3e0f5 LDAP: don't store agent password in plain text 2012-05-14 12:58:58 +02:00
Arthur Schiwon 2e34673989 LDAP: no whitespaces after the , in the DNs, resolves conflicts with some servers 2012-05-14 12:25:33 +02:00
Thomas Tanghus 1f2b37c08b Contacts: Photo upload handlers wern't being loaded for new contacts.
Name conflict with two FileUploads :-P
2012-05-14 11:08:00 +02:00
Klaas Freitag 3514ec5947 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-14 10:52:25 +02:00
Klaas Freitag 1fc74ea174 Add ctmp extension to blacklist to make sync test files not versioned. 2012-05-14 10:51:41 +02:00
Thomas Tanghus 40f91d9f7c Contacts: The proper DOM wasn't loaded after import and thumbnails weren't being updated. 2012-05-14 10:13:45 +02:00
Michael Gapczynski 6d37f9b951 Remove scroll to bookmarks_menu, no longer existent and the bookmark controls are always visible at the top anyways 2012-05-13 21:10:27 -04:00
Robin Appelman e7c106d91e selective app loading for remote/public 2012-05-14 00:28:28 +02:00
Robin Appelman 0fb90fa875 set public handeler in info,xml for sharing 2012-05-14 00:28:27 +02:00
Thomas Tanghus 4e1e978b89 Contacts: Forgot one file for the import fix. 2012-05-13 23:27:14 +02:00
Thomas Tanghus 9295f49553 Contacts: Add error checking and reporting to import from files app. 2012-05-13 23:27:14 +02:00
Michael Gapczynski 1629c77eb5 Validate bookmark inputs, fixes bug oc-636 2012-05-13 16:58:47 -04:00
Tom Needham 90518e8d2a Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-13 20:50:19 +00:00
Tom Needham b80b8656eb Third time lucky fixing google font include 2012-05-13 20:49:54 +00:00
Michael Gapczynski 8a42d159f7 Variable not declared in media app, fixes bug oc-633. Thanks to die3lustigen2. 2012-05-13 16:45:03 -04:00
Tom Needham ddb8d1460b Revert "Remove google webfont include"
This reverts commit 30d31fecd9.
2012-05-13 20:43:20 +00:00
Tom Needham 21dfe9dc5e Fixed keyboard shortcut for saving files. Thanks adlr in #ace! 2012-05-13 20:19:20 +00:00
Tom Needham 30d31fecd9 Remove google webfont include 2012-05-13 19:41:41 +00:00
Tom Needham 78ecfc89a7 Fix breadcrumb path 2012-05-13 19:33:42 +00:00
Georg Ehrke ddf0903ace add post user delete hook for calendar sharing 2012-05-13 20:03:52 +02:00
Robin Appelman ee0294bbb1 update translations 2012-05-13 20:00:34 +02:00
Georg Ehrke da9486157d Merge branch 'master' into calendar_repeat 2012-05-13 19:10:49 +02:00
Georg Ehrke 0892abd050 some little js fixes for drop import 2012-05-13 15:08:27 +02:00
Georg Ehrke 62a86748b5 Merge branch 'master' into calendar_dropimport 2012-05-13 15:06:02 +02:00
Georg Ehrke 63a1b066bc add first version of drop import 2012-05-13 15:05:57 +02:00
Georg Ehrke 5ac10a9c0e hide share tab for new events, because you can't share an event that haven't got an id yet 2012-05-13 12:28:28 +02:00
Georg Ehrke f45411f79d fix another php notice 2012-05-13 12:25:26 +02:00
Georg Ehrke 85cc34fd05 fix another php notice 2012-05-13 12:14:08 +02:00
Georg Ehrke f6dc158d51 fix php notice and displaying of events 2012-05-13 12:02:36 +02:00
Thomas Tanghus 56bd3f1220 Revert "Edited combobox to adhere to coding standards and added a dblclick handler."
This reverts commit 19b55d3fce.
2012-05-13 06:22:15 +02:00
Thomas Tanghus 996020d82b Revert "Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)"
This reverts commit a36a8faad4.

Moved it to unstable branch for now.
2012-05-13 06:22:15 +02:00
Georg Ehrke dfef36ba2f some changes for calendar repeat class 2012-05-12 23:16:11 +02:00
Georg Ehrke b1cae9651e add functions get cached events in a specific time period 2012-05-12 23:00:21 +02:00
Georg Ehrke dc34ed5a12 Merge branch 'master' into calendar_repeat 2012-05-12 22:55:35 +02:00
Thomas Mueller 546ae30421 non-minified version added 2012-05-12 20:56:29 +02:00
Thomas Mueller 51cb1c9ffa fixing file headers with copyright 2012-05-12 20:46:07 +02:00
Thomas Tanghus 19b55d3fce Edited combobox to adhere to coding standards and added a dblclick handler. 2012-05-12 13:43:34 +02:00
Thomas Tanghus a36a8faad4 Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-) 2012-05-12 13:43:33 +02:00
Bartek Przybylski ab9927d5fc oc-627, calling base function instead of loading too much useless functions 2012-05-12 13:25:04 +02:00
Michael Gapczynski b4e7c05959 Encoded slashes (%2F) don't look pretty in our private link urls 2012-05-11 20:58:21 -04:00
Michael Gapczynski faebee5f25 Turn async off when fetching users to make sure the users get removed from the select form 2012-05-11 20:39:48 -04:00
Robin Appelman d07512c82d fix gallery previous not showing 2012-05-12 00:37:19 +02:00
Robin Appelman 736739bbbd load remote and public paths from info.xml during upgrade instead of setting them every time 2012-05-11 20:33:56 +02:00
Arthur Schiwon 3c2af95108 LDAP: offer only ownCloud-enabled users for sharing 2012-05-11 19:21:13 +02:00
Thomas Tanghus 8e5240d579 Contacts: Make the structured name dialog modal to avoid confusion. 2012-05-11 18:21:55 +02:00
Thomas Tanghus 646a4bd635 Contacts: Clone event handlers as well. 2012-05-11 18:21:55 +02:00
Thomas Tanghus 08e0b6cf5e Contacts: Also strip parameters. 2012-05-11 18:21:55 +02:00
Sam Tuke d98d72aa99 improved url generation - made use of OC.linkTo() for linking to versions history page 2012-05-11 17:13:58 +01:00
Michiel de Jong f0362dbf58 register public.php?service=host-meta 2012-05-11 17:25:32 +02:00
Michiel de Jong 9469c9947f fix warning 'unknown var appsDir' 2012-05-11 16:59:44 +02:00
Arthur Schiwon 7efa7171e3 LDAP: wrong assumptions for case (in)sensitivity, implement far better solution 2012-05-11 15:42:57 +02:00
Michiel de Jong 3fd2e0d2ce correct host-meta mime type 2012-05-11 15:27:11 +02:00
Michiel de Jong 4c02a82f6c move lrdd to jrd 2012-05-11 15:26:45 +02:00
Michiel de Jong b133f22d7f move host-meta to JRD because I can't work out how to deal with ampersands in XRD 2012-05-11 15:21:45 +02:00
Michiel de Jong a95c1b8082 fix auth dialog includes 2012-05-11 15:21:45 +02:00
Sam Tuke 03fad97764 fixed some include path issues
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-11 13:17:37 +01:00
Michiel de Jong 61d535984d clean up auth dialog 2012-05-11 11:05:44 +02:00
Michiel de Jong 2e309aae97 announce OAuth2 implicit grant end-point the new way 2012-05-11 10:52:37 +02:00
Michiel de Jong 02cee2c562 trying to fix /.well-known/host-meta 2012-05-11 10:47:42 +02:00
Michiel de Jong 0c7f0aa3fa attempt to align the webfinger app with new public.php routing 2012-05-11 10:26:30 +02:00
Michael Gapczynski 59a2616105 Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links 2012-05-10 23:04:27 -04:00
Michael Gapczynski 20d9a8b6a1 Fix accidental creation of duplicate files because of extra / in search results 2012-05-10 22:04:05 -04:00
Michael Gapczynski a3f250bfe6 Fix text files for search results 2012-05-10 21:44:04 -04:00
Michael Gapczynski 0c86f8a61e Fix image previews for search results 2012-05-10 21:36:17 -04:00
Michael Gapczynski daff3aa667 Prevent overwriting of private link status 2012-05-10 21:06:45 -04:00
Michael Gapczynski 60103d9b94 Only mount shared storage after a user has logged in, fixes shared folder not appearing for some WebDAV clients and sync client 2012-05-10 19:56:41 -04:00
Thomas Tanghus e5840e1fe2 Contacts: Hack to add structured name from formatted name. 2012-05-11 01:14:11 +02:00
Thomas Tanghus aa51639271 Contacts: Fix check for version. 2012-05-11 01:14:11 +02:00
Thomas Tanghus 78c11700f9 Added some margin. 2012-05-11 01:14:11 +02:00
Brice Maron 4094f6f8e0 Correct undef variable mistake from prev commit 2012-05-10 19:51:03 +00:00
Jan-Christoph Borchardt d1e5a56bc6 fixing upload icon color 2012-05-10 21:40:22 +02:00
Brice Maron ffe5ef2268 Correct calendar loading when calendar are from hooks. fix oc-619 2012-05-10 19:36:30 +00:00
Thomas Tanghus 7bc6e86969 Contacts: Fix some regressions from last commit. 2012-05-10 20:44:12 +02:00
Michael Gapczynski 3c6c8ecab0 Make email private link submit on enter as well 2012-05-10 11:44:06 -04:00
Thomas Tanghus 2c6740b0c7 Some UI and code restructering according to usability tests: https://mail.kde.org/pipermail/owncloud/2012-May/003194.html 2012-05-10 16:53:25 +02:00
Thomas Tanghus ddd991a59e Minor css fix. 2012-05-10 16:42:10 +02:00
Jan-Christoph Borchardt e3f452cf53 larger clickable area for new button 2012-05-10 14:08:08 +00:00
Jan-Christoph Borchardt 2ae37b32d4 fixing background for clicked new button 2012-05-10 13:44:30 +00:00
Jan-Christoph Borchardt 8fc565821f reduced text shadow brightness 2012-05-10 13:37:48 +00:00
Jan-Christoph Borchardt 46b1f35107 highlight the files new and upload button all the time 2012-05-10 13:34:44 +00:00
Arthur Schiwon 7a5028317d LDAP: don't fall over case insensitive LDAP attribute name 2012-05-10 12:59:20 +02:00
Vitaly Kuznetsov 6f981738bb Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example) 2012-05-10 09:10:53 +00:00
Bart Visscher 9a66b869c0 Gallery: Use App storage instead of contructing our own path 2012-05-10 09:14:27 +02:00
Bart Visscher b022ccb863 Whitespace fixes 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 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 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
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 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
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
Tom Needham 7dcf38c40f Better checking of ajax paramters and better logging 2012-05-08 19:48:28 +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
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
Arthur Schiwon d01db3a807 LDAP: make sure, configuration is read when a public method needs it 2012-05-08 14:02:16 +02:00
Arthur Schiwon 5dee914ed2 LDAP: sqlite compatibility 2012-05-08 13:56:07 +02:00
Arthur Schiwon 251a6d1a9f LDAP: write to log in case bind fails. 2012-05-08 12:04:52 +02:00
Georg Ehrke cdf5d4e231 fix for previous commit 2012-05-08 08:49:14 +02:00
Georg Ehrke 0ce1cbdd14 fix calendar vulnerability 2012-05-08 08:46:27 +02:00
Brice Maron 010b97febd Avoid touch operation when unshare public link 2012-05-07 22:37:18 +00:00
Bart Visscher 4dbc2093c6 Create a function for linking to remote.php 2012-05-07 21:47:14 +02:00
Georg Ehrke 9b5e0bebef fix path for ampache in settings 2012-05-07 20:47:32 +02:00
Georg Ehrke 5b7cefb1e5 make ampache work with remote.php 2012-05-07 20:26:09 +02:00
Arthur Schiwon 5a1ea62437 LDAP: Fall back to Base DN if user/group base settings are blanked 2012-05-07 18:38:02 +02:00
Michael Gapczynski bf8b3b0696 Forgot to set token variable 2012-05-07 12:36:29 -04:00
Arthur Schiwon e9c7ecf22d applying coding guideline 2012-05-07 17:35:23 +02:00
Arthur Schiwon 0ff5ab65be applying coding guideline 2012-05-07 17:35:23 +02:00
Michael Gapczynski e0a5f976e7 Fix bug oc-542, encode urls for private links 2012-05-07 11:30:36 -04:00
Michael Gapczynski 71423ec566 Fix bug oc-402, check if token is set for a private link 2012-05-07 10:47:55 -04:00
Michael Gapczynski b9033d3b78 Only load sharing statuses if in files app 2012-05-07 10:47:55 -04:00
Georg Ehrke f28d71bb9c fix gallery sharing 2012-05-07 16:46:35 +02:00
Georg Ehrke ef073a148f make calendar compatible with public.php 2012-05-07 15:48:41 +02:00
Georg Ehrke 936c8ba1cc improve remote.php and create public.php 2012-05-07 15:39:17 +02:00
Georg Ehrke 5904d5cf50 Merge branch 'remote.php' 2012-05-07 15:07:16 +02:00
Georg Ehrke 1138df0f4b fix webdav, bloody merge conflicts 2012-05-07 12:47:34 +02:00
Georg Ehrke 6bdbcc1f49 fix path of carddav in addressbook management 2012-05-07 12:18:58 +02:00
Georg Ehrke b125caaaf6 fix path of caldav in calendar management 2012-05-07 12:16:25 +02:00
Georg Ehrke ef10603c26 fix pathes in calendar and contacts 2012-05-07 12:02:20 +02:00
Georg Ehrke 46fe2e3e2a fix merge conflicts 2012-05-07 11:47:14 +02:00
Georg Ehrke 7d2a68fc31 make carddav work with remote.php 2012-05-07 11:24:19 +02:00
Florian Hülsmann 8534373f2f better invalid webfinger URI handling 2012-05-07 11:15:24 +02:00
Michiel de Jong 3a184e2e1d whitespace correction in webfinger.php 2012-05-07 09:51:37 +02:00
Michiel de Jong c4e47953ac require base lib and deal with malformed user addresses in webfinger.php 2012-05-07 09:46:15 +02:00
Michiel de Jong 5155f589fd prevent xss in webfinger 2012-05-07 09:26:54 +02:00
Bart Visscher 2d581c675f Audit: Log sharing actions 2012-05-07 09:04:07 +02:00
Bart Visscher a2df8a4746 Audit: Log messages with separate function 2012-05-07 09:04:07 +02:00
Bart Visscher 1e12db35ee Audit: Add user login/logout logging 2012-05-07 09:04:07 +02:00
Bart Visscher 640ba1828f Start of audit app
Audit the filesystem action
2012-05-07 09:04:07 +02:00
Thomas Tanghus 65b9850e53 Code cleanup. 2012-05-07 04:46:09 +02:00
Michael Gapczynski 471cad7d90 Remove manual file cache insertions of shared files, update mtime of shared folder 2012-05-06 20:14:29 -04:00
Michael Gapczynski 41179a1456 Fix feedback for sharing errors 2012-05-06 19:06:24 -04:00
Brice Maron 333345d201 Add php-pdo to soft depend check 2012-05-06 21:42:33 +00:00
Brice Maron fe8b10a922 Add php-xml as dependency for core fix oc-364 2012-05-06 21:38:35 +00:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Thomas Tanghus 2488cdb8a1 Calendar: Fixed image paths. 2012-05-06 19:19:16 +02:00
Thomas Tanghus 5bf69cace1 Contacts: Re-added some styling that got lost in a revert. 2012-05-06 19:19:15 +02:00
Brice Maron 9dbc6b5158 Correct wrong DB quotes for calendar share functions 2012-05-06 15:41:14 +00:00
Thomas Tanghus bede32be24 Contacts: Fix for Android browser again, again. 2012-05-06 13:51:16 +02:00
Thomas Tanghus c1019a6e98 Contacts: Resized Add button. Now how do I add a gradient? ;-) 2012-05-06 13:51:16 +02:00
Thomas Tanghus 400ade063c Revert Android positioning 'fix'.
This reverts commit 20f1c1e6ca and 93ae945414.
2012-05-06 13:51:16 +02:00
Thomas Tanghus f2ec68d40c Revert "Contacts: Fix for leftcontent positioning in Android browser."
This reverts commit 93ae945414.
2012-05-06 13:51:16 +02:00
Bart Visscher f69f764e8b Working remote.php with webdav and caldav 2012-05-06 00:12:51 +02:00
Georg Ehrke c996600786 push changes 2012-05-05 22:54:14 +02:00
Georg Ehrke 6c2fc0cbe8 fix writing of webdav.php 2012-05-05 20:43:11 +02:00
Georg Ehrke aa4f01fbcc fix pathes for cal andcarddav 2012-05-05 18:58:58 +02:00
Georg Ehrke 4b4c3c3f3a remove debug messages 2012-05-05 18:58:58 +02:00
Bart Visscher 24a8451b2e Tasks: Fix addtask for <5.4 php version 2012-05-05 18:48:24 +02:00
Georg Ehrke 101406eba7 fix writing in remote folder 2012-05-05 18:29:26 +02:00
Bart Visscher 2facf509cc Merge branch 'tasks' for Tasks app 2012-05-05 18:26:13 +02:00
Bart Visscher 2092caf6d3 Tasks: Fix add task action 2012-05-05 18:16:14 +02:00
Robin Appelman 70cb053e6b improve cryptstream fro writing non-chunksized data 2012-05-05 16:49:48 +02:00
Robin Appelman d875191777 only emit the filesystem hooks once when creating a new file 2012-05-05 16:49:48 +02:00
Florian Hülsmann 4a7591d0ab Custom icons for contacts app 2012-05-05 16:31:58 +02:00
Thomas Tanghus 74a0df335a Contacts: Make editable fields more discoverable. Align group field vertically #pixelpushing 2012-05-05 15:23:48 +02:00
Thomas Tanghus eda42cece9 Contacts: Don't try to render invalid properties. 2012-05-05 13:49:47 +02:00
Thomas Tanghus f9aadfff7a Contacts: Set min-width on note to make it render correctly. 2012-05-05 13:49:47 +02:00
Frank Karlitschek 9bcc5c11a8 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Thomas Tanghus 2c264f836c Contacts: Better checks for GD library. 2012-05-04 23:53:29 +02:00
Bart Visscher d0b7b01737 Tasks: Some styling 2012-05-04 20:57:37 +02:00
Bart Visscher 19d2b94837 Tasks: More updates to public API 2012-05-04 20:20:37 +02:00
Thomas Tanghus 76b8d06284 Add missing file. 2012-05-04 20:17:15 +02:00
Bart Visscher 1fef13b0c0 Calendar: Use array_merge to join event arrays 2012-05-04 17:34:13 +02:00
Bart Visscher eae21f3269 Tasks: Fix ajax calls in javascript 2012-05-04 17:27:10 +02:00
Bart Visscher 0006b432f5 Tasks: Update for movable apps 2012-05-04 17:20:24 +02:00
Bart Visscher 439467746a Tasks: Update to new public API 2012-05-04 17:19:25 +02:00
Bart Visscher 1e47156226 Merge branch 'master' into tasks 2012-05-04 17:04:11 +02:00
Thomas Tanghus 01da64caf7 Contacts: Changed the Add property button to not fixed and use plain button. 2012-05-04 16:36:45 +02:00
Thomas Tanghus 248eae2d0f Contacts: Improve NOTE UI. Cleanup markup. 2012-05-04 15:47:55 +02:00
Arthur Schiwon 907fa9d85b LDAP: check first, if requested attribute exists 2012-05-04 14:13:23 +02:00
Arthur Schiwon 716c5a3c8e LDAP: use the correct attribute for the display name 2012-05-04 14:02:04 +02:00
Arthur Schiwon 231eec7325 LDAP: also those functions were not meant to be static 2012-05-04 13:48:55 +02:00
Arthur Schiwon 6c670cb82d LDAP: more cleanup 2012-05-04 13:48:18 +02:00
Arthur Schiwon 333e8986f6 LDAP: copyright stuff 2012-05-04 13:26:07 +02:00
Arthur Schiwon def59755ad LDAP: cleanup 2012-05-04 13:26:07 +02:00
Arthur Schiwon adb32ad347 LDAP: checkPassword ain't static 2012-05-04 13:26:07 +02:00
Arthur Schiwon 594221a467 LDAP: make oc_user_ldap::checkPassword make use of central OC_LDAP 2012-05-04 13:26:07 +02:00
Arthur Schiwon 3499783ea5 remove debug info 2012-05-04 13:26:07 +02:00
Arthur Schiwon 7aad40ca4d LDAP: make oc_user_ldap::userExists make use of central OC_LDAP 2012-05-04 13:26:07 +02:00
Arthur Schiwon 6f982d2e20 LDAP: make oc_user_ldap::getUsers make use of central OC_LDAP 2012-05-04 13:26:07 +02:00
Arthur Schiwon 7a06e144ec LDAP: central function for user and group list retrieval (will replace retrieveList from group part) 2012-05-04 13:26:07 +02:00
Thomas Tanghus 2296521a2e Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116 2012-05-04 11:16:29 +02:00
Thomas Tanghus e61e40c23d Contacts: Hack around malformed BDAY. 2012-05-04 01:27:59 +02:00
Thomas Tanghus bde5b4a7ff Contacts: Don't load event handlers more than once, or you're asking for trouble :-P 2012-05-04 00:13:35 +02:00
Bart Visscher 07ff1e723a Calendar: Fix repeating events 2012-05-03 23:33:44 +02:00
Bart Visscher 89c8316f8f Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2012-05-03 23:26:43 +02:00
Bart Visscher 077ea94f71 Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
Conflicts:
	apps/calendar/ajax/events.php
2012-05-03 23:18:43 +02:00
Arthur Schiwon 76a60a2fc3 ups, we don't have a CSS file therefore 2012-05-03 23:03:05 +02:00
Bart Visscher b6ea57c8b6 Bookmarks: Move delete code to Bookmarks class, also change to use id 2012-05-03 17:33:57 +02:00
Thomas Tanghus 8076b1e12d Contacts: Remove some logging. 2012-05-03 16:01:40 +02:00
Thomas Tanghus a89231ac1d Contacts: Clean up tipsies. 2012-05-03 16:01:40 +02:00
Thomas Tanghus 5be9084c73 Contacts: Fixed paths in import. 2012-05-03 16:01:40 +02:00
Thomas Tanghus cbee0d3128 Contacts: Fix paths and improve markup and css in address book overview. 2012-05-03 16:01:40 +02:00
Frank Karlitschek 97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek 43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Thomas Tanghus 375ba98645 Contacts: Move gif used by jquery.Jcrop and make style sheet use %webroot% path. 2012-05-03 11:15:44 +02:00
Thomas Tanghus 15be032740 Contacts: Improve loading contact. 2012-05-03 11:15:44 +02:00
Thomas Tanghus 6cc9f600d2 Contacts: Don't resize profile picture if it's not too big. 2012-05-03 11:15:44 +02:00
Frank Karlitschek 351740601a port oc_response 2012-05-03 10:46:27 +02:00
Michael Gapczynski 80dff77b65 Fix private links 2012-05-02 19:24:43 -04:00
Robin Appelman e5ef3e1340 move archive library to core so we can properly depend on it 2012-05-02 23:48:23 +02:00
Robin Appelman 0b51c53443 run none of the extranal storage tests on default 2012-05-02 23:44:00 +02:00
Robin Appelman 4ba527625f don't try to register file actions when we're not in the files app 2012-05-02 23:26:57 +02:00
Bart Visscher 47081a2471 Gallery: Update version for database update 2012-05-02 21:36:34 +02:00
Bart Visscher f7e410147f Contacts: check for malformed VCards in calendar hook 2012-05-02 21:36:33 +02:00
Michael Gapczynski 6d37b8567b Refactoring and upload support for Google Drive backend 2012-05-02 14:41:57 -04:00
Frank Karlitschek 4fe90f62f4 port checkAppEnabled 2012-05-02 19:08:37 +02:00
Frank Karlitschek eec7c3833c fix install 2012-05-02 19:02:41 +02:00
Bart Visscher 71f9b1968e Tasks: Make it possible to close the details area 2012-05-02 17:28:19 +02:00
Georg Ehrke 33c343ed11 add require_once('../lib/base.php'); to webdav.php 2012-05-02 16:47:25 +02:00
Georg Ehrke da03d05700 create folder 'remote' for the remote services like caldav, carddav and webdav 2012-05-02 16:41:23 +02:00
Frank Karlitschek 82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek ff66600bc0 port appconfig 2012-05-02 14:11:29 +02:00
Frank Karlitschek 8e99475886 first part of the config stuff 2012-05-02 13:28:56 +02:00
Frank Karlitschek 8c7f854671 move all the files stuff into a files class 2012-05-02 12:54:31 +02:00
Thomas Tanghus f1830866a3 Contacts: Removed styling and (most) js from template. Started making app more keyboard/screenreader friendly. General cleanup in code and markup. 2012-05-02 12:10:44 +02:00
Thomas Tanghus 72256abf34 Contacts: Trying to improve PHOTO handling a bit. 2012-05-02 11:44:00 +02:00
Arthur Schiwon 6750998984 files is not internal any more, part II 2012-05-02 11:26:22 +02:00
Thomas Müller 8ed8d9cd91 fixing namespace 2012-05-02 00:55:26 +02:00
Frank Karlitschek 2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek 93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek 31e32e3c10 ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek e2fb094693 some more porting 2012-05-01 21:07:08 +02:00
Frank Karlitschek ab58471904 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-01 20:07:36 +02:00
Frank Karlitschek 1a2bbd2ee4 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Michael Gapczynski 20f3875f1b Change default from address to sharing-noreply@server for emailing private links 2012-05-01 13:06:17 -04:00
Frank Karlitschek 254b8b9506 porting of OC_User to public API complete.
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
Frank Karlitschek 70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek 5bf69237b2 ported isLoggedIn 2012-05-01 18:46:15 +02:00
Frank Karlitschek d0554bef06 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +02:00
Georg Ehrke f817ff573e Merge branch 'master' into calendar_repeat 2012-05-01 16:18:55 +02:00
Georg Ehrke f75a7c084f add class for repeating events 2012-05-01 16:16:12 +02:00
Frank Karlitschek 3f9ac6405a port some of the log call to the new public api
more to come
2012-05-01 14:29:34 +02:00
Arthur Schiwon 51b6aab436 LDAP: remove Notices on settings 2012-05-01 12:25:17 +02:00
Arthur Schiwon 54854b2e3d LDAP: decent behaviour and log message when there is no connection to the LDAP server 2012-05-01 12:17:33 +02:00
Bartek Przybylski 11314c81d9 add/remove handlers 2012-05-01 10:07:48 +02:00
Frank Karlitschek e8ec999090 port to use the new public api 2012-05-01 09:49:22 +02:00
Frank Karlitschek e409e7cd4c forgot a file 2012-05-01 09:38:10 +02:00
Thomas Müller 5193ddd7d7 fixing syntax error 2012-04-30 21:55:25 +02:00
Georg Ehrke 8a3d41c043 fix a PHP Notice 2012-04-30 21:46:33 +02:00
Georg Ehrke 6c908a4cd0 fix path in calendars geo.js 2012-04-30 21:18:54 +02:00
Frank Karlitschek f425b80deb one todo less 2012-04-30 19:21:29 +02:00
Frank Karlitschek b20b30b6fe Implement a basic versioning configuration. Only a on/off switch for now.
I changed my mind about the more complex configuration options. We go with good default for now and don´t expose all the technical options to the users.
They can still override in the config file if it´s really really needed and they know what they are doing
2012-04-30 19:18:00 +02:00
Thomas Mueller 07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Thomas Tanghus 9c520c70a8 Various file path fixes. 2012-04-30 01:48:01 +02:00
Thomas Tanghus a8b6fdd396 Contacts: Small css tweaks. 2012-04-30 01:01:24 +02:00
Thomas Tanghus 0bccd9c18c Contacts: Forgot to add the import template. 2012-04-29 23:26:14 +02:00
Thomas Tanghus f6fefe9a36 Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI.
Remove an obsolute file and did some cleanup.
2012-04-29 22:12:27 +02:00
Thomas Tanghus 023479b1e2 Contacts: removed unused method and ajax file. 2012-04-29 22:12:27 +02:00
Thomas Tanghus 163344243b jquery.combobox: Added 'showButton' option 2012-04-29 22:12:27 +02:00
Frank Karlitschek b862c49ae6 enable by default. at least during oC4 testing 2012-04-29 21:18:28 +02:00
Frank Karlitschek 0d0129221b add a info.xml to files 2012-04-29 21:17:22 +02:00
Robin Appelman 84bd83b1dc fix file deletion 2012-04-29 16:09:41 +02:00
NIEK Antoine c6f034a5d2 Support "songs" ampache API action for proper rhythmbox support 2012-04-29 00:47:57 +02:00
Jan-Christoph Borchardt afeb9d9cbf moving the file actions properly 2012-04-28 23:11:48 +02:00
Georg Ehrke bef701c448 add version file to files app 2012-04-28 13:35:05 +02:00
Georg Ehrke 7eb7492360 some fixes for sharing 2012-04-27 23:14:53 +02:00
Bartek Przybylski 72c0d6968e fix duplicated entries on upload 2012-04-27 22:48:27 +02:00
Bart Visscher 6e7f5ec4ce Tasks: Add input to edit the task location 2012-04-27 20:26:12 +02:00
Bart Visscher c627657fc6 Tasks: Fix the display of the list of tasks 2012-04-27 17:48:08 +02:00
Sam Tuke a1b309a42a Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-27 13:23:58 +01:00
Georg Ehrke 0aaf6d16a5 Merge branch 'master' into movable_apps_2 2012-04-27 14:22:12 +02:00
Sam Tuke 80c850d018 added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts 2012-04-27 13:19:16 +01:00
Thomas Tanghus 768041b6cb Contacts: Added convinience method for notifications. 2012-04-27 10:35:31 +02:00
Thomas Tanghus 18c11ec81b jquery.combobox: Added 'editable' option and cleaned up a bit. 2012-04-27 10:35:31 +02:00
Thomas Tanghus 1384fdfe01 Contacts: Updated first run page. 2012-04-27 10:35:31 +02:00
Georg Ehrke f7fb4a54c9 ampache should work now 2012-04-26 22:00:37 +02:00
Georg Ehrke 5fda0e4b3b make *DAV work with movable apps 2012-04-26 21:56:29 +02:00
Georg Ehrke 6930af4c0f Merge branch 'master' into movable_apps_2 2012-04-26 21:27:22 +02:00
Georg Ehrke 78b2da583d move files to the correct place 2012-04-26 21:24:41 +02:00
Sam Tuke d96e962fc1 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-26 18:45:59 +01:00
Sam Tuke 18a024e251 started implementing ajax file rollback 2012-04-26 18:45:17 +01:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke 40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Sam Tuke c693ee2adb added available version names to files dropdown menu via new ajax script 2012-04-26 16:48:43 +01:00
Georg Ehrke 0249a72cab fix downloading of files in files app 2012-04-26 17:35:12 +02:00
Michael Gapczynski 754844f5c9 Add ability to send private links from sharing via email 2012-04-26 10:33:24 -04:00
Sam Tuke 6312067ab5 improved styling, called css file in history.php 2012-04-26 14:32:29 +01:00
Georg Ehrke ebd82ee772 fixes for media app 2012-04-26 15:23:17 +02:00
Georg Ehrke 2c92a79b5d fixes for contacts app 2012-04-26 15:20:01 +02:00
Sam Tuke b19fae392b linked more button to history page 2012-04-26 13:54:38 +01:00
Georg Ehrke 3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Sam Tuke 02c1127de3 changed function name to avoid clash with sharing dropdown 2012-04-26 13:41:22 +01:00
Thomas Tanghus 4bb1a2c2d6 Contacts: Some js cleanup. 2012-04-26 10:38:39 +02:00
Thomas Tanghus 5dbf362623 Contacts: Added import with with file picker. 2012-04-26 03:21:52 +02:00
Michael Gapczynski c20abfef38 Fix a counting mistake 2012-04-25 19:30:58 -04:00
Michael Gapczynski 32de47d1d9 Update sharing when users are removed, added to groups, and removed from groups 2012-04-25 18:18:58 -04:00