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
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
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
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
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
8d89bba07c
use new sanitizeHTML() function
2012-06-20 12:23:26 +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
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
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
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
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
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
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
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
195c37f88a
fix for encryption binary files
2012-06-16 01:31:03 +02: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
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
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
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
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
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
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
d28a4f0638
prevent xss attacks also if some javascript ends up in the alt-tag
2012-06-14 14:17:30 +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
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
e154806838
fix another ui bug of calendar
2012-06-13 22:20:43 +02:00
2e44ffaf02
another ui fix
2012-06-13 22:14:40 +02:00
b1139e977a
fix a ui bug for calendar sharing
2012-06-13 22:12:54 +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
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
6f55a52858
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:33:05 -04: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
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
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
c44591e27a
Contacts: Final (for now) fix to encoding probs on import.
2012-06-12 12:32:37 +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
3c9be43aa4
add some information about repeating events caching on personal settings page
2012-06-11 22:16:26 +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
Thomas Tanghus
Brice Maron
Georg Ehrke
Tom Needham
Bart Visscher
Michael Gapczynski
Thomas Mueller
Bjoern Schiessle
Arthur Schiwon
Sam Tuke
Robin Appelman
Stephan Bergemann
Marco B