1746cba249
Some small changes
2011-12-09 22:36:39 +01:00
a3cb04013e
Update OC_VObject
2011-12-09 21:56:03 +01:00
2e951c0ce5
Gallary: Fix alignment of album thumbnails
2011-12-09 21:44:13 +01:00
5cb10548b3
Resolved conflict
2011-12-09 15:28:51 +01:00
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
b3661adf02
Various fixes to multiple address books handling
2011-12-09 15:10:51 +01:00
ac8177d83e
Merge branch 'master' into calendar
2011-12-09 14:45:41 +01:00
bd68cee8cf
add resettimezone file for testing timezone detection
2011-12-09 14:36:43 +01:00
add48b2657
optimize timezone detection
2011-12-09 14:35:59 +01:00
eeaf539a44
Gallery: splitout model code
2011-12-08 20:05:12 +01:00
2103c331a0
Merge branch 'master' into calendar
2011-12-08 14:03:14 +01:00
d4546cdf37
bump version number to force db rebuild
2011-12-08 17:19:38 +07:00
a389d94e2b
Imageviewer: fix fancybox.png image url in fancybox css
2011-12-07 20:41:00 +01:00
546b7279a3
Contacts: Add "Preferred" before phone label for preferred numbers
2011-12-07 20:40:59 +01:00
1220edd4df
Contacts: Add direct link to details of a contact
2011-12-07 20:40:59 +01:00
36abf22a48
Contacts: Fix postname var spelling
2011-12-07 20:40:59 +01:00
7e990a8e5c
Contacts: refactor common ajax functions to OC_Contacts_App
2011-12-07 20:40:59 +01:00
247146f703
Contacts: refactor rendering of part.details template
2011-12-07 20:40:58 +01:00
c67ac46b6c
Use a proxy class to interface with Sabre_VObject classes
2011-12-07 20:40:58 +01:00
b9e6f5e42d
compliance with http://www.w3.org/community/unhosted/wiki/remoteStorage
2011-12-07 21:51:47 +07:00
afa93c1f28
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-06 23:11:36 +00:00
830efdccac
Fixed adding, editing and deleting address books. One minor UI flaw remains.
2011-12-05 03:38:06 +01:00
2b48b733a3
Merge gitorious.org:~tanghus/owncloud/tanghus-owncloud into tanghus_remote_backup
2011-12-04 20:42:30 +01:00
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
361d4ac13b
fix merge conflicts
2011-12-03 17:25:17 +01:00
31846141b0
Contacts: make name editable again
2011-12-02 21:24:48 +01:00
25a6679c1e
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-02 16:12:29 +00:00
58d1a3516a
Removed some debug statements.
...
Changed double quotes to single quotes.
2011-12-01 16:06:27 +01:00
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
0bbeb13e26
Calendar: Also check if the enddate is in the requested range for events
2011-11-30 21:13:26 +01:00
e5fdc6013a
Calendar: Use the default timezone that is set in lib/base.php
2011-11-30 21:13:04 +01:00
bf719d6670
Disable save button whilst saving. Refined code.
2011-11-29 22:54:51 +00:00
ced944258a
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-11-29 22:45:26 +00:00
dd7a411f9a
Disable save button while saving. Streamlined code.
2011-11-29 22:11:42 +00:00
a8e4d2946a
Merge branch 'database' into filesystem
2011-11-26 01:25:08 +01:00
1d312cf070
Correct ldap check in dependencies_chk app
2011-11-25 23:43:24 +01:00
53ff85e2ad
Contacts: layout updates
2011-11-24 21:36:35 +01:00
6ce6cbf489
Contacts: better label for saving a property
2011-11-24 21:36:35 +01:00
9701145f83
Contacts: make type of phone property also multiselect in addproperty
2011-11-24 21:36:34 +01:00
4a57728ddd
Bookmarks: make a soft-requirement of php-curl
2011-11-24 21:36:34 +01:00
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
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
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
93502b3ef8
Music - Fix album and artist expand layout.
2011-11-24 02:55:51 +01:00
6c01175acd
fix ampache htmlentity calls
2011-11-24 02:53:44 +01:00
bae6c1167c
Merge branch 'fullcalendar'
2011-11-23 21:08:26 +01:00
ee549dfb38
Fix scrolling through months
2011-11-23 21:07:49 +01:00
5e037bfd54
Contacts: remove redundant li in setpropertyform template
2011-11-23 21:07:32 +01:00
a2ecdfcac1
Contacts: support multiple phone type parameter
2011-11-23 21:07:32 +01:00
ad390d5e42
Add type selects to editing ADR & TEL contact property types
2011-11-23 21:07:32 +01:00
a38778f911
fix timeformat setting for fullcalendar
2011-11-20 14:23:26 +01:00
6c4692380f
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-11-20 11:41:58 +01:00
4bebf419d1
use oc_appconfig instead of oc_config for the external apps
2011-11-18 20:19:55 +01:00
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
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
cff6a41e2b
fixed copy&paste error: store ldap_tls setting in user_ldap, not
...
user_tls
2011-11-18 14:07:11 +01:00
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
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
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
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
28cd41a2a4
users_ldap - added getUsers() method to fetch all existing users from
...
LDAP server
2011-11-18 14:05:37 +01:00
96b91e5b0b
fix ampache encoding problem. use htmlentities encoding parameter directly.
2011-11-18 14:03:26 +01:00
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
3d498002d0
first implementation of the search function
2011-11-14 22:52:34 +01:00
89b3a395df
fix timezone for repeating events
2011-11-12 22:30:09 +01:00
a303992d78
support for repeating events
2011-11-12 22:02:04 +01:00
eea20e51d8
another fix of caldav url
2011-11-12 16:13:27 +01:00
7fd52de2d3
fix merge conflicts
2011-11-12 15:13:44 +01:00
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
03d9fab3c0
fix caldav url
2011-11-12 14:06:14 +01:00
88de9e4050
Keyboard shortcuts for saving. Refined code.
2011-11-11 20:46:06 +00:00
26272c4252
automatic timezone detection
2011-11-11 15:51:44 +01:00
524e3686a0
tell the user when the files are being scanned
2011-11-10 16:40:09 +01:00
ef124c3e21
Use a function to generate select options
2011-11-09 22:19:52 +01:00
b095859a92
Use Last-Modified property to check for changed events
2011-11-09 22:17:09 +01:00
c65e417666
Use parse function in Calendar_Object
2011-11-09 22:16:24 +01:00
5a6aba1e11
provide caching for file metadata
2011-11-09 18:41:57 +01:00
938c5ef21c
contacts: every card needs a version!
2011-11-09 11:35:50 +01:00
4b424e12df
contacts: put property key in background, the value is important!
2011-11-09 11:35:50 +01:00
841be90939
Improve style in contacts
2011-11-09 11:35:50 +01:00
5cc6635eb8
remove OC_Filesystem::fromUploadedFile
2011-11-08 22:36:05 +01:00
ca6c500799
remove OC_Filesystem::fileatime
2011-11-08 22:26:03 +01:00
ec015a2e68
remove the need to register storage providers, pass the classname during mounting instead
2011-11-08 22:21:25 +01:00
c33884779d
Fixed problem closing the editor.
2011-11-07 22:45:26 +00:00
059ab889bd
Fixed error where saving message appears twice.
2011-11-07 22:27:49 +00:00
7a8c762e48
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-11-07 17:16:56 +00:00
97291fda58
Add allow_url_fopen directive to admin_dependencies_chk
2011-11-06 16:54:05 +01:00
cc35cb74e1
Try to avoid closing the share box too soon on multiple selections
2011-11-06 15:29:51 +01:00
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
8eda6f8feb
make webfinger work properly if owncloud is installed in a subdirectory
2011-11-03 13:09:51 +01:00
e2907eb99d
no longer rely on PEAR::isError since we can use PDO now
2011-11-03 13:09:51 +01:00
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
e533e82bc9
Add sequence name in insertid to be more portable
2011-10-29 11:40:48 +02:00
eaad3ab45f
Be consistent with licencing
2011-10-29 10:15:29 +02:00
a21908cf18
Change name and fix a typo
2011-10-29 10:07:01 +02:00
a809fe9a04
Add a dependencies check apps
2011-10-29 00:27:25 +02:00
8dd2f463f8
Cleanup tipsy popups on more actions
2011-10-27 22:56:22 +02:00
1e8e2ae353
Move unselect call to after the dialog starts
2011-10-27 22:54:39 +02:00
6d4d15b221
Fix html id's in part.addcardform.php
2011-10-27 22:47:56 +02:00
c0e9c805ec
Disable loading non-existing settings script in bookmark app
2011-10-27 22:46:52 +02:00
865be6064a
adjusting to new db "api", merge with master
2011-10-27 21:16:04 +02:00
0d022de0f4
Merge branch 'master' into gallery
2011-10-27 20:27:57 +02:00
6eee638482
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-25 20:48:59 +01:00
715e376cd2
Fix setproperty form
2011-10-25 20:01:40 +02:00
d0e9c81399
Quickfix hanging tipsy popups
2011-10-25 20:01:04 +02:00
55d957489d
Fix fromtime/totime warnings
2011-10-25 19:59:23 +02:00
50649ad0d1
Implement select event creation
2011-10-25 19:57:20 +02:00
950018b5c3
Fix scrolling calendar
2011-10-25 19:56:57 +02:00
9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
74740fb71a
Do not set incorrect components for default calendar
2011-10-23 11:35:29 +02:00
4d60f9d3bd
improved style in contacts
2011-10-22 21:32:07 +02:00
d89666261f
Some improvements on the contact application
2011-10-22 19:23:22 +02:00
b224991ea2
Fix translations, empty properties
2011-10-22 19:23:22 +02:00
dc9c5f10f5
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-22 16:28:24 +02:00
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
9761a1de3e
translatable error messages
2011-10-22 13:14:54 +02:00
0011c42669
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-22 13:12:13 +02:00
42306f1e35
Avoid error when no image is provided for cover or thumbnail
2011-10-22 11:34:49 +02:00
9d46c378b9
Fix unescessary use of non portable 'replace' sql and add loging when GD not installed
2011-10-22 11:01:06 +02:00
0d4240e196
Fix music navigation entry controls going over the sidebar
2011-10-22 02:31:16 -04:00
cf5686def0
Merge branch 'master' of gitorious.org:owncloud/owncloud into fullcalendar
2011-10-21 23:24:39 +02:00
433b57c315
fix new allday bug
2011-10-21 22:59:26 +02:00
d50b014aba
fix allday bug
2011-10-21 22:47:31 +02:00
ba3d139de8
Merged from master and fixed issue with opening multiple editors
2011-10-21 21:22:06 +01:00
eb68201bc5
Better event popup
2011-10-21 22:08:55 +02:00
a1eda425ed
added transition function from 'old' calendar to fullcalendar (fixed currentview bug)
2011-10-21 22:08:30 +02:00
61660c068a
Fix function name error in contacts app
2011-10-21 21:49:58 +02:00
f0565de900
use fancybox instead of lightbox
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-10-21 20:19:39 +02:00
c40383b610
enable listview button
2011-10-21 18:27:12 +02:00
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
d09b3ad2e7
Revert "first implementation of fullcalendar plugin with old buttons working"
...
This reverts commit b40122832f
2011-10-21 17:50:10 +02:00
b40122832f
first implementation of fullcalendar plugin with old buttons working
2011-10-21 16:11:38 +02:00
085001fa24
Disable calendar scrolling, doesn't work yet
2011-10-20 23:49:29 +02:00
96002c8c8f
Implement listview for fullcalendar
2011-10-20 23:49:29 +02:00
beb5d62779
Optimize deleting event
2011-10-20 23:49:28 +02:00
2269f74c27
Fix changing calendar data
2011-10-20 23:49:28 +02:00
3d8a1ccb3f
Implement resizing of events
2011-10-20 23:49:28 +02:00
a8bca282df
Implement moving of event
2011-10-20 23:49:28 +02:00
bb5ccc5731
Connect popup to fullcalendar
2011-10-20 23:49:28 +02:00
0eb6c759d7
Connect newEvent & editEvent to fullcalendar
2011-10-20 23:49:28 +02:00
4fe48a50f0
Translation of calendar interface
2011-10-20 23:49:27 +02:00
2e6ec6ce0b
Connect calendar buttons to actions
2011-10-20 23:49:27 +02:00
4075d18050
Implement loading of events in calendar
2011-10-20 23:49:27 +02:00
a12cdb55b1
Replace ownCloud calendar html with fullcalendar implementation
2011-10-20 23:49:27 +02:00
2906ea3d78
Add caching for filelist sharing icon status to avoid many http req.
2011-10-20 23:03:05 +02:00
e9b6a1018d
remove unneeded definiton of get_temp_dir
2011-10-20 01:27:04 +02:00
8f77179d29
Merge commit 'refs/merge-requests/64' of git://gitorious.org/owncloud/owncloud
2011-10-20 01:24:23 +02:00
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
7e34452746
Little trick to avoid editor loading twice on double click
2011-10-19 22:42:44 +02:00
da8d32ae38
Tweak bookmarklet to not change the current page. Correct encoding when add bookmark
2011-10-18 23:27:53 +02:00
9ea34250a0
Lower also the album name in media scanner...
2011-10-18 23:15:47 +02:00
b15d8878b7
Correct use of null for not null columns in media scanner
2011-10-18 22:41:25 +02:00
c32cce4b35
new way of showing gallery covers, missing files
2011-10-18 21:43:33 +02:00
55e8b02a09
new way of showing gallery covers
2011-10-18 21:42:27 +02:00
29368d1c58
Add 3 More log writing in files sharing app
2011-10-18 21:30:08 +02:00
b975f11514
make sharing work with the new mouting mechanism
2011-10-18 21:19:13 +02:00
59eac3bc29
Correct little typo/bug in log display and remove ending php tag
2011-10-18 20:10:17 +02:00
2ac00b378a
Fix file sharing : Don't give a unused param to execute
2011-10-17 23:39:23 +02:00
492931562f
Fix bookmark listing with mysql: limit is binded as string.
2011-10-17 13:49:33 +02:00
4d1776faf9
catch some edge cases in media player
2011-10-17 01:25:11 +02:00
595b13f1e0
prevent the remaining ob_clean related errors
2011-10-17 01:18:02 +02:00
330c513015
prevent error in media player ajax api
2011-10-17 00:25:13 +02:00
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
b0127e3918
use OC_Log instead of error_log
2011-10-16 21:42:24 +02:00
323a98adb7
Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar
2011-10-15 17:16:00 +02:00
c383543ec9
Remove unused parameter
2011-10-15 11:45:58 +02:00
9cfae56df5
Fix calendar colors with new calendar
2011-10-15 11:45:58 +02:00
9bde002c95
Fixed issue with opening editor multiple times.
2011-10-14 22:56:14 +01:00
8d4039b678
Add loading message to image lightbox and tweak events
2011-10-14 23:51:51 +02:00
3fee961a0a
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-14 22:07:30 +01:00
8450785379
Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloud
2011-10-14 20:38:42 +02:00
ea8461e83d
scrolling in calendar
2011-10-14 13:46:28 +02:00
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
8da00e2d9a
avoiding notice if ['HTTPS'] is not set
2011-10-13 15:50:08 +02:00
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
ef8826ac2d
remove 'description' from OC_Connector_Sabre_CalDAV propertyMap
...
* the description field was removed in commit:
f3f5d775b5
2011-10-12 15:10:59 +11:00
4cbae823eb
Merge branch 'master' into calendar
2011-10-10 21:08:11 +02:00
f49ecee24c
reload calendar automatically
2011-10-10 12:03:30 +02:00
e2468c4343
fix webfinger install script
2011-10-09 17:24:18 +02:00
6e62911a4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-09 17:13:34 +02:00
f4fb6356cd
use install.php properly
2011-10-09 17:12:16 +02:00
42f289d994
Updated bug message
2011-10-09 16:01:48 +01:00
203f7a3a87
Move contact delete button to top right corner
2011-10-09 00:04:37 +02:00
88aa40e6ac
Show add contact form on opening contacts page
2011-10-09 00:04:37 +02:00
19d4e6e1d5
apps/bookmarks: remove unused variable
...
This is not needed anymore since commit
6b64aa3faf
2011-10-08 21:07:43 +02:00
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
deaeab3d92
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-08 15:47:03 +01:00
adebefad84
Fixed editor loading and file saving issue
2011-10-08 15:46:38 +01:00
6b64aa3faf
removed description. changed target to _blank. removed sorting. updated layout.
2011-10-08 13:54:45 +02:00
f3f5d775b5
removed description field for calendar
2011-10-08 13:28:01 +02:00
39e7db7db4
added missing files
2011-10-08 13:11:13 +02:00
590ff0ced9
moved bookmarklet to personal. username must be provided when adding a new user.
2011-10-08 13:10:49 +02:00
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
a13d42fdaf
Fixes for adding contact property
2011-10-07 23:01:49 +02:00
46b8703b71
Display contact name without label and in bold
2011-10-07 22:42:50 +02:00
f95e8c62c9
Save the right contact property
2011-10-07 22:38:19 +02:00
8ea9c39241
Fix saving properties with a new contact
2011-10-07 22:25:26 +02:00
bc54f13636
Fix name when adding contact
2011-10-07 21:59:25 +02:00
7e0da0cb25
fix amapache url
2011-10-07 18:13:46 +02:00
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
6449a45695
disable openid on default
2011-10-07 17:02:55 +02:00
4fc8e28fba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 16:46:18 +02:00
fa72f1c3cc
some icon corrections
2011-10-07 16:18:47 +02:00
980a0893f0
Change colorselector to use border for selected color
2011-10-07 16:03:26 +02:00
20554be9f4
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-07 00:15:54 +02:00
e345fbd386
conflicts solved
2011-10-06 22:40:11 +02:00
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
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
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
3cc7212c82
Add icon for calendar color selector
2011-10-06 21:22:55 +02:00
b0847a61f5
Start using OC_JSON in gallery app
2011-10-06 21:22:01 +02:00
4786ed321e
Replace _ in timezone setting with a space
2011-10-06 13:22:36 +02:00
c28f1e0276
Implement timezone fix from Stephen Rees-Carter
2011-10-06 13:22:36 +02:00
bf017fb4bd
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-06 13:21:38 +02:00
55ab68a332
support of RRULE in calendar app
2011-10-06 13:21:13 +02:00
c853fc75a1
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
2011-10-06 10:31:05 +11:00
d9464de690
Updated saving feedback
2011-10-05 21:59:03 +01:00
f92fa6989e
another query fix
2011-10-05 22:28:17 +02:00
30343f15e2
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-05 20:49:08 +01:00
af6eb52b5e
correct wrong variable name in remoteStorage app
2011-10-05 20:01:58 +02:00
d5931b8c48
gallery db query fix
2011-10-05 19:32:30 +02:00
edd958836e
Moved addScript and addStyle calls to app.php
2011-10-05 16:32:01 +01:00
86825ee3b5
Cleanup of code. Fixed breadcrumb removal issue
2011-10-05 16:10:11 +01:00
28dcbe3cb0
disabled gallery app by default until it's in a branch
2011-10-05 14:54:34 +02:00
8e532b5ceb
removed extra calendar settings. Also, table layout?
2011-10-05 14:32:25 +02:00
5570222b40
Added the missing quotes on the filename.
2011-10-05 15:20:32 +04:00
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
15e5bd16ab
use texteditor for search results
2011-10-05 02:44:24 +02:00
c6a73bee5e
remove now unneeded textviewer
2011-10-05 02:38:55 +02:00
1fba8619d4
move some code to where it belongs and remove duplicated editor app
2011-10-05 02:36:54 +02:00
a8621265e2
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-05 02:11:44 +02:00
813e8b274a
Added all the remaining extensions to filetypes
...
mapping which ace-editor supports.
2011-10-05 00:23:16 +02:00
7579fc7bc9
updated margins
2011-10-04 21:39:13 +02:00
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
2c95c799e6
Add new contact name to end of cantact list
2011-10-04 21:16:57 +02:00
fada3517b0
All the basic field for add contact added
2011-10-04 21:16:57 +02:00
39d42fc62b
Save button now removed after closing editor
2011-10-04 20:15:20 +01:00
0179b61f69
fixed another bug with breadcrumbs
2011-10-04 21:05:49 +02:00
451b5940ea
fixed scrollbar issues. fixed missing breadcrumb image.
2011-10-04 21:01:05 +02:00
fa203d186e
Added fillHeight() js function for resizing editor
2011-10-04 19:46:27 +01:00
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
09c1179094
Fixed breadcrumb issue.
2011-10-04 19:07:22 +01:00
340f6bbaba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 19:37:54 +02:00
d1518f2901
updated calendar settings
2011-10-04 19:37:26 +02:00
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
5c9b069fe5
Updated saving feedback to use loading.gif
2011-10-04 17:43:13 +01:00
9d918b5ac8
Updated control bar styling and save feedback.
2011-10-04 16:31:26 +01:00
58d284419c
HTML data is now encoded before being shown.
2011-10-04 15:27:29 +01:00
70091ec649
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 10:17:55 +02:00
33b660857a
fix ical import
2011-10-04 10:17:11 +02:00
79da90bb08
renamed unhosted to remoteStorage (needs to be updated with coming protocol version)
2011-10-04 10:07:46 +02:00
45fda6f43e
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-03 23:43:58 +01:00
6c9ff0e47e
Fixed ajax urls
2011-10-03 23:41:32 +01:00
32ce0d3c6e
Fixed file saving issue.
2011-10-03 23:28:47 +01:00
02d7b1a1fc
Added breadcrumb and control bar.
2011-10-03 22:59:40 +01:00
77e12a15b1
fix checkLoggedIn function in import of ical files
2011-10-03 22:52:13 +02:00
c40a1fcede
added import function as filehandler
2011-10-03 22:50:10 +02:00
dec8106665
Add user friendly calendar color chooser
2011-10-03 20:42:47 +02:00
6159b79715
Take setting default value out of loop
2011-10-03 20:42:47 +02:00
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
acbd31255e
fix add bookmark bug.
2011-10-03 20:44:03 +08:00
a2bcbec791
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-10-03 02:01:24 +02:00
36196b6c2d
use browsercache for gallery covers
2011-10-02 19:42:14 +02:00
7bcc0efd6a
show galleries in search results
2011-10-02 19:33:55 +02:00
39c4d9b2ca
enable by default
2011-10-02 18:53:47 +02:00
c3d7ffc877
adding tmp icon for app, extending memory size for php in .htaccess
2011-10-02 17:52:11 +02:00
ee62eb7bb0
adding missing files, don know why they disappeared
2011-10-02 17:48:02 +02:00
6643f68663
merge 'gallery_app_devel' to 'master'
2011-10-02 17:17:46 +02:00
bdcf31cc73
Added translatable text.
2011-10-02 16:06:30 +02:00
213275a1f8
Add translation and fixed some css problems
2011-10-02 15:55:23 +02:00
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
fef31bc6c7
Merge commit 'refs/merge-requests/39' of git://gitorious.org/owncloud/owncloud
2011-10-02 14:00:55 +02:00
54e5a10846
avoid creating empty albums, removing od depreciated code openings
2011-10-02 13:52:04 +02:00
07b3b103ce
changing <? to <?php
2011-10-02 12:24:02 +02:00
0825073e8c
Editor now loads on top of files app.
2011-10-01 22:48:00 +01:00
0ebe9ad70c
added function to export single events
2011-10-01 23:19:06 +02:00
f9824f6108
choosable default duration of event
2011-10-01 22:53:18 +02:00
339d417420
removing add new album button, removing logs, and unused code
2011-10-01 22:36:01 +02:00
1ea183a0f7
fix duration bug
2011-10-01 21:09:08 +02:00
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
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
a7431d99e5
remove debugging text in drag and drop function
2011-10-01 20:31:58 +02:00
43a3e46369
added drag and drop function for events in calendar app
2011-10-01 20:27:30 +02:00
83e7f9d54a
showing galleries bahaviour change
2011-10-01 11:26:47 +02:00
5a40804773
bookmarks are now translatable
2011-10-01 11:14:43 +02:00
bf6414d3ad
choosable time format
2011-10-01 10:39:07 +02:00
0514a1925b
choosable first day of week & choosable days of weekend
2011-10-01 09:54:52 +02:00
ddd28aae67
Remove test data from calendar creation
2011-09-30 23:17:30 +02:00
9a5d517ec2
Add more checks for admin user
2011-09-30 23:17:30 +02:00
f4782a7690
Check if the application is actually enabled
2011-09-30 23:17:18 +02:00
35d490f8e9
fix playing songs from search results
2011-09-29 23:55:00 +02:00
d59c48217d
Change colspan in choose calendar dialog to 6
2011-09-29 22:15:42 +02:00
84e209f1e0
added app for admins to create a zipfile containing the owncloud data
2011-09-29 17:11:07 +02:00
fcc6d61fe1
only play the music once
2011-09-29 00:48:45 +02:00
0d40617c07
improvements in media collection viewer
2011-09-29 00:42:30 +02:00
8d3c3785bc
sort music collection
2011-09-28 23:50:28 +02:00
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
3c361cec92
Removed unnecessary theme files.
2011-09-28 22:23:50 +01:00
c9c7d5e1aa
Add support for DURATION in VEVENT
2011-09-28 23:17:26 +02:00
5875b50de0
Use .empty function instead of .html("")
2011-09-28 23:17:26 +02:00
7c20aea96c
Use OC.filePath to locate ajax entry points
2011-09-28 23:17:25 +02:00
3f7d964acd
Color event background with calendar color
2011-09-28 23:17:25 +02:00
45c983e899
Add missing datetime type
2011-09-28 23:17:25 +02:00
93a0e668a6
styling fixes for playback controlls
2011-09-28 22:36:15 +02:00
98ded8d168
Added support for more file types
2011-09-28 21:31:13 +01:00
bc7289bb28
Changed theme. Editing is now default action for all supported types. Fixed static url.
2011-09-28 21:25:25 +01:00
1639a1ca49
fix persistent playlist for media player
2011-09-28 22:21:06 +02:00
c39c6d36df
do not use 'URL' but 'address'
2011-09-28 22:11:47 +02:00
4fe993a55d
Replaced urlencode() and urldecode() with htmlspecialchars() and htmlspecialchars_decode()
2011-09-28 20:26:30 +01:00
2ca74dc334
Ficed text encoding bug. Removed unnecessary file retrival call
2011-09-28 20:23:00 +01:00
3129855cc4
Fixed typo. Added translation support.
2011-09-28 20:17:45 +01:00
3886a749fb
Updated copyright info and ajax responses
2011-09-28 19:52:08 +01:00
61c4f9b3c8
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 18:44:17 +02:00
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
3ab8739809
Implemented ace-editor for basic file editing.
2011-09-28 15:26:54 +01:00
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
e30220e287
media app: show current song, add margin, enable tooltip
2011-09-28 11:46:04 +02:00
8e42b02a22
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-28 10:29:07 +02:00
8c405a59d8
little bug fixes in calendar app
2011-09-28 23:28:14 +02:00
c6f78fbe43
Add flag in info.xml to control the apps that are installed by default
2011-09-27 22:36:14 +02:00
61aa00899d
show only most essential stuff in add and edit event form
2011-09-27 21:56:16 +02:00
f4ecf47e61
Fixed delete cross positioning issue.
2011-09-27 05:26:49 +10:00
e4dc33b368
Reverting: initial commit for gallery app
2011-09-26 20:05:36 +02:00
63e6863222
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-25 22:32:16 +02:00
bc43851d74
initial commit for gallery app
2011-09-25 22:32:08 +02:00
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
64b68f2474
correctly update the collection when music files are moved around
2011-09-25 01:34:55 +02:00
ae4c83af91
moved scanning to controls bar
2011-09-25 00:17:54 +02:00
368412a730
lots of music improvements, might break some things though
2011-09-25 00:02:50 +02:00
700ac75565
updated translations
2011-09-24 23:12:18 +02:00
a54ea3246c
removed 'share by publiclink' app as it has been superseded by Sharing
2011-09-24 23:03:28 +02:00
408c391f83
removed deprecated images and icons
2011-09-24 22:09:41 +02:00
da63140b04
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-24 19:53:37 +02:00
4aeb2990c0
delete calendar function for userinterface
2011-09-24 19:52:55 +02:00
260893816b
remove getID3 demos due to security issue caused by one of them
2011-09-24 19:09:54 +02:00
842ce24d2b
apps/calendar: check for unset variable
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:07 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
782069e1fa
Change copyright notice to short form
2011-09-23 22:59:54 +02:00
5741811d36
Fix use of reserved javascript keyword 'new'
2011-09-23 22:22:03 +02:00
Bart Visscher
Thomas Tanghus
Georg Ehrke
Michiel de Jong
Tom Needham
Thomas Olsen
Robin Appelman
Brice Maron
Insanemal
Ignacio Daniel Rostagno
Markus Kalkbrenner
krzaczek
Weng Xuetian
Jakob Sack
Bartek Przybylski
David Iwanowitsch
Georg Ehrke
Frank Karlitschek
Michael Gapczynski
Florian Pritz
Hendrik Langer
John Kristensen
Marvin Thomas Rabe
Jan-Christoph Borchardt
Stephen Rees-Carter
Borjan Tchakaloff
Florian Jacob
Thomas Schmidt
Scott Barnett
Jan-Christoph Borchardt