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
60ec46f706
- remove leading http[s] to let createBaseUri() generate secure/unsecure base URI
...
- if secure is set to true add 's' to http
2012-06-29 12:01:23 +02:00
75af5778a4
pass progresskey the correct way during calender import
2012-06-29 00:49:37 +02:00
31bba86e87
Fix external storage UI for Admin page
2012-06-28 17:55:22 -04:00
02e4e0e08f
Gallery: Get all the image information for a directory at once
2012-06-28 22:11:04 +02:00
91d92aed02
fix for previous commit
2012-06-28 19:13:43 +02:00
4b3af1f73b
use OC_Calendar_Export for publicly shared calendars
2012-06-28 19:12:50 +02:00
930bbeabd4
Calendar Export: replace spaces with dashes in the name of the calendar / event
2012-06-28 19:04:14 +02:00
9dd7ca2667
some changes and more doc for OC_Calendar_Export class
2012-06-28 18:54:13 +02:00
9a4709e68d
fix calendar export for Apple iCal - i hate bloody line ends
2012-06-28 16:41:00 +02:00
c4f5639cb4
Merge branch 'master' into calendar_export
2012-06-28 15:24:30 +02:00
bdd1baeb85
use public API
2012-06-28 14:18:57 +02:00
e5792cc064
adjust the name and/or location of the stored versions if the actual file gets moved or renamed
2012-06-28 14:06:20 +02:00
f22f49671b
move hook to erase versions from deleted files to the right place
2012-06-28 12:42:47 +02:00
52f99a7570
delete file versions if the user deletes a file
2012-06-28 11:48:57 +02:00
dac539b619
handover the correct timestamp
2012-06-28 11:46:17 +02:00
3cea1b062e
Merge branch 'master' into calendar_export
2012-06-28 09:27:54 +02:00
e04a605b9b
No need for this anymore.
2012-06-28 01:51:42 +02:00
a48aba316e
Smoother profile picture loading - hopefully.
2012-06-28 01:46:33 +02:00
db6139fd41
Don't overwrite fake directory stream for Amazon S3 storage
2012-06-27 19:44:52 -04:00
426193cf6c
Migration: Fix contacts and bookmarks
2012-06-27 21:18:31 +00:00
77b7f214d2
Load contactlist progressivly.
2012-06-27 22:44:28 +02:00
e029e8cb14
Merge branch 'master' into calendar_export
2012-06-27 22:27:55 +02:00
8712754f8c
fix style of some doc
2012-06-27 22:27:48 +02:00
1f738d8c9f
Merge branch 'master' into calendar_export
2012-06-27 22:24:12 +02:00
9b605969f1
Fixes in Dropbox API, try to catch Dropbox exceptions, implement rename and copy in Dropbox storage backend
2012-06-27 15:23:49 -04:00
77c66e8cc4
move some documentation to the right place
2012-06-27 21:05:46 +02:00
25a50f00bd
add merge calendar function and add some documentation to OC_Calendar_Calendar
2012-06-27 20:56:58 +02:00
b7f86cf282
Add Samba Share parameter to external storage UI
2012-06-27 12:24:21 -04:00
2c773d549d
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:07:42 -04:00
19f94774fb
Don't overwrite fake directory stream for Dropbox and Google Drive
2012-06-27 12:04:33 -04:00
c67ae2e7f1
no reason to strip tags at this point
2012-06-27 15:56:14 +02:00
d5237c42bc
Util::formatDate() expect $timestamp as double
2012-06-27 15:05:40 +02:00
90b5cf680f
Merge branch 'master' into calendar_export
2012-06-27 14:05:11 +02:00
060a297260
enable highlighting of address in OSM.
2012-06-27 11:46:42 +02:00
79da782892
Improve error handling of Dropbox storage backend
2012-06-26 20:37:50 -04:00
3edc40a68a
Load default categories if there are none,
2012-06-27 02:12:53 +02:00
823bef3a09
Ensure event handlers are being set when adding first contact.
2012-06-27 02:12:53 +02:00
afd9705283
Add check for return value.
2012-06-27 02:12:53 +02:00
f55f13eebc
Don't call getLocalFile() until you know it actually is music
2012-06-26 14:51:31 -04:00
cad282b73f
Added some error checking.
2012-06-26 18:15:24 +02:00
1b2d09f9ca
Added missing requesttoken.
2012-06-26 18:15:24 +02:00
d8b181cd84
Added error checking on all db queries.
2012-06-26 18:15:24 +02:00
db115429f7
Added createUser hook.
2012-06-26 18:15:24 +02:00
de4a540ce6
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-26 16:30:34 +02:00
46e93168cd
Fix variable name.
2012-06-26 16:06:52 +02:00
7dc72a48cc
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-26 15:48:21 +02:00
b9ce4e1f40
add OC_Calendar_Object::createUID()
2012-06-26 15:20:29 +02:00
9cb01bd093
xss fix
2012-06-26 14:27:50 +02:00
c7de74c471
Merge branch 'master' into calendar_export
2012-06-26 14:15:07 +02:00
bf756293c6
Added signals.
2012-06-26 05:26:50 +02:00
8df59852a4
Adjust pic width a bit.
2012-06-26 04:09:45 +02:00
b384d79bf8
Remove x-scrollbar from contacts list.
2012-06-25 23:32:03 +02:00
103ae6faa4
Media: Change includes in app.php to use the autoloader
2012-06-25 21:05:10 +02:00
fb53708d10
LDAP: compare base trees case insensitively
2012-06-25 20:53:45 +02:00
2250fb1159
Emit Completed.
2012-06-25 20:30:21 +02:00
dc4b891327
Better visual feedback and prevent drop on self.
2012-06-25 18:24:15 +02:00
b8d6ad0431
Improve styling on draggables.
2012-06-25 18:24:15 +02:00
380f41136c
Added placeholder msg to share with menu to clarify user list restricted to security context
2012-06-25 16:57:41 +01:00
9bb409d881
fix syntax error after merge
2012-06-25 17:34:28 +02:00
ef93bf223a
Try to conserve some memory. Should fix oc-1106 for master.
2012-06-25 17:26:44 +02:00
3f6a7859c9
LDAP: cheaper userExists() implementation, fixes oc-1012
2012-06-25 13:22:00 +02:00
d64a7716f1
LDAP: always sanitize DN and DN-containing attributes
2012-06-25 13:22:00 +02:00
a09a01a49f
sanitizeHTML() has to be called later to keep the path unchanged
2012-06-25 12:44:54 +02:00
9ee528bc74
Only delete existing thumbnails (bug #1100 )
2012-06-25 10:15:20 +02:00
052bd8efbb
Drag'n'Drop contacts between addressbook. Still needs some css magic.
2012-06-25 03:42:27 +02:00
51d33768b8
Prevent errors and mini enhancement of saved window in bookmarks
2012-06-24 21:30:14 +00:00
0fb9d0bf29
Correct bookmark app : add through interface and remove missing css
2012-06-24 21:24:43 +00:00
e845e56749
Remove excessive debugging.
2012-06-24 22:25:32 +02:00
3afbc3d2dc
Add some DRYness to logging.
2012-06-24 22:25:32 +02:00
f10c51193b
Fixed function name.
2012-06-24 22:25:32 +02:00
df1eca4fa2
Also load categories from VJOURNAL.
2012-06-24 22:25:32 +02:00
61adae1e49
Use intervals for sessions deletion with postgres fix oc-492
2012-06-24 19:41:23 +00:00
f56b3df0bc
Resolve scanning issue case comparison of songs
2012-06-24 16:03:25 +00:00
c53a8fa541
Correct seq name in media songs fix oc-589
2012-06-24 16:02:41 +00:00
0f9b9fa111
Remove unneeded parameter.
2012-06-24 16:07:18 +02:00
5393c0cfed
Click to select which address book to add to.
2012-06-24 16:03:10 +02:00
9e6d2f2f82
Improve prev/next selection on delete.
2012-06-24 15:07:44 +02:00
ca5de26bac
another fix for oc-1044
2012-06-24 09:41:37 +02:00
17e289aef2
Merge branch 'master' into calendar_export
2012-06-23 19:54:12 +02:00
6e5573acb5
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-23 14:42:54 +00:00
5323983fc7
Text editor: Waste less space for line numbers
2012-06-23 14:42:37 +00:00
d39d7fb9ff
Remove references to /apps/ and correct inclusion of settings
2012-06-22 22:05:39 +00:00
b5e3e150eb
Correction of path looking for apps and css
2012-06-22 20:58:52 +00:00
ded9ea5ad3
Spelling fixes
2012-06-22 22:57:35 +02:00
ea3a6d9fcf
Merge resource error-suppressing fix
2012-06-22 22:54:25 +02:00
2e6e154475
Gallery: Fix opening folders with a ' in the name
2012-06-22 22:46:12 +02:00
0939b1b0ab
Merge branch 'master' into calendar_export
2012-06-22 21:36:51 +02:00
618a3c1d94
Fix removing personal mounts
2012-06-22 12:22:42 -04:00
b650f46698
Fix variable checks for mounting Google Drive
2012-06-22 12:22:42 -04:00
41cfd55f55
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-22 16:17:23 +00:00
96ec7a66bb
More session_write_close
2012-06-22 17:21:56 +02:00
0aafc717ec
Text Editor: fix editor positioning
2012-06-22 15:02:03 +00:00
aade44471d
pdf viewer no longer 'eats' keyboard input
2012-06-22 16:10:25 +02:00
1f06cdf81f
Small js fix.
2012-06-22 14:27:46 +02:00
07124ee38d
Cast translation to string.
2012-06-22 14:27:46 +02:00
e1fa9c282b
xss vulnerabilities fixed
2012-06-22 14:11:57 +02:00
5b46734a40
xss vulnerability fixed
2012-06-22 13:58:15 +02:00
8c2803a7c1
Correct image path and apps path replacement
2012-06-22 13:12:03 +02:00
19931e2008
remove unnecessary closing PHP tag
2012-06-22 12:49:56 +02:00
bef9b671ee
LDAP: cheaper userExists() implementation
2012-06-22 12:42:07 +02:00
8c28aec664
date don't change correctly in the view list (bug #973 ) fixed
2012-06-22 11:30:40 +02:00
82f39d3292
Contacts: Fix name and carddav-url encoding
2012-06-21 23:30:04 +02:00
fd23c286ef
Calendar: Fix caldav url encoding
2012-06-21 23:30:04 +02:00
4a22f4ca78
Calendar: convert choosecalendar.rowfields template from plain php to html+php
2012-06-21 23:30:04 +02:00
1d07b9e291
Calendar: Missing userid in allCalendars call
2012-06-21 23:30:04 +02:00
c047fdafdb
Calendar: Fix missing template parameter 'shared' for new and update calendar
2012-06-21 23:30:04 +02:00
95b5202893
Correct usage of approot
2012-06-21 21:13:12 +00:00
bf6abdde2d
Add missing ')'
2012-06-21 12:26:06 -04:00
a5938e4e37
Merge branch 'master' into multi_app_dir
2012-06-21 20:19:31 +00:00
37d12144c2
Fix URL delimiter.
2012-06-21 22:03:57 +02:00
ad7154b344
Fix being able to link directly to contact, that I broke in other commit.
2012-06-21 22:02:17 +02:00
b17bf59ced
Only search for VEVENTs.
2012-06-21 20:51:23 +02:00
b17e682609
Tasks: Add delete action
2012-06-21 19:49:28 +02:00
10351550cd
Tasks: Use list label for ordering by list
2012-06-21 19:49:28 +02:00
b9e3b0ddf9
Tasks: Fix position of the summary input
2012-06-21 19:49:28 +02:00
e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
a9a913c273
Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
...
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
49033ff8e0
dont change the encryption key during the test case
2012-06-21 18:53:10 +02:00
6707e4187e
only use 1 fsview when initializing encryption
2012-06-21 18:35:12 +02:00
56de98ed8c
fix saved file size for uploaded files
2012-06-21 18:22:18 +02:00
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
1338279ca0
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 16:42:16 +02:00
49d9eb7acf
fix calendar
2012-06-21 16:24:05 +02:00
7c3f6f61db
Fixed missing jQuery event object - expire interface now works with Firefox
2012-06-21 14:54:24 +01:00
f5740a6f92
fix a PHP Notice
2012-06-21 15:20:15 +02:00
34739b7ec5
use new sanitizeHTML() function
2012-06-21 13:57:18 +02:00
09d2f76727
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-21 11:51:50 +02:00
2f9763d216
check if user is allowed to edit bookmarks
2012-06-21 11:50:51 +02:00
1db2539223
make edit event form work with DateTime Property UTC
2012-06-21 11:35:20 +02:00
cd005e6c62
use new sanitizeHTML() function
2012-06-21 10:28:43 +02:00
f8ec280b6e
correct presentation of HTML encoded characters
2012-06-21 09:44:20 +02:00
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
Georg Ehrke
Michael Gapczynski
Bjoern Schiessle
Robin Appelman
Bart Visscher
Thomas Tanghus
Tom Needham
Arthur Schiwon
Sam Tuke
Brice Maron
Michael Gapczynski
Thomas Mueller
Stephan Bergemann