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
895d5707ee
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:09:11 -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
c0e86489c9
no reason to strip tags at this point
2012-06-27 17:56:00 +02: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
7af76e36e1
enable highlighting of address in OSM.
2012-06-27 11:41:52 +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
ae00f40b97
add OC_Calendar_Object::createUID()
2012-06-26 15:21:41 +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
a72eddeef7
LDAP: compare base trees case insensitively
2012-06-25 20:54:21 +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
2ad93849ab
Idiot proof dialog ;-)
2012-06-25 19:33:51 +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
ad5aa5ac15
Try to conserve some memory. Should fix oc-1106 for stable4.
2012-06-25 17:16:34 +02:00
42a5cd21b9
Missing requesttoken.
2012-06-25 17:15:33 +02:00
ddf321d534
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-25 16:22:19 +02:00
56ed8ba70b
Select which address book to add a contact to. Fixes oc-1071.
2012-06-25 16:21:29 +02:00
594e19bddc
LDAP: always sanitize DN and DN-containing attributes
2012-06-25 13:22:49 +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
85ac75b4f4
xss vulnerability fixed
2012-06-25 12:38:11 +02:00
9ee528bc74
Only delete existing thumbnails (bug #1100 )
2012-06-25 10:15:20 +02:00
0083dbb3ce
Only delete existing thumbnails (bug #1100 )
2012-06-25 10:11:06 +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
6da926f1c3
Resolve scanning issue case comparison of songs
2012-06-24 15:58:51 +00:00
5b908209de
Correct seq name in media songs fix oc-589
2012-06-24 15:12:05 +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
a12557ca4d
another fix for oc-1044
2012-06-24 09:42:14 +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
1c0e72cd5a
Text editor: Waste less space for line numbers
2012-06-23 14:43:52 +00: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
b591c83008
Text Editor: fix editor positioning
2012-06-22 16:20:09 +00: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
b6c862b32f
use sanitizeHTML() function
...
Conflicts:
apps/gallery/lib/tiles.php
2012-06-22 14:03:05 +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
e5171da300
remove unnecessary closing PHP tag
2012-06-22 12:50:49 +02:00
19931e2008
remove unnecessary closing PHP tag
2012-06-22 12:49:56 +02:00
0d9534eb4b
LDAP: cheaper userExists() implementation
2012-06-22 12:43:09 +02:00
bef9b671ee
LDAP: cheaper userExists() implementation
2012-06-22 12:42:07 +02:00
65c14e21ce
date don't change correctly in the view list (bug #973 ) fixed
2012-06-22 11:32:57 +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
d72b85684f
Only search for VEVENTs.
2012-06-21 20:53:50 +02:00
9045557258
Tasks: Add delete action
2012-06-21 20:18:12 +02:00
d75b5cfdd2
Tasks: Use list label for ordering by list
2012-06-21 20:18:08 +02:00
dda56c5e3d
Tasks: Fix position of the summary input
2012-06-21 20:17:49 +02:00
46ad51cbe2
dont change the encryption key during the test case
2012-06-21 18:53:52 +02:00
bd8b921de4
only use 1 fsview when initializing encryption
2012-06-21 18:36:16 +02: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
da9107fe69
fix saved file size for uploaded files
2012-06-21 18:07:56 +02:00
7b4cb44af8
truncate decrypted files based on size
2012-06-21 17:51:54 +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
096f5598b4
fix calendar
2012-06-21 16:23:13 +02:00
7c3f6f61db
Fixed missing jQuery event object - expire interface now works with Firefox
2012-06-21 14:54:24 +01:00
288c5e7581
fix a PHP Notice
2012-06-21 15:20:53 +02: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
3b4d2a971a
check if user is allowed to edit bookmarks
2012-06-21 12:29:50 +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
37ed3b5bd2
make edit event form work with DateTime Property UTC
2012-06-21 11:35:58 +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
82e8cb23fe
Merge branch 'master' into calendar_export
2012-06-21 09:08:26 +02:00
fedfa4c98e
DateTime objects are directly comparable
2012-06-20 21:38:56 +02:00
a6dc7345d0
Gallery: Move code/js/css from main template to the right place
2012-06-20 21:28:37 +02:00
10a0d5a46c
More changes for updating the contacts list.
2012-06-20 21:00:49 +02:00
dc8c188ffe
Better error checking.
2012-06-20 21:00:49 +02:00
426ed27be2
Make sure address books are shown even if empty.
2012-06-20 21:00:49 +02:00
0f1fe0b505
Log error as ERROR.
2012-06-20 21:00:49 +02:00
e43d02fadb
fix encrypted flags not being saved correctly
2012-06-20 20:18:42 +02:00
9ba467d629
fix encryption for binary files
2012-06-20 20:18:42 +02:00
0f2600e9ea
add binary test case for encryption
2012-06-20 20:18:41 +02:00
e3f1507374
use absolute path for file proxies
2012-06-20 20:18:41 +02:00
40e7b56783
Merge branch 'master' into calendar_export
2012-06-20 20:15:07 +02:00
0f13cbb47d
Merge branch 'master' into calendar_repeat
2012-06-20 20:14:08 +02:00
c1d205cbf5
Merge branch 'master' into calendar_export
2012-06-20 20:14:03 +02:00
d0dbc8beab
make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
2012-06-20 20:04:41 +02:00
f255ac8b3a
make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
2012-06-20 20:03:25 +02:00
4b231c15d5
bookmarks: make read later-button draggable again, fixes oc-944
2012-06-20 19:43:02 +02:00
72215a818d
added new user settings interface for deleting old file versions
...
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
2012-06-20 18:25:12 +01:00
d6bf62ea4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 16:26:02 +01:00
c244daac89
removed readdir to fix bug oc-1054
2012-06-20 16:24:49 +01:00
6308ca6b8a
Merge branch 'shared_log'
2012-06-20 17:20:46 +02:00
0086639891
Merge branch 'audit'
2012-06-20 17:20:39 +02:00
6404476bec
Delay setup of FS until OC_Filesystem is used
2012-06-20 17:10:49 +02:00
cd934d5d89
Adjust OC_Filesystem use in hooks to string, so the class is loaded as late as possible
2012-06-20 17:10:49 +02:00
5cc75ad818
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-06-20 17:08:48 +02:00
8e427d80d3
use sanitizeHTML() function
2012-06-20 17:00:55 +02:00
0e61b5457b
use new sanitizeHTML() function
2012-06-20 17:00:33 +02:00
a7f0811829
bookmarks: make read later-button draggable again, fixes oc-944
2012-06-20 16:31:22 +02:00
5a2c93ec2d
use sanitizeHTML() function
2012-06-20 15:11:14 +02:00
572dd9fbad
Merge branch 'master' into calendar_repeat
2012-06-20 13:29:12 +02:00
27c995230c
Merge branch 'master' into calendar_export
2012-06-20 13:28:30 +02:00
1ecbf459c9
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 13:01:55 +02:00
5b02217906
forgotten $, incorrect subtract
2012-06-20 12:47:31 +02:00
7c6b8475eb
LDAP: only map users within the User Base Tree
2012-06-20 12:47:24 +02:00
0289f442a8
forgotten $, incorrect subtract
2012-06-20 12:41:30 +02:00
8d89bba07c
use new sanitizeHTML() function
2012-06-20 12:23:26 +02:00
311c2bc0d3
Calendar: Write-close session to enable parallel events.php requests
2012-06-19 23:18:26 +02:00
c260db0e9a
Tasks: Fix resizing of the content part
2012-06-19 23:17:14 +02:00
0d43d6402d
Tasks: Use POST for ajax calls that change data
2012-06-19 23:17:00 +02:00
cff1b6e699
Don't use substr to get first char of string
2012-06-19 23:16:17 +02:00
28a72e0e3c
Fixed deleteAll function for deleting all old versions of files (expireAll)
...
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
0b9a48b4b6
Re-add missing loadhandlers() call.
2012-06-19 14:56:21 +02:00
33aec973df
Loading of contacts was placed outside of $(document).ready() function.
2012-06-19 14:55:14 +02:00
5ce0097b6f
Calendar: only run ->expand if the event is repeating
2012-06-19 13:30:45 +02:00
2b2da6fe35
Calendar: js fix
2012-06-19 13:26:55 +02:00
c8c105df33
Calendar: fix modifying of end DateTime object
2012-06-19 13:04:11 +02:00
a38463d41a
Merge branch 'master' into calendar_repeat
2012-06-19 11:30:12 +02:00
244920aeb0
LDAP: only map users within the User Base Tree
2012-06-19 01:15:58 +02:00
8c8a0cca75
Merge branch 'master' into calendar_export
2012-06-18 23:10:01 +02:00
a1364c9726
fixes oc-1026
2012-06-18 22:48:52 +02:00
debd9c8dfb
fix problem with encryption flag not being saved correctly in the filecache
2012-06-18 18:18:10 +02:00
16560fe5c1
Merge branch 'master' into calendar_repeat
2012-06-18 15:59:26 +02:00
6e405513ab
Merge branch 'master' into calendar_export
2012-06-18 15:59:21 +02:00
13aad8f06d
some little fixes for repeating events caching
2012-06-18 15:58:01 +02:00
79f9d61ec8
Allow apps to load before login, needed for user_openid
2012-06-18 15:40:48 +02:00
beed6e0f0e
Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""
...
This reverts commit e3b58f6783
2012-06-18 14:47:58 +02:00
e3b58f6783
Revert "create OC_Calendar_Object::generateStartEndDate function"
...
This reverts commit aa7ce480f4
2012-06-18 14:47:09 +02:00
6b6d3d68d4
Merge branch 'master' into calendar_repeat
2012-06-18 14:34:43 +02:00
c2b7d05188
Merge branch 'master' into calendar_export
2012-06-18 14:34:38 +02:00
e5feb4e1aa
Remove obsolete js.
2012-06-18 02:22:22 +02:00
73fd4c979a
Update js after contactlist change.
2012-06-18 02:21:29 +02:00
d8048414aa
Removed erroneous value attributes. Partial fix for oc-1029.
2012-06-18 00:39:38 +02:00
a4f53922c2
Removed erroneous value attributes. Partial fix for oc-1029.
2012-06-18 00:36:25 +02:00
cab4a634df
Save addressbook id to be able to rearrange contacts properly.
2012-06-17 23:14:02 +02:00
3efec3fde9
Make contact list fit in viewport.
2012-06-17 23:12:48 +02:00
ea4d8ccf70
Rearrange markup.
2012-06-17 23:12:11 +02:00
8337b30e43
Add thumbnail links so they are loaded when addressbook is expanded.
2012-06-17 23:09:25 +02:00
7d84c4741c
Use uasort instead of usort.
2012-06-17 21:50:49 +02:00
46a771d2e6
Sort addressbooks.
2012-06-17 21:47:15 +02:00
fb700de4a4
Add effect on addressbook show/hide.
2012-06-17 21:37:13 +02:00
9e4a41e9cb
Add effect on addressbook show/hide.
2012-06-17 21:34:56 +02:00
5a8f4b8783
Adjustments for inview handler etc.
2012-06-17 20:25:32 +02:00
b6b6d69158
Moved parsing to the controller and js to contacts.js.
2012-06-17 20:25:32 +02:00
2875901fc7
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
91f5a1de39
Obsolete language="Javascript".
2012-06-17 20:25:32 +02:00
b1cfc99f63
Styled address book entries.
2012-06-17 20:25:32 +02:00
56d25d4d1b
Make the parsing in the controller, not in the template. Assign only relevant entries to the template.
2012-06-17 20:25:32 +02:00
92e35bd843
now a little less in template - more in ajax controller
2012-06-17 20:25:32 +02:00
7f485d1b20
contacts app now lists contacts sorted by expandable/collapsable addressbooks
2012-06-17 20:25:32 +02:00
b8daae30b6
Merge branch 'master' into calendar_repeat
2012-06-17 16:41:49 +02:00
4b872d10fc
Merge branch 'master' into calendar_export
2012-06-17 16:41:44 +02:00
8d67ca09b5
user_migrate: remove old code
2012-06-17 12:07:16 +00:00
b064fc6968
user_migrate: remove old code
2012-06-17 12:06:40 +00:00
229587a31e
Merge branch 'master' into calendar_repeat
2012-06-17 08:36:26 +02:00
a8da950819
Merge branch 'master' into calendar_export
2012-06-17 08:36:20 +02:00
ad4f066bac
suppress error when using is_dir on non directory in smb backend
2012-06-17 03:09:49 +02:00
ed66c63c29
improve caching smb results a bit
2012-06-17 02:59:38 +02:00
769cbe9a4c
improve filecache support for smb
2012-06-17 02:54:23 +02:00
33ab91710f
PDF Viewer: Double encode link.
2012-06-16 19:49:57 +02:00
9c6d82d00d
PDF Viewer: Double encode link.
2012-06-16 19:48:33 +02:00
7f1e0287a9
Merge branch 'master' into calendar_repeat
2012-06-16 19:04:50 +02:00
56f8fc0f70
Merge branch 'master' into calendar_export
2012-06-16 19:04:45 +02:00
707660b35f
files_imageviewer: Double encode paths. Fixes oc-1016.
2012-06-16 18:57:51 +02:00
1118498050
files_imageviewer: Double encode paths. Fixes oc-1016.
2012-06-16 18:54:55 +02:00
4cbdd59859
Fix char encoding.
2012-06-16 18:38:20 +02:00
6642ef6a50
Fix string encoding probs.
2012-06-16 18:06:47 +02:00
fd9a4f8d51
Merge branch 'master' into calendar_repeat
2012-06-16 09:48:43 +02:00
be4820bbca
Merge branch 'master' into calendar_export
2012-06-16 09:48:32 +02:00
fc632b5795
fix merge conflicts
2012-06-16 09:48:07 +02:00
31ec93bd00
remove a lot of closing php tags and empty lines at a file's end in calendar app
2012-06-16 09:45:17 +02:00
05c1afd0d1
Merge branch 'master' into calendar_repeat
2012-06-16 09:41:31 +02:00
4d392801cc
Merge branch 'master' into calendar_export
2012-06-16 09:41:24 +02:00
cbe5449f47
remove a closing php tag in calendar
2012-06-16 09:40:32 +02:00
b6375e7a8c
remove a closing php tag in calendar
2012-06-16 09:40:03 +02:00
a6531d0311
Merge branch 'master' into calendar_repeat
2012-06-16 09:35:53 +02:00
81e8ffc4ba
Merge branch 'master' into calendar_export
2012-06-16 09:35:48 +02:00
bf2062b09d
write_close the session when scanning files or music
2012-06-16 01:35:39 +02:00
ec3033a5dd
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-15 19:34:25 -04:00
195c37f88a
fix for encryption binary files
2012-06-16 01:31:03 +02:00
c1744d2eb6
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:17:31 +00:00
8484e16516
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-15 23:14:48 +00:00
e37ef6dd47
Move user import to personal settings. Fix user migration between servers.
2012-06-15 23:14:40 +00:00
4268fe61ba
Calendar: Write-close session to enable parallel events.php requests
2012-06-16 00:44:23 +02:00
6d3ae575b6
Remove $DOCUMENTROOT, not used
2012-06-16 00:11:36 +02:00
03951ccc6b
fix encryption proxy for updated filecache
2012-06-15 23:11:55 +02:00
19bfe21401
add binary test case for encryption
2012-06-15 23:11:33 +02:00
fbd45a939f
Merge branch 'master' into calendar_repeat
2012-06-15 20:48:32 +02:00
4d2894f390
Merge branch 'master' into calendar_export
2012-06-15 20:48:26 +02:00
f06c08a637
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
2012-06-15 19:56:15 +02:00
449760f665
add hasUpdated to oc_filestorage
2012-06-15 16:43:24 +02:00
5c6a7172ca
Files: Double encode download links. Fix for oc-1016.
2012-06-15 15:58:10 +02:00
8f6121ffa8
Files: Double encode download links. Fix for oc-1016.
2012-06-15 15:57:04 +02:00
aa7ce480f4
create OC_Calendar_Object::generateStartEndDate function
2012-06-15 12:11:22 +02:00
4767c70578
fix merge conflicts
2012-06-15 11:48:26 +02:00
22a33b509f
use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod
2012-06-15 11:39:19 +02:00
e4529301ff
change some function names in OC_Calendar_Repeat
2012-06-15 11:34:21 +02:00
5c10683432
use easier parseable date to init datetime
2012-06-15 11:29:16 +02:00
6f20d51646
fix generateEventOutput for calendar hook
2012-06-15 11:25:29 +02:00
b6a8de8530
don't clean and cache calendar on every update
2012-06-15 11:24:40 +02:00
f9c34942e1
applied merge request #128 : fixed some sorting and display issues with gallery app.
...
This also fix bug #872 for the new gallery
2012-06-15 10:46:29 +02:00
0dd4ea5a4f
Merge branch 'master' into calendar_export
2012-06-15 10:41:06 +02:00
4b7bdd5ace
Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into merge-requests/128
...
Conflicts:
apps/gallery/templates/index.php
2012-06-15 09:51:04 +02:00
effb6f1309
Update stylesheet for type=url.
2012-06-15 04:32:01 +02:00
8a68d09b0f
Use type=url for URL field.
2012-06-15 04:32:01 +02:00
92083aa20c
Fix upload for Google Drive; Google Documents List API documentation was misleading
2012-06-14 20:57:08 -04:00
f6aa366857
Make sure there is a calendar after delete.
2012-06-15 02:10:55 +02:00
3c75ac5f62
Update calendar after delete.
2012-06-15 02:07:32 +02:00
ad8c4ab182
Only create new calendar when there are none. Fix oc-1007.
2012-06-15 01:55:02 +02:00
ad32c20300
Agree on argument type (cleaned this time).
2012-06-15 01:51:26 +02:00
6d43e6565e
Revert "Agree on argument type."
...
This reverts commit 0f6b1be0e6
2012-06-15 00:53:13 +02:00
0f6b1be0e6
Agree on argument type.
2012-06-15 00:50:42 +02:00
1e76a530ea
No need to find calendar twice.
2012-06-15 00:28:12 +02:00
31db583f03
Make events show again.
2012-06-15 00:26:34 +02:00
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
96a3e28c2e
Cleanup code.
2012-06-14 23:05:31 +02:00
27ab6daeb0
If Hr. Lerdorf had made up his mind on parameter order, life would have been a lot easier...
2012-06-14 23:05:31 +02:00
f3b30e4658
Forgot $ sign for variable
2012-06-14 15:14:01 -04:00
f7e686d4f1
Revert "Fix a counting mistake"
...
This reverts commit c20abfef38
2012-06-14 15:05:20 -04:00
ec69377ade
first load compatibility.js
2012-06-14 21:00:19 +02:00
4cc9bf09be
fix javascript error
2012-06-14 20:55:36 +02:00
4eb0c270aa
fixed handling of fallback_images
2012-06-14 19:38:43 +02:00
b025ff8de3
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:33:00 +02:00
12bfc551fb
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:31:38 +02:00
6e15b231b0
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-14 12:27:30 -04:00
47c03a0eff
Contacts: Fixes for CSRF.
2012-06-14 18:13:01 +02:00
3b58c7a407
Remove debug statements.
2012-06-14 18:03:50 +02:00
a3afd51b94
fixed one issue with last directory in structure having a lot of
...
subdirectories and finally some pictures
2012-06-14 18:02:07 +02:00
b6ee4c458b
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-14 18:00:45 +02:00
5b1a14f9ea
Contacts: Implement CSRF prevention.
2012-06-14 18:00:13 +02:00
4510571aa1
Add app for logging access to shared files
2012-06-14 17:44:41 +02:00
fa67927eb5
fixed bug #996 : first picture in folder is repeated in the last position behaving like a directory
...
Conflicts:
apps/gallery/templates/index.php
2012-06-14 17:08:52 +02:00
60bd2562d8
fixed bug #996 : first picture in folder is repeated in the last position behaving like a directory
2012-06-14 15:16:13 +02:00
6468e0a1d5
fixed bug #996 : first picture in folder is repeated in the last position behaving like a directory
2012-06-14 15:14:36 +02:00
df4737f52a
prevent xss attacks also if some javascript ends up in the alt-tag
2012-06-14 14:19:12 +02:00
d28a4f0638
prevent xss attacks also if some javascript ends up in the alt-tag
2012-06-14 14:17:30 +02:00
cd759aee00
fixed xss vulnerability in un-packed version of jquery.fancybox and repack it
2012-06-14 13:45:33 +02:00
87855f2506
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-14 13:44:42 +02:00
211a546600
fixed xss vulnerability in un-packed version of jquery.fancybox and repack it
2012-06-14 13:41:39 +02:00
756eb3548f
Use the right csrf token.
2012-06-14 13:23:12 +02:00
544f97f034
debugging output removed
2012-06-14 13:19:11 +02:00
4a47fa255d
xss vulnerability fixed for fancybox image viewer
2012-06-14 13:18:59 +02:00
b0ecef02e9
debugging output removed
2012-06-14 13:17:06 +02:00
e7b93b1807
xss vulnerability fixed for fancybox image viewer
2012-06-14 13:13:17 +02:00
bc6884b176
we don't neede the functions for empty stacks any more
2012-06-14 12:51:27 +02:00
b32afd1331
we don't have empty previewstacks any more - code cleaned up
2012-06-14 12:39:18 +02:00
56d2e99239
deleted some debugging output
2012-06-14 01:29:41 +02:00
22cd610a79
use images from deeper directories for preview if the actual directory doesn't contain any
2012-06-14 01:29:25 +02:00
9f59cc5eb0
improved look of directories not containing images directly
2012-06-14 01:29:17 +02:00
e99a95a756
now also working for directories only containing one image
2012-06-14 01:27:34 +02:00
4711c2bb41
fixed second_level_images issue
2012-06-14 01:27:26 +02:00
e4278574a8
fixed sorting errors and missbehaviours - now sorting like file browser
2012-06-14 01:27:01 +02:00
f9af0ef703
fix another ui bug of calendar
2012-06-13 22:21:23 +02:00
e154806838
fix another ui bug of calendar
2012-06-13 22:20:43 +02:00
92a11011b1
another ui fix
2012-06-13 22:15:12 +02:00
2e44ffaf02
another ui fix
2012-06-13 22:14:40 +02:00
4ff11308a3
fix a ui bug for calendar sharing
2012-06-13 22:13:24 +02:00
b1139e977a
fix a ui bug for calendar sharing
2012-06-13 22:12:54 +02:00
e543ec6eb6
show username of the body who shares in the summary
2012-06-13 22:07:30 +02:00
6bd80d6457
show username of the body who shares in the summary
2012-06-13 22:07:23 +02:00
7d29bee859
fix merge conflicts
2012-06-13 21:40:05 +02:00
61b044e00e
Files Texteditor: Use our own "Droid Sans Mono" font-face and fonts
2012-06-13 21:39:12 +02:00
7a8e7f18db
Calendar: Clicking #datecontrol_date gives datepicker to jump to date
2012-06-13 21:39:12 +02:00
4da6b3a391
Calendar: Make button of #datecontrol_date
2012-06-13 21:39:12 +02:00
c24752dc1d
Merge branch 'master' into calendar_export
2012-06-13 21:38:33 +02:00
b5889d6ffe
Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
...
Conflicts:
apps/files_external/templates/settings.php
lib/template.php
2012-06-13 15:17:46 -04:00
bd01e93469
Add support for mounting Google Drive in external storage UI
2012-06-13 13:54:50 -04:00
3e339f3d66
Remove check for encryption.
2012-06-13 19:04:47 +02:00
613a122437
Remove check for encryption.
2012-06-13 19:03:34 +02:00
d33d599b1b
Remove debug statements.
2012-06-13 18:57:12 +02:00
bc1e8cb0a2
Contacts: implemented CSRF prevention.
2012-06-13 17:35:42 +02:00
3a8b280c06
Merge branch 'master' into calendar_export
2012-06-13 15:29:47 +02:00
9bdad6fdbf
fix merge conflicts
2012-06-13 11:40:00 +02:00
7868b25dcc
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:34:35 -04:00
6f55a52858
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:33:05 -04:00
48116cf9ab
increase version of calendar app to force db upgrade
2012-06-12 19:54:07 +02:00
d54fc6dfd4
increase possible size of uri in database - fix oc-140
2012-06-12 19:54:07 +02:00
deb2f87556
increase version of calendar app to force db upgrade
2012-06-12 19:53:26 +02:00
dc0adbad02
increase possible size of uri in database - fix oc-140
2012-06-12 19:52:25 +02:00
f7727a322d
Merge branch 'master' into calendar_repeat
2012-06-12 19:26:52 +02:00
5f80be7664
Add support for mounting Dropbox in external storage UI
2012-06-12 11:36:43 -04:00
635a2f8ec9
Label the delete operation "unshare" for files in the "Shared" folder to reduce
...
confusion about the operation.
2012-06-12 16:32:00 +02:00
8626f04f5d
Label the delete operation "unshare" for files in the "Shared" folder to reduce
...
confusion about the operation.
2012-06-12 16:27:24 +02:00
71573f7934
Merge branch 'master' into calendar_repeat
2012-06-12 15:58:01 +02:00
c9d408ff8c
automatic cache repeating events after an update
2012-06-12 15:56:51 +02:00
ef6b6ac230
block slashes only for new files and new folders but not for file upload from url (bug #964 )
2012-06-12 14:16:09 +02:00
f6e7c633a0
block slashes only for new files and new folders but not for file upload from url (bug #964 )
2012-06-12 14:11:28 +02:00
cee9d400c0
Contacts: Final (for now) fix to encoding probs on import.
2012-06-12 12:33:37 +02:00
c44591e27a
Contacts: Final (for now) fix to encoding probs on import.
2012-06-12 12:32:37 +02:00
b70226b493
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-12 11:57:36 +02:00
4501407283
committed patch (bug #967 ) to add missing translations for file actions
2012-06-12 11:41:13 +02:00
b38ce8adfd
committed patch (bug #967 ) to add missing translations for file actions
2012-06-12 11:39:03 +02:00
5e37a10334
PDF.JS updated, compatibility.js added for browser support, should fix: oc-395
2012-06-12 00:50:34 +02:00
3be5e2af26
utf8 in der DB config
2012-06-11 23:04:28 +02:00
66c3ddcd74
Merge branch 'master' into calendar_repeat
2012-06-11 22:18:46 +02:00
210b71502b
Fix copy/paste error.
2012-06-11 22:18:14 +02:00
3c9be43aa4
add some information about repeating events caching on personal settings page
2012-06-11 22:16:26 +02:00
e0a5e3e992
Fix js for missing address fields.
2012-06-11 22:15:56 +02:00
c75a7966de
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
2012-06-11 22:15:31 +02:00
ac11647d7a
Fix js for missing address fields.
2012-06-11 22:14:21 +02:00
4b86cbcb6f
Quick fix for index errors when not importing from files.
2012-06-11 22:14:21 +02:00
c75f9f9397
Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e
2012-06-11 22:14:21 +02:00
8af53829d5
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
2012-06-11 22:14:21 +02:00
08a3a4f185
fix a bug in OC_Calendar_Repeat
2012-06-11 21:43:24 +02:00
759ddcbf32
Tasks: Fix resizing of the content part
2012-06-11 20:34:06 +02:00
0eee140eaf
Gallery: remove extra include of lib/base.php
2012-06-11 20:34:06 +02:00
eddad8bedb
Calendar: remove unused markup from #controls
2012-06-11 20:34:06 +02:00
f9bf34340c
Removed unecessary sanitization
2012-06-11 19:49:24 +02:00
68f819ee20
Removed double sanitization
2012-06-11 19:47:42 +02:00
9edd40354e
Merge branch 'master' into calendar_repeat
2012-06-11 19:46:12 +02:00
ad36fc8938
Fix double sanitization
2012-06-11 19:43:37 +02:00
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
1d493a70e7
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
2012-06-11 18:13:12 +02:00
18d19b022f
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-11 17:28:15 +02:00
09e744b793
connect OC_Calendar_repeat to events.php
2012-06-11 17:25:03 +02:00
009c4c9045
add function isrepeating to OC_Calendar_Object class and change OC_Calendar_Object::getUTCforMDB from protected to public
2012-06-11 17:15:50 +02:00
2dd84373c1
fix bug in OC_Calendar_Repeat
2012-06-11 17:13:20 +02:00
266c5238c9
LDAP: offer config option for Group Display Name attribute
2012-06-11 16:50:54 +02:00
fcc9a5c8d4
LDAP: offer config option for Group Display Name attribute
2012-06-11 16:48:43 +02:00
739589f485
make sure that contact data are always utf8 encoded to avoid encoding problems
2012-06-11 16:26:21 +02:00
24a1ab8c15
Merge branch 'master' into calendar_repeat
2012-06-11 15:38:02 +02:00
44e62c03e2
increase version number of calendar
2012-06-11 15:37:19 +02:00
32b366585d
some fixes for repeating events caching
2012-06-11 15:36:48 +02:00
e6c8febafc
add hooks to connect calendar / event changes with OC_Calendar_Repeat
2012-06-11 15:18:46 +02:00
5cb9d82b45
modify hooks in OC_Calendar_Calendar
2012-06-11 15:16:59 +02:00
eb3605aa63
modify hooks in OC_Calendar_Object
2012-06-11 15:15:13 +02:00
01bd048bb3
remove insert id
2012-06-11 15:01:48 +02:00
40459c8c66
some work on repeating events caching - basic class should work now :)
2012-06-11 15:00:51 +02:00
c009bc4b87
Revert
2012-06-11 13:27:32 +02:00
74eece2620
Contacts: Fix NOTE also on add, not just save.
2012-06-11 12:56:41 +02:00
6d9947b3ff
Contacts: Fix NOTE also on add, not just save.
2012-06-11 12:55:54 +02:00
6817a6b102
First try of implementing assignHTML
2012-06-11 12:45:07 +02:00
0df67aeae9
ldap: check array for emptiness, not nullness
2012-06-11 12:26:48 +02:00
c110308c1e
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-11 12:14:10 +02:00
7f5e8e39c4
ldap: check array for emptiness, not nullness
2012-06-11 12:13:55 +02:00
6da717b644
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
...
Backport for sanitized user data.
2012-06-11 11:57:36 +02:00
d294373f47
Sanitzing user input
2012-06-11 11:56:54 +02:00
f8337c9d72
Using POST instead of GET.
2012-06-11 11:56:11 +02:00
cc653a8a40
Sanitize user input
2012-06-11 11:54:45 +02:00
8f09299e24
Sanitizing user input
2012-06-11 11:54:03 +02:00
f2216dc9d2
Gallery: Fix database creation on update, also only from version less then 0.5
2012-06-11 11:20:51 +02:00
f4c459782b
Merge branch 'master' into calendar_repeat
2012-06-11 10:59:19 +02:00
ece1162949
use native sabredav functions to generate repeating events
2012-06-11 10:55:26 +02:00
e79e18d866
Copy/paste error.
2012-06-11 02:40:55 +02:00
3f9b967be7
Sanitizing user input
2012-06-11 00:36:58 +02:00
f8d2e21c66
Sanitize user input
2012-06-11 00:23:35 +02:00
27d1c1bb94
Sanitize user input
2012-06-11 00:14:28 +02:00
9f276729c2
Using POST instead of GET.
2012-06-10 23:38:26 +02:00
380aab470f
Sanitzing user input
2012-06-10 23:16:59 +02:00
3c57fb935b
Mount personal mount points into filesystem
2012-06-10 16:34:44 -04:00
40f8419fdf
Contacts: 11th hour fix for invalid VCARD from CardDAV.
2012-06-10 20:56:55 +02:00
c898a8a6c9
Contacts: 11th hour fix for invalid VCARD from CardDAV.
2012-06-10 20:54:52 +02:00
cdac0eae46
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-10 20:47:35 +02:00
6a44d02898
XSS--
2012-06-10 19:54:04 +02:00
bf4626da93
prevent XSS
2012-06-10 19:52:23 +02:00
c6a03ec6d8
remove include command for when
2012-06-10 18:41:17 +02:00
ef1b04619d
fix merge conflicts
2012-06-10 18:38:01 +02:00
bdb76d4873
Merge branch 'master' into calendar_export
2012-06-10 18:37:16 +02:00
c11f6cc3f9
fix variable name and undefined index notice
2012-06-10 17:25:50 +02:00
3970be3d7f
fix variable name and undefined index notice
2012-06-10 17:25:19 +02:00
31d48d4ba4
adding missing file
2012-06-10 13:20:49 +02:00
de6b683b50
fix first time image loading error
2012-06-10 13:19:22 +02:00
2dca0926b0
gallery: removing search provider for now
2012-06-10 13:19:17 +02:00
7ee722e0da
removing app access check, fix title for links in tiles
2012-06-10 13:18:55 +02:00
e073cd756c
tabs for spaces, fix array key name
2012-06-10 13:18:47 +02:00
f6c07094c2
hide share button until sharing wont be fixed
2012-06-10 13:18:41 +02:00
1853a83874
adding navigation bar to gallery
2012-06-10 13:18:36 +02:00
fe64e625ff
remove old code
2012-06-10 13:18:30 +02:00
f0f9269161
adding missing file
2012-06-10 13:18:17 +02:00
6682c60866
pictures: update script and removal some all stuff
2012-06-10 13:17:23 +02:00
9c1cc15c8d
adding title when fancybox is displayed
2012-06-10 13:16:19 +02:00
c932f93a40
replace spaces with tabs, use const and linkTo instead of static path
2012-06-10 13:16:12 +02:00
276aefba81
hack for file download
2012-06-10 13:16:06 +02:00
71b4cddd52
removing test image
2012-06-10 13:16:00 +02:00
c67de113c6
aviod incorrect image size returning in gallery listing
2012-06-10 13:15:51 +02:00
63c02fd595
use fancybox to display image preview
2012-06-10 13:15:45 +02:00
7aff5eae6c
navigate on galleries
2012-06-10 13:15:39 +02:00
2b80102909
new db scheme
2012-06-10 13:15:32 +02:00
9b2b5e0f6d
git status
2012-06-10 13:15:23 +02:00
76f20eb57c
fix first time image loading error
2012-06-10 13:05:00 +02:00
746994c2be
Fixed merge conflict.
2012-06-10 12:59:36 +02:00
f90c8738ab
Contacts: Used non-existent var.
2012-06-10 12:48:39 +02:00
0838b4c225
gallery: removing search provider for now
2012-06-10 09:52:33 +02:00
be6848a549
let´s put the files_odfviewer application into the stable4 branch for convinience. We release it as part of ownCloud 4.0.x anyways.
2012-06-09 23:18:56 +02:00
995f9c7348
sanitize scope and host
2012-06-09 21:08:24 +02:00
322fd51261
avoid clickjacking
2012-06-09 21:08:24 +02:00
ab41b57f62
Add Dropbox storage backend
2012-06-09 15:02:48 -04:00
b46903fa76
sanitize when logged in as another user
2012-06-09 20:39:24 +02:00
d065b2d29e
prevent opening non-music files through the media ajax api
2012-06-09 17:39:14 +02:00
601bac746d
use absolute path for file proxies
2012-06-09 17:34:13 +02:00
e7f6f7e452
fix another XSS
2012-06-09 16:45:37 +02:00
642e7ce110
fix another XSS
2012-06-09 16:44:48 +02:00
f955f6a685
fix XSS in Calendar
2012-06-09 16:36:01 +02:00
c9214afff8
fix XSS in Calendar
2012-06-09 16:35:35 +02:00
ff4b175622
increase height of event dialog
2012-06-09 15:40:27 +02:00
009fbd89b4
fix creation of monthly repeated events
2012-06-09 15:40:27 +02:00
2862740674
increase height of event dialog
2012-06-09 15:38:03 +02:00
cfb9c764ca
fix creation of monthly repeated events
2012-06-09 15:15:00 +02:00
001293a702
removing app access check, fix title for links in tiles
2012-06-09 15:12:50 +02:00
0f454215e7
Code cleanup.
2012-06-09 15:04:08 +02:00
59d16c5f9a
Contacts: Use POST instead of GET.
2012-06-09 15:02:23 +02:00
081e1874cb
Contacts: Use POST instead of GET.
2012-06-09 15:00:44 +02:00
88341e5797
Code cleanup.
2012-06-09 15:00:44 +02:00
28ab92ee76
make use of post instead of get
2012-06-09 14:41:26 +02:00
4aee5a7ce4
Tasks: Use POST for ajax calls that change data
2012-06-09 14:39:41 +02:00
c83f418a02
Merge branch 'master' into calendar_repeat
2012-06-09 12:30:39 +02:00
a9b561430a
add hooks for events
2012-06-09 12:30:09 +02:00
7ed30649bb
add hooks for calendars
2012-06-09 12:18:25 +02:00
cac995ee9f
some more work on repeating events caching
2012-06-09 11:49:25 +02:00
ac74d87e3e
some work on repeating events caching
2012-06-08 22:22:16 +02:00
201a40a1a3
tabs for spaces, fix array key name
2012-06-08 21:55:28 +02:00
0c7431e57d
hide share button until sharing wont be fixed
2012-06-08 21:44:33 +02:00
8bc22907b8
adding navigation bar to gallery
2012-06-08 21:44:33 +02:00
6b0a2ae60e
remove old code
2012-06-08 21:44:32 +02:00
71b04717ab
adding missing file
2012-06-08 21:44:31 +02:00
9e434dea60
tabs for spaces, removing thumbnail on file removal
2012-06-08 21:44:31 +02:00
ac36512102
Don't use substr to get first char of string
2012-06-08 21:38:10 +02:00
23533a763a
Don't fix bugs not present in this branch ;-)
2012-06-08 20:44:58 +02:00
5eb5d23ac1
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
...
Conflicts:
apps/contacts/ajax/uploadphoto.php
2012-06-08 20:43:42 +02:00
0a49bae87a
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
2012-06-08 20:39:54 +02:00
e83e30a8a9
Merge branch 'master' into calendar_repeat
2012-06-08 19:54:42 +02:00
8fcdccdcdc
Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
2012-06-08 13:48:38 -04:00
4b3ae60558
Working UI for external storage mount configuration
2012-06-08 11:42:29 -04:00
eb192ff4f3
code cleanup from previous commit
2012-06-08 16:31:12 +02:00
cf1430df45
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-06-08 16:27:07 +02:00
0722ff6e32
fix for bug #872 : Folders not holding any images are ignored, even if they hold subfolders with images
2012-06-08 16:24:31 +02:00
0dc371f579
typo in var
2012-06-08 14:58:07 +02:00
f70615106f
typo in var
2012-06-08 14:57:27 +02:00
8c7fa15aaf
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:58:00 +02:00
4d3b7574f3
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:55:16 +02:00
65cd15ca15
fix merge conflicts
2012-06-08 11:21:55 +02:00
1d93a8fcfe
Merge branch 'master' into calendar_export
2012-06-08 11:20:17 +02:00
4768510923
split share and root config for smb backend, also sanitize config a bit more
2012-06-08 01:29:55 +02:00
4afcae8d56
Gallery: Fix database creation on update, also only from version less then 0.5
2012-06-07 23:38:50 +02:00
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
d4f6f3e935
Contacts: Attempt to make file upload work in ICS Chrome.
2012-06-07 20:29:16 +02:00
33c802dcaa
Break text to fit in dialog.
2012-06-07 20:29:15 +02:00
0f68276921
LDAP: cache the results, reduce LDAP searches
2012-06-07 18:56:06 +02:00
c2f557f1dd
LDAP: cache the results, reduce LDAP searches
2012-06-07 18:55:32 +02:00
4beabe23e7
ldap: enable the destructor
2012-06-07 18:15:11 +02:00
6626598435
ldap: enable the destructor
2012-06-07 18:13:41 +02:00
14e1be56a0
pictures: update script and removal some all stuff
2012-06-07 17:08:04 +02:00
d2a8746c49
Edited combobox to adhere to coding standards and added a dblclick handler.
2012-06-07 16:44:54 +02:00
f3f3c791ba
ldap: correct query condition and determining of success
2012-06-07 13:40:26 +02:00
691f00eb39
ldap: check index carefully, can be 0
2012-06-07 13:40:16 +02:00
44880ab3fa
ldap: remove unused private functions
2012-06-07 13:39:42 +02:00
6894882ca9
ldap: correct query condition and determining of success
2012-06-07 13:39:42 +02:00
470cb17f90
ldap: check index carefully, can be 0
2012-06-07 13:39:42 +02:00
9266f4da99
Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511
2012-06-07 13:10:19 +02:00
312536dbf9
Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511
2012-06-07 13:08:42 +02:00
de6d550cce
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:22:25 +02:00
e1f4978150
Calendar: Added more explicit sync links and fixed indentation.
2012-06-07 12:21:24 +02:00
3d48bf18d3
Contacts: Import upload button was obscured on Android browser.
2012-06-07 10:58:15 +02:00
3804f68ff5
Contacts: Import upload button was obscured on Android browser.
2012-06-07 10:55:40 +02:00
9c84149119
A bit of pixel-pushing.
2012-06-07 10:55:40 +02:00
8fd6cdf407
adding title when fancybox is displayed
2012-06-06 23:29:23 +02:00
5417d803c4
replace spaces with tabs, use const and linkTo instead of static path
2012-06-06 23:23:49 +02:00
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
6a812644e4
Correct remote and public, and last occurence of OC::
2012-06-06 20:24:15 +00:00
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
a90089c792
hack for file download
2012-06-06 22:20:56 +02:00
7c88081acb
removing test image
2012-06-06 22:13:49 +02:00
aa0fc3c69a
aviod incorrect image size returning in gallery listing
2012-06-06 22:13:49 +02:00
671fe49809
use fancybox to display image preview
2012-06-06 22:13:49 +02:00
76e7e361ae
navigate on galleries
2012-06-06 22:13:49 +02:00
34a21a63ce
new db scheme
2012-06-06 22:13:49 +02:00
6d211155ab
git status
2012-06-06 22:13:48 +02:00
bb07c20bf4
fixed var name, $filename should be $foldername
2012-06-06 18:11:23 +02:00
c960e42a17
fixed var name, $filename should be $foldername
2012-06-06 18:08:51 +02:00
5c17338ac7
Contacts: Make js a tad DRYer. Added URL property.
2012-06-06 15:29:33 +02:00
ed950e3ba2
Correct mime type.
2012-06-06 15:29:33 +02:00
48ccfa42d3
LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
2012-06-06 12:31:22 +02:00
190fca1121
LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
2012-06-06 12:29:48 +02:00
ca0108aabf
Corrected typos.
2012-06-06 11:50:49 +02:00
517bd28940
Corrected typos.
2012-06-06 11:49:45 +02:00
6abe8f9e2e
fixed wrong function call
2012-06-06 10:40:22 +02:00
2fa19ce9a0
Merge branch 'master' into calendar_repeat
2012-06-06 10:12:11 +02:00
d8d558377c
Merge branch 'master' into calendar_export
2012-06-06 10:11:34 +02:00
fce614b82c
Less aggressive caching on thumbnails too.
2012-06-06 01:06:13 +02:00
68670bcc66
Cleanup.
2012-06-06 01:06:13 +02:00
624f8ae36d
Also use OC_Cache here.
2012-06-06 01:06:13 +02:00
80de23d08b
Contacts: Removed temp dir cleanup after using OC_Cache.
2012-06-06 01:06:12 +02:00
f1b10fcc93
update translations
2012-06-06 00:29:44 +02:00
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
a3c1f70be4
dont show config option for file upload size if we cant write the new value
2012-06-06 00:24:15 +02:00
063c9accb6
prevent creating files with a / the name
2012-06-06 00:04:02 +02:00
e6c4e53486
prevent creating files with a / the name
2012-06-06 00:02:51 +02:00
20aee83d07
Use UID for cache key.
2012-06-05 21:20:10 +02:00
cb941996c0
Contacts: Use OC_Cache for contact photo handling instead of temp dir.
2012-06-05 20:34:12 +02:00
3a5076d646
show pictures in folder with special characters, e.g. '+'
2012-06-05 17:58:23 +02:00
0d1a07d4ae
show pictures in folder with special characters, e.g. '+'
2012-06-05 16:36:05 +02:00
769d94ab26
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
2012-06-05 14:14:26 +02:00
44260a552c
xss vulnerability fixed
2012-06-05 10:49:36 +02:00
e817504569
xss vulnerability fixed
2012-06-05 10:49:26 +02:00
d71c4db10a
xss vulnerability fixed
2012-06-05 10:46:28 +02:00
564b0358f9
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-05 10:38:42 +02:00
dcc5b5ca0a
xss vulnerability fixed
2012-06-05 10:37:22 +02:00
d194132b6f
Contacts: Cache standard photo less aggressively
2012-06-05 10:32:26 +02:00
7e931575b4
comment out non working code
2012-06-05 09:28:51 +02:00
64f6534f51
Tasks: styling fixes
2012-06-04 23:04:31 +02:00
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
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
4bc88ef59d
prevent xss attacks by manipulating image file names
2012-06-04 18:11:17 +02:00
d5566d0267
prevent xss attacks by manipulating text file names
2012-06-04 18:11:08 +02:00
f291a843bf
prevent xss attacks by manipulating image file names
2012-06-04 16:22:25 +02:00
1d6ca084a6
prevent xss attacks by manipulating text file names
2012-06-04 16:20:03 +02:00
c8f670dfab
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 14:00:35 +02:00
3b9bf83fe7
Contacts: Make tmp file cleaup a bit safer.
2012-06-04 13:38:37 +02:00
782d82730a
commited a bit too much before
2012-06-04 13:28:31 +02:00
8983c6dd6b
commited a bit too much before
2012-06-04 13:27:55 +02:00
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
855f404e5c
Contacts: Temporary files weren't deleted if crop window was closed without saving.
2012-06-04 13:14:31 +02:00
d657263403
Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4
2012-06-04 13:13:53 +02:00
74ac2ac63a
Contacts: When editing photo on a newly created contact the name in the contact list was cleared.
2012-06-04 13:13:43 +02:00
59bbf0acee
LDAP: link to documentation on settings page
2012-06-04 13:05:18 +02:00
b48228ae3d
LDAP: link to documentation on settings page
2012-06-04 13:04:18 +02:00
6560f1d894
don't change events timezone and remove the DTSTART value tag
2012-06-04 12:28:05 +02:00
2d80c148ba
Don't allow user to delete, rename and re-share the "Shared" directory
2012-06-04 10:42:09 +02:00
4d1428db0f
Merge branch 'master' into calendar_repeat
2012-06-03 19:17:05 +02:00
865b7d6a7b
Merge branch 'master' into calendar_export
2012-06-03 14:56:25 +02:00
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
e58efd7877
LDAP group backend: Set configured true when it is... fixe oc-887
2012-06-01 16:02:38 +02:00
34464b1f8b
LDAP group backend: Set configured true when it is... fixe oc-887
2012-06-01 16:02:04 +02:00
86279bc192
LDAP group backend: If a group filter is not configured, do not do anything. Fixes oc-867
2012-06-01 14:05:08 +02:00
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
46b3b30d46
add status
...
file for repeating events caching
2012-06-01 13:47:48 +02:00
e44f9ab46e
correctly detect https
2012-06-01 11:47:14 +02:00
a2b41a140e
correctly detect https
2012-06-01 11:46:18 +02:00
e75146a811
Merge branch 'master' into calendar_repeat
2012-06-01 11:40:39 +02:00
7a8e322679
some work for repeating events caching
2012-06-01 11:30:54 +02:00
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
8ed13e627e
don´t do warnings.
...
Not sure if this start_session call is really needed here.
2012-06-01 11:08:40 +02:00
baae4c741d
fix the breadcrumb
2012-05-31 21:44:05 +02:00
670022cc8a
fix the breadcrumb
2012-05-31 21:43:07 +02:00
5f4132d6ba
more fixes
2012-05-31 21:16:36 +02:00
c3ccdbaa79
more fixes
2012-05-31 21:14:46 +02:00
57a56299d8
more fixes
...
i don´t understand why this worked before.
2012-05-31 21:10:03 +02:00
d56966f14f
someone broke this completely. Hope it works again. Please check your apache error log and turn php notices on if you work on ajax call
2012-05-31 20:45:39 +02:00
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
739c5488a5
Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4
2012-05-31 20:17:30 +02:00
5d425a9f79
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:16:44 +02:00
0059535140
fix potential XSS
2012-05-31 20:03:15 +02:00
f0bd571866
fix potential XSS
2012-05-31 20:01:12 +02:00
3db28d7616
linkTo instead of hard links in Files and Files_Archive. Hope that makes sense.
2012-05-31 19:46:51 +02:00
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
3b36a9b704
LDAP: make queries compatible also with PostgreSQL
2012-05-31 13:07:49 +02:00
7ec3e37199
LDAP: make queries compatible also with PostgreSQL
2012-05-31 13:06:27 +02:00
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
2ae58ee6c0
Calendar: small cleanup of import progress writing
2012-05-31 13:01:30 +02:00
0934a975b2
Remove unused L10N variable
2012-05-31 13:01:30 +02:00
c5cc70c0e3
Merge branch 'master' into calendar_repeat
2012-05-31 12:20:56 +02:00
449b9b92f0
LDAP: fix wrong value for input type
2012-05-30 22:37:00 +02:00
93849916bb
LDAP: support for 'member' as group-member-association
2012-05-30 22:36:48 +02:00
8b4e16ec77
LDAP: fix wrong value for input type
2012-05-30 22:34:51 +02:00
4dc7ed139b
don´t hardcode /tmp
2012-05-30 14:18:47 +02:00
22a04d8e93
don´t hardcode /tmp
2012-05-30 14:14:32 +02:00
dbcd26be68
Contacts: Rewrote import script.
2012-05-29 23:41:53 +02:00
f1a48aec73
Merge branch 'master' into calendar_repeat
2012-05-29 19:47:48 +02:00
29b17672b4
a bit of work for repeating events caching
2012-05-29 19:46:17 +02:00
d334f33eba
Initial support for Amazon S3 storage backend
...
Conflicts:
apps/files_external/tests/config.php
2012-05-29 12:19:29 -04:00
c9df18ed8c
Forgot a break.
2012-05-29 16:46:54 +02:00
6515c5c1e7
Contacts: NOTE wasn't saved properly.
2012-05-29 16:45:52 +02:00
51aa84e70a
Contacts: NOTE wasn't saved properly.
2012-05-29 16:43:59 +02:00
dff16e70a9
Contacts: Improve loading and cleanup of dialogs.
2012-05-29 16:43:59 +02:00
29372677ae
add lib collection and lib scanner to media's appinfo/app.php
2012-05-29 13:36:51 +02:00
482caa04f9
add button to clear calendar's cache
2012-05-29 13:34:27 +02:00
a56f2dbce7
Merge branch 'master' into calendar_repeat
2012-05-29 13:16:08 +02:00
1c1ed52867
fix status
...
of timezone detection
2012-05-29 13:14:36 +02:00
75afc09b9d
fix status
...
of timezone detection
2012-05-29 13:14:05 +02:00
d1f0261b5d
Correct typo in last_insert_id for calendar and pg fix #oc-731
2012-05-28 20:57:52 +00:00
22cd0f1cda
Correct typo in last_insert_id for calendar and pg fix #oc-731
2012-05-28 20:41:39 +00:00
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
817f9ff57d
Contacts: Fix XSS.
2012-05-28 14:42:57 +02:00
cf113409ad
Contacts: Fix XSS.
2012-05-28 14:41:48 +02:00
1eebbaebdb
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-05-28 13:59:47 +02:00
c79a529edd
remove not needed includes
2012-05-28 13:57:45 +02:00
df5bdc8e42
Contacts: Double check XSS, and fix a rookie error ;-)
2012-05-28 13:19:31 +02:00
53da328aa1
Contacts: Double check XSS.
2012-05-28 12:56:56 +02:00
8bd6d862b8
Please don't tell me I did that :-P
2012-05-28 12:52:18 +02:00
5b7ef90d3a
add urlencode for caldav link
2012-05-28 10:50:10 +02:00
5e7b318e42
add urlencode for caldav link
2012-05-28 10:49:27 +02:00
459114b994
Merge branch 'master' into calendar_repeat
2012-05-26 22:54:24 +02:00
3db5fb891c
allow longer paths for gallery
2012-05-26 21:54:49 +02:00
143287738a
allow longer paths for gallery
2012-05-26 21:50:54 +02:00
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
d2369b6e96
LDAP: support for 'member' as group-member-association
2012-05-26 16:38:37 +02:00
1645f77aad
fix share for users with a point within their name
2012-05-26 15:41:32 +02:00
a1c9191006
fix share for users with a point within their name
2012-05-26 15:23:46 +02:00
2774ff1ad8
Add HEAD request management for files ajax/download.php
2012-05-25 11:19:38 +02:00
bc9accd26e
Merge branch 'master' into calendar_repeat
2012-05-25 10:30:00 +02:00
9c2a6fb551
Add HEAD request management for files ajax/download.php
2012-05-24 22:48:10 +00:00
5fa14806c8
Add translation for error message
2012-05-24 19:16:00 +00:00
2c9311cf48
Add error message when uploading folder or null files. ref oc-739
2012-05-24 18:47:34 +00:00
a1539dace7
share code between smb and ftp filestorage backends
2012-05-24 19:41:32 +02:00
f00a50c76a
Add pending line in file list before trying to upload. Correct indentation
2012-05-24 16:56:19 +00:00
2f40f11c87
smb filestorage backend
2012-05-24 18:23:59 +02:00
bee724c53e
Initial work on UI for mounting external storage
2012-05-24 11:06:03 -04:00
d8ca4f78cf
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:36:39 -04:00
970124a90b
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:35:29 -04:00
20e9903396
Correct small style problem with task app fix #oc-689
2012-05-23 22:36:36 +00:00
97d682dc13
Correct small style problem with task app fix #oc-689
2012-05-23 21:02:34 +00:00
3fee3a4633
Merge branch 'unstable' of gitorious.org:owncloud/owncloud into unstable
2012-05-22 14:44:40 +01:00
27f7dae932
removed closing php tag
2012-05-22 13:42:55 +01:00
647888eea2
add a ldap encryption warning
2012-05-22 12:35:28 +02:00
8cd7410447
encryption is not yet compatible with ldap
2012-05-22 12:15:51 +02:00
54a3717005
Contacts: Backport XSS fix.
2012-05-21 21:49:35 +02:00
a896da0d91
Contacts: XSS fix. Still some more to check.
2012-05-21 21:47:15 +02:00
d7c09d8bb5
add a warning
2012-05-20 10:59:37 +02:00
2f8f7501ef
add warning
2012-05-20 10:58:20 +02:00
ad66bb9c84
Merge branch 'calendar_dropimport'
2012-05-19 18:58:24 +02:00
5a48ade933
Make sure sharing and versions dropdowns come down in the same location for all files
2012-05-19 11:24:23 -04:00
d4072c82dd
some fixes for contacts, gallery and openid
2012-05-19 15:22:21 +02:00
07fa8da278
fix for calendar
2012-05-19 15:05:58 +02:00
7e49a33d64
getStorage belongs to files not to apps.
2012-05-19 10:44:08 +02:00
35bd601215
Fix check for when to store a new version of a file
2012-05-18 22:27:43 -04:00
f750da1802
Fix revert link on history page of file versions
2012-05-18 22:07:48 -04:00
89f5701d1a
Fix versioning of shared files
2012-05-18 22:07:48 -04:00
ea7456a06a
Forgot to actually call remove on the history dropdown
2012-05-18 10:53:58 -04:00
fcb4d2aaee
Remove the history dropdown before creating a new one
2012-05-18 10:42:49 -04:00
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
c1bb8139a0
LDAP: we're 0.2 now
2012-05-18 18:00:30 +02:00
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
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
e606213fa0
make upload work with IE again
2012-05-18 17:07:00 +02:00
0c7efc234b
LDAP: update meta info
2012-05-18 17:07:00 +02:00
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
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
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
73a72054a3
fix call of all versions page
2012-05-18 12:00:35 +02:00
7d49bf7f6e
some changes in calendar repeat class
2012-05-18 11:48:18 +02:00
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
48505c5626
improve tar archive backend
2012-05-18 01:54:59 +02:00
5b42325b01
History dropdown clean-up
2012-05-17 18:57:52 -04:00
74d49920f2
Close history dropdown on success. Avoids confusion.
2012-05-17 21:22:48 +00:00
0aac70aaf1
Revert google webfont removal. Sadly this causes havoc with the editor!
2012-05-17 20:23:43 +00:00
f7366de673
Merge branch 'master' into calendar_repeat
2012-05-17 22:17:23 +02:00
38b93653a1
Merge branch 'master' into calendar_dropimport
2012-05-17 22:17:06 +02:00
fbe0d0d4fd
Fix private links inside folders
2012-05-17 16:12:33 -04:00
6146b6a131
fix paths to images and set height for calendar management dialog
2012-05-17 21:51:38 +02:00
57d41bb1f8
Merge branch 'merge-requests/115'
2012-05-17 15:39:39 -04:00
cbfbbe672c
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
...
Conflicts:
apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
2cc0515161
no use for double quotes here
2012-05-17 21:03:06 +02:00
f998ed331a
removing dead code
2012-05-17 21:01:42 +02:00
3e454d3459
oops! was hardcoding my test domain inadvertently
2012-05-17 21:00:11 +02:00
7a7c301d7d
LDAP: follow user- and groupname char limitations for LDAP display names
...
WARNING: may affect existing installations if display names included unallowed characters. Allowed are only a-zA-Z0-9._-@ This fix is however needed, because names with unallowed characters may cause conflicts
2012-05-17 17:17:40 +02:00
57cf0ae3d1
LDAP: remove unnecessary debug output
2012-05-17 17:17:40 +02:00
38c56388c1
LDAP: Fix case sensitivity issues with display name attribute
2012-05-17 17:17:40 +02:00
b9cd0ecc8a
Contacts: wrong name was set on initial load.
2012-05-17 16:46:39 +02:00
cf181e88bb
Try to setup a user's filesystem if the user hasn't logged in before and is shared a file
2012-05-17 09:24:54 -04:00
2f1e601809
Contacts: Disable in-app import if encryption is enabled, and make an attempt of supporting IE uploads too. Can't test it though...
2012-05-17 14:31:04 +02:00
9b3847f49b
Initial support for Amazon S3 storage backend
2012-05-16 21:52:05 -04:00
bfdb374a2c
allow reverting file from history dropdown
2012-05-17 02:16:33 +02:00
4ccfd27fa2
fix versioning for movable apps
2012-05-17 01:53:23 +02:00
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
d216678481
Contacts: removed check for empty FN field because Chrome/Chromium barfed.
2012-05-16 23:45:43 +02:00
9e83c3f823
add caldav and carddav files in their old place for backward compatibility - add rewriterule for caldav and carddav
2012-05-16 21:05:15 +02:00
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
ab18a0bfe8
ldap: unique index names for the database, fixes non-creating of indexes for the second table and potential issues in the app
2012-05-16 18:11:42 +02:00
eceed497b1
fix paths in apps/remoteStorage/ajax/revokeToken.php
2012-05-16 18:08:50 +02:00
fefa4412c4
added phpdoc comment
2012-05-16 15:17:51 +01:00
c0df40084a
added recognition of which version is 'current' - which is currently live and in use on history page
2012-05-16 15:00:36 +01:00
fbc2892083
try to remove deprecated files from /files on update
2012-05-16 15:59:36 +02:00
c04074692e
Fix incorrect toaddress being passed for emailing private links
2012-05-15 19:05:26 -04:00
a00c5ac78c
fixed some include path issues
...
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
2012-05-15 18:21:51 +01:00
0f66870470
Contacts: Corrected i18n call.
2012-05-15 18:49:38 +02:00
b619821f4a
Create a new OC_Share object instead of manually inserting rows when adding a user to a group share, prevents a couple of potential bugs
2012-05-15 12:03:20 -04:00
6673375eeb
No multiple file sharing in this next release, sharing UI isn't ready for it :(
2012-05-15 11:45:59 -04:00
7b92c27777
Check if a file is encrypted before sharing (encrypted files cannot be shared)
2012-05-15 11:29:02 -04:00
Georg Ehrke
Tom Needham
Michael Gapczynski
Robin Appelman
Thomas Tanghus
Bart Visscher
Bjoern Schiessle
Michael Gapczynski
Arthur Schiwon
Sam Tuke
Brice Maron
Thomas Mueller
Stephan Bergemann
Marco B
Lukas Reschke
Frank Karlitschek
Bartek Przybylski
Michiel de Jong
Benjamin Diele
Sam Tuke
Sam Tuke