Georg Ehrke
|
82e8cb23fe
|
Merge branch 'master' into calendar_export
|
2012-06-21 09:08:26 +02:00 |
Bart Visscher
|
fedfa4c98e
|
DateTime objects are directly comparable
|
2012-06-20 21:38:56 +02:00 |
Bart Visscher
|
a6dc7345d0
|
Gallery: Move code/js/css from main template to the right place
|
2012-06-20 21:28:37 +02:00 |
Thomas Tanghus
|
10a0d5a46c
|
More changes for updating the contacts list.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
dc8c188ffe
|
Better error checking.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
426ed27be2
|
Make sure address books are shown even if empty.
|
2012-06-20 21:00:49 +02:00 |
Thomas Tanghus
|
0f1fe0b505
|
Log error as ERROR.
|
2012-06-20 21:00:49 +02:00 |
Georg Ehrke
|
40e7b56783
|
Merge branch 'master' into calendar_export
|
2012-06-20 20:15:07 +02:00 |
Georg Ehrke
|
0f13cbb47d
|
Merge branch 'master' into calendar_repeat
|
2012-06-20 20:14:08 +02:00 |
Georg Ehrke
|
c1d205cbf5
|
Merge branch 'master' into calendar_export
|
2012-06-20 20:14:03 +02:00 |
Arthur Schiwon
|
f255ac8b3a
|
make bookmarks bookmarklet work again, kudos to Victor Dubiniuk
|
2012-06-20 20:03:25 +02:00 |
Arthur Schiwon
|
4b231c15d5
|
bookmarks: make read later-button draggable again, fixes oc-944
|
2012-06-20 19:43:02 +02:00 |
Sam Tuke
|
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 |
Sam Tuke
|
d6bf62ea4e
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-20 16:26:02 +01:00 |
Sam Tuke
|
c244daac89
|
removed readdir to fix bug oc-1054
|
2012-06-20 16:24:49 +01:00 |
Bart Visscher
|
6308ca6b8a
|
Merge branch 'shared_log'
|
2012-06-20 17:20:46 +02:00 |
Bart Visscher
|
0086639891
|
Merge branch 'audit'
|
2012-06-20 17:20:39 +02:00 |
Bart Visscher
|
6404476bec
|
Delay setup of FS until OC_Filesystem is used
|
2012-06-20 17:10:49 +02:00 |
Bart Visscher
|
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 |
Bjoern Schiessle
|
5a2c93ec2d
|
use sanitizeHTML() function
|
2012-06-20 15:11:14 +02:00 |
Georg Ehrke
|
572dd9fbad
|
Merge branch 'master' into calendar_repeat
|
2012-06-20 13:29:12 +02:00 |
Georg Ehrke
|
27c995230c
|
Merge branch 'master' into calendar_export
|
2012-06-20 13:28:30 +02:00 |
Bjoern Schiessle
|
1ecbf459c9
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-20 13:01:55 +02:00 |
Arthur Schiwon
|
5b02217906
|
forgotten $, incorrect subtract
|
2012-06-20 12:47:31 +02:00 |
Arthur Schiwon
|
7c6b8475eb
|
LDAP: only map users within the User Base Tree
|
2012-06-20 12:47:24 +02:00 |
Bjoern Schiessle
|
8d89bba07c
|
use new sanitizeHTML() function
|
2012-06-20 12:23:26 +02:00 |
Sam Tuke
|
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 |
Thomas Tanghus
|
0b9a48b4b6
|
Re-add missing loadhandlers() call.
|
2012-06-19 14:56:21 +02:00 |
Thomas Tanghus
|
33aec973df
|
Loading of contacts was placed outside of $(document).ready() function.
|
2012-06-19 14:55:14 +02:00 |
Georg Ehrke
|
5ce0097b6f
|
Calendar: only run ->expand if the event is repeating
|
2012-06-19 13:30:45 +02:00 |
Georg Ehrke
|
2b2da6fe35
|
Calendar: js fix
|
2012-06-19 13:26:55 +02:00 |
Georg Ehrke
|
c8c105df33
|
Calendar: fix modifying of end DateTime object
|
2012-06-19 13:04:11 +02:00 |
Georg Ehrke
|
a38463d41a
|
Merge branch 'master' into calendar_repeat
|
2012-06-19 11:30:12 +02:00 |
Georg Ehrke
|
8c8a0cca75
|
Merge branch 'master' into calendar_export
|
2012-06-18 23:10:01 +02:00 |
Thomas Mueller
|
a1364c9726
|
fixes oc-1026
|
2012-06-18 22:48:52 +02:00 |
Robin Appelman
|
debd9c8dfb
|
fix problem with encryption flag not being saved correctly in the filecache
|
2012-06-18 18:18:10 +02:00 |
Georg Ehrke
|
16560fe5c1
|
Merge branch 'master' into calendar_repeat
|
2012-06-18 15:59:26 +02:00 |
Georg Ehrke
|
6e405513ab
|
Merge branch 'master' into calendar_export
|
2012-06-18 15:59:21 +02:00 |
Georg Ehrke
|
13aad8f06d
|
some little fixes for repeating events caching
|
2012-06-18 15:58:01 +02:00 |
Bart Visscher
|
79f9d61ec8
|
Allow apps to load before login, needed for user_openid
|
2012-06-18 15:40:48 +02:00 |
Georg Ehrke
|
beed6e0f0e
|
Revert "Revert "create OC_Calendar_Object::generateStartEndDate function""
This reverts commit e3b58f6783 .
|
2012-06-18 14:47:58 +02:00 |
Georg Ehrke
|
e3b58f6783
|
Revert "create OC_Calendar_Object::generateStartEndDate function"
This reverts commit aa7ce480f4 .
|
2012-06-18 14:47:09 +02:00 |
Georg Ehrke
|
6b6d3d68d4
|
Merge branch 'master' into calendar_repeat
|
2012-06-18 14:34:43 +02:00 |
Georg Ehrke
|
c2b7d05188
|
Merge branch 'master' into calendar_export
|
2012-06-18 14:34:38 +02:00 |
Thomas Tanghus
|
e5feb4e1aa
|
Remove obsolete js.
|
2012-06-18 02:22:22 +02:00 |
Thomas Tanghus
|
73fd4c979a
|
Update js after contactlist change.
|
2012-06-18 02:21:29 +02:00 |
Thomas Tanghus
|
a4f53922c2
|
Removed erroneous value attributes. Partial fix for oc-1029.
|
2012-06-18 00:36:25 +02:00 |
Thomas Tanghus
|
cab4a634df
|
Save addressbook id to be able to rearrange contacts properly.
|
2012-06-17 23:14:02 +02:00 |
Thomas Tanghus
|
3efec3fde9
|
Make contact list fit in viewport.
|
2012-06-17 23:12:48 +02:00 |
Thomas Tanghus
|
ea4d8ccf70
|
Rearrange markup.
|
2012-06-17 23:12:11 +02:00 |
Thomas Tanghus
|
8337b30e43
|
Add thumbnail links so they are loaded when addressbook is expanded.
|
2012-06-17 23:09:25 +02:00 |
Thomas Tanghus
|
7d84c4741c
|
Use uasort instead of usort.
|
2012-06-17 21:50:49 +02:00 |
Thomas Tanghus
|
46a771d2e6
|
Sort addressbooks.
|
2012-06-17 21:47:15 +02:00 |
Thomas Tanghus
|
fb700de4a4
|
Add effect on addressbook show/hide.
|
2012-06-17 21:37:13 +02:00 |
Thomas Tanghus
|
9e4a41e9cb
|
Add effect on addressbook show/hide.
|
2012-06-17 21:34:56 +02:00 |
Thomas Tanghus
|
5a8f4b8783
|
Adjustments for inview handler etc.
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
b6b6d69158
|
Moved parsing to the controller and js to contacts.js.
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
2875901fc7
|
Obsolete language="Javascript".
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
91f5a1de39
|
Obsolete language="Javascript".
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
b1cfc99f63
|
Styled address book entries.
|
2012-06-17 20:25:32 +02:00 |
Thomas Tanghus
|
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 |
Stephan Bergemann
|
92e35bd843
|
now a little less in template - more in ajax controller
|
2012-06-17 20:25:32 +02:00 |
Stephan Bergemann
|
7f485d1b20
|
contacts app now lists contacts sorted by expandable/collapsable addressbooks
|
2012-06-17 20:25:32 +02:00 |
Georg Ehrke
|
b8daae30b6
|
Merge branch 'master' into calendar_repeat
|
2012-06-17 16:41:49 +02:00 |
Georg Ehrke
|
4b872d10fc
|
Merge branch 'master' into calendar_export
|
2012-06-17 16:41:44 +02:00 |
Tom Needham
|
b064fc6968
|
user_migrate: remove old code
|
2012-06-17 12:06:40 +00:00 |
Georg Ehrke
|
229587a31e
|
Merge branch 'master' into calendar_repeat
|
2012-06-17 08:36:26 +02:00 |
Georg Ehrke
|
a8da950819
|
Merge branch 'master' into calendar_export
|
2012-06-17 08:36:20 +02:00 |
Robin Appelman
|
ad4f066bac
|
suppress error when using is_dir on non directory in smb backend
|
2012-06-17 03:09:49 +02:00 |
Robin Appelman
|
ed66c63c29
|
improve caching smb results a bit
|
2012-06-17 02:59:38 +02:00 |
Robin Appelman
|
769cbe9a4c
|
improve filecache support for smb
|
2012-06-17 02:54:23 +02:00 |
Thomas Tanghus
|
9c6d82d00d
|
PDF Viewer: Double encode link.
|
2012-06-16 19:48:33 +02:00 |
Georg Ehrke
|
7f1e0287a9
|
Merge branch 'master' into calendar_repeat
|
2012-06-16 19:04:50 +02:00 |
Georg Ehrke
|
56f8fc0f70
|
Merge branch 'master' into calendar_export
|
2012-06-16 19:04:45 +02:00 |
Thomas Tanghus
|
1118498050
|
files_imageviewer: Double encode paths. Fixes oc-1016.
|
2012-06-16 18:54:55 +02:00 |
Thomas Tanghus
|
4cbdd59859
|
Fix char encoding.
|
2012-06-16 18:38:20 +02:00 |
Thomas Tanghus
|
6642ef6a50
|
Fix string encoding probs.
|
2012-06-16 18:06:47 +02:00 |
Georg Ehrke
|
fd9a4f8d51
|
Merge branch 'master' into calendar_repeat
|
2012-06-16 09:48:43 +02:00 |
Georg Ehrke
|
be4820bbca
|
Merge branch 'master' into calendar_export
|
2012-06-16 09:48:32 +02:00 |
Georg Ehrke
|
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 |
Georg Ehrke
|
05c1afd0d1
|
Merge branch 'master' into calendar_repeat
|
2012-06-16 09:41:31 +02:00 |
Georg Ehrke
|
4d392801cc
|
Merge branch 'master' into calendar_export
|
2012-06-16 09:41:24 +02:00 |
Georg Ehrke
|
b6375e7a8c
|
remove a closing php tag in calendar
|
2012-06-16 09:40:03 +02:00 |
Georg Ehrke
|
a6531d0311
|
Merge branch 'master' into calendar_repeat
|
2012-06-16 09:35:53 +02:00 |
Georg Ehrke
|
81e8ffc4ba
|
Merge branch 'master' into calendar_export
|
2012-06-16 09:35:48 +02:00 |
Robin Appelman
|
bf2062b09d
|
write_close the session when scanning files or music
|
2012-06-16 01:35:39 +02:00 |
Robin Appelman
|
195c37f88a
|
fix for encryption binary files
|
2012-06-16 01:31:03 +02:00 |
Tom Needham
|
8484e16516
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-15 23:14:48 +00:00 |
Tom Needham
|
e37ef6dd47
|
Move user import to personal settings. Fix user migration between servers.
|
2012-06-15 23:14:40 +00:00 |
Bart Visscher
|
4268fe61ba
|
Calendar: Write-close session to enable parallel events.php requests
|
2012-06-16 00:44:23 +02:00 |
Bart Visscher
|
6d3ae575b6
|
Remove $DOCUMENTROOT, not used
|
2012-06-16 00:11:36 +02:00 |
Robin Appelman
|
03951ccc6b
|
fix encryption proxy for updated filecache
|
2012-06-15 23:11:55 +02:00 |
Robin Appelman
|
19bfe21401
|
add binary test case for encryption
|
2012-06-15 23:11:33 +02:00 |
Georg Ehrke
|
fbd45a939f
|
Merge branch 'master' into calendar_repeat
|
2012-06-15 20:48:32 +02:00 |
Georg Ehrke
|
4d2894f390
|
Merge branch 'master' into calendar_export
|
2012-06-15 20:48:26 +02:00 |
Robin Appelman
|
f06c08a637
|
cleanup oc_filecache, splitting it in several parts and using the new hasUpdated
|
2012-06-15 19:56:15 +02:00 |
Robin Appelman
|
449760f665
|
add hasUpdated to oc_filestorage
|
2012-06-15 16:43:24 +02:00 |
Thomas Tanghus
|
8f6121ffa8
|
Files: Double encode download links. Fix for oc-1016.
|
2012-06-15 15:57:04 +02:00 |
Georg Ehrke
|
aa7ce480f4
|
create OC_Calendar_Object::generateStartEndDate function
|
2012-06-15 12:11:22 +02:00 |
Georg Ehrke
|
4767c70578
|
fix merge conflicts
|
2012-06-15 11:48:26 +02:00 |
Georg Ehrke
|
22a33b509f
|
use DateTime as type of parameter in the functions is_cached_inperiod and get_inperiod
|
2012-06-15 11:39:19 +02:00 |
Georg Ehrke
|
e4529301ff
|
change some function names in OC_Calendar_Repeat
|
2012-06-15 11:34:21 +02:00 |
Georg Ehrke
|
5c10683432
|
use easier parseable date to init datetime
|
2012-06-15 11:29:16 +02:00 |
Georg Ehrke
|
6f20d51646
|
fix generateEventOutput for calendar hook
|
2012-06-15 11:25:29 +02:00 |
Georg Ehrke
|
b6a8de8530
|
don't clean and cache calendar on every update
|
2012-06-15 11:24:40 +02:00 |
Georg Ehrke
|
0dd4ea5a4f
|
Merge branch 'master' into calendar_export
|
2012-06-15 10:41:06 +02:00 |
Bjoern Schiessle
|
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 |
Thomas Tanghus
|
effb6f1309
|
Update stylesheet for type=url.
|
2012-06-15 04:32:01 +02:00 |
Thomas Tanghus
|
8a68d09b0f
|
Use type=url for URL field.
|
2012-06-15 04:32:01 +02:00 |
Michael Gapczynski
|
92083aa20c
|
Fix upload for Google Drive; Google Documents List API documentation was misleading
|
2012-06-14 20:57:08 -04:00 |
Thomas Tanghus
|
f6aa366857
|
Make sure there is a calendar after delete.
|
2012-06-15 02:10:55 +02:00 |
Thomas Tanghus
|
3c75ac5f62
|
Update calendar after delete.
|
2012-06-15 02:07:32 +02:00 |
Thomas Tanghus
|
ad8c4ab182
|
Only create new calendar when there are none. Fix oc-1007.
|
2012-06-15 01:55:02 +02:00 |
Thomas Tanghus
|
ad32c20300
|
Agree on argument type (cleaned this time).
|
2012-06-15 01:51:26 +02:00 |
Thomas Tanghus
|
6d43e6565e
|
Revert "Agree on argument type."
This reverts commit 0f6b1be0e6 .
|
2012-06-15 00:53:13 +02:00 |
Thomas Tanghus
|
0f6b1be0e6
|
Agree on argument type.
|
2012-06-15 00:50:42 +02:00 |
Thomas Tanghus
|
1e76a530ea
|
No need to find calendar twice.
|
2012-06-15 00:28:12 +02:00 |
Thomas Tanghus
|
31db583f03
|
Make events show again.
|
2012-06-15 00:26:34 +02:00 |
Brice Maron
|
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 |
Thomas Tanghus
|
96a3e28c2e
|
Cleanup code.
|
2012-06-14 23:05:31 +02:00 |
Thomas Tanghus
|
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 |
Michael Gapczynski
|
f3b30e4658
|
Forgot $ sign for variable
|
2012-06-14 15:14:01 -04:00 |
Michael Gapczynski
|
f7e686d4f1
|
Revert "Fix a counting mistake"
This reverts commit c20abfef38 .
|
2012-06-14 15:05:20 -04:00 |
Thomas Mueller
|
ec69377ade
|
first load compatibility.js
|
2012-06-14 21:00:19 +02:00 |
Thomas Mueller
|
4cc9bf09be
|
fix javascript error
|
2012-06-14 20:55:36 +02:00 |
Stephan Bergemann
|
4eb0c270aa
|
fixed handling of fallback_images
|
2012-06-14 19:38:43 +02:00 |
Arthur Schiwon
|
12bfc551fb
|
reverting 8c7fa15aaf , differs between OC3 and 4
|
2012-06-14 18:31:38 +02:00 |
Michael Gapczynski
|
6e15b231b0
|
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
|
2012-06-14 12:27:30 -04:00 |
Thomas Tanghus
|
47c03a0eff
|
Contacts: Fixes for CSRF.
|
2012-06-14 18:13:01 +02:00 |
Stephan Bergemann
|
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 |
Bart Visscher
|
4510571aa1
|
Add app for logging access to shared files
|
2012-06-14 17:44:41 +02:00 |
Bjoern Schiessle
|
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 |
Bjoern Schiessle
|
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 |
Bjoern Schiessle
|
d28a4f0638
|
prevent xss attacks also if some javascript ends up in the alt-tag
|
2012-06-14 14:17:30 +02:00 |
Bjoern Schiessle
|
87855f2506
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-14 13:44:42 +02:00 |
Bjoern Schiessle
|
211a546600
|
fixed xss vulnerability in un-packed version of jquery.fancybox and repack it
|
2012-06-14 13:41:39 +02:00 |
Thomas Tanghus
|
756eb3548f
|
Use the right csrf token.
|
2012-06-14 13:23:12 +02:00 |
Bjoern Schiessle
|
b0ecef02e9
|
debugging output removed
|
2012-06-14 13:17:06 +02:00 |
Bjoern Schiessle
|
e7b93b1807
|
xss vulnerability fixed for fancybox image viewer
|
2012-06-14 13:13:17 +02:00 |
Stephan Bergemann
|
bc6884b176
|
we don't neede the functions for empty stacks any more
|
2012-06-14 12:51:27 +02:00 |
Stephan Bergemann
|
b32afd1331
|
we don't have empty previewstacks any more - code cleaned up
|
2012-06-14 12:39:18 +02:00 |
Stephan Bergemann
|
56d2e99239
|
deleted some debugging output
|
2012-06-14 01:29:41 +02:00 |
Stephan Bergemann
|
22cd610a79
|
use images from deeper directories for preview if the actual directory doesn't contain any
|
2012-06-14 01:29:25 +02:00 |
Stephan Bergemann
|
9f59cc5eb0
|
improved look of directories not containing images directly
|
2012-06-14 01:29:17 +02:00 |
Stephan Bergemann
|
e99a95a756
|
now also working for directories only containing one image
|
2012-06-14 01:27:34 +02:00 |
Stephan Bergemann
|
4711c2bb41
|
fixed second_level_images issue
|
2012-06-14 01:27:26 +02:00 |
Stephan Bergemann
|
e4278574a8
|
fixed sorting errors and missbehaviours - now sorting like file browser
|
2012-06-14 01:27:01 +02:00 |
Georg Ehrke
|
e154806838
|
fix another ui bug of calendar
|
2012-06-13 22:20:43 +02:00 |
Georg Ehrke
|
2e44ffaf02
|
another ui fix
|
2012-06-13 22:14:40 +02:00 |
Georg Ehrke
|
b1139e977a
|
fix a ui bug for calendar sharing
|
2012-06-13 22:12:54 +02:00 |
Georg Ehrke
|
6bd80d6457
|
show username of the body who shares in the summary
|
2012-06-13 22:07:23 +02:00 |
Georg Ehrke
|
7d29bee859
|
fix merge conflicts
|
2012-06-13 21:40:05 +02:00 |
Bart Visscher
|
61b044e00e
|
Files Texteditor: Use our own "Droid Sans Mono" font-face and fonts
|
2012-06-13 21:39:12 +02:00 |
Bart Visscher
|
7a8e7f18db
|
Calendar: Clicking #datecontrol_date gives datepicker to jump to date
|
2012-06-13 21:39:12 +02:00 |
Bart Visscher
|
4da6b3a391
|
Calendar: Make button of #datecontrol_date
|
2012-06-13 21:39:12 +02:00 |
Georg Ehrke
|
c24752dc1d
|
Merge branch 'master' into calendar_export
|
2012-06-13 21:38:33 +02:00 |
Michael Gapczynski
|
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 |
Michael Gapczynski
|
bd01e93469
|
Add support for mounting Google Drive in external storage UI
|
2012-06-13 13:54:50 -04:00 |
Thomas Tanghus
|
613a122437
|
Remove check for encryption.
|
2012-06-13 19:03:34 +02:00 |
Thomas Tanghus
|
d33d599b1b
|
Remove debug statements.
|
2012-06-13 18:57:12 +02:00 |
Thomas Tanghus
|
bc1e8cb0a2
|
Contacts: implemented CSRF prevention.
|
2012-06-13 17:35:42 +02:00 |
Georg Ehrke
|
3a8b280c06
|
Merge branch 'master' into calendar_export
|
2012-06-13 15:29:47 +02:00 |
Georg Ehrke
|
9bdad6fdbf
|
fix merge conflicts
|
2012-06-13 11:40:00 +02:00 |
Michael Gapczynski
|
6f55a52858
|
Fix incorrect creation of filesystem for user@group in data folder during shares
|
2012-06-12 21:33:05 -04:00 |
Georg Ehrke
|
deb2f87556
|
increase version of calendar app to force db upgrade
|
2012-06-12 19:53:26 +02:00 |
Georg Ehrke
|
dc0adbad02
|
increase possible size of uri in database - fix oc-140
|
2012-06-12 19:52:25 +02:00 |
Georg Ehrke
|
f7727a322d
|
Merge branch 'master' into calendar_repeat
|
2012-06-12 19:26:52 +02:00 |
Michael Gapczynski
|
5f80be7664
|
Add support for mounting Dropbox in external storage UI
|
2012-06-12 11:36:43 -04:00 |
Bjoern Schiessle
|
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 |
Georg Ehrke
|
71573f7934
|
Merge branch 'master' into calendar_repeat
|
2012-06-12 15:58:01 +02:00 |
Georg Ehrke
|
c9d408ff8c
|
automatic cache repeating events after an update
|
2012-06-12 15:56:51 +02:00 |
Bjoern Schiessle
|
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 |
Thomas Tanghus
|
c44591e27a
|
Contacts: Final (for now) fix to encoding probs on import.
|
2012-06-12 12:32:37 +02:00 |
Bjoern Schiessle
|
b38ce8adfd
|
committed patch (bug #967) to add missing translations for file actions
|
2012-06-12 11:39:03 +02:00 |
Thomas Mueller
|
5e37a10334
|
PDF.JS updated, compatibility.js added for browser support, should fix: oc-395
|
2012-06-12 00:50:34 +02:00 |
Marco B
|
3be5e2af26
|
utf8 in der DB config
|
2012-06-11 23:04:28 +02:00 |
Georg Ehrke
|
66c3ddcd74
|
Merge branch 'master' into calendar_repeat
|
2012-06-11 22:18:46 +02:00 |
Georg Ehrke
|
3c9be43aa4
|
add some information about repeating events caching on personal settings page
|
2012-06-11 22:16:26 +02:00 |
Thomas Tanghus
|
ac11647d7a
|
Fix js for missing address fields.
|
2012-06-11 22:14:21 +02:00 |
Thomas Tanghus
|
4b86cbcb6f
|
Quick fix for index errors when not importing from files.
|
2012-06-11 22:14:21 +02:00 |
Thomas Tanghus
|
c75f9f9397
|
Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e
|
2012-06-11 22:14:21 +02:00 |
Thomas Tanghus
|
8af53829d5
|
Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-)
|
2012-06-11 22:14:21 +02:00 |
Georg Ehrke
|
08a3a4f185
|
fix a bug in OC_Calendar_Repeat
|
2012-06-11 21:43:24 +02:00 |
Bart Visscher
|
759ddcbf32
|
Tasks: Fix resizing of the content part
|
2012-06-11 20:34:06 +02:00 |
Bart Visscher
|
0eee140eaf
|
Gallery: remove extra include of lib/base.php
|
2012-06-11 20:34:06 +02:00 |
Bart Visscher
|
eddad8bedb
|
Calendar: remove unused markup from #controls
|
2012-06-11 20:34:06 +02:00 |
Lukas Reschke
|
f9bf34340c
|
Removed unecessary sanitization
|
2012-06-11 19:49:24 +02:00 |
Lukas Reschke
|
68f819ee20
|
Removed double sanitization
|
2012-06-11 19:47:42 +02:00 |
Georg Ehrke
|
9edd40354e
|
Merge branch 'master' into calendar_repeat
|
2012-06-11 19:46:12 +02:00 |
Lukas Reschke
|
ad36fc8938
|
Fix double sanitization
|
2012-06-11 19:43:37 +02:00 |
Lukas Reschke
|
6defbc7f4d
|
Removed some unessecary sanitizations
|
2012-06-11 19:20:48 +02:00 |
Lukas Reschke
|
2b22c538c8
|
Make some apps compatible
|
2012-06-11 19:07:51 +02:00 |
Bjoern Schiessle
|
1d493a70e7
|
replace "=0D=0A" (\r\n) with a simple "\n" in vards during import
|
2012-06-11 18:13:12 +02:00 |
Bjoern Schiessle
|
18d19b022f
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-06-11 17:28:15 +02:00 |
Georg Ehrke
|
09e744b793
|
connect OC_Calendar_repeat to events.php
|
2012-06-11 17:25:03 +02:00 |
Georg Ehrke
|
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 |
Georg Ehrke
|
2dd84373c1
|
fix bug in OC_Calendar_Repeat
|
2012-06-11 17:13:20 +02:00 |
Arthur Schiwon
|
fcc9a5c8d4
|
LDAP: offer config option for Group Display Name attribute
|
2012-06-11 16:48:43 +02:00 |
Bjoern Schiessle
|
739589f485
|
make sure that contact data are always utf8 encoded to avoid encoding problems
|
2012-06-11 16:26:21 +02:00 |
Georg Ehrke
|
24a1ab8c15
|
Merge branch 'master' into calendar_repeat
|
2012-06-11 15:38:02 +02:00 |
Georg Ehrke
|
44e62c03e2
|
increase version number of calendar
|
2012-06-11 15:37:19 +02:00 |
Georg Ehrke
|
32b366585d
|
some fixes for repeating events caching
|
2012-06-11 15:36:48 +02:00 |
Georg Ehrke
|
e6c8febafc
|
add hooks to connect calendar / event changes with OC_Calendar_Repeat
|
2012-06-11 15:18:46 +02:00 |
Georg Ehrke
|
5cb9d82b45
|
modify hooks in OC_Calendar_Calendar
|
2012-06-11 15:16:59 +02:00 |
Georg Ehrke
|
eb3605aa63
|
modify hooks in OC_Calendar_Object
|
2012-06-11 15:15:13 +02:00 |
Georg Ehrke
|
01bd048bb3
|
remove insert id
|
2012-06-11 15:01:48 +02:00 |
Georg Ehrke
|
40459c8c66
|
some work on repeating events caching - basic class should work now :)
|
2012-06-11 15:00:51 +02:00 |
Lukas Reschke
|
c009bc4b87
|
Revert
|
2012-06-11 13:27:32 +02:00 |
Thomas Tanghus
|
6d9947b3ff
|
Contacts: Fix NOTE also on add, not just save.
|
2012-06-11 12:55:54 +02:00 |
Lukas Reschke
|
6817a6b102
|
First try of implementing assignHTML
|
2012-06-11 12:45:07 +02:00 |
Arthur Schiwon
|
0df67aeae9
|
ldap: check array for emptiness, not nullness
|
2012-06-11 12:26:48 +02:00 |
Georg Ehrke
|
f4c459782b
|
Merge branch 'master' into calendar_repeat
|
2012-06-11 10:59:19 +02:00 |
Georg Ehrke
|
ece1162949
|
use native sabredav functions to generate repeating events
|
2012-06-11 10:55:26 +02:00 |
Thomas Tanghus
|
e79e18d866
|
Copy/paste error.
|
2012-06-11 02:40:55 +02:00 |
Lukas Reschke
|
3f9b967be7
|
Sanitizing user input
|
2012-06-11 00:36:58 +02:00 |
Lukas Reschke
|
f8d2e21c66
|
Sanitize user input
|
2012-06-11 00:23:35 +02:00 |
Lukas Reschke
|
27d1c1bb94
|
Sanitize user input
|
2012-06-11 00:14:28 +02:00 |
Lukas Reschke
|
9f276729c2
|
Using POST instead of GET.
|
2012-06-10 23:38:26 +02:00 |
Lukas Reschke
|
380aab470f
|
Sanitzing user input
|
2012-06-10 23:16:59 +02:00 |
Michael Gapczynski
|
3c57fb935b
|
Mount personal mount points into filesystem
|
2012-06-10 16:34:44 -04:00 |
Thomas Tanghus
|
40f8419fdf
|
Contacts: 11th hour fix for invalid VCARD from CardDAV.
|
2012-06-10 20:56:55 +02:00 |
Frank Karlitschek
|
bf4626da93
|
prevent XSS
|
2012-06-10 19:52:23 +02:00 |
Georg Ehrke
|
c6a03ec6d8
|
remove include command for when
|
2012-06-10 18:41:17 +02:00 |
Georg Ehrke
|
ef1b04619d
|
fix merge conflicts
|
2012-06-10 18:38:01 +02:00 |
Georg Ehrke
|
bdb76d4873
|
Merge branch 'master' into calendar_export
|
2012-06-10 18:37:16 +02:00 |
Bartek Przybylski
|
c11f6cc3f9
|
fix variable name and undefined index notice
|
2012-06-10 17:25:50 +02:00 |
Bartek Przybylski
|
76f20eb57c
|
fix first time image loading error
|
2012-06-10 13:05:00 +02:00 |
Thomas Tanghus
|
f90c8738ab
|
Contacts: Used non-existent var.
|
2012-06-10 12:48:39 +02:00 |
Bartek Przybylski
|
0838b4c225
|
gallery: removing search provider for now
|
2012-06-10 09:52:33 +02:00 |
Michiel de Jong
|
995f9c7348
|
sanitize scope and host
|
2012-06-09 21:08:24 +02:00 |
Michiel de Jong
|
322fd51261
|
avoid clickjacking
|
2012-06-09 21:08:24 +02:00 |
Michael Gapczynski
|
ab41b57f62
|
Add Dropbox storage backend
|
2012-06-09 15:02:48 -04:00 |
Michiel de Jong
|
b46903fa76
|
sanitize when logged in as another user
|
2012-06-09 20:39:24 +02:00 |
Robin Appelman
|
d065b2d29e
|
prevent opening non-music files through the media ajax api
|
2012-06-09 17:39:14 +02:00 |
Robin Appelman
|
601bac746d
|
use absolute path for file proxies
|
2012-06-09 17:34:13 +02:00 |
Georg Ehrke
|
e7f6f7e452
|
fix another XSS
|
2012-06-09 16:45:37 +02:00 |
Georg Ehrke
|
c9214afff8
|
fix XSS in Calendar
|
2012-06-09 16:35:35 +02:00 |
Georg Ehrke
|
2862740674
|
increase height of event dialog
|
2012-06-09 15:38:03 +02:00 |
Georg Ehrke
|
cfb9c764ca
|
fix creation of monthly repeated events
|
2012-06-09 15:15:00 +02:00 |
Bartek Przybylski
|
001293a702
|
removing app access check, fix title for links in tiles
|
2012-06-09 15:12:50 +02:00 |
Thomas Tanghus
|
081e1874cb
|
Contacts: Use POST instead of GET.
|
2012-06-09 15:00:44 +02:00 |
Thomas Tanghus
|
88341e5797
|
Code cleanup.
|
2012-06-09 15:00:44 +02:00 |
Georg Ehrke
|
28ab92ee76
|
make use of post instead of get
|
2012-06-09 14:41:26 +02:00 |
Bart Visscher
|
4aee5a7ce4
|
Tasks: Use POST for ajax calls that change data
|
2012-06-09 14:39:41 +02:00 |
Georg Ehrke
|
c83f418a02
|
Merge branch 'master' into calendar_repeat
|
2012-06-09 12:30:39 +02:00 |
Georg Ehrke
|
a9b561430a
|
add hooks for events
|
2012-06-09 12:30:09 +02:00 |
Georg Ehrke
|
7ed30649bb
|
add hooks for calendars
|
2012-06-09 12:18:25 +02:00 |
Georg Ehrke
|
cac995ee9f
|
some more work on repeating events caching
|
2012-06-09 11:49:25 +02:00 |
Georg Ehrke
|
ac74d87e3e
|
some work on repeating events caching
|
2012-06-08 22:22:16 +02:00 |
Bartek Przybylski
|
201a40a1a3
|
tabs for spaces, fix array key name
|
2012-06-08 21:55:28 +02:00 |
Bartek Przybylski
|
0c7431e57d
|
hide share button until sharing wont be fixed
|
2012-06-08 21:44:33 +02:00 |
Bartek Przybylski
|
8bc22907b8
|
adding navigation bar to gallery
|
2012-06-08 21:44:33 +02:00 |
Bartek Przybylski
|
6b0a2ae60e
|
remove old code
|
2012-06-08 21:44:32 +02:00 |
Bartek Przybylski
|
71b04717ab
|
adding missing file
|
2012-06-08 21:44:31 +02:00 |
Bartek Przybylski
|
9e434dea60
|
tabs for spaces, removing thumbnail on file removal
|
2012-06-08 21:44:31 +02:00 |
Bart Visscher
|
ac36512102
|
Don't use substr to get first char of string
|
2012-06-08 21:38:10 +02:00 |
Thomas Tanghus
|
0a49bae87a
|
Contacts: Closed stupid XSS hole. Thanks AnybodyElse ;-)
|
2012-06-08 20:39:54 +02:00 |
Georg Ehrke
|
e83e30a8a9
|
Merge branch 'master' into calendar_repeat
|
2012-06-08 19:54:42 +02:00 |
Michael Gapczynski
|
8fcdccdcdc
|
Add Amazon Web Services SDK to 3rdparty for Amazon S3 external storage
|
2012-06-08 13:48:38 -04:00 |
Michael Gapczynski
|
4b3ae60558
|
Working UI for external storage mount configuration
|
2012-06-08 11:42:29 -04:00 |
Arthur Schiwon
|
f70615106f
|
typo in var
|
2012-06-08 14:57:27 +02:00 |
Arthur Schiwon
|
4d3b7574f3
|
Sharing, fix: connect to hooks from the correct classes
|
2012-06-08 11:55:16 +02:00 |
Georg Ehrke
|
65cd15ca15
|
fix merge conflicts
|
2012-06-08 11:21:55 +02:00 |
Georg Ehrke
|
1d93a8fcfe
|
Merge branch 'master' into calendar_export
|
2012-06-08 11:20:17 +02:00 |
Robin Appelman
|
4768510923
|
split share and root config for smb backend, also sanitize config a bit more
|
2012-06-08 01:29:55 +02:00 |
Bart Visscher
|
4afcae8d56
|
Gallery: Fix database creation on update, also only from version less then 0.5
|
2012-06-07 23:38:50 +02:00 |
Brice Maron
|
cf02f3c107
|
Merge branch 'master' into multi_app_dir
|
2012-06-07 19:11:55 +00:00 |
Thomas Tanghus
|
d4f6f3e935
|
Contacts: Attempt to make file upload work in ICS Chrome.
|
2012-06-07 20:29:16 +02:00 |
Thomas Tanghus
|
33c802dcaa
|
Break text to fit in dialog.
|
2012-06-07 20:29:15 +02:00 |
Arthur Schiwon
|
c2f557f1dd
|
LDAP: cache the results, reduce LDAP searches
|
2012-06-07 18:55:32 +02:00 |
Arthur Schiwon
|
6626598435
|
ldap: enable the destructor
|
2012-06-07 18:13:41 +02:00 |
Bartek Przybylski
|
14e1be56a0
|
pictures: update script and removal some all stuff
|
2012-06-07 17:08:04 +02:00 |
Thomas Tanghus
|
d2a8746c49
|
Edited combobox to adhere to coding standards and added a dblclick handler.
|
2012-06-07 16:44:54 +02:00 |
Arthur Schiwon
|
44880ab3fa
|
ldap: remove unused private functions
|
2012-06-07 13:39:42 +02:00 |
Arthur Schiwon
|
6894882ca9
|
ldap: correct query condition and determining of success
|
2012-06-07 13:39:42 +02:00 |
Arthur Schiwon
|
470cb17f90
|
ldap: check index carefully, can be 0
|
2012-06-07 13:39:42 +02:00 |
Thomas Tanghus
|
312536dbf9
|
Migration: Fixed wrong download URL: http://forum.owncloud.org/viewtopic.php?f=4&t=2511
|
2012-06-07 13:08:42 +02:00 |
Thomas Tanghus
|
e1f4978150
|
Calendar: Added more explicit sync links and fixed indentation.
|
2012-06-07 12:21:24 +02:00 |
Thomas Tanghus
|
3804f68ff5
|
Contacts: Import upload button was obscured on Android browser.
|
2012-06-07 10:55:40 +02:00 |
Thomas Tanghus
|
9c84149119
|
A bit of pixel-pushing.
|
2012-06-07 10:55:40 +02:00 |
Bartek Przybylski
|
8fd6cdf407
|
adding title when fancybox is displayed
|
2012-06-06 23:29:23 +02:00 |
Bartek Przybylski
|
5417d803c4
|
replace spaces with tabs, use const and linkTo instead of static path
|
2012-06-06 23:23:49 +02:00 |
Brice Maron
|
5c2b2fc842
|
Change app path logic in templates
|
2012-06-06 20:24:16 +00:00 |
Brice Maron
|
6a812644e4
|
Correct remote and public, and last occurence of OC::
|
2012-06-06 20:24:15 +00:00 |
Brice Maron
|
cc494259d3
|
Unit path and webpath, correct some more
|
2012-06-06 20:24:15 +00:00 |
Bartek Przybylski
|
a90089c792
|
hack for file download
|
2012-06-06 22:20:56 +02:00 |
Bartek Przybylski
|
7c88081acb
|
removing test image
|
2012-06-06 22:13:49 +02:00 |
Bartek Przybylski
|
aa0fc3c69a
|
aviod incorrect image size returning in gallery listing
|
2012-06-06 22:13:49 +02:00 |
Bartek Przybylski
|
671fe49809
|
use fancybox to display image preview
|
2012-06-06 22:13:49 +02:00 |
Bartek Przybylski
|
76e7e361ae
|
navigate on galleries
|
2012-06-06 22:13:49 +02:00 |
Bartek Przybylski
|
34a21a63ce
|
new db scheme
|
2012-06-06 22:13:49 +02:00 |
Bartek Przybylski
|
6d211155ab
|
git status
|
2012-06-06 22:13:48 +02:00 |
Bjoern Schiessle
|
c960e42a17
|
fixed var name, $filename should be $foldername
|
2012-06-06 18:08:51 +02:00 |
Thomas Tanghus
|
5c17338ac7
|
Contacts: Make js a tad DRYer. Added URL property.
|
2012-06-06 15:29:33 +02:00 |
Thomas Tanghus
|
ed950e3ba2
|
Correct mime type.
|
2012-06-06 15:29:33 +02:00 |
Arthur Schiwon
|
190fca1121
|
LDPA: don't drop legal whitespaces when sanitizing DN. Fixes oc-914
|
2012-06-06 12:29:48 +02:00 |
Thomas Tanghus
|
ca0108aabf
|
Corrected typos.
|
2012-06-06 11:50:49 +02:00 |
Bjoern Schiessle
|
6abe8f9e2e
|
fixed wrong function call
|
2012-06-06 10:40:22 +02:00 |
Georg Ehrke
|
2fa19ce9a0
|
Merge branch 'master' into calendar_repeat
|
2012-06-06 10:12:11 +02:00 |
Georg Ehrke
|
d8d558377c
|
Merge branch 'master' into calendar_export
|
2012-06-06 10:11:34 +02:00 |