001a47afb0
Remove obsolete FIXMEs.
2012-07-16 01:46:16 +02:00
dd95149238
Also unlink unsuccessful imports.
2012-07-15 17:34:30 +02:00
d49b789348
Merge branch 'master' into calendar_import
2012-07-15 16:56:38 +02:00
160e701fbf
Make list droppable too instead of just the header.
2012-07-15 12:28:29 +02:00
db034f05ca
Improve temp file handling.
2012-07-15 12:28:29 +02:00
8b49e304e0
Hide file form field behind image so it will maybe work with IE...
2012-07-15 12:28:29 +02:00
48521fcfaa
Made notifications more flexible.
2012-07-15 12:28:29 +02:00
d71da67bee
Typo.
2012-07-15 12:28:29 +02:00
7af608881b
Added notification.
2012-07-15 12:28:29 +02:00
4e684b9e9d
Fixed sorting of addressbooks.
2012-07-15 12:28:29 +02:00
287285880c
Removed obsolete TODO.
2012-07-15 12:28:28 +02:00
eba4f08015
Refactored contacts import.
2012-07-15 04:17:30 +02:00
87912a8c65
Fix loading previous or next contact after deleting one.
2012-07-15 04:17:30 +02:00
140263003a
Give default address book a more intuitive name and replace spaces with underscores in uri.
2012-07-14 14:11:43 +02:00
d45d73eecf
Try to avoid occasional error messages.
2012-07-14 14:11:43 +02:00
7d1f644011
use new way to register remote/public.php entries in user_webfinger
2012-07-13 23:24:22 +02:00
b45d3ced79
fix remote and public.php
2012-07-13 22:44:35 +02:00
f496a9dea6
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
2012-07-11 20:29:59 -04:00
ac395dced1
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
2012-07-11 20:28:29 -04:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
91a15bae76
Revert santizing toaddress, because PHPMailer now throws exceptions
2012-07-11 16:02:43 -04:00
7077678f7f
Sanitize toaddress for emailing private links
2012-07-11 15:26:22 -04:00
c3fea30811
Sanitizing file names
2012-07-11 19:14:04 +02:00
e896c0a9e3
Fix addressbook sharing, formatItems() changed in past commits
2012-07-11 11:33:48 -04:00
07efd39d8a
prevent script execution during slideshow
2012-07-11 15:44:39 +02:00
e248412ca9
use getStorage() to get versions location
...
update routine implemented
version number of files_versions increased
Conflicts:
apps/files_versions/lib/hooks.php
2012-07-11 11:06:29 +02:00
5575493900
Merge branch 'master' into calendar_import
2012-07-11 10:47:30 +02:00
ca8028bd73
small fixes in merge request 104, use OCP\Files::getStorage
2012-07-11 02:33:11 +02:00
0b14b4e3e8
Call exit() to prevent further code execution if directory does not exist
2012-07-11 02:33:11 +02:00
ef1924dbbb
gallery :: display big picture according to exif
...
- fixes oc-314
- caching of the 'big' images in subfolder view
next to the tumbnails
- now choosen to use max 1200px for viewing
this helps speeding up the viewing process
Signed-off-by: BlackEagle <ike.devolder@gmail.com>
2012-07-11 02:33:10 +02:00
3134a962d9
Call exit() to prevent further code execution if directory does not exist
2012-07-10 18:59:42 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
bf09bcc854
add OCP\Files to access files
2012-07-10 19:22:06 +02:00
9be6432aac
shrink css height for gallery_div from 152 to 150 to shrink grey background thumbnail height
2012-07-10 16:58:37 +02:00
acb9612332
fix thumbnail size calculation, use const for THUMBNAIL_HEIGHT
2012-07-10 16:58:37 +02:00
02c9b03b8e
Missing dir added.
2012-07-10 16:58:37 +02:00
3e53bf4a86
Fix for oc-972, oc-1144 and oc-1191
2012-07-10 16:58:37 +02:00
91da4b05b7
fixed typos
2012-07-10 15:51:57 +01:00
9d2cbc88f0
Revert reversion of f5c329af98 :-P
2012-07-10 01:24:40 +02:00
34ac2ea1ba
Don't escape assigned values.
2012-07-10 01:24:40 +02:00
861c379255
Make sure the proper DOM is loaded and the right address book gets expanded.
2012-07-10 01:24:40 +02:00
0744e5a172
Look for the right field :-P
2012-07-10 01:24:40 +02:00
7cb74a0bf3
Reduce variables assigned.
2012-07-10 01:24:40 +02:00
50462903d6
Revert "Delay fetching of carddata and set ETag and size instead."
...
This reverts commit f5c329af98
2012-07-10 01:24:40 +02:00
b97eb3a48f
fixing oc-1198
2012-07-09 23:50:26 +02:00
43f00a2dc8
create uploads directory for ssl certificates if it didn't exists
2012-07-09 18:11:29 +02:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
b67199bb45
add css id attribute, minor fixes
2012-07-09 16:04:46 +02:00
6f408c3651
add supersized slideshow
2012-07-09 15:13:23 +02:00
77f07c672e
remove hard coded path
2012-07-09 12:49:04 +02:00
6bf1473f0e
replace urlencoded slash
2012-07-09 11:58:16 +02:00
32b476d6ec
remove comments around code block
2012-07-09 10:19:19 +02:00
7d41d3aba8
webdav ssl cleanup
2012-07-09 09:40:33 +02:00
f5c329af98
Delay fetching of carddata and set ETag and size instead.
2012-07-09 01:48:42 +02:00
47aaca49a1
Rescan categories in small batches to reduce memory usage.
2012-07-09 00:16:14 +02:00
d1cf787197
Move code to OC_Contacts_App::scanCategories().
2012-07-09 00:15:37 +02:00
6d123e90f3
Remove deleted address book from list.
2012-07-08 23:38:03 +02:00
0b6cd8d203
Simplify VCF generation.
2012-07-08 23:36:52 +02:00
dc8193fccb
Make it possible to import files using CR as eol.
2012-07-08 18:28:55 +02:00
334257d2b6
Implemented VCFExportPlugin.
2012-07-08 17:52:57 +02:00
3424785db0
Implemented Sabre iCalendar Export Plugin.
2012-07-08 16:58:17 +02:00
f5c620006e
Set the loading class on the property being changed, not on its container. Now on all the places relevant ;-)
2012-07-08 16:15:52 +02:00
97106f198f
Set the loading class on the property being changed, not on its container.
2012-07-08 16:11:45 +02:00
e6a60198e4
Return error messages in correct format.
2012-07-08 14:11:48 +02:00
2b22f0db0a
Add missing requesttoken.
2012-07-08 13:28:12 +02:00
ea70ca3ce3
CSRF checks
2012-07-07 16:12:21 +02:00
2c318f45f4
CSRF checks
2012-07-07 16:08:27 +02:00
04a0755fd3
CSRF checks
2012-07-07 16:03:21 +02:00
b7c510a61a
CSRF checks
2012-07-07 16:02:33 +02:00
0abcf0a421
CSRF checks
2012-07-07 15:58:11 +02:00
c63db28eaf
CSRF check
2012-07-07 15:54:52 +02:00
b967530795
increase the time limit again to a sensible granularity of 1 min.
...
Please talk to me before changing this.
2012-07-06 18:42:41 +02:00
ca26bcc581
close file after write process
2012-07-06 17:09:20 +02:00
e91b4bc2ac
allow user to upload his own root certificate for secure webdav mount
2012-07-06 15:58:38 +02:00
75d01b065d
Make export batch size configurable.
2012-07-06 13:49:04 +02:00
cafbd02337
Fix endless loop when no addressbooks.
2012-07-06 13:24:56 +02:00
a1872412bf
Correct hack ;)
2012-07-06 12:59:07 +02:00
ab1b4f1f03
Fugly fixed include.
2012-07-06 12:59:07 +02:00
963faf6458
CURLOPT_SSL_VERIFYPEER=false shouldn't be in master
2012-07-06 12:35:29 +02:00
8353517969
use OC_Connector_Sabre_Client
2012-07-06 12:24:03 +02:00
f875240b47
comment out some code
2012-07-06 11:23:20 +02:00
9a10efd80f
Merge branch 'master' into calendar_import
2012-07-06 11:01:12 +02:00
a5a1d929ca
No need for being protected.
2012-07-06 03:22:42 +02:00
59b38e668d
Missing requesttoken
2012-07-06 03:22:42 +02:00
5e0b80dc8d
Contacts: Fix copy&paste error
2012-07-05 17:12:52 +02:00
51774cca6b
use OC_Filesystem for rollback
2012-07-05 14:20:40 +02:00
378fa2bc86
check if caview really exists
2012-07-05 12:17:33 +02:00
55cde0e5aa
moved remove and rename hook to libs/hooks.php
2012-07-05 11:35:08 +02:00
aa3b575ceb
disabled user upload of root certificates until sabredav client can handle them
2012-07-05 11:31:30 +02:00
aa95cf2c98
Merge branch 'master' into calendar_import
2012-07-05 11:30:37 +02:00
f86ecb3bf7
send ca cert path to sabredav client
2012-07-05 11:28:32 +02:00
9d00f4d2fb
Correct db default value.
2012-07-05 00:40:11 +02:00
dac2c14ae9
Add missing CSRF check.
2012-07-05 00:37:08 +02:00
5d79444852
Missing update script.
2012-07-04 22:58:31 +02:00
706a13544b
Remove ugly activation hack.
2012-07-04 22:13:36 +02:00
7ec2d6ce85
Merge branch 'master' into calendar_import
2012-07-04 21:15:32 +02:00
a4c2893128
some more work on calendar import - new import is (nearly) done
2012-07-04 21:14:40 +02:00
e258da5c3c
certificate should be only visible for users
2012-07-04 17:22:04 +02:00
5d61b85a1d
allow users to upload ssl root certificates for the webdav client
2012-07-04 17:18:36 +02:00
b2eac08ad3
Query contacts in batches of 20. Possible fix for oc-1126.
2012-07-04 16:54:00 +02:00
6d3afb3857
Moved action buttons down to the add field menu. Fixes oc-1155.
2012-07-04 13:57:07 +02:00
657eef354a
Merge branch 'master' into calendar_import
2012-07-04 13:03:30 +02:00
393eefa5d2
replace some direct links with OC.imagePath
2012-07-03 23:44:47 +02:00
f98bd1ad66
Merge branch 'master' into calendar_import
2012-07-03 22:35:46 +02:00
c036700c54
some more work on calendar import
2012-07-03 22:33:24 +02:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
b1c9785eb3
Merge branch 'master' of gitorious.org:owncloud/owncloud
...
Conflicts:
apps/files_versions/lib/versions.php
2012-07-03 18:17:32 +01:00
a775deaf22
Moved hooks and versions.php into new lib directory
...
Part-ported filesystem operations to OC_FilesystemView
Refactored Storage class to depend on an OC_FsV object and have fewer static classes
2012-07-03 17:42:51 +01:00
aec6eea235
use filesystem abstraction layer to copy file versions
2012-07-03 18:25:49 +02:00
1e36e1f2cb
Use formatted shared addressbook in all cases, addressbooks out of order now
2012-07-03 11:36:57 -04:00
4185bd6292
Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app
2012-07-03 11:11:01 -04:00
b6cff93254
fix spelling fail in code
2012-07-03 16:47:46 +02:00
0b3ed2b048
Merge branch 'master' into calendar_import
2012-07-03 16:39:09 +02:00
ca2b1f7863
fix encoding fail in calendar app - bugfix for oc-1194
2012-07-03 13:55:48 +02:00
cfcfdd674e
Merge branch 'master' into calendar_import
2012-07-03 13:43:52 +02:00
29a9559fa9
some work on calendar import dialog
2012-07-03 13:43:18 +02:00
77b582e4e6
Change getItems() return to a 3-dimensional array to handle multiple shares of the same item
2012-07-02 15:29:34 -04:00
88cbbc86b8
Text editor: Always use UTF-8 to keep Ace happy.
2012-07-02 19:06:40 +00:00
0a6f7b33c3
LDAP: make it UTF-8 save
2012-07-02 20:31:19 +02:00
ab036d4764
webdav client crashes for secure connections if he doesn't have the right root certificate for ssl verification. For the moment I print at least a useful error message to the OC log and the Apache log
2012-07-02 17:52:51 +02:00
515adceace
LDAP: reset resource on failed bind
...
check for resource
2012-07-02 14:03:29 +02:00
e89a0949c4
remove some whitespace
2012-07-01 23:32:21 +02:00
803f2c2517
some work on calendar import
2012-07-01 21:36:09 +02:00
eca2e073f8
Don't reload the page after sending private link to email address
2012-07-01 11:54:32 -04:00
0b9b1757fe
Add share action to addressbooks!
2012-06-30 21:06:49 -04:00
47f46890c8
Fix generateTarget() for contacts backend
2012-06-30 21:03:36 -04:00
6a060ecd23
use light grey instead of white
2012-07-01 01:02:54 +02:00
c7a4075aaa
Updates contacts migration provider
2012-06-30 22:56:47 +00:00
be11f71d27
fix doc for OC_Calendar_Calendar::generateTextColor()
2012-07-01 00:31:05 +02:00
601237a0c3
add algorithm to generate the calendar's text color
2012-07-01 00:09:33 +02:00
2418d9a1a9
Change registerBackend calls class argument to strings
2012-06-30 17:33:30 -04:00
ce331bd1d3
improvements for dropoimport
2012-06-30 23:18:41 +02:00
a705b19cd5
little fix for import
2012-06-30 22:45:12 +02:00
f15941a967
improve dropimport
2012-06-30 22:26:29 +02:00
4890bbb30d
Merge branch 'master' into calendar_import
2012-06-30 22:08:36 +02:00
376431fa0d
import works now for dropimport
2012-06-30 22:08:30 +02:00
fa5b31ac9c
fix documentation style
2012-06-30 17:09:20 +02:00
8e0addebc3
fix some doc
2012-06-30 15:39:20 +02:00
34b2486d53
some improvements for calendar export
2012-06-30 15:23:21 +02:00
390f5cc89f
some work on (drop)import)
2012-06-30 15:17:29 +02:00
51173163ce
Contacts: align the bottom control buttons
2012-06-30 11:22:09 +00:00
704a1c655e
Contacts: fix add contact icon path
2012-06-30 11:07:54 +00:00
433d15d309
Merge branch 'master' into calendar_import
2012-06-30 12:50:26 +02:00
6e6f90a8a2
fix merge conflicts
2012-06-30 12:44:51 +02:00
34d4eb8edd
some more work on calendar import class
2012-06-30 12:42:36 +02:00
edc6a648d1
Fix placeholder value for optional fields in external storage UI
2012-06-29 19:35:57 -04:00
252453cd34
fix encryption test cases when not logged in
2012-06-30 01:05:18 +02:00
a4614f83ff
Don't add duplicate contacts in the list when en-/disable an address book.
2012-06-29 23:18:47 +02:00
246894243a
Merge branch 'master' into calendar_import
2012-06-29 21:46:09 +02:00
719c7f7f6e
Fix WebDAV external storage opendir() and stat() for directories, bug fix for oc-1160
2012-06-29 13:01:00 -04:00
3ed7738d5e
Increment user_openid version to load new app type
2012-06-29 18:38:04 +02:00
f61793aa14
Coding style fixes
2012-06-29 18:38:04 +02:00
2b4ecbaba0
Whitespace fixes
2012-06-29 18:38:04 +02:00
652a874fa6
fix displaying of events
2012-06-29 18:13:52 +02:00
3bcf176a53
add some hooks to fix calendar sharing
2012-06-29 17:27:29 +02:00
7e9455c382
Allow multiple Google Drive and Dropbox external storages to be configured
2012-06-29 11:22:54 -04:00
2d49a491fb
Clear the mount point value for the new mount point row
2012-06-29 11:10:51 -04:00
f311c2a2ff
Hide the delete button on new mount point row
2012-06-29 11:10:51 -04:00
bda0026374
fix birthday calendar
2012-06-29 15:43:18 +02:00
b95996c02c
- when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
...
- don't allow renaming if a file/directory with the name already exists
2012-06-29 15:23:04 +02:00
08e707d258
some work on OC_Calendar_Import
2012-06-29 14:32:07 +02:00
60ec46f706
- remove leading http[s] to let createBaseUri() generate secure/unsecure base URI
...
- if secure is set to true add 's' to http
2012-06-29 12:01:23 +02:00
75af5778a4
pass progresskey the correct way during calender import
2012-06-29 00:49:37 +02:00
31bba86e87
Fix external storage UI for Admin page
2012-06-28 17:55:22 -04:00
02e4e0e08f
Gallery: Get all the image information for a directory at once
2012-06-28 22:11:04 +02:00
91d92aed02
fix for previous commit
2012-06-28 19:13:43 +02:00
4b3af1f73b
use OC_Calendar_Export for publicly shared calendars
2012-06-28 19:12:50 +02:00
930bbeabd4
Calendar Export: replace spaces with dashes in the name of the calendar / event
2012-06-28 19:04:14 +02:00
9dd7ca2667
some changes and more doc for OC_Calendar_Export class
2012-06-28 18:54:13 +02:00
9a4709e68d
fix calendar export for Apple iCal - i hate bloody line ends
2012-06-28 16:41:00 +02:00
c4f5639cb4
Merge branch 'master' into calendar_export
2012-06-28 15:24:30 +02:00
bdd1baeb85
use public API
2012-06-28 14:18:57 +02:00
e5792cc064
adjust the name and/or location of the stored versions if the actual file gets moved or renamed
2012-06-28 14:06:20 +02:00
f22f49671b
move hook to erase versions from deleted files to the right place
2012-06-28 12:42:47 +02:00
52f99a7570
delete file versions if the user deletes a file
2012-06-28 11:48:57 +02:00
dac539b619
handover the correct timestamp
2012-06-28 11:46:17 +02:00
3cea1b062e
Merge branch 'master' into calendar_export
2012-06-28 09:27:54 +02:00
e04a605b9b
No need for this anymore.
2012-06-28 01:51:42 +02:00
a48aba316e
Smoother profile picture loading - hopefully.
2012-06-28 01:46:33 +02:00
db6139fd41
Don't overwrite fake directory stream for Amazon S3 storage
2012-06-27 19:44:52 -04:00
426193cf6c
Migration: Fix contacts and bookmarks
2012-06-27 21:18:31 +00:00
77b7f214d2
Load contactlist progressivly.
2012-06-27 22:44:28 +02:00
e029e8cb14
Merge branch 'master' into calendar_export
2012-06-27 22:27:55 +02:00
8712754f8c
fix style of some doc
2012-06-27 22:27:48 +02:00
1f738d8c9f
Merge branch 'master' into calendar_export
2012-06-27 22:24:12 +02:00
9b605969f1
Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend
2012-06-27 15:23:49 -04:00
77c66e8cc4
move some documentation to the right place
2012-06-27 21:05:46 +02:00
25a50f00bd
add merge calendar function and add some documentation to OC_Calendar_Calendar
2012-06-27 20:56:58 +02:00
b7f86cf282
Add Samba Share parameter to external storage UI
2012-06-27 12:24:21 -04:00
2c773d549d
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:07:42 -04:00
19f94774fb
Don't overwrite fake directory stream for Dropbox and Google Drive
2012-06-27 12:04:33 -04:00
c67ae2e7f1
no reason to strip tags at this point
2012-06-27 15:56:14 +02:00
235515e84b
Something like this should do it for sharing contacts
2012-06-27 15:44:42 +02:00
d5237c42bc
Util::formatDate() expect $timestamp as double
2012-06-27 15:05:40 +02:00
90b5cf680f
Merge branch 'master' into calendar_export
2012-06-27 14:05:11 +02:00
060a297260
enable highlighting of address in OSM.
2012-06-27 11:46:42 +02:00
79da782892
Improve error handling of Dropbox storage backend
2012-06-26 20:37:50 -04:00
3edc40a68a
Load default categories if there are none,
2012-06-27 02:12:53 +02:00
823bef3a09
Ensure event handlers are being set when adding first contact.
2012-06-27 02:12:53 +02:00
afd9705283
Add check for return value.
2012-06-27 02:12:53 +02:00
b9e1033563
Basic framework for contacts sharing
2012-06-27 01:05:36 +02:00
32f9901bcd
Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend()
2012-06-27 01:05:36 +02:00
28b7793d5b
Fixes and change database table from sharing to share
2012-06-27 01:05:36 +02:00
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
8198114615
Some more changes to getItems() and fixes in shared storage
2012-06-27 01:05:36 +02:00
71350bc618
I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api.
2012-06-27 01:05:36 +02:00
945565f420
Move ajax and js files to core
2012-06-27 01:05:36 +02:00
f55f13eebc
Don't call getLocalFile() until you know it actually is music
2012-06-26 14:51:31 -04:00
cad282b73f
Added some error checking.
2012-06-26 18:15:24 +02:00
1b2d09f9ca
Added missing requesttoken.
2012-06-26 18:15:24 +02:00
d8b181cd84
Added error checking on all db queries.
2012-06-26 18:15:24 +02:00
db115429f7
Added createUser hook.
2012-06-26 18:15:24 +02:00
de4a540ce6
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-26 16:30:34 +02:00
46e93168cd
Fix variable name.
2012-06-26 16:06:52 +02:00
7dc72a48cc
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-26 15:48:21 +02:00
b9ce4e1f40
add OC_Calendar_Object::createUID()
2012-06-26 15:20:29 +02:00
9cb01bd093
xss fix
2012-06-26 14:27:50 +02:00
c7de74c471
Merge branch 'master' into calendar_export
2012-06-26 14:15:07 +02:00
bf756293c6
Added signals.
2012-06-26 05:26:50 +02:00
8df59852a4
Adjust pic width a bit.
2012-06-26 04:09:45 +02:00
b384d79bf8
Remove x-scrollbar from contacts list.
2012-06-25 23:32:03 +02:00
103ae6faa4
Media: Change includes in app.php to use the autoloader
2012-06-25 21:05:10 +02:00
fb53708d10
LDAP: compare base trees case insensitively
2012-06-25 20:53:45 +02:00
2250fb1159
Emit Completed.
2012-06-25 20:30:21 +02:00
dc4b891327
Better visual feedback and prevent drop on self.
2012-06-25 18:24:15 +02:00
b8d6ad0431
Improve styling on draggables.
2012-06-25 18:24:15 +02:00
380f41136c
Added placeholder msg to share with menu to clarify user list restricted to security context
2012-06-25 16:57:41 +01:00
9bb409d881
fix syntax error after merge
2012-06-25 17:34:28 +02:00
ef93bf223a
Try to conserve some memory. Should fix oc-1106 for master.
2012-06-25 17:26:44 +02:00
3f6a7859c9
LDAP: cheaper userExists() implementation, fixes oc-1012
2012-06-25 13:22:00 +02:00
d64a7716f1
LDAP: always sanitize DN and DN-containing attributes
2012-06-25 13:22:00 +02:00
a09a01a49f
sanitizeHTML() has to be called later to keep the path unchanged
2012-06-25 12:44:54 +02:00
9ee528bc74
Only delete existing thumbnails (bug #1100 )
2012-06-25 10:15:20 +02:00
052bd8efbb
Drag'n'Drop contacts between addressbook. Still needs some css magic.
2012-06-25 03:42:27 +02:00
51d33768b8
Prevent errors and mini enhancement of saved window in bookmarks
2012-06-24 21:30:14 +00:00
0fb9d0bf29
Correct bookmark app : add through interface and remove missing css
2012-06-24 21:24:43 +00:00
e845e56749
Remove excessive debugging.
2012-06-24 22:25:32 +02:00
3afbc3d2dc
Add some DRYness to logging.
2012-06-24 22:25:32 +02:00
f10c51193b
Fixed function name.
2012-06-24 22:25:32 +02:00
df1eca4fa2
Also load categories from VJOURNAL.
2012-06-24 22:25:32 +02:00
61adae1e49
Use intervals for sessions deletion with postgres fix oc-492
2012-06-24 19:41:23 +00:00
f56b3df0bc
Resolve scanning issue case comparison of songs
2012-06-24 16:03:25 +00:00
c53a8fa541
Correct seq name in media songs fix oc-589
2012-06-24 16:02:41 +00:00
0f9b9fa111
Remove unneeded parameter.
2012-06-24 16:07:18 +02:00
5393c0cfed
Click to select which address book to add to.
2012-06-24 16:03:10 +02:00
9e6d2f2f82
Improve prev/next selection on delete.
2012-06-24 15:07:44 +02:00
ca5de26bac
another fix for oc-1044
2012-06-24 09:41:37 +02:00
17e289aef2
Merge branch 'master' into calendar_export
2012-06-23 19:54:12 +02:00
6e5573acb5
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-23 14:42:54 +00:00
5323983fc7
Text editor: Waste less space for line numbers
2012-06-23 14:42:37 +00:00
d39d7fb9ff
Remove references to /apps/ and correct inclusion of settings
2012-06-22 22:05:39 +00:00
b5e3e150eb
Correction of path looking for apps and css
2012-06-22 20:58:52 +00:00
ded9ea5ad3
Spelling fixes
2012-06-22 22:57:35 +02:00
ea3a6d9fcf
Merge resource error-suppressing fix
2012-06-22 22:54:25 +02:00
2e6e154475
Gallery: Fix opening folders with a ' in the name
2012-06-22 22:46:12 +02:00
0939b1b0ab
Merge branch 'master' into calendar_export
2012-06-22 21:36:51 +02:00
618a3c1d94
Fix removing personal mounts
2012-06-22 12:22:42 -04:00
b650f46698
Fix variable checks for mounting Google Drive
2012-06-22 12:22:42 -04:00
41cfd55f55
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-22 16:17:23 +00:00
96ec7a66bb
More session_write_close
2012-06-22 17:21:56 +02:00
0aafc717ec
Text Editor: fix editor positioning
2012-06-22 15:02:03 +00:00
aade44471d
pdf viewer no longer 'eats' keyboard input
2012-06-22 16:10:25 +02:00
1f06cdf81f
Small js fix.
2012-06-22 14:27:46 +02:00
07124ee38d
Cast translation to string.
2012-06-22 14:27:46 +02:00
e1fa9c282b
xss vulnerabilities fixed
2012-06-22 14:11:57 +02:00
5b46734a40
xss vulnerability fixed
2012-06-22 13:58:15 +02:00
8c2803a7c1
Correct image path and apps path replacement
2012-06-22 13:12:03 +02:00
19931e2008
remove unnecessary closing PHP tag
2012-06-22 12:49:56 +02:00
bef9b671ee
LDAP: cheaper userExists() implementation
2012-06-22 12:42:07 +02:00
8c28aec664
date don't change correctly in the view list (bug #973 ) fixed
2012-06-22 11:30:40 +02:00
82f39d3292
Contacts: Fix name and carddav-url encoding
2012-06-21 23:30:04 +02:00
fd23c286ef
Calendar: Fix caldav url encoding
2012-06-21 23:30:04 +02:00
4a22f4ca78
Calendar: convert choosecalendar.rowfields template from plain php to html+php
2012-06-21 23:30:04 +02:00
1d07b9e291
Calendar: Missing userid in allCalendars call
2012-06-21 23:30:04 +02:00
c047fdafdb
Calendar: Fix missing template parameter 'shared' for new and update calendar
2012-06-21 23:30:04 +02:00
95b5202893
Correct usage of approot
2012-06-21 21:13:12 +00:00
bf6abdde2d
Add missing ')'
2012-06-21 12:26:06 -04:00
a5938e4e37
Merge branch 'master' into multi_app_dir
2012-06-21 20:19:31 +00:00
37d12144c2
Fix URL delimiter.
2012-06-21 22:03:57 +02:00
ad7154b344
Fix being able to link directly to contact, that I broke in other commit.
2012-06-21 22:02:17 +02:00
b17bf59ced
Only search for VEVENTs.
2012-06-21 20:51:23 +02:00
b17e682609
Tasks: Add delete action
2012-06-21 19:49:28 +02:00
10351550cd
Tasks: Use list label for ordering by list
2012-06-21 19:49:28 +02:00
b9e3b0ddf9
Tasks: Fix position of the summary input
2012-06-21 19:49:28 +02:00
e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
a9a913c273
Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
...
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
49033ff8e0
dont change the encryption key during the test case
2012-06-21 18:53:10 +02:00
6707e4187e
only use 1 fsview when initializing encryption
2012-06-21 18:35:12 +02:00
56de98ed8c
fix saved file size for uploaded files
2012-06-21 18:22:18 +02:00
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
1338279ca0
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 16:42:16 +02:00
49d9eb7acf
fix calendar
2012-06-21 16:24:05 +02:00
7c3f6f61db
Fixed missing jQuery event object - expire interface now works with Firefox
2012-06-21 14:54:24 +01:00
f5740a6f92
fix a PHP Notice
2012-06-21 15:20:15 +02:00
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
09d2f76727
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 11:51:50 +02:00
2f9763d216
check if user is allowed to edit bookmarks
2012-06-21 11:50:51 +02:00
1db2539223
make edit event form work with DateTime Property UTC
2012-06-21 11:35:20 +02:00
cd005e6c62
use new sanitizeHTML() function
2012-06-21 10:28:43 +02:00
f8ec280b6e
correct presentation of HTML encoded characters
2012-06-21 09:44:20 +02:00
Thomas Tanghus
Georg Ehrke
Robin Appelman
Michael Gapczynski
Lukas Reschke
Bjoern Schiessle
Jörn Friedrich Dreyer
BlackEagle
Johannes Willnecker
Sam Tuke
Thomas Mueller
jfd
Frank Karlitschek
Bart Visscher
Tom Needham
Arthur Schiwon
Michael Gapczynski
Brice Maron