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 |
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 |
|
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 |
|
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
|
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 |
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 |