Bartek Przybylski
8fe5251029
unicode chars in gallery name fix
2012-02-25 20:38:22 +01:00
Georg Ehrke
bfb67286c8
fix merge conflicts
2012-02-25 16:54:27 +01:00
Robin Appelman
ea8f71a19c
Merge branch 'master' into encryption
2012-02-25 16:36:58 +01:00
Georg Ehrke
097ce76fc4
Merge branch 'master' into sabredav_1.6
2012-02-25 16:29:32 +01:00
Bartek Przybylski
3cf81cadd5
gallery thumbnail creation fix
2012-02-25 10:03:58 +01:00
Robin Appelman
7988541476
cleanup pdfviewer app name
2012-02-24 23:54:38 +01:00
Georg Ehrke
1d1dfcbc1a
replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime
2012-02-24 22:20:40 +01:00
Marvin Thomas Rabe
9df193f051
Calendar selection only available if there are more than one.
2012-02-23 22:28:14 +01:00
Marvin Thomas Rabe
7c738a1384
Sharing dropdown width fixed.
2012-02-23 22:28:13 +01:00
Georg Ehrke
b1fb325d48
rename updatecalendar to update
2012-02-23 22:07:31 +01:00
Georg Ehrke
f285790fa1
change links in the event form for the new ajax folders
2012-02-23 22:07:08 +01:00
Georg Ehrke
319e93f7fb
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
2012-02-23 22:06:43 +01:00
Georg Ehrke
cfa284bfa8
update js files for new ajax pathes
2012-02-23 22:06:16 +01:00
Georg Ehrke
8cd1027214
better var name in changeview.php
2012-02-23 22:00:46 +01:00
Georg Ehrke
b7de1850a0
add moved files to clean up ajax folder
2012-02-23 21:58:39 +01:00
Georg Ehrke
e188b96596
remove old ajax files
2012-02-23 21:58:01 +01:00
Bart Visscher
8f9c852325
Add filtering on category, priority and location
2012-02-23 21:11:31 +01:00
Marvin Thomas Rabe
ce4fe9e7cb
Editor fixed.
2012-02-23 20:36:20 +01:00
Frank Karlitschek
a62e109e8c
make the location of the 3rdparty folder flexible.
...
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
2012-02-23 15:37:38 +01:00
Marvin Thomas Rabe
196d619689
Little bookmark improvement
2012-02-22 23:58:38 +01:00
Marvin Thomas Rabe
358fd1c024
Changed text
2012-02-22 23:53:54 +01:00
Marvin Thomas Rabe
77493e8d70
Changed bookmarklet to read later widget
2012-02-22 23:52:56 +01:00
Marvin Thomas Rabe
996e6cf419
No bookmarks message will now show up if all bookmarks are delted
2012-02-22 23:28:36 +01:00
Marvin Thomas Rabe
3988ec2813
Updated bookmark form
2012-02-22 23:22:17 +01:00
Marvin Thomas Rabe
5387820a3b
changed look of bookmarklet
2012-02-22 23:08:50 +01:00
Alessandro Cosentino
70f9936651
sharing code between the two bookmarklets
2012-02-22 16:38:05 -05:00
Robin Appelman
814bc2fd2b
make encryption filetype blacklist configurable
2012-02-22 22:20:46 +01:00
Bart Visscher
c768751c23
Display more information in the task list
2012-02-22 22:06:06 +01:00
Bart Visscher
f3ebd29661
Fix updating task for new calendar API
2012-02-22 21:15:57 +01:00
Bart Visscher
18bac944b4
Change loading of tasks to ajax call
2012-02-22 20:21:27 +01:00
Bart Visscher
92db4f8be0
Update edittaskform for new calendar API
2012-02-22 20:12:54 +01:00
Bart Visscher
7f754c02f3
Change code from using OC_Tasks_VTodo to OC_Tasks_App
2012-02-22 20:11:38 +01:00
Michiel de Jong
3f87c2cedb
correct header Content-Type: application/xrd+xml
2012-02-22 19:05:41 +00:00
Michiel de Jong
9850820b42
BearerAuth and multiple tokens support in remoteStorage app
2012-02-22 18:05:52 +00:00
Michiel de Jong
6c6b570ff1
avoid notice in error log from user_webfinger app
2012-02-22 18:04:21 +00:00
Marvin Thomas Rabe
fd72f2bd29
Removed redundant code.
2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe
e2d6bf4c63
Bookmarklet Window closes itself after submit.
2012-02-22 16:04:32 +01:00
Marvin Thomas Rabe
d9914664f6
Text editor display error fixed.
2012-02-22 16:04:31 +01:00
Marvin Thomas Rabe
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
Robin Appelman
ed0c99ef14
make sure we always have the encryption key unlocked
2012-02-22 15:18:22 +01:00
Robin Appelman
1a9ded981b
Merge branch 'master' into enc
2012-02-22 14:26:52 +01:00
Thomas Tanghus
faf6055baa
Translate and fix copy/paste error.
2012-02-22 14:19:23 +01:00
Bart Visscher
499ec15c26
Add icon for tasks app
2012-02-22 13:32:04 +01:00
Bart Visscher
4af22bfb7a
Merge branch 'master' into tasks
2012-02-22 11:56:24 +01:00
Georg Ehrke
9460c9e907
remove old import.php
2012-02-22 11:53:28 +01:00
Thomas Tanghus
9794e7e427
Fix merge conflict.
2012-02-22 11:20:57 +01:00
Georg Ehrke
cff0ac2bf9
better permission check in resize.php
2012-02-22 10:42:33 +01:00
Georg Ehrke
0ae088a50a
add getowner function to OC_Calendar_Object
2012-02-22 10:42:01 +01:00
Georg Ehrke
48f42176cd
add is_editing_allowed function to OC_Calendar_Share
2012-02-22 10:41:16 +01:00
Georg Ehrke
d20b8399c3
clean up sql commands in OC_Calendar_Share
2012-02-22 10:20:58 +01:00
Thomas Tanghus
c5c843bfef
Improved upgrading VCARD v. 2.1 => 3.0. Improved import of malformed cards. Remove duplicate code.
2012-02-21 23:22:06 +01:00
Thomas Tanghus
e0c92662f8
JS fix on address book creation.
2012-02-21 23:22:06 +01:00
Thomas Tanghus
a79f5d40de
Remove my FIXME comments when I've fixed it :-P
2012-02-21 23:22:06 +01:00
Robin Appelman
c20319d377
fix incorrect information in the filecache when using encryption
2012-02-21 20:48:49 +01:00
Robin Appelman
d9c7e4c333
proper mimetypes for encrypted files
2012-02-21 20:48:48 +01:00
Robin Appelman
325858e9e2
add stream wrapper for in-memory files and dont use global variables for the fakedir stream wrapper
2012-02-21 20:48:48 +01:00
Robin Appelman
c121a1a1e7
implement file_put_contents with stream data using fopen
2012-02-21 20:48:48 +01:00
Robin Appelman
6a8364c3ff
rework the way file_put_contents is handeled
2012-02-21 20:48:48 +01:00
Robin Appelman
b3a974d8bb
only trigger hooks for the default filesystem view
2012-02-21 20:48:48 +01:00
Robin Appelman
f1cbb9effc
initial integration of encryption
2012-02-21 20:48:48 +01:00
Robin Appelman
e2b4954176
simple file encryption wip
2012-02-21 20:48:48 +01:00
Robin Appelman
3d67cd51c2
encryption proxy wip
2012-02-21 20:48:47 +01:00
Bart Visscher
d3e6ea6ac0
Bookmarks: uses the core action icons
2012-02-21 20:28:24 +01:00
Georg Ehrke
3d8d6d718b
add 'permissions' as a sql condition in allSharedwithuser
2012-02-21 20:10:52 +01:00
Bart Visscher
86d2927c02
Calendar: Correct calendarcolor format for ical color property
2012-02-21 20:10:40 +01:00
Georg Ehrke
236d2aa5b8
rename updatecalendar to update
2012-02-21 19:42:48 +01:00
Georg Ehrke
e227a65f66
Merge remote-tracking branch 'origin/calendar_sharing' into calendar_sharing
2012-02-21 19:36:42 +01:00
Georg Ehrke
70a369e16d
change links in the event form for the new ajax folders
2012-02-21 19:16:14 +01:00
Marvin Thomas Rabe
21f8d0992f
Added missing files
2012-02-21 18:29:49 +01:00
Thomas Tanghus
7a49c8e59c
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 23:42:06 +01:00
VicDeo
d5f7a39936
Contact list scroll fix
2012-02-20 23:54:23 +03:00
Thomas Tanghus
ffdfe8257b
Contacts: Fix adding/updating address book with empty name.
2012-02-20 15:24:54 +01:00
Thomas Tanghus
456ada01fa
Contacts: Apply strip_tags on compound values.
2012-02-20 14:36:21 +01:00
Thomas Tanghus
12bcbcdc62
Update ctag in deleteFromDAVData.
2012-02-20 14:24:10 +01:00
Thomas Tanghus
8ed4262393
Merge gitorious.org:owncloud/owncloud into vcategories
2012-02-20 13:18:22 +01:00
Georg Ehrke
0ae2e250f5
change pathes in calendar/templates/* files to make them work with the new folder structure in /calendar/ajax
2012-02-20 11:52:19 +01:00
Georg Ehrke
a069d83f44
fix unexspected T-String in calendars index.php
2012-02-20 11:46:10 +01:00
Georg Ehrke
ec7ed3c882
add rw and r to events.php
2012-02-20 11:35:19 +01:00
Georg Ehrke
619c62e681
change parameter names for shared calendars
2012-02-20 11:31:41 +01:00
Georg Ehrke
548a2e6263
add readonly calendar to the eventsources
2012-02-20 11:28:20 +01:00
Georg Ehrke
3efa69bc84
update js files for new ajax pathes
2012-02-20 11:27:25 +01:00
Georg Ehrke
1cf7fc261f
better var name in changeview.php
2012-02-20 11:26:43 +01:00
Georg Ehrke
8dff0fb58d
add moved files to clean up ajax folder
2012-02-20 11:26:22 +01:00
Georg Ehrke
ceb0016bdc
remove old ajax files
2012-02-20 11:25:42 +01:00
Arthur Schiwon
7ff4e40b20
Combing LDAP backend with LDAP extended backend
2012-02-20 10:39:55 +01:00
Alessandro Cosentino
490c9db15d
Added bookmarklet for browser. Inspired by Google Bookmarks
2012-02-19 20:18:27 -05:00
Thomas Tanghus
c62673d360
Added public static OC_VCategories object to OC_Contacts_App.
...
Parse cards for new categories in add and edit methods.
2012-02-19 23:32:09 +01:00
Florian Pritz
9d2379742b
apps/calendar: update ctag after deleteFromDAVData
...
Without this clients won't see the update because they compare ctags
before fetching the actual calendar to reduce traffic.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2012-02-19 21:42:47 +01:00
Michael Gapczynski
87627c7a50
Fix overwriting of internal sharing for shared folders - bug oc-260
2012-02-18 19:30:54 -05:00
Tom Needham
71a2241aee
Fixed call to OC_User. Thanks Burillo on IRC
2012-02-18 23:53:10 +00:00
Thomas Tanghus
2ee2f87efe
Strip tags on address on client side.
2012-02-18 11:49:31 +01:00
Thomas Tanghus
868cf6bb83
Avoid errors from missing GD library.
2012-02-18 11:49:31 +01:00
Thomas Tanghus
96612c506e
Removed obsolete commented code and made minor speed improvements.
...
Added stub function for loading categories.
2012-02-18 11:49:31 +01:00
Georg Ehrke
d8734cee02
fix sql command
2012-02-18 11:21:07 +01:00
Michael Gapczynski
6f1ed85f0b
Temporary fix for sharing files
2012-02-17 21:56:20 -05:00
Bart Visscher
6bbd67c3c6
Calendar: only update default view when it really changed
2012-02-17 22:10:02 +01:00
Bart Visscher
539fd7240c
Calendar: optimize sending calendar events, also enabled caching of result
2012-02-17 22:09:31 +01:00
Bart Visscher
a33b757b19
Calendar: Add default repeat values when editing a non-repeating event
2012-02-17 22:09:22 +01:00
Bart Visscher
dab5531474
Bookmarks: Fix image urls in bookmarks.js
2012-02-17 22:07:15 +01:00
Bart Visscher
e8b69d45a3
Fixup use of OC_Helper::linkTo function
2012-02-17 22:07:14 +01:00
Bart Visscher
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
Bart Visscher
5f3c549227
Contacts: Add removed app enabled check
2012-02-17 22:07:14 +01:00
Georg Ehrke
011bc1e764
fix unsharing of groups
2012-02-17 21:19:04 +01:00
Henning Becker
62da0bae43
Handle event exceptions in calendar app. Execeptions to recurring events are not shown anymore.
2012-02-17 14:32:02 +01:00
Georg Ehrke
a3b8d54576
Merge branch 'master' into calendar_sharing
2012-02-17 14:14:53 +01:00
Thomas Tanghus
86893ea78c
UI tweaks for name selector combobox.
2012-02-16 10:38:00 +01:00
Thomas Tanghus
fa7fabf024
Minor tweaks
2012-02-16 10:38:00 +01:00
Tom Needham
e6b835bea8
Update breadcrumb css on close
2012-02-14 21:55:51 +00:00
Tom Needham
aec6a3c32f
Fix editing shared files and file opening bug. Fixes oc-209 and oc-195
2012-02-14 21:49:51 +00:00
Thomas Tanghus
31dab0372d
Added some fixes for what to show when address books are (de)selected, all contacts deleted etc. Still need some cleaning up.
2012-02-14 13:57:11 +01:00
Thomas Tanghus
ae426ad115
Added some check for when addinf deleting contacts.
2012-02-14 10:36:22 +01:00
Thomas Tanghus
f7161bb48b
Added some error checking as mentioned in http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-227
2012-02-14 02:15:21 +01:00
Thomas Tanghus
dc20900e10
Modify check for missing UID.
2012-02-14 01:56:38 +01:00
Thomas Tanghus
53503148f3
Use proper index file.
2012-02-14 01:47:18 +01:00
Thomas Tanghus
4446854f75
Don't try to load a profile picture for contacts the doesn't have any.
2012-02-14 01:11:21 +01:00
Thomas Tanghus
07c422d81d
Removed superfluous debug.
2012-02-14 01:02:01 +01:00
Thomas Tanghus
3adaacc0ce
Added OC_Contacts_VCard::moveToAddressBook
2012-02-14 01:00:41 +01:00
Thomas Tanghus
024405e4f1
Added function for later testing.
2012-02-14 01:00:41 +01:00
Bart Visscher
a37bd93222
External: Use OC_Util::checkLoggedIn
2012-02-14 00:13:04 +01:00
Bart Visscher
777804fac2
Gallery: remove unused cover.php
2012-02-14 00:12:22 +01:00
Bart Visscher
525306c1e2
Replace Expires and caching headers by OC_Response functions
2012-02-13 23:48:05 +01:00
Bart Visscher
29fc82c364
Send gallery album thumbnail with OC_Response::sendFile
2012-02-13 23:35:37 +01:00
Bart Visscher
594dcf13f2
Contacts+OC_Respone: Move enableCaching out of setEtagHeader and setLastModifiedHeader
2012-02-13 22:47:31 +01:00
Bart Visscher
169ddc5b0b
Gallery: Only get local file when generating photo thumbnail
2012-02-13 22:39:30 +01:00
Bart Visscher
e137020f67
Gallery: Use OC_Respone::enableCaching for (album)thumbnails
2012-02-13 22:38:34 +01:00
Bart Visscher
e084386770
Gallery: Move login check to beginning of galleryOp.php
2012-02-13 22:33:52 +01:00
Bart Visscher
e402896001
Gallery: Remove autoloaded includes from galleryOp.php
2012-02-13 22:33:48 +01:00
Georg Ehrke
01827e9340
Merge branch 'master' into calendar_sharing
2012-02-13 17:08:52 +01:00
Georg Ehrke
40d343e2af
fix oc-bug 239 - & => &
2012-02-12 22:34:10 +01:00
Bart Visscher
5c816c0cc9
Contacts: Optimize thumbnail cache handling a bit
2012-02-12 20:40:52 +01:00
Bart Visscher
125cf79a37
OC_Response: add setExpiresHeader function
2012-02-12 20:40:52 +01:00
Bart Visscher
45bb6f5fd4
OC_Response: add redirect function
2012-02-12 20:40:52 +01:00
Bart Visscher
ee7931f457
Contacts: Add missing parameter
2012-02-12 20:40:52 +01:00
Bart Visscher
0917bdecdd
Contacts: Move response caching to OC_Response
2012-02-12 17:21:33 +01:00
Tom Needham
a0bb6079c5
Add description to texteditor info.xml -fix oc-234
2012-02-12 15:42:05 +00:00
Bart Visscher
f5385e4a63
Contacts: Add id to vars with id in them
2012-02-12 16:12:46 +01:00
Bart Visscher
623afb69b6
Contacts: cleanup OC_L10N usage
2012-02-12 16:11:41 +01:00
Bart Visscher
39f342d595
Contacts: Move debug logging of $_POST to after access checks
2012-02-12 15:58:55 +01:00
Bart Visscher
6eb1427ac0
Contacts: Document usage of OC_Contacts_App::getAddressbook
...
Remove redundant access checks and add comments to the calls to
OC_Contacts_App::getAddressbook that are access checks
2012-02-12 15:55:36 +01:00
Bart Visscher
b77132edbe
Contacts: Save last-modified time in REV property if not set
2012-02-12 15:14:25 +01:00
Bart Visscher
6bd0aad117
Contacts: Fix adding N property in getContactVCard
2012-02-12 15:14:24 +01:00
Bart Visscher
facd4cbe17
Contacts: Cleanup photo and thumbnail code
2012-02-12 15:14:24 +01:00
Bart Visscher
90d189a8b3
Access check fix in contacts/ajax/activation.php
...
plus small cleanup
2012-02-12 15:14:24 +01:00
Bart Visscher
8f3da6ee9b
Small coding style update
...
Fixup OC_Contacts_App
2012-02-12 15:14:23 +01:00
Bart Visscher
1a74f0a18c
Improve logging in OC_Contacts_App
...
Add logging to errors paths in getAddressbook and getContactObject.
2012-02-12 15:14:23 +01:00
Bart Visscher
c4ee924869
Cleanup OC_Contacts_Addressbook::find usage
...
Use OC_Contacts_App::getAddressbook($id) instead of OC_Contacts_Addressbook::find($id), it contains access checks.
2012-02-12 15:14:23 +01:00
Georg Ehrke
c9db88aa3b
Merge branch 'master' into calendar_sharing
2012-02-12 10:46:34 +01:00
Georg Ehrke
73038156cc
check userrights in events.php
2012-02-12 10:40:57 +01:00
Bart Visscher
b5418173e5
Derive the user principles from the owncloud users
...
The code for updating the principles table is still there. To make it easier to
revert this commit if that is necessary.
2012-02-11 21:09:51 +01:00
Georg Ehrke
db23ec5c1c
show shared calendars
2012-02-11 14:02:51 +01:00
Georg Ehrke
66ac6c232c
fix sharing calendar manager
2012-02-11 13:30:15 +01:00
Tom Needham
20b9678789
replace database name and table prefix with default values
2012-02-10 20:23:28 +00:00
Georg Ehrke
a8b7ae515c
Merge branch 'master' into calendar_sharing
2012-02-10 19:36:00 +01:00
Thomas Tanghus
1d6b4f8f3c
Merge branch 'tanghus_contacts'
2012-02-10 16:44:06 +01:00
Thomas Tanghus
b4924ed1e5
Variable wasn't reset.
2012-02-10 16:43:40 +01:00
Thomas Tanghus
fd9ce6da35
Merge gitorious.org:owncloud/owncloud into tanghus_contacts
2012-02-10 16:42:45 +01:00
Thomas Tanghus
c95e8a1fc5
Added custom combobox widget.
2012-02-10 16:40:40 +01:00
Tom Needham
2f80df1f9e
Merge branch 'master' of gitorious.org:owncloud/owncloud into migration
2012-02-10 15:24:26 +00:00
Bart Visscher
9379c3e128
Gallery: remove unset call, not needed anymore
2012-02-09 22:47:05 +01:00
Thomas Tanghus
25f1263c11
Merge gitorious.org:owncloud/owncloud into tanghus_contacts
2012-02-09 19:07:54 +01:00
Thomas Tanghus
ff53b0c209
Keep js data structure in sync on changes.
...
More checks for missing properties.
2012-02-09 19:04:07 +01:00
Bart Visscher
88b2391d2b
Fix wrong var name in sharedstorage.php
2012-02-08 21:12:31 +01:00
Bart Visscher
7cd1a302d3
Gallery: Add caching headers to album thumbnail sending
2012-02-08 21:12:31 +01:00
Bart Visscher
158360c09b
Gallery: use thumbnails of images for the album thumbnail
...
The thumbnails were already generated in this function, but now we save them
for displaying of the album.
2012-02-08 21:12:31 +01:00
Bart Visscher
43d2266f5c
Add caching to gallery thumbnail generation
2012-02-08 21:12:30 +01:00
Bart Visscher
eb5de4d4f7
Change gallery thumbnail generation to OC_Image
2012-02-08 21:12:30 +01:00
Bart Visscher
7c03b612d2
OC-41: [Calendar] Date format not translatable
2012-02-08 21:12:30 +01:00
Robin Appelman
c4a6b99814
use oc_filecache and oc_eventsource for music scanning
2012-02-08 17:30:16 +01:00
Georg Ehrke
9fd07ee10d
Merge branch 'master' into calendar
2012-02-08 17:13:50 +01:00
Robin Appelman
36d696c30d
dont load pdfview for ie
2012-02-08 16:28:59 +01:00
Robin Appelman
5f7727629a
Merge branch 'filesystem'
2012-02-08 15:50:58 +01:00
Thomas Tanghus
25faa40bd0
More @£#¤ conflicts
...
Merge branch 'temp' into tanghus_contacts
2012-02-08 09:36:16 +01:00
Thomas Tanghus
f4a586a52c
Fix merge conflicts
2012-02-08 09:18:58 +01:00
Thomas Tanghus
c191ef6459
Added files for new contact editor/viewer.
2012-02-08 09:14:10 +01:00
Thomas Tanghus
0c5eb542bd
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
6112cdc7e8
Hide container for emails/phones/adresses if there are none.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
9f1370a6d1
Updated copyrights.
...
Element menu didn't update.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
c0c6b5310e
Added files for new contact editor/viewer.
2012-02-08 08:47:03 +01:00
Thomas Tanghus
3e9a69b9b7
Merge branch 'tanghus_contacts' of gitorious.org:owncloud/owncloud into tanghus_contacts
...
Conflicts:
apps/contacts/ajax/contactdetails.php
apps/contacts/js/contacts.js
2012-02-08 08:33:51 +01:00
Thomas Tanghus
424c64c0eb
Don't import cards that can't be parsed by Sabre, but log it instead.
...
Fix missing 'N' or 'FN' fields on import.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
249e46c5b7
Some fixes for malformed VCards.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
4db661ba9d
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
23396721e4
Hide container for emails/phones/adresses if there are none.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
1e4444f25b
Updated copyrights.
...
Element menu didn't update.
2012-02-08 07:59:39 +01:00
Thomas Tanghus
90a830baba
Added files for new contact editor/viewer.
2012-02-08 07:59:39 +01:00
Georg Ehrke
cdf1cf82ba
merge 64a617b2a1
into master
2012-02-07 22:49:23 +01:00
Thomas Tanghus
2cebfb50a4
Fixed broken "Add new" contact.
...
Possible fix for cards with missing 'FN' property added through DAV.
Misc. UI cleanups.
2012-02-06 14:18:40 +01:00
Thomas Tanghus
5962e66b6d
Hide container for emails/phones/adresses if there are none.
2012-02-06 08:15:23 +01:00
Thomas Tanghus
bc79951f33
Updated copyrights.
...
Element menu didn't update.
2012-02-06 08:04:06 +01:00
Thomas Tanghus
3af427fa54
Added files for new contact editor/viewer.
2012-02-06 07:32:57 +01:00
Thomas Tanghus
89616d81f0
Modification for adding photos.
2012-02-06 07:24:39 +01:00
Tom Needham
960dd750c9
Added dbexport to export output. Initial import code.
2012-02-05 23:00:38 +00:00
Robin Appelman
30673e4786
writable not writeable
2012-02-05 14:03:44 +01:00
Georg Ehrke
89073970d3
change comments in import.php
2012-02-05 12:13:53 +01:00
Georg Ehrke
8337eaa1ec
add import function for contacts
2012-02-05 12:13:53 +01:00
Robin Appelman
36bc1a2102
Merge branch 'master' into filesystem
2012-02-05 01:22:29 +01:00
Georg Ehrke
55be59e738
Merge branch 'master' into calendar
2012-02-04 21:34:38 +01:00
Georg Ehrke
5e08d1bb40
Merge branch 'calendar' of gitorious.org:owncloud/owncloud into calendar
2012-02-04 21:27:18 +01:00
Georg Ehrke
b810380d56
add sharing management for calendars
2012-02-04 21:23:31 +01:00
Bartek Przybylski
cfc710e768
preferences store fix
2012-02-04 20:15:55 +01:00
Bartek Przybylski
f6a27dfa28
stripping root from gallery name
2012-02-04 15:35:58 +01:00
Bartek Przybylski
f1672d7d10
handling special chars in dirnames
2012-02-04 11:02:13 +01:00
Bartek Przybylski
5a106d1036
gallery: fix FS hooks
2012-02-04 10:30:32 +01:00
Tom Needham
24c79c5bce
Updated Migrate_provider bookmakr implementation
2012-02-03 22:41:39 +00:00
Tom Needham
1133eaa679
load bookmarks provider class
2012-02-03 21:28:58 +00:00
Tom Needham
ee88ded463
more commenting out for debugging, added logging commands
2012-02-03 21:00:12 +00:00
Tom Needham
0bbc9ade7d
fix syntax, add logging, debug xml output instead of zip
2012-02-03 20:48:32 +00:00
Bartek Przybylski
8df0650658
gallery settings, defining scan root and shor order
2012-02-03 21:38:44 +01:00
Bartek Przybylski
ee01d1a81d
removing console error in safari for bookmarks
2012-02-03 21:37:09 +01:00
Tom Needham
5507db9b15
Initial migration code, and basic export for bookmarks
2012-02-03 20:32:06 +00:00
Georg Ehrke
ab31a890b6
use strip_tags for calendar names
2012-02-02 21:23:41 +01:00
Georg Ehrke
bfa69c3e59
add a label calendar to the settings page - bugfix for oc-157
2012-02-02 18:37:06 +01:00
Thomas Tanghus
6225b5ec86
More in-/output sanitation,
2012-02-02 17:54:30 +01:00
Thomas Tanghus
66b96e4440
Sanitize in- and output.
2012-02-02 17:54:30 +01:00
Georg Ehrke
f81ac81550
fix merge conflicts
2012-02-02 17:48:29 +01:00
Robin Appelman
7b9fb84fe9
Merge branch 'master' into filesystem
2012-02-02 17:30:54 +01:00
Georg Ehrke
92b8f32386
Calendar: Bugfix: better input validation
2012-02-02 15:01:05 +01:00
Georg Ehrke
91b705cc4f
remove debug file
2012-02-02 12:37:58 +01:00
Georg Ehrke
f870f9efcf
validate parameters in changeview.php
2012-02-02 12:18:29 +01:00
Georg Ehrke
9e5172f75c
Merge branch 'master' into calendar
2012-02-02 12:12:48 +01:00
Bartek Przybylski
f198296576
gallery works in safari now
2012-02-01 22:15:46 +01:00
Marvin Thomas Rabe
f999fbf81a
Bookmark layout updated
2012-02-01 22:02:06 +01:00
Marvin Thomas Rabe
bbd10a3c94
Bookmark layout updated
2012-02-01 21:19:31 +01:00
Robin Appelman
d514b1d92d
Merge branch 'master' into filesystem
2012-02-01 15:57:32 +01:00
David Iwanowitsch
6583d30e26
fix javascript
2012-02-01 15:40:59 +01:00
David Iwanowitsch
e229a6adec
Added searchprovider for bookmarks, initial l10n support for bookmark plugin
...
moved some code from updateList.php to bookmarks.php, to make it reusable
2012-02-01 15:40:59 +01:00
Robin Appelman
0124809a42
prevent sharing from making aditional http requests while scanning
...
additional requests to the server can block feedback of scannning depending on server configuration
2012-02-01 15:33:12 +01:00
Georg Ehrke
39d312861a
add active to the db structure of shared calendars
2012-01-31 22:33:39 +01:00
Georg Ehrke
2b8ec1cad0
Calendar: fix html of import dialog
2012-01-31 22:03:08 +01:00
Georg Ehrke
153467dbe0
add share as a tab
2012-01-31 21:39:40 +01:00
Georg Ehrke
7b82d153c7
Merge branch 'master' into calendar
2012-01-31 21:35:08 +01:00
Georg Ehrke
3a5d3dfd97
increase version number to force db upgrade
2012-01-31 21:33:50 +01:00
Georg Ehrke
32bff22dc7
change db structure of calendar for sharing calendars
2012-01-31 21:26:09 +01:00
Georg Ehrke
64a617b2a1
fix all day with one day to much - bugfix for oc-126
2012-01-31 20:46:27 +01:00
Thomas Tanghus
1f718d31e1
Merge branch 'tanghus_contacts'
2012-01-31 19:35:11 +01:00
Thomas Tanghus
6c340416d9
Resize profile picture if bigger than 200px on either x or y.
...
Bolded text on message box.
2012-01-31 19:32:24 +01:00
Thomas Tanghus
3f1486534f
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-93
...
Property was added multiple times.
- Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-8
"Missing "N" field: Contacts app not compatible with vcard 3.0 format"
- Almost sure I've fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-27
"Full name in Contacts app doesn't sync to iOS 5 contacts" because it is caused by oc-8
2012-01-31 19:30:56 +01:00
Thomas Tanghus
db1f77e4f5
Some reminders in the code of what I have to change post OC3.0
2012-01-31 19:30:56 +01:00
Georg Ehrke
149bbeb260
make tab names translatable
2012-01-31 17:15:25 +01:00
Georg Ehrke
c72c4dd412
add alarm as a tab
2012-01-31 16:59:34 +01:00
Georg Ehrke
4c1fb4c282
fix style of the tabs
2012-01-31 16:49:21 +01:00
Robin Appelman
803f86e0fc
dont try to use the filesystem when it isnt setup yet
2012-01-31 12:44:01 +01:00
Georg Ehrke
538618df62
Merge branch 'master' into calendar
2012-01-31 11:58:40 +01:00
Georg Ehrke
fc70c7094a
add tabs for repeating and attendees in the event form
2012-01-31 11:57:09 +01:00
Robin Appelman
1191b57b34
Merge branch 'master' into filesystem
2012-01-30 23:20:47 +01:00
Michael Gapczynski
e0f655fb70
Sharing app needs to be loaded for public link of file in Shared folder - fixes bug 113
2012-01-30 16:49:24 -05:00
Robin Appelman
4522d19b4c
merge master into filesystem
2012-01-30 20:29:33 +01:00
Bartek Przybylski
5574b87e9b
new gallery look and feel
2012-01-30 19:36:33 +01:00
Georg Ehrke
30f1de71a6
remove debug file
2012-01-29 16:08:09 +01:00
Georg Ehrke
928e9b121b
fix version-compare in calendars app.php
2012-01-29 10:59:15 +01:00
Robin Appelman
ad4e305c96
update translations
2012-01-27 00:59:24 +01:00
Robin Appelman
830cf87697
use the correct hooks to remove contact/calendars of remvoed users
2012-01-26 19:05:46 +01:00
Robin Appelman
266fbb442e
use oc_filesystem::getlocalfile instead of manually trying to get the correct local file when creating album covers
...
fixes broken album covers on shared files
2012-01-26 18:12:59 +01:00
Bartek Przybylski
63ae4b3dfc
db cleanup after gallery remove
2012-01-25 21:15:27 +01:00
Bartek Przybylski
5172e0a7a3
creating thumbnails on upload, recursive remove
2012-01-25 21:07:43 +01:00
Thomas Tanghus
e6298325f6
Removed debug output
2012-01-24 23:08:40 +01:00
Thomas Tanghus
5458e52935
Fixed http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-92
...
"Character '&' in address data causes wrong data".
This was also the case for the 'N' property.
2012-01-24 23:08:40 +01:00
Robin Appelman
a77f3a07a1
Fix some issues in ampache resonponse
...
Patch by Markus Germeier
2012-01-24 02:56:57 +01:00
Robin Appelman
6fccf12299
update translations
2012-01-24 00:42:08 +01:00
Robin Appelman
cdfb252ced
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-24 00:24:09 +01:00
Bartek Przybylski
456394d3ec
oc-89 handling no photos in collection alert
2012-01-23 23:25:36 +01:00
Tom Needham
e1a499f65d
disable keyboard shortcuts as temp fix
2012-01-23 20:59:37 +00:00
Georg Ehrke
b8e01939e9
fix undefined indices - bugfix for oc-99
2012-01-23 15:05:53 +01:00
Georg Ehrke
66f8a0e1a3
validate the calendar name
2012-01-21 17:42:52 +01:00
Georg Ehrke
78c5c2e7d5
fix Undefined variable - bugfix for oc-69
2012-01-21 17:42:52 +01:00
Robin Appelman
01ebb74a33
some gallery css fixes
2012-01-21 00:54:02 +01:00
Bartek Przybylski
437d50c6f6
recognizing img basing on extension
2012-01-20 23:28:40 +01:00
Robin Appelman
97901391f4
make media detection based on extention case insensitive
2012-01-20 19:34:34 +01:00
Robin Appelman
415e968612
fix renaming albums
2012-01-20 19:32:08 +01:00
Robin Appelman
b5ae924031
dont show errors when not renaming an album
2012-01-20 19:28:57 +01:00
Robin Appelman
9dcdf517f5
fix deleting/renaming albums with a ' in the name
2012-01-20 19:26:09 +01:00
Robin Appelman
7ea2923fa8
translation updates
2012-01-20 18:53:45 +01:00
Robin Appelman
735fcf8bd2
only double quoted string seems to be detected in js
2012-01-20 17:47:55 +01:00
Robin Appelman
1c311c36bf
add translation wrappers to gallery strings in js
2012-01-20 17:09:31 +01:00
Robin Appelman
42ef44e1b4
show proper feedback that collection scanning is done and show the collection afterwards
2012-01-20 01:41:37 +01:00
Cloud Dumper
6ccb1187df
Don't wrap collection cells.
...
This change makes sure cells are never wrapped.
If the text is too big for the column, ellipsis is
used instead.
2012-01-20 01:14:21 +01:00
Cloud Dumper
d12afe0541
Sort songs also by path.
...
Add song_path in the ORDER BY.
Fix oc-31.
2012-01-20 01:14:01 +01:00
Robin Appelman
3552626358
Merge branch 'master' into filesystem
2012-01-20 00:48:03 +01:00
Bart Visscher
ccad24a925
[Calendar] Use class for active view button
2012-01-19 21:00:19 +01:00
Bart Visscher
838766add0
OC-23: [Calendar] Double vertical scrollbar in week view
2012-01-19 20:50:22 +01:00
Thomas Tanghus
ca03a26f15
- Added fix for empty 'FN' field on import via CardDAV clients.
...
- Make sure that the contact in the list has a display name.
- More tweaks on thumbnail caching.
2012-01-19 19:47:09 +01:00
Thomas Tanghus
137c630377
Optimizations and more aggressive caching.
2012-01-19 18:28:17 +01:00
Thomas Tanghus
5bd117dd6d
UI fixes in contact editor and address book dialog.
...
Error checking in ajax methods.
Localize menu entry.
2012-01-19 16:07:17 +01:00
Thomas Tanghus
dc942d6f3e
Added redirecting to static image file and caching for contacts with no photo embedded.
2012-01-19 16:07:17 +01:00
Georg Ehrke
ce13b3b7cd
fix double new calendar button - bugfix for oc 59
2012-01-19 12:27:16 +01:00
Bartek Przybylski
b44a7dc36a
enhancement: oc-36
2012-01-17 20:12:26 +01:00
Bartek Przybylski
10aa296895
fix: oc-33
2012-01-17 20:00:12 +01:00
Georg Ehrke
69ca0ae177
move loading icon to the top bar
2012-01-17 19:48:29 +01:00
Georg Ehrke
1f95231801
use button for new calendar
2012-01-17 19:09:11 +01:00
Georg Ehrke
6e86b34586
Merge branch 'master' into calendar
2012-01-17 15:57:29 +01:00
Georg Ehrke
91016e37d4
fix ocbug 34
2012-01-17 15:38:32 +01:00
Georg Ehrke
42b1c75a66
fix ocbug 24
2012-01-17 15:18:01 +01:00
Michael Gapczynski
7859c1105c
Apps need to be enabled in order to search through Shared directory for media scanning
2012-01-16 22:18:16 -05:00
Michael Gapczynski
de16537231
Emit hooks in OC_Share when sharing a file and forward hooks for deletion and writing of source file
2012-01-16 20:16:32 -05:00
Michael Gapczynski
1f35c94242
Make media app listen for post_delete instead of delete
2012-01-16 19:52:04 -05:00
Georg Ehrke
2179437726
use timepicker to force users to use HH:MM
2012-01-16 20:22:54 +01:00
Robin Appelman
965ea96439
update translations
2012-01-16 17:34:53 +01:00
Robin Appelman
96e2f15d8a
merge master into filesystem
2012-01-16 03:06:11 +01:00
Robin Appelman
b0dbca0cc7
fix export link for contacts
2012-01-16 02:27:59 +01:00
Robin Appelman
15ea83834d
prevent multiply owncloud instances on the same domain intefering with each others playlists
2012-01-15 19:25:55 +01:00
Robin Appelman
a44bbd8005
don't use depricated <? use the full <?php
2012-01-15 18:58:08 +01:00
Cloud Dumper
6b50980469
Remove reference to unexisting file in music.css.
...
`img/pbar-ani.gif' is not on the repository.
2012-01-15 18:47:17 +01:00
Georg Ehrke
c81beab96d
Merge branch 'master' into calendar
2012-01-15 18:33:46 +01:00
Georg Ehrke
3364502f00
use svg icon for calendar
2012-01-15 18:29:44 +01:00
Bartek Przybylski
07cf709eeb
better scanning model for gallery, more feedback to user while scanning
2012-01-15 15:31:37 +01:00
Robin Appelman
7cd809b286
update translations
2012-01-15 15:12:58 +01:00
Bartek Przybylski
3ec5ffe24e
Simple translation for gallery
2012-01-15 12:15:22 +01:00
Bartek Przybylski
5ecc10b756
recursive gallery removing on parent dir remove
2012-01-15 12:15:22 +01:00
Georg Ehrke
ec3955b158
change description of the changed colors (calendar)
2012-01-15 10:58:39 +01:00
Georg Ehrke
cf1023567b
change calendar colors
2012-01-15 10:52:07 +01:00
Georg Ehrke
360778e520
use backslash n instead of a real new line
2012-01-15 00:56:11 +01:00
Georg Ehrke
0e428ec595
fix newline problem in contacts
2012-01-15 00:47:50 +01:00
Georg Ehrke
43f7b2fd2d
fix newline problem in calendar
2012-01-15 00:45:27 +01:00
Georg Ehrke
fed7eef4f3
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-15 00:31:23 +01:00
Georg Ehrke
87b46decfa
added bart to the authors in info.xml
2012-01-15 00:30:04 +01:00
Robin Appelman
5cd6e0f4d9
remove some of the flickering in opera
2012-01-15 00:14:42 +01:00
Georg Ehrke
b1433119cc
highlight the current view
2012-01-15 00:06:26 +01:00
Bartek Przybylski
ef69abd4dc
constans for signals handling
2012-01-14 23:13:01 +01:00
Robin Appelman
b106686382
remove ununsed copy-paste leftovers
2012-01-14 22:27:20 +01:00
Robin Appelman
0615d096ce
make pdf viewer work with text editor
2012-01-14 22:25:07 +01:00
Robin Appelman
352d73f1e0
some minor changes to the text editor loading
2012-01-14 21:58:16 +01:00
Robin Appelman
4cc68eac6d
make pdf viewer work a bit better with the rest of owncloud
2012-01-14 21:38:33 +01:00
Tom Needham
bfdbcbee12
Fix breadcrumb issue when closing editor
2012-01-14 15:45:19 +00:00
Tom Needham
e979aa0c32
fix editor js
2012-01-14 15:36:57 +00:00
Tom Needham
58a781d9e4
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-14 15:31:49 +00:00
Bartek Przybylski
e0dc8b8ab2
handle gallery remove when removing dir via webinterface
2012-01-14 15:01:57 +01:00
Georg Ehrke
4d1c414ffb
Merge branch 'calendar'
2012-01-14 14:25:49 +01:00
Georg Ehrke
868cf46290
improve import function
2012-01-14 14:22:30 +01:00
Bartek Przybylski
06388e1339
handling directory renaming and thumbnail move on gallery name chenge
2012-01-14 13:52:24 +01:00
Bartek Przybylski
a9878dca6d
content divs alignment
2012-01-14 11:19:24 +01:00
Tom Needham
ffd47ef4d7
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-13 16:55:55 +00:00
Georg Ehrke
f9c4975a45
improve import form for calendar
2012-01-13 13:57:46 +01:00
Thomas Tanghus
0ba472c18a
Too quick on the copy/paste trigger...
2012-01-12 23:43:00 +01:00
Thomas Tanghus
1697347045
Oops. Missing ')' :-P
2012-01-12 22:55:43 +01:00
Thomas Tanghus
e60860148c
Don't chunk_split encoded image string.
...
Don't return json error but null if card can't be parsed.
Small check for non-parsable card in index.php.
2012-01-12 22:50:12 +01:00
Thomas Tanghus
22356533a0
Added search. Thanks to icewind it was mostly copy/paste :-)
2012-01-12 22:50:12 +01:00
Thomas Tanghus
0d120efda5
Add PRODID to vcards created by ownCloud.
2012-01-12 22:50:12 +01:00
Georg Ehrke
28e15fd487
Merge branch 'calendar'
2012-01-12 22:07:23 +01:00
Georg Ehrke
cd8f54ade2
update js of calendar import
2012-01-12 22:06:53 +01:00
Georg Ehrke
9bcd367873
Merge branch 'master' into calendar
2012-01-12 21:44:56 +01:00
Georg Ehrke
0b45d19ea0
change app icon
2012-01-12 16:50:49 +01:00
Thomas Tanghus
c6eeb4a808
Don't add address if none of the fields are filled out.
2012-01-12 02:39:33 +01:00
Robin Appelman
b71ea287aa
reimplement auto playing music from location hash (like from search results)
2012-01-12 02:02:45 +01:00
Robin Appelman
8de4163ba2
fix searching artists and albums
2012-01-12 02:01:59 +01:00
Robin Appelman
25213a790d
fix event handler after re-expanding an artist in collection view
2012-01-12 01:18:27 +01:00
Robin Appelman
1b5d206ca7
fix expending artists and albums in collection view
2012-01-12 01:14:16 +01:00
Robin Appelman
f4338f631b
fix searching music
2012-01-12 00:54:35 +01:00
Bartek Przybylski
118cbf8400
user suggested style change
2012-01-11 23:54:02 +01:00
Bartek Przybylski
afa07beda0
resolving depricated script opening
2012-01-11 23:42:13 +01:00
Thomas Tanghus
24dc1aec8e
Tweaked some tipsys.
2012-01-11 23:05:34 +01:00
Bartek Przybylski
dddcd66ead
using new image backend, moving ajax calls to one file, using generated thumnails to speedup covers loading
2012-01-11 22:06:54 +01:00
Thomas Tanghus
237ba65a20
Localizin strings and adding error checking.
2012-01-11 20:07:15 +01:00
Thomas Tanghus
eae3e134ff
Make sure VERSION is set.
...
Set REV for each edit.
Download single VCard.
2012-01-11 06:20:06 +01:00
Thomas Tanghus
d93a5a0774
Added files for error messages, removed old syle sheet.
2012-01-11 04:05:30 +01:00
Thomas Tanghus
1a6ad816a3
CSS cleanup, more error checking, better error messages, general cleanup.
2012-01-11 04:05:30 +01:00
Thomas Tanghus
5500041cca
Added missing }
2012-01-11 04:05:29 +01:00
Robin Appelman
d92b083c1d
fix old calendar name and color not being preserved when editing a calendar
2012-01-11 01:53:25 +01:00
Robin Appelman
3c910b812b
also use translated string for music navigation entry when showing inline controls
2012-01-11 01:26:27 +01:00
Robin Appelman
f67e5d18e7
update translations
2012-01-11 01:06:59 +01:00
Thomas Tanghus
e316cddf65
More fixes on saving TYPE parameters.
...
Use jQuery Dialog for error messages instead of alert()
2012-01-10 14:59:31 +01:00
Tom Needham
2a0ed930ef
improved ui for go to line button
2012-01-09 22:42:28 +00:00
Tom Needham
66020c5d44
update page title
2012-01-09 22:38:19 +00:00
Tom Needham
6d37c7d351
Added live search
2012-01-09 22:22:12 +00:00
Thomas Tanghus
60653c0544
Return standard thumbnail even if contact couldn't be found as it could be because it was just added,
2012-01-09 23:16:07 +01:00
Thomas Tanghus
aadb81a32a
OC_DB::insertid was being called too late to get the correct result.
2012-01-09 23:14:11 +01:00
Tom Needham
3f67918522
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-09 21:17:41 +00:00
Tom Needham
27d9cbd8c0
Added 'Go to line' functionality
2012-01-09 21:16:41 +00:00
Thomas Tanghus
ac63afbd95
Insert new contacts alphabetically correct in the list.
...
Added some tipsys to the editor.
2012-01-09 22:05:28 +01:00
Thomas Tanghus
978a08ab1c
Fixed Phone types not being saved correctly when adding them.
2012-01-09 20:38:06 +01:00
Thomas Tanghus
604ca61d78
Some cleanup, better error messages and such.
2012-01-09 20:38:06 +01:00
Thomas Tanghus
47548fb8c6
Fixed showing first contact if non is selected.
2012-01-09 20:38:05 +01:00
Thomas Tanghus
85ab3b3924
Modified thumbnail.php to use OC_Image. Cut out 50 loc ;-)
2012-01-09 20:38:05 +01:00
Thomas Tanghus
d91a4fcaf3
Changed SQL queries for looking up contacts to only query once and sort at the same time.
2012-01-09 20:38:05 +01:00
Tom Needham
6c78cd2765
Moved .separator to core css
2012-01-09 18:39:09 +00:00
Tom Needham
3be0564040
improved ui and save button action
2012-01-09 18:17:26 +00:00
Tom Needham
19186bf37b
hide save button for read-only files
2012-01-09 17:22:51 +00:00
Tom Needham
18b8dc1c21
fixed saving bug
2012-01-09 17:03:19 +00:00
Tom Needham
f7f19af816
Handles file permissions. Protect against overwriting changes.
2012-01-08 23:30:50 +00:00
Robin Appelman
ccc43f0ea0
merge master into filesystem
2012-01-08 18:01:33 +01:00
Robin Appelman
ed5fb902bd
remove mp3info from dependency check
2012-01-08 17:35:41 +01:00
Robin Appelman
13784bee18
mp3info is giving to much trouble, get rid of it
2012-01-08 17:35:40 +01:00
Kshitij Parajuli
041e3575d1
When a music file is playing, the page title gets modified.
2012-01-08 17:35:40 +01:00
Georg Ehrke
4c91ca2f86
Merge branch 'master' into calendar
2012-01-08 16:42:32 +01:00
Robin Appelman
9c6248443a
dont overwrite the database with the gallery database
2012-01-08 14:35:23 +01:00
Cloud Dumper
4d1ed7e05f
Improve music playlist rendering.
...
This change:
* bolds currently playing song in playlist;
* forces song names in playlist to one line, ellipsize after (...);
* adds jQuery tipsies to get the whole song name, along with the
artist name, and the album the song is coming from.
No need to split this changeset into three different ones for the sake
of atomicity.
Two first elements were on the priorities / bug list available there:
http://gitorious.org/owncloud/pages/Home
2012-01-08 13:45:44 +01:00
Bartek Przybylski
c2392bbace
db overwriting, gallery creating fix
2012-01-08 11:25:08 +01:00
Bartek Przybylski
21c4515465
rename fix, licence header added
2012-01-08 11:01:25 +01:00
Robin Appelman
d1edc360d9
merge master into filesystem
2012-01-08 01:53:40 +01:00
Bartek Przybylski
23f52aa6fd
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-01-08 01:34:50 +01:00
Bartek Przybylski
2de3b4bd17
rename and delete hooks
2012-01-08 01:32:11 +01:00
Cloud Dumper
5b57cd310e
Also use track_number to retrieve song track.
...
This adds support for id3v2 tags such as TRACK/TOTAL.
2012-01-08 00:30:57 +01:00
Cloud Dumper
6b95d7427a
Sort results from music collection getters.
...
Albums and artists are now ordered by name, song by track number and name.
2012-01-08 00:30:57 +01:00
Bartek Przybylski
e51957b4de
gallery version bump to force db update
2012-01-08 00:22:28 +01:00
Bartek Przybylski
9ed3c31fc9
automatic adding of photo to album, feedback for user while scanning, general cleanup
2012-01-08 00:14:34 +01:00
Georg Ehrke
c3cda81577
update calendar pot file
2012-01-07 18:30:32 +01:00
Georg Ehrke
67a8ae084a
fix search function
2012-01-07 14:31:47 +01:00
Frank Karlitschek
33847dd101
enable gallery and admin_export by default at least for the alpha and beta.
2012-01-07 13:33:53 +01:00
Georg Ehrke
f18e866a1e
improve search function
2012-01-06 14:36:24 +01:00
Georg Ehrke
db490fbc8f
Merge branch 'master' into calendar
2012-01-05 21:02:58 +01:00
Georg Ehrke
cb445deb5f
fix login check in ajax files
2012-01-05 21:02:11 +01:00
Georg Ehrke
486694c2ec
fix js for repeating events
2012-01-05 20:54:44 +01:00
Georg Ehrke
a01a3d412c
fix autodetection for the week of the month
2012-01-05 17:53:13 +01:00
Georg Ehrke
edc9a150aa
fix editeventdialog for monthly repeating events with a specific weekday and weeknumber combination
2012-01-05 17:49:09 +01:00
Georg Ehrke
d3a0c7354c
fix repeat rule for every weekday
2012-01-05 17:09:01 +01:00
Georg Ehrke
a88cc91ad9
fix end for repeating events
2012-01-05 17:05:30 +01:00
Frank Karlitschek
e0a058c732
remove error output if symlink already exists. this can happen if a user removed config.php to trigger the setup wizzard
2012-01-03 17:23:50 +01:00
Georg Ehrke
fe59015126
Merge branch 'master' into calendar
2012-01-03 13:51:55 +01:00
Georg Ehrke
30857b24ea
Merge branch 'master' into calendar
2012-01-02 11:41:18 +01:00
Georg Ehrke
5ccd26959f
remove unused js
2012-01-02 11:39:23 +01:00
Georg Ehrke
e6739d230e
add function to detect always the timezone
2012-01-02 11:35:50 +01:00
Thomas Tanghus
fb4c3bd9ce
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-02 01:09:22 +01:00
Tom Needham
65c37abef9
added ace source
2012-01-01 23:29:23 +00:00
Robin Appelman
536bc3d3c5
add jplayer source
2012-01-01 23:48:38 +01:00
Tom Needham
67854a94bf
Removed old code
2012-01-01 21:27:38 +00:00
Tom Needham
5d9b7bf1dd
Added ace license file
2012-01-01 20:05:30 +00:00
Tom Needham
ad9a81bf41
Added support for more file types
2012-01-01 20:04:46 +00:00
Tom Needham
4eb7487e61
Updated ace-editor software
2012-01-01 19:45:30 +00:00
Thomas Tanghus
853d1730c7
Merge git://gitorious.org/owncloud/owncloud into oc_image
2012-01-01 20:07:01 +01:00
Michael Gapczynski
64a24191a3
Fix return for empty Shared folder in opendir()
2012-01-01 14:04:16 -05:00
Tom Needham
e04951f8fd
Fixed keyboard shortcuts
2011-12-31 12:28:25 +00:00
Tom Needham
215cb1e6e0
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-31 12:21:40 +00:00
Thomas Tanghus
1b146b85d2
Removed redundant DB queries.
2011-12-31 01:34:22 +01:00
Thomas Tanghus
97471b5c2a
Thumbnails was overwriting default style so hover and active didn't work. Moved them to the 'a' element instead.
2011-12-30 23:39:31 +01:00
Thomas Tanghus
830a34a10a
Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts
2011-12-30 21:09:42 +01:00
Thomas Tanghus
4793d25c57
Added license and waiver of conditions for jquery.inview.
...
CSS fix on contact list.
Query contacts from multiple address books.
2011-12-30 21:07:16 +01:00
Bartek Przybylski
31663cfff5
contacts entry duplication fix
2011-12-30 17:47:14 +01:00
Bartek Przybylski
96dc279e8e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-12-30 17:06:48 +01:00
Bartek Przybylski
2ea20862fc
gallery fixes
2011-12-30 17:06:29 +01:00
Georg Ehrke
3bb11db943
Merge branch 'master' into calendar
2011-12-29 19:16:33 +01:00
Tom Needham
8afb2e98fa
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-28 16:16:35 +00:00
Thomas Tanghus
a70fbcea28
More missing js.
2011-12-28 10:31:45 +01:00
Thomas Tanghus
5a99310cdf
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
...
Fixed some conflicts.
Conflicts:
apps/contacts/css/styles.css
apps/contacts/templates/index.php
2011-12-28 10:14:59 +01:00
Bart Visscher
16e4e6dcc3
Contacts: small merge cleanups
2011-12-27 22:44:52 +01:00
Bart Visscher
3e2e5196d2
Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
...
Conflicts:
apps/calendar/export.php
apps/contacts/index.php
2011-12-27 22:18:01 +01:00
Bart Visscher
5fd595c0bf
Calendar: add loading indicator
2011-12-27 21:50:31 +01:00
Robin Appelman
5bff1c8ad1
some coding style fixes for the pdf viewer
2011-12-27 14:19:07 +01:00
Robin Appelman
f009ede753
some styling changes for the pdf viewer
2011-12-27 14:09:22 +01:00
Robin Appelman
1efb4a0c61
remove debug messages in console
2011-12-27 13:41:22 +01:00
Bartek Przybylski
f7674d06d3
pdf viewer from Google Code-In program
2011-12-27 12:36:51 +01:00
Georg Ehrke
ffa835c56f
fix the default setting for yearly repeating events
2011-12-26 19:59:15 +01:00
Thomas Tanghus
16c8f62658
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
2011-12-26 13:27:53 +01:00
Georg Ehrke
9eef57faed
make repeating events editable
2011-12-25 23:19:49 +01:00
Georg Ehrke
8ee53708ae
use pre-decrement instead of post-decrement
2011-12-25 15:07:53 +01:00
Georg Ehrke
5e6fa608eb
use OC_JSON::checkLoggedIn() in all ajax files
2011-12-22 16:31:01 +01:00
Georg Ehrke
469e983a02
fix merge conflicts
2011-12-21 22:16:46 +01:00
Bartek Przybylski
1383cb51e7
removing and renaming albums
2011-12-21 21:55:52 +01:00
Bartek Przybylski
6a1a7fcd26
merged with stash
2011-12-21 18:40:43 +01:00
Bartek Przybylski
25fa9bf8ec
merged with stash
2011-12-21 18:37:17 +01:00
Bartek Przybylski
3c42867109
merged
2011-12-21 18:35:29 +01:00
Bart Visscher
d5e9c7d572
Gallery: fix calculation of folder thumbnail selection
2011-12-18 23:10:43 +01:00
Bart Visscher
fbad1da9e2
Contacts: check if PREF parameter is set before useing it
2011-12-18 23:10:43 +01:00
Bart Visscher
dff9585f64
Contacts: add missing property_options template var
2011-12-18 23:10:43 +01:00
Bart Visscher
ff346ad135
Calendar: small for loop fix
2011-12-18 23:10:43 +01:00
Bart Visscher
4eb36b0ecf
Calendar: refactor common ajax functions to OC_Calendar_App
2011-12-18 23:10:42 +01:00
Michael Gapczynski
9e50cecf27
Fix shared status for files inside a shared folder
2011-12-17 21:13:54 -05:00
Thomas Tanghus
092c41f375
Added missing files and tried to revert the wrong commit of app/contacts/js/interfaces.js
2011-12-17 20:38:52 +01:00
Thomas Tanghus
a7b048dc05
Added thumbnails to contact list. The contacts have a default thumbnail when the page is
...
first loaded. Once the page is loaded the thumbnails will be lazy-loaded to the contacts
viewable.
2011-12-17 20:05:54 +01:00
Georg Ehrke
f6ed7a19be
Merge branch 'master' into calendar
2011-12-16 21:21:34 +01:00
Thomas Tanghus
f3e8776dc6
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
2011-12-16 17:43:06 +01:00
Thomas Tanghus
feeb0c742a
Misc. changes after review by bartv.
2011-12-16 17:42:07 +01:00
Robin Appelman
65214bed0c
make the sharing app return the corrrect result for is_writable on the shared folder
2011-12-16 17:31:31 +01:00
Thomas Tanghus
59ad0a6c9c
Update README
2011-12-13 10:39:31 +01:00
Robin Appelman
9fdd1bafdc
Merge branch 'master' into filesystem
2011-12-11 23:42:22 +01:00
Thomas Tanghus
d55e689261
Added readme.tanghus
2011-12-11 21:17:10 +01:00
Tom Needham
3f44a28e28
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-11 18:16:14 +00:00
Thomas Tanghus
39430c837f
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
2011-12-11 16:29:53 +01:00
Thomas Tanghus
c7b7758816
Updating of contact list when activating/adding/deleting address books now works.
2011-12-11 16:26:00 +01:00
Georg Ehrke
56f12cbfb1
delete unused files
2011-12-10 17:54:42 +01:00
Georg Ehrke
33caa64cce
check for php version is greater than 5.3.0 - we make extensive use of Date Time Libs
2011-12-10 15:11:41 +01:00
Georg Ehrke
b7c754cb32
Merge branch 'master' into calendar
2011-12-10 15:03:33 +01:00
Bart Visscher
1746cba249
Some small changes
2011-12-09 22:36:39 +01:00
Bart Visscher
a3cb04013e
Update OC_VObject
2011-12-09 21:56:03 +01:00
Bart Visscher
2e951c0ce5
Gallary: Fix alignment of album thumbnails
2011-12-09 21:44:13 +01:00
Bart Visscher
76c37792cb
WIP
2011-12-09 21:41:21 +01:00
Thomas Tanghus
5cb10548b3
Resolved conflict
2011-12-09 15:28:51 +01:00
Thomas Tanghus
7aa8eb3427
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
...
Conflicts:
apps/contacts/ajax/deletebook.php
apps/contacts/index.php
2011-12-09 15:25:26 +01:00
Thomas Tanghus
b3661adf02
Various fixes to multiple address books handling
2011-12-09 15:10:51 +01:00
Georg Ehrke
ac8177d83e
Merge branch 'master' into calendar
2011-12-09 14:45:41 +01:00
Georg Ehrke
bd68cee8cf
add resettimezone file for testing timezone detection
2011-12-09 14:36:43 +01:00
Georg Ehrke
add48b2657
optimize timezone detection
2011-12-09 14:35:59 +01:00
Bart Visscher
487c23e27f
Merge branch 'master' into tasks
2011-12-08 20:06:26 +01:00
Bart Visscher
eeaf539a44
Gallery: splitout model code
2011-12-08 20:05:12 +01:00
Georg Ehrke
2103c331a0
Merge branch 'master' into calendar
2011-12-08 14:03:14 +01:00
Michiel de Jong
d4546cdf37
bump version number to force db rebuild
2011-12-08 17:19:38 +07:00
Bart Visscher
a389d94e2b
Imageviewer: fix fancybox.png image url in fancybox css
2011-12-07 20:41:00 +01:00
Bart Visscher
546b7279a3
Contacts: Add "Preferred" before phone label for preferred numbers
2011-12-07 20:40:59 +01:00
Bart Visscher
1220edd4df
Contacts: Add direct link to details of a contact
2011-12-07 20:40:59 +01:00
Bart Visscher
36abf22a48
Contacts: Fix postname var spelling
2011-12-07 20:40:59 +01:00
Bart Visscher
7e990a8e5c
Contacts: refactor common ajax functions to OC_Contacts_App
2011-12-07 20:40:59 +01:00
Bart Visscher
247146f703
Contacts: refactor rendering of part.details template
2011-12-07 20:40:58 +01:00
Bart Visscher
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
Michiel de Jong
b9e6f5e42d
compliance with http://www.w3.org/community/unhosted/wiki/remoteStorage
2011-12-07 21:51:47 +07:00
Tom Needham
afa93c1f28
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-06 23:11:36 +00:00
Thomas Tanghus
830efdccac
Fixed adding, editing and deleting address books. One minor UI flaw remains.
2011-12-05 03:38:06 +01:00
Thomas Tanghus
2b48b733a3
Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_backup
2011-12-04 20:42:30 +01:00
Thomas Tanghus
95ae0f23f1
Added UI for selecting/editing address books.
...
Export, CardDAV link and activation/deactivation of address books done.
2011-12-04 20:25:46 +01:00
Georg Ehrke
361d4ac13b
fix merge conflicts
2011-12-03 17:25:17 +01:00
Bart Visscher
5e4f28ea21
Tasks: Fix php warnings with empty tasks list
2011-12-02 21:33:30 +01:00
Bart Visscher
9c5306d9b1
Merge branch 'master' into tasks
2011-12-02 21:25:23 +01:00
Bart Visscher
31846141b0
Contacts: make name editable again
2011-12-02 21:24:48 +01:00
Tom Needham
25a6679c1e
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-02 16:12:29 +00:00
Thomas Tanghus
58d1a3516a
Removed some debug statements.
...
Changed double quotes to single quotes.
2011-12-01 16:06:27 +01:00
Thomas Olsen
21d613cbc6
Added export.php for contacts app. Works the same way as the one in the calendar app, except there is no UI for it.
...
Fixed indentation in /index.php
2011-12-01 02:02:45 +01:00
Bart Visscher
0bbeb13e26
Calendar: Also check if the enddate is in the requested range for events
2011-11-30 21:13:26 +01:00
Bart Visscher
e5fdc6013a
Calendar: Use the default timezone that is set in lib/base.php
2011-11-30 21:13:04 +01:00
Tom Needham
bf719d6670
Disable save button whilst saving. Refined code.
2011-11-29 22:54:51 +00:00
Tom Needham
ced944258a
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-11-29 22:45:26 +00:00
Tom Needham
dd7a411f9a
Disable save button while saving. Streamlined code.
2011-11-29 22:11:42 +00:00
Robin Appelman
a8e4d2946a
Merge branch 'database' into filesystem
2011-11-26 01:25:08 +01:00
Brice Maron
1d312cf070
Correct ldap check in dependencies_chk app
2011-11-25 23:43:24 +01:00
Bart Visscher
53ff85e2ad
Contacts: layout updates
2011-11-24 21:36:35 +01:00
Bart Visscher
6ce6cbf489
Contacts: better label for saving a property
2011-11-24 21:36:35 +01:00
Bart Visscher
9701145f83
Contacts: make type of phone property also multiselect in addproperty
2011-11-24 21:36:34 +01:00
Bart Visscher
4a57728ddd
Bookmarks: make a soft-requirement of php-curl
2011-11-24 21:36:34 +01:00
Insanemal
c945989a70
Total rewite of fix.
...
This now re-looks up the username and returns that for use.
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
Insanemal
8d092434ed
Adjusted the check user function to lowercase the return.
...
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
Insanemal
18d8dc4757
Added option to lowercase all usernames.
...
This resolves bug with Windows AD servers as LDAP server.
Windows is case insensitve on logon requests.
If users are stored camel case and logon using all lower it causes issues
as OwnCloud is configured to be case sensitive.
Signed-off-by: Insanemal <insanemal@gmail.com>
2011-11-24 02:57:53 +01:00
Ignacio Daniel Rostagno
93502b3ef8
Music - Fix album and artist expand layout.
2011-11-24 02:55:51 +01:00
Robin Appelman
6c01175acd
fix ampache htmlentity calls
2011-11-24 02:53:44 +01:00
Bart Visscher
bae6c1167c
Merge branch 'fullcalendar'
2011-11-23 21:08:26 +01:00
Bart Visscher
ee549dfb38
Fix scrolling through months
2011-11-23 21:07:49 +01:00
Bart Visscher
5e037bfd54
Contacts: remove redundant li in setpropertyform template
2011-11-23 21:07:32 +01:00
Bart Visscher
a2ecdfcac1
Contacts: support multiple phone type parameter
2011-11-23 21:07:32 +01:00
Bart Visscher
ad390d5e42
Add type selects to editing ADR & TEL contact property types
2011-11-23 21:07:32 +01:00
Georg Ehrke
a38778f911
fix timeformat setting for fullcalendar
2011-11-20 14:23:26 +01:00
Georg Ehrke
6c4692380f
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-11-20 11:41:58 +01:00
Robin Appelman
4bebf419d1
use oc_appconfig instead of oc_config for the external apps
2011-11-18 20:19:55 +01:00
Markus Kalkbrenner
48ae18a733
- fixed translateable strings in template
...
- added explaination about ldap filter and display name
- bugfix: keys in ldap response are lower case => lower display name filed before searching
2011-11-18 14:08:30 +01:00
Markus Kalkbrenner
bf84aa23f4
- provide a setting for the ldap user display name instead of hardcoded value 'uid' which is not common for Active Directory
...
- provide a sorted list of ldap users
- replaced double quotes by single quotes and spaces by tabs according to coding standards
- replaced hardcoded strings in template by translatable ones
2011-11-18 14:08:30 +01:00
Markus Kalkbrenner
cff6a41e2b
fixed copy&paste error: store ldap_tls setting in user_ldap, not
...
user_tls
2011-11-18 14:07:11 +01:00
Markus Kalkbrenner
0155effdb7
- bugfix: allow anonymous bind for search, then bind with users credentials.
...
- added explaination how to setup anonymous bind for search to template
- make usage of TLS configurable
2011-11-18 14:07:11 +01:00
krzaczek
7454af0c79
apps files_sharing - fix in share.js to check the "can edit" checkbox -
...
there was a bug in share.js so the checbox was always unchecked
2011-11-18 14:05:38 +01:00
krzaczek
82f30c709c
apps file_sharing - remove "$RUNTIME_NOAPPS = true" from all ajax file
...
to enable other user backend
2011-11-18 14:05:38 +01:00
krzaczek
a70c2b3cb9
apps file_sharing
...
changed
$RUNTIME_NOAPPS = true;
to
$RUNTIME_NOAPPS = false;
in ajax/userautocomplete.php - to fetch users also from different user
backends - not only database backend
2011-11-18 14:05:37 +01:00
krzaczek
28cd41a2a4
users_ldap - added getUsers() method to fetch all existing users from
...
LDAP server
2011-11-18 14:05:37 +01:00
Weng Xuetian
96b91e5b0b
fix ampache encoding problem. use htmlentities encoding parameter directly.
2011-11-18 14:03:26 +01:00
Weng Xuetian
0d274b0268
fix id3 tag resolve. should use utf8 from getID3 directly but not
...
to convert them from ISO8859-1 to utf8 after analyze.
2011-11-18 14:03:26 +01:00
Georg Ehrke
3d498002d0
first implementation of the search function
2011-11-14 22:52:34 +01:00
Georg Ehrke
89b3a395df
fix timezone for repeating events
2011-11-12 22:30:09 +01:00
Georg Ehrke
a303992d78
support for repeating events
2011-11-12 22:02:04 +01:00
Georg Ehrke
eea20e51d8
another fix of caldav url
2011-11-12 16:13:27 +01:00
Georg Ehrke
7fd52de2d3
fix merge conflicts
2011-11-12 15:13:44 +01:00
Georg Ehrke
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
Georg Ehrke
03d9fab3c0
fix caldav url
2011-11-12 14:06:14 +01:00
Tom Needham
88de9e4050
Keyboard shortcuts for saving. Refined code.
2011-11-11 20:46:06 +00:00
Georg Ehrke
26272c4252
automatic timezone detection
2011-11-11 15:51:44 +01:00
Robin Appelman
524e3686a0
tell the user when the files are being scanned
2011-11-10 16:40:09 +01:00
Bart Visscher
ef124c3e21
Use a function to generate select options
2011-11-09 22:19:52 +01:00
Bart Visscher
b095859a92
Use Last-Modified property to check for changed events
2011-11-09 22:17:09 +01:00
Bart Visscher
c65e417666
Use parse function in Calendar_Object
2011-11-09 22:16:24 +01:00
Robin Appelman
5a6aba1e11
provide caching for file metadata
2011-11-09 18:41:57 +01:00
Jakob Sack
938c5ef21c
contacts: every card needs a version!
2011-11-09 11:35:50 +01:00
Jakob Sack
4b424e12df
contacts: put property key in background, the value is important!
2011-11-09 11:35:50 +01:00
Jakob Sack
841be90939
Improve style in contacts
2011-11-09 11:35:50 +01:00
Robin Appelman
5cc6635eb8
remove OC_Filesystem::fromUploadedFile
2011-11-08 22:36:05 +01:00
Robin Appelman
ca6c500799
remove OC_Filesystem::fileatime
2011-11-08 22:26:03 +01:00
Robin Appelman
ec015a2e68
remove the need to register storage providers, pass the classname during mounting instead
2011-11-08 22:21:25 +01:00
Tom Needham
c33884779d
Fixed problem closing the editor.
2011-11-07 22:45:26 +00:00
Tom Needham
059ab889bd
Fixed error where saving message appears twice.
2011-11-07 22:27:49 +00:00
Tom Needham
7a8c762e48
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-11-07 17:16:56 +00:00
Brice Maron
97291fda58
Add allow_url_fopen directive to admin_dependencies_chk
2011-11-06 16:54:05 +01:00
Brice Maron
cc35cb74e1
Try to avoid closing the share box too soon on multiple selections
2011-11-06 15:29:51 +01:00
Brice Maron
ce2b39b398
Merge commit 'refs/merge-requests/69' of git://gitorious.org/owncloud/owncloud into merge-requests/69
2011-11-04 00:31:35 +01:00
Robin Appelman
8eda6f8feb
make webfinger work properly if owncloud is installed in a subdirectory
2011-11-03 13:09:51 +01:00
Robin Appelman
e2907eb99d
no longer rely on PEAR::isError since we can use PDO now
2011-11-03 13:09:51 +01:00
Brice Maron
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
Brice Maron
e533e82bc9
Add sequence name in insertid to be more portable
2011-10-29 11:40:48 +02:00
Brice Maron
eaad3ab45f
Be consistent with licencing
2011-10-29 10:15:29 +02:00
Brice Maron
a21908cf18
Change name and fix a typo
2011-10-29 10:07:01 +02:00
Brice Maron
a809fe9a04
Add a dependencies check apps
2011-10-29 00:27:25 +02:00
Bart Visscher
8dd2f463f8
Cleanup tipsy popups on more actions
2011-10-27 22:56:22 +02:00
Bart Visscher
1e8e2ae353
Move unselect call to after the dialog starts
2011-10-27 22:54:39 +02:00
Bart Visscher
6d4d15b221
Fix html id's in part.addcardform.php
2011-10-27 22:47:56 +02:00
Bart Visscher
c0e9c805ec
Disable loading non-existing settings script in bookmark app
2011-10-27 22:46:52 +02:00
Bartek Przybylski
865be6064a
adjusting to new db "api", merge with master
2011-10-27 21:16:04 +02:00
Bartek Przybylski
0d022de0f4
Merge branch 'master' into gallery
2011-10-27 20:27:57 +02:00
Tom Needham
6eee638482
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-25 20:48:59 +01:00
Bart Visscher
715e376cd2
Fix setproperty form
2011-10-25 20:01:40 +02:00
Bart Visscher
d0e9c81399
Quickfix hanging tipsy popups
2011-10-25 20:01:04 +02:00
Bart Visscher
55d957489d
Fix fromtime/totime warnings
2011-10-25 19:59:23 +02:00
Bart Visscher
50649ad0d1
Implement select event creation
2011-10-25 19:57:20 +02:00
Bart Visscher
950018b5c3
Fix scrolling calendar
2011-10-25 19:56:57 +02:00
Bart Visscher
9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
David Iwanowitsch
74740fb71a
Do not set incorrect components for default calendar
2011-10-23 11:35:29 +02:00
Jakob Sack
4d60f9d3bd
improved style in contacts
2011-10-22 21:32:07 +02:00
Jakob Sack
d89666261f
Some improvements on the contact application
2011-10-22 19:23:22 +02:00
Jakob Sack
b224991ea2
Fix translations, empty properties
2011-10-22 19:23:22 +02:00
Georg Ehrke
dc9c5f10f5
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-22 16:28:24 +02:00
Frank Karlitschek
045c42aa99
new "external" application. you can integrate external application like roundcube, squirellmail or a wiki into ownCloud.
2011-10-22 15:44:34 +02:00
Georg Ehrke
9761a1de3e
translatable error messages
2011-10-22 13:14:54 +02:00
Georg Ehrke
0011c42669
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-22 13:12:13 +02:00
Brice Maron
42306f1e35
Avoid error when no image is provided for cover or thumbnail
2011-10-22 11:34:49 +02:00
Brice Maron
9d46c378b9
Fix unescessary use of non portable 'replace' sql and add loging when GD not installed
2011-10-22 11:01:06 +02:00
Michael Gapczynski
0d4240e196
Fix music navigation entry controls going over the sidebar
2011-10-22 02:31:16 -04:00
Georg Ehrke
cf5686def0
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-21 23:24:39 +02:00
Georg Ehrke
433b57c315
fix new allday bug
2011-10-21 22:59:26 +02:00
Georg Ehrke
d50b014aba
fix allday bug
2011-10-21 22:47:31 +02:00
Tom Needham
ba3d139de8
Merged from master and fixed issue with opening multiple editors
2011-10-21 21:22:06 +01:00
Bart Visscher
eb68201bc5
Better event popup
2011-10-21 22:08:55 +02:00
Georg Ehrke
a1eda425ed
added transition function from 'old' calendar to fullcalendar (fixed currentview bug)
2011-10-21 22:08:30 +02:00
Bart Visscher
61660c068a
Fix function name error in contacts app
2011-10-21 21:49:58 +02:00
Florian Pritz
f0565de900
use fancybox instead of lightbox
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-21 20:19:39 +02:00
Georg Ehrke
c40383b610
enable listview button
2011-10-21 18:27:12 +02:00
Georg Ehrke
e48377d85b
added transition function from 'old' calendar to fullcalendar (fixed currentview bug) and removed listview (it is not implemented in fullcalendar yet)
2011-10-21 18:19:44 +02:00
Georg Ehrke
d09b3ad2e7
Revert "first implementation of fullcalendar plugin with old buttons working"
...
This reverts commit b40122832f
.
2011-10-21 17:50:10 +02:00
Georg Ehrke
b40122832f
first implementation of fullcalendar plugin with old buttons working
2011-10-21 16:11:38 +02:00
Bart Visscher
085001fa24
Disable calendar scrolling, doesn't work yet
2011-10-20 23:49:29 +02:00
Bart Visscher
96002c8c8f
Implement listview for fullcalendar
2011-10-20 23:49:29 +02:00
Bart Visscher
beb5d62779
Optimize deleting event
2011-10-20 23:49:28 +02:00
Bart Visscher
2269f74c27
Fix changing calendar data
2011-10-20 23:49:28 +02:00
Bart Visscher
3d8a1ccb3f
Implement resizing of events
2011-10-20 23:49:28 +02:00
Bart Visscher
a8bca282df
Implement moving of event
2011-10-20 23:49:28 +02:00
Bart Visscher
bb5ccc5731
Connect popup to fullcalendar
2011-10-20 23:49:28 +02:00
Bart Visscher
0eb6c759d7
Connect newEvent & editEvent to fullcalendar
2011-10-20 23:49:28 +02:00
Bart Visscher
4fe48a50f0
Translation of calendar interface
2011-10-20 23:49:27 +02:00
Bart Visscher
2e6ec6ce0b
Connect calendar buttons to actions
2011-10-20 23:49:27 +02:00
Bart Visscher
4075d18050
Implement loading of events in calendar
2011-10-20 23:49:27 +02:00
Bart Visscher
a12cdb55b1
Replace ownCloud calendar html with fullcalendar implementation
2011-10-20 23:49:27 +02:00
Brice Maron
2906ea3d78
Add caching for filelist sharing icon status to avoid many http req.
2011-10-20 23:03:05 +02:00
Robin Appelman
e9b6a1018d
remove unneeded definiton of get_temp_dir
2011-10-20 01:27:04 +02:00
Robin Appelman
8f77179d29
Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud
2011-10-20 01:24:23 +02:00
Hendrik Langer
466b41c36b
Don't use sys_get_temp_dir(), as it reports the wrong path in restricted environments
2011-10-19 23:38:35 +02:00
Brice Maron
7e34452746
Little trick to avoid editor loading twice on double click
2011-10-19 22:42:44 +02:00
Brice Maron
da8d32ae38
Tweak bookmarklet to not change the current page. Correct encoding when add bookmark
2011-10-18 23:27:53 +02:00
Brice Maron
9ea34250a0
Lower also the album name in media scanner...
2011-10-18 23:15:47 +02:00
Brice Maron
b15d8878b7
Correct use of null for not null columns in media scanner
2011-10-18 22:41:25 +02:00
Bartek Przybylski
c32cce4b35
new way of showing gallery covers, missing files
2011-10-18 21:43:33 +02:00
Bartek Przybylski
55e8b02a09
new way of showing gallery covers
2011-10-18 21:42:27 +02:00
Brice Maron
29368d1c58
Add 3 More log writing in files sharing app
2011-10-18 21:30:08 +02:00
Robin Appelman
b975f11514
make sharing work with the new mouting mechanism
2011-10-18 21:19:13 +02:00
Brice Maron
59eac3bc29
Correct little typo/bug in log display and remove ending php tag
2011-10-18 20:10:17 +02:00
Brice Maron
2ac00b378a
Fix file sharing : Don't give a unused param to execute
2011-10-17 23:39:23 +02:00
Brice Maron
492931562f
Fix bookmark listing with mysql: limit is binded as string.
2011-10-17 13:49:33 +02:00
Robin Appelman
4d1776faf9
catch some edge cases in media player
2011-10-17 01:25:11 +02:00
Robin Appelman
595b13f1e0
prevent the remaining ob_clean related errors
2011-10-17 01:18:02 +02:00
Robin Appelman
330c513015
prevent error in media player ajax api
2011-10-17 00:25:13 +02:00
Brice Maron
1f6be85719
Fix bookmarks app to work with postgresql.
...
Rework the bookmark app to manage postgresql.
Add a fetchOne function into the PdoStmtWrapper
Fix a tipo in comments.
2011-10-16 23:03:03 +02:00
Robin Appelman
b0127e3918
use OC_Log instead of error_log
2011-10-16 21:42:24 +02:00
Georg Ehrke
323a98adb7
Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar
2011-10-15 17:16:00 +02:00
Bart Visscher
c383543ec9
Remove unused parameter
2011-10-15 11:45:58 +02:00
Bart Visscher
9cfae56df5
Fix calendar colors with new calendar
2011-10-15 11:45:58 +02:00
Tom Needham
9bde002c95
Fixed issue with opening editor multiple times.
2011-10-14 22:56:14 +01:00
Brice Maron
8d4039b678
Add loading message to image lightbox and tweak events
2011-10-14 23:51:51 +02:00
Tom Needham
3fee961a0a
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-14 22:07:30 +01:00
Robin Appelman
8450785379
Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloud
2011-10-14 20:38:42 +02:00
Georg Ehrke
ea8461e83d
scrolling in calendar
2011-10-14 13:46:28 +02:00
Georg Ehrke
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
Michiel@unhosted
8da00e2d9a
avoiding notice if ['HTTPS'] is not set
2011-10-13 15:50:08 +02:00
John Kristensen
c86d1824fe
Improve handling of calendar export $_GET params
...
* a notice would be reported if either of the 'cal' or 'event' $_GET params
where not supplied, which would result in 'Cannot modify header information'
warnings
2011-10-12 15:23:39 +11:00
John Kristensen
ef8826ac2d
remove 'description' from OC_Connector_Sabre_CalDAV propertyMap
...
* the description field was removed in commit:
f3f5d775b5
but the field was still trying to be mapped - causing errors with CalDAV
2011-10-12 15:10:59 +11:00
Georg Ehrke
4cbae823eb
Merge branch 'master' into calendar
2011-10-10 21:08:11 +02:00
Georg Ehrke
f49ecee24c
reload calendar automatically
2011-10-10 12:03:30 +02:00
Michiel@unhosted
e2468c4343
fix webfinger install script
2011-10-09 17:24:18 +02:00
Michiel@unhosted
6e62911a4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-09 17:13:34 +02:00
Michiel@unhosted
f4fb6356cd
use install.php properly
2011-10-09 17:12:16 +02:00
Tom Needham
42f289d994
Updated bug message
2011-10-09 16:01:48 +01:00
Bart Visscher
203f7a3a87
Move contact delete button to top right corner
2011-10-09 00:04:37 +02:00
Bart Visscher
88aa40e6ac
Show add contact form on opening contacts page
2011-10-09 00:04:37 +02:00
Florian Pritz
19d4e6e1d5
apps/bookmarks: remove unused variable
...
This is not needed anymore since commit
6b64aa3faf
.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-08 21:07:43 +02:00
Florian Pritz
4a4e6eb071
apps/bookmarks: follow redirects when fetching title
...
This solves a problem where hitting a redirect page would lead to a "302
Found" title.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-08 20:36:40 +02:00
Tom Needham
deaeab3d92
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-08 15:47:03 +01:00
Tom Needham
adebefad84
Fixed editor loading and file saving issue
2011-10-08 15:46:38 +01:00
Marvin Thomas Rabe
6b64aa3faf
removed description. changed target to _blank. removed sorting. updated layout.
2011-10-08 13:54:45 +02:00
Marvin Thomas Rabe
f3f5d775b5
removed description field for calendar
2011-10-08 13:28:01 +02:00
Marvin Thomas Rabe
39e7db7db4
added missing files
2011-10-08 13:11:13 +02:00
Marvin Thomas Rabe
590ff0ced9
moved bookmarklet to personal. username must be provided when adding a new user.
2011-10-08 13:10:49 +02:00
Jan-Christoph Borchardt
0bb3270503
Revert "support of RRULE in calendar app"
...
Reverting as per Georg's request (not stable enough yet)
This reverts commit 55ab68a332
.
2011-10-08 00:12:57 +02:00
Bart Visscher
a13d42fdaf
Fixes for adding contact property
2011-10-07 23:01:49 +02:00
Bart Visscher
46b8703b71
Display contact name without label and in bold
2011-10-07 22:42:50 +02:00
Bart Visscher
f95e8c62c9
Save the right contact property
2011-10-07 22:38:19 +02:00
Bart Visscher
8ea9c39241
Fix saving properties with a new contact
2011-10-07 22:25:26 +02:00
Bart Visscher
bc54f13636
Fix name when adding contact
2011-10-07 21:59:25 +02:00
Robin Appelman
7e0da0cb25
fix amapache url
2011-10-07 18:13:46 +02:00
Tom Needham
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
Robin Appelman
6449a45695
disable openid on default
2011-10-07 17:02:55 +02:00
Robin Appelman
4fc8e28fba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 16:46:18 +02:00
Jan-Christoph Borchardt
fa72f1c3cc
some icon corrections
2011-10-07 16:18:47 +02:00
Bart Visscher
980a0893f0
Change colorselector to use border for selected color
2011-10-07 16:03:26 +02:00
Robin Appelman
20554be9f4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 00:15:54 +02:00
Marvin Thomas Rabe
e345fbd386
conflicts solved
2011-10-06 22:40:11 +02:00
Marvin Thomas Rabe
bb26fe9300
Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55
2011-10-06 22:37:06 +02:00
Marvin Thomas Rabe
ae56bb63c6
Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52
2011-10-06 22:36:34 +02:00
Marvin Thomas Rabe
878178145d
Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into merge-requests/54
2011-10-06 22:35:36 +02:00
Bart Visscher
3cc7212c82
Add icon for calendar color selector
2011-10-06 21:22:55 +02:00
Bart Visscher
b0847a61f5
Start using OC_JSON in gallery app
2011-10-06 21:22:01 +02:00
Bart Visscher
c30aa4ddeb
Start using OC_JSON in tasks app
2011-10-06 21:21:38 +02:00
Bart Visscher
16ee08385e
Merge branch 'master' into tasks
2011-10-06 15:37:20 +02:00
Bart Visscher
4786ed321e
Replace _ in timezone setting with a space
2011-10-06 13:22:36 +02:00
Bart Visscher
c28f1e0276
Implement timezone fix from Stephen Rees-Carter
2011-10-06 13:22:36 +02:00
Georg Ehrke
bf017fb4bd
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-06 13:21:38 +02:00
Georg Ehrke
55ab68a332
support of RRULE in calendar app
2011-10-06 13:21:13 +02:00
Stephen Rees-Carter
c853fc75a1
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
2011-10-06 10:31:05 +11:00
Tom Needham
d9464de690
Updated saving feedback
2011-10-05 21:59:03 +01:00
Bartek Przybylski
f92fa6989e
another query fix
2011-10-05 22:28:17 +02:00
Tom Needham
30343f15e2
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-05 20:49:08 +01:00
Michiel@unhosted
af6eb52b5e
correct wrong variable name in remoteStorage app
2011-10-05 20:01:58 +02:00
Bartek Przybylski
d5931b8c48
gallery db query fix
2011-10-05 19:32:30 +02:00
Tom Needham
edd958836e
Moved addScript and addStyle calls to app.php
2011-10-05 16:32:01 +01:00
Tom Needham
86825ee3b5
Cleanup of code. Fixed breadcrumb removal issue
2011-10-05 16:10:11 +01:00
Jan-Christoph Borchardt
28dcbe3cb0
disabled gallery app by default until it's in a branch
2011-10-05 14:54:34 +02:00
Jan-Christoph Borchardt
8e532b5ceb
removed extra calendar settings. Also, table layout?
2011-10-05 14:32:25 +02:00
Borjan Tchakaloff
5570222b40
Added the missing quotes on the filename.
2011-10-05 15:20:32 +04:00
Borjan Tchakaloff
0cde2a3146
Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder).
2011-10-05 14:27:50 +04:00
Robin Appelman
15e5bd16ab
use texteditor for search results
2011-10-05 02:44:24 +02:00
Robin Appelman
c6a73bee5e
remove now unneeded textviewer
2011-10-05 02:38:55 +02:00
Robin Appelman
1fba8619d4
move some code to where it belongs and remove duplicated editor app
2011-10-05 02:36:54 +02:00
Robin Appelman
a8621265e2
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-05 02:11:44 +02:00
Florian Jacob
813e8b274a
Added all the remaining extensions to filetypes
...
mapping which ace-editor supports.
2011-10-05 00:23:16 +02:00
Marvin Thomas Rabe
7579fc7bc9
updated margins
2011-10-04 21:39:13 +02:00
Tom Needham
93ed844015
Control events are now bound on the page load rather than everytime the editor is loaded.
2011-10-04 20:20:08 +01:00
Bart Visscher
2c95c799e6
Add new contact name to end of cantact list
2011-10-04 21:16:57 +02:00
Bart Visscher
fada3517b0
All the basic field for add contact added
2011-10-04 21:16:57 +02:00
Tom Needham
39d42fc62b
Save button now removed after closing editor
2011-10-04 20:15:20 +01:00
Marvin Thomas Rabe
0179b61f69
fixed another bug with breadcrumbs
2011-10-04 21:05:49 +02:00
Marvin Thomas Rabe
451b5940ea
fixed scrollbar issues. fixed missing breadcrumb image.
2011-10-04 21:01:05 +02:00
Tom Needham
fa203d186e
Added fillHeight() js function for resizing editor
2011-10-04 19:46:27 +01:00
Tom Needham
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
Tom Needham
09c1179094
Fixed breadcrumb issue.
2011-10-04 19:07:22 +01:00
Marvin Thomas Rabe
340f6bbaba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 19:37:54 +02:00
Marvin Thomas Rabe
d1518f2901
updated calendar settings
2011-10-04 19:37:26 +02:00
Marvin Thomas Rabe
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
Tom Needham
5c9b069fe5
Updated saving feedback to use loading.gif
2011-10-04 17:43:13 +01:00
Tom Needham
9d918b5ac8
Updated control bar styling and save feedback.
2011-10-04 16:31:26 +01:00
Tom Needham
58d284419c
HTML data is now encoded before being shown.
2011-10-04 15:27:29 +01:00
Georg Ehrke
70091ec649
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 10:17:55 +02:00
Georg Ehrke
33b660857a
fix ical import
2011-10-04 10:17:11 +02:00
Jan-Christoph Borchardt
79da90bb08
renamed unhosted to remoteStorage (needs to be updated with coming protocol version)
2011-10-04 10:07:46 +02:00
Tom Needham
45fda6f43e
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-03 23:43:58 +01:00
Tom Needham
6c9ff0e47e
Fixed ajax urls
2011-10-03 23:41:32 +01:00
Tom Needham
32ce0d3c6e
Fixed file saving issue.
2011-10-03 23:28:47 +01:00
Tom Needham
02d7b1a1fc
Added breadcrumb and control bar.
2011-10-03 22:59:40 +01:00
Georg Ehrke
77e12a15b1
fix checkLoggedIn function in import of ical files
2011-10-03 22:52:13 +02:00
Georg Ehrke
c40a1fcede
added import function as filehandler
2011-10-03 22:50:10 +02:00
Bart Visscher
dec8106665
Add user friendly calendar color chooser
2011-10-03 20:42:47 +02:00
Bart Visscher
6159b79715
Take setting default value out of loop
2011-10-03 20:42:47 +02:00
Marvin Thomas Rabe
ffc5c4dabe
Merge commit 'refs/merge-requests/51' of git://gitorious.org/owncloud/owncloud into merge-requests/51
2011-10-03 15:18:48 +02:00
Weng Xuetian
acbd31255e
fix add bookmark bug.
2011-10-03 20:44:03 +08:00
Marvin Thomas Rabe
a2bcbec791
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-10-03 02:01:24 +02:00
Robin Appelman
36196b6c2d
use browsercache for gallery covers
2011-10-02 19:42:14 +02:00
Robin Appelman
7bcc0efd6a
show galleries in search results
2011-10-02 19:33:55 +02:00
Frank Karlitschek
39c4d9b2ca
enable by default
2011-10-02 18:53:47 +02:00
Bartek Przybylski
c3d7ffc877
adding tmp icon for app, extending memory size for php in .htaccess
2011-10-02 17:52:11 +02:00
Bartek Przybylski
ee62eb7bb0
adding missing files, don know why they disappeared
2011-10-02 17:48:02 +02:00
Bartek Przybylski
6643f68663
merge 'gallery_app_devel' to 'master'
2011-10-02 17:17:46 +02:00
Marvin Thomas Rabe
bdcf31cc73
Added translatable text.
2011-10-02 16:06:30 +02:00
Marvin Thomas Rabe
213275a1f8
Add translation and fixed some css problems
2011-10-02 15:55:23 +02:00
Marvin Thomas Rabe
daee88fd26
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
2011-10-02 15:51:24 +02:00
Robin Appelman
fef31bc6c7
Merge commit 'refs/merge-requests/39' of git://gitorious.org/owncloud/owncloud
2011-10-02 14:00:55 +02:00
Bartek Przybylski
54e5a10846
avoid creating empty albums, removing od depreciated code openings
2011-10-02 13:52:04 +02:00
Bartek Przybylski
07b3b103ce
changing <? to <?php
2011-10-02 12:24:02 +02:00
Tom Needham
0825073e8c
Editor now loads on top of files app.
2011-10-01 22:48:00 +01:00
Georg Ehrke
0ebe9ad70c
added function to export single events
2011-10-01 23:19:06 +02:00
Georg Ehrke
f9824f6108
choosable default duration of event
2011-10-01 22:53:18 +02:00
Bartek Przybylski
339d417420
removing add new album button, removing logs, and unused code
2011-10-01 22:36:01 +02:00
Georg Ehrke
1ea183a0f7
fix duration bug
2011-10-01 21:09:08 +02:00
Georg Ehrke
8219516ec0
removed bug, that the drag and drop function added 24h to the duration of the event, after moving an event from allday to a time
2011-10-01 20:44:08 +02:00
Georg Ehrke
50007f2d40
removed bug, that you can't change time in week view, when event was an allday event
2011-10-01 20:36:20 +02:00
Georg Ehrke
a7431d99e5
remove debugging text in drag and drop function
2011-10-01 20:31:58 +02:00
Georg Ehrke
43a3e46369
added drag and drop function for events in calendar app
2011-10-01 20:27:30 +02:00
Bartek Przybylski
83e7f9d54a
showing galleries bahaviour change
2011-10-01 11:26:47 +02:00
Marvin Thomas Rabe
5a40804773
bookmarks are now translatable
2011-10-01 11:14:43 +02:00
Georg Ehrke
bf6414d3ad
choosable time format
2011-10-01 10:39:07 +02:00
Georg Ehrke
0514a1925b
choosable first day of week & choosable days of weekend
2011-10-01 09:54:52 +02:00
Bart Visscher
ddd28aae67
Remove test data from calendar creation
2011-09-30 23:17:30 +02:00
Bart Visscher
9a5d517ec2
Add more checks for admin user
2011-09-30 23:17:30 +02:00
Bart Visscher
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +02:00
Robin Appelman
35d490f8e9
fix playing songs from search results
2011-09-29 23:55:00 +02:00
Bart Visscher
d59c48217d
Change colspan in choose calendar dialog to 6
2011-09-29 22:15:42 +02:00
Thomas Schmidt
84e209f1e0
added app for admins to create a zipfile containing the owncloud data
2011-09-29 17:11:07 +02:00
Robin Appelman
fcc6d61fe1
only play the music once
2011-09-29 00:48:45 +02:00
Robin Appelman
0d40617c07
improvements in media collection viewer
2011-09-29 00:42:30 +02:00
Robin Appelman
8d3c3785bc
sort music collection
2011-09-28 23:50:28 +02:00
Bart Visscher
f29f601ec4
Revert "commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)"
...
Implemented the calendar color as background of the events.
This reverts commit 59d4ddd905
.
2011-09-28 23:25:22 +02:00
Tom Needham
3c361cec92
Removed unnecessary theme files.
2011-09-28 22:23:50 +01:00
Bart Visscher
c9c7d5e1aa
Add support for DURATION in VEVENT
2011-09-28 23:17:26 +02:00
Bart Visscher
5875b50de0
Use .empty function instead of .html("")
2011-09-28 23:17:26 +02:00
Bart Visscher
7c20aea96c
Use OC.filePath to locate ajax entry points
2011-09-28 23:17:25 +02:00
Bart Visscher
3f7d964acd
Color event background with calendar color
2011-09-28 23:17:25 +02:00
Bart Visscher
45c983e899
Add missing datetime type
2011-09-28 23:17:25 +02:00
Robin Appelman
93a0e668a6
styling fixes for playback controlls
2011-09-28 22:36:15 +02:00
Tom Needham
98ded8d168
Added support for more file types
2011-09-28 21:31:13 +01:00
Tom Needham
bc7289bb28
Changed theme. Editing is now default action for all supported types. Fixed static url.
2011-09-28 21:25:25 +01:00
Robin Appelman
1639a1ca49
fix persistent playlist for media player
2011-09-28 22:21:06 +02:00
Jan-Christoph Borchardt
c39c6d36df
do not use 'URL' but 'address'
2011-09-28 22:11:47 +02:00
Tom Needham
4fe993a55d
Replaced urlencode() and urldecode() with htmlspecialchars() and htmlspecialchars_decode()
2011-09-28 20:26:30 +01:00
Tom Needham
2ca74dc334
Ficed text encoding bug. Removed unnecessary file retrival call
2011-09-28 20:23:00 +01:00
Tom Needham
3129855cc4
Fixed typo. Added translation support.
2011-09-28 20:17:45 +01:00
Tom Needham
3886a749fb
Updated copyright info and ajax responses
2011-09-28 19:52:08 +01:00
Georg Ehrke
61c4f9b3c8
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 18:44:17 +02:00
Georg Ehrke
59d4ddd905
commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)
2011-09-28 18:43:59 +02:00
Tom Needham
3ab8739809
Implemented ace-editor for basic file editing.
2011-09-28 15:26:54 +01:00
Frank Karlitschek
98c59605aa
show the syncing and ampache urls on the settings page. not very pretty but otherwise the user has no way to configure the desktop integration
2011-09-28 16:05:01 +02:00
Thomas Schmidt
e30220e287
media app: show current song, add margin, enable tooltip
2011-09-28 11:46:04 +02:00
Georg Ehrke
8e42b02a22
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 10:29:07 +02:00
Georg Ehrke
8c405a59d8
little bug fixes in calendar app
2011-09-28 23:28:14 +02:00
Bart Visscher
c6f78fbe43
Add flag in info.xml to control the apps that are installed by default
2011-09-27 22:36:14 +02:00
Georg Ehrke
61aa00899d
show only most essential stuff in add and edit event form
2011-09-27 21:56:16 +02:00
Scott Barnett
f4ecf47e61
Fixed delete cross positioning issue.
2011-09-27 05:26:49 +10:00
Bartek Przybylski
e4dc33b368
Reverting: initial commit for gallery app
2011-09-26 20:05:36 +02:00
Bartek Przybylski
63e6863222
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-25 22:32:16 +02:00
Bartek Przybylski
bc43851d74
initial commit for gallery app
2011-09-25 22:32:08 +02:00
Bart Visscher
17e631bc5e
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
Robin Appelman
64b68f2474
correctly update the collection when music files are moved around
2011-09-25 01:34:55 +02:00
Jan-Christoph Borchardt
ae4c83af91
moved scanning to controls bar
2011-09-25 00:17:54 +02:00
Jan-Christoph Borchardt
368412a730
lots of music improvements, might break some things though
2011-09-25 00:02:50 +02:00
Jan-Christoph Borchardt
700ac75565
updated translations
2011-09-24 23:12:18 +02:00
Jan-Christoph Borchardt
a54ea3246c
removed 'share by publiclink' app as it has been superseded by Sharing
2011-09-24 23:03:28 +02:00
Jan-Christoph Borchardt
408c391f83
removed deprecated images and icons
2011-09-24 22:09:41 +02:00
Georg Ehrke
da63140b04
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-24 19:53:37 +02:00
Georg Ehrke
4aeb2990c0
delete calendar function for userinterface
2011-09-24 19:52:55 +02:00
Robin Appelman
260893816b
remove getID3 demos due to security issue caused by one of them
2011-09-24 19:09:54 +02:00
Florian Pritz
842ce24d2b
apps/calendar: check for unset variable
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:07 +02:00
Florian Pritz
c7d4e72341
set cookie secure if forcessl is enabled
...
This also moves session_start in lib/base.php down a bit because we need
OC::$SERVERROOT to get the config settings.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:00 +02:00
Florian Pritz
037d0e9640
apps/contacts: only display buttons if there is a contact
...
If you don't have any contacts, it would display a non-functioning
delete button.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:59 +02:00
Florian Pritz
983445cd39
apps/contacts: fix wrapping issue in addpropertyform
...
The browser added random line breaks between the label and input field
making it hard to see what's what.
Now we break lines intentionally just like in setpropertyform.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:58 +02:00
Florian Pritz
d7c165eb35
apps/bookmarks: use curl instead of file_get_contents
...
Don't depend on allow_url_fopen being enabled when we already use curl
elsewhere in the code.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:57 +02:00
Florian Pritz
934b18405a
fix apps/bookmarks if oc_bookmarks_tags is empty
...
If you have bookmarks, but there are no tags in oc_bookmarks_tags, the
query doesn't return any results. Using a left join fixes this.
Reference:
http://stackoverflow.com/questions/3171276/select-multiple-tables-when-one-table-is-empty-in-mysql
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:56 +02:00
Florian Pritz
ff10303755
apps/calendar: change ctag after modifying event
...
edit() tried to do that, but it used $id which is the event id and not
the calendar id.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:55 +02:00
Florian Pritz
d928cd3636
files: hide non functioning code when called from a/f_s/get.php
...
The checkboxes don't work because files.js is missing. Adding it leads
to the problem that it relies on files/ajax and most of the code only
works for logged in users.
The actions div contains undefined variables and doesn't work either.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:54 +02:00
Florian Pritz
b0e23a1634
apps/calendar: add delete button to edit event form
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:51 +02:00
Florian Pritz
761ba4a379
don't escape new lines in vevent description
...
This ended up as "\n\\n" in the data base and the escaped \n was also
visible in the edit form.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:50 +02:00
Florian Pritz
8648e3c43c
only call error_log() if DEBUG is true
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
Florian Pritz
9c550e8e9f
fix error when uploading music
...
These methods are called statically so make them static.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:44 +02:00
Florian Pritz
6f3c118038
apps/calendar: check if variables are set before using them
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:42 +02:00
Bart Visscher
782069e1fa
Change copyright notice to short form
2011-09-23 22:59:54 +02:00
Bart Visscher
5741811d36
Fix use of reserved javascript keyword 'new'
2011-09-23 22:22:03 +02:00
Jan-Christoph Borchardt
6e46bd7373
integrated and updated calendar translations
2011-09-23 20:38:19 +02:00
Jan-Christoph Borchardt
aa4aa40b57
fixed a few calendar words, hack to get shortcode for May translatable
2011-09-23 20:19:39 +02:00
Jan-Christoph Borchardt
d3fedc14e2
fixed contacts strings (no technical stuff in the interface, don't scream at people, ...), ready for translation
2011-09-23 20:13:27 +02:00
Bart Visscher
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
Jan-Christoph Borchardt
5559a0dede
updated translations
2011-09-23 19:08:02 +02:00
Jakob Sack
73d0caf8a4
Add Sabre_DAV_Browser_Plugin to *DAV-servers to ease debugging
2011-09-23 09:40:01 +02:00
Robin Appelman
917ea58a8c
fix file uploads for IE
2011-09-22 23:25:23 +02:00
Bart Visscher
0dd5fd5cd3
Mark form field with error message
2011-09-20 21:25:28 +02:00
Bart Visscher
aad62919da
Small styling fixes
2011-09-20 14:38:16 +02:00
Bart Visscher
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
Bart Visscher
82c7598861
Remove global vars and use the OC static version.
...
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
Bart Visscher
d5656716f6
Fix calendar active checkbox
2011-09-18 17:13:48 +02:00
Bart Visscher
0660133d2e
Fix event error/success json message
2011-09-18 17:13:47 +02:00
Bart Visscher
7c5e389067
deleteUser function must be static
2011-09-18 17:13:47 +02:00
Bart Visscher
8826aa8056
Add basic fields to tasks app
2011-09-17 21:55:06 +02:00
Bart Visscher
78863696b7
First version of tasks app
2011-09-17 21:55:06 +02:00
Robin Appelman
d0d3fecc95
no need to escape values when using prepared statements
2011-09-17 02:30:00 +02:00
Bart Visscher
22db68816e
Remove unused function call
2011-09-17 01:55:05 +02:00
Bart Visscher
079df42103
Disable the Oneday and Fourweeks buttons in calendar interface
2011-09-17 01:55:04 +02:00
Jakob Sack
fe62c803e2
fix small bugs
2011-09-17 00:46:04 +02:00
Jakob Sack
54a3b28dce
Split OC_Contacts_Addressbook in _Addressbook and _VCard
2011-09-17 00:26:57 +02:00
Bart Visscher
2a84f7f07c
Move most javascript to calendar.js
2011-09-16 17:50:55 +02:00
Bart Visscher
45d42a9654
Move validateEventForm function and fix success handling
2011-09-16 17:06:57 +02:00
Bart Visscher
73d3dc91fd
Handle multi open of choosecalendar dialog
2011-09-16 14:11:22 +02:00
Bart Visscher
0fde26c86c
Close event new/edit dialog when clicking outside the dialog
2011-09-16 14:02:21 +02:00
Bart Visscher
2353f02d9a
Fixes for Calendar app
2011-09-16 00:21:51 +02:00
Bart Visscher
15559d3e88
First implementation of edit event
2011-09-16 00:21:19 +02:00
Bart Visscher
b413dcfa7c
Fix conversion of VTODO and VJOURNAL items
2011-09-16 00:19:43 +02:00
Bart Visscher
388b14604a
Move Calendar Object code to its own class OC_Calendar_Object
2011-09-16 00:19:43 +02:00
Jakob Sack
d3ee19e675
fix documentation
2011-09-15 23:20:49 +02:00
Jakob Sack
4d7ed0f2f5
Add documentation to calendar.php
2011-09-15 22:45:58 +02:00
Jakob Sack
ae622dbbfe
Small fix in documentation
2011-09-15 22:45:40 +02:00
Jakob Sack
c3ff534b19
Improve reading of vCard files
2011-09-15 11:06:21 +02:00
Bart Visscher
b6c69e580a
Move php code out of part.eventform
2011-09-14 23:36:23 +02:00
Bart Visscher
cb9a67906d
Move event form field to part.eventform template
2011-09-14 23:36:23 +02:00
Bart Visscher
68758f9b2c
Rename calendar javascript functions into Calendar.UI namespace
2011-09-14 23:36:22 +02:00
Bart Visscher
7c9f1007d5
Fix initial visibility of database settings in setup
2011-09-14 23:36:22 +02:00
Golnaz Nilieh
0ff9bc4806
Add link and other edit information to newly added bookmarks.
2011-09-13 16:10:52 +04:30
Golnaz Nilieh
67addb4882
Add support of editing bookmarks.
2011-09-13 15:40:09 +04:30
Florian Jacob
9a5530a48f
Correct deleting events over CalDAV
...
A quick patch that corrects not being able to delete
calendar events. (misnamed variable). Thanks to Robert J. Clark.
2011-09-12 19:50:07 +02:00
Michiel@unhosted
fb96256c63
offer login popup from oauth dialog
2011-09-12 15:17:52 +02:00
Michiel@unhosted
d0746d7e32
offer login popup from oauth dialog, correct base uri
2011-09-12 15:04:21 +02:00
Michiel@unhosted
6e569c5ed1
correction in webfinger.php activation trap
2011-09-12 14:59:22 +02:00
Michiel@unhosted
f928d4af56
correct xml syntax
2011-09-12 14:35:15 +02:00
Michiel@unhosted
5685965fdb
improve uninstalled-protection
2011-09-12 14:22:48 +02:00
Michiel@unhosted
f93be510a3
check activation and make activation impossible by default
2011-09-12 14:15:19 +02:00
Michiel@unhosted
d07f3d548c
improved troubleshooting instructions
2011-09-12 13:47:14 +02:00
Michiel@unhosted
cb7cc99302
correct protocol
2011-09-12 01:22:40 +02:00
Michiel@unhosted
6e6be3aa8f
putting activation inside activate.php
2011-09-12 00:32:38 +02:00
Michiel@unhosted
994c7f3dad
adding webfinger app
2011-09-12 00:12:34 +02:00
Jan-Christoph Borchardt
de729d8d8b
renamed last CW to Week
2011-09-11 21:50:13 +02:00
Bart Visscher
cd44dff5af
Better feedback for saving calendar and openid settings
2011-09-11 20:38:52 +02:00
Bart Visscher
3234597703
Correct copyright notices
2011-09-11 17:25:02 +02:00
Georg Ehrke
e9df292b62
commented out broken code in add event function
2011-09-11 16:49:08 +02:00
Alexander Wigen
72aa1bf75c
Only show used address attributes in contact view
2011-09-11 12:52:40 +02:00
Georg Ehrke
647fab07c7
fixes in german language
2011-09-10 12:26:01 +02:00
Bart Visscher
97fc236760
Fix a warning and an error
2011-09-10 11:58:08 +02:00
Georg Ehrke
1afeb5cd12
bug fixes in calendar lib
2011-09-10 10:52:35 +02:00
Bart Visscher
cbb36829e6
Small update Calendars dialog
2011-09-09 22:28:34 +02:00
Bart Visscher
760b47a62f
Use OC_Helper::linkTo also for absolute urls.
...
One central place to check for https.
2011-09-09 22:19:15 +02:00
Georg Ehrke
80f5942868
translatable categories and other translations added
2011-09-09 20:39:38 +02:00
Georg Ehrke
f031e308cd
show caldav url in choose calendar dialog
2011-09-09 18:44:33 +02:00
Jakob Sack
5fed5bab4a
Improving contacts
2011-09-08 23:36:47 +02:00
Bart Visscher
74f6dd5d5a
Add creating calendars with the web interface
2011-09-08 12:29:29 +02:00
Bart Visscher
f3e98878da
Implement calendar list view
2011-09-07 15:13:26 +02:00
Bart Visscher
dabf10f99c
Use js Date for holding dates in the whole calendar app
2011-09-07 09:49:23 +02:00
Bart Visscher
fbde66a56c
Eliminate most global calendar js vars
2011-09-07 09:49:23 +02:00
Bart Visscher
0df98b9a78
Remove generate_ prefix from vars
2011-09-07 09:49:23 +02:00
Bart Visscher
9b14c276e3
Store date for click in jQuery.data('date_info')
2011-09-07 09:49:23 +02:00
Bart Visscher
abb6a15aa4
Change generateDates to use js Date for calculations
2011-09-07 09:49:22 +02:00
Golnaz Nilieh
b7ba0839c6
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-06 17:14:48 +04:30
Golnaz Nilieh
c5aa139296
Use an animated gif in add-bookmark form, while fetching metadata.
2011-09-06 17:13:03 +04:30
Golnaz Nilieh
0b5f0ac249
Don't clear bookmark description field, If it is empty in bookmark metadata.
2011-09-06 16:13:23 +04:30
Jan-Christoph Borchardt
75383a8308
small wording changes
2011-09-04 18:13:53 +02:00