25fa9bf8ec
merged with stash
2011-12-21 18:37:17 +01:00
3c42867109
merged
2011-12-21 18:35:29 +01:00
d5e9c7d572
Gallery: fix calculation of folder thumbnail selection
2011-12-18 23:10:43 +01:00
fbad1da9e2
Contacts: check if PREF parameter is set before useing it
2011-12-18 23:10:43 +01:00
dff9585f64
Contacts: add missing property_options template var
2011-12-18 23:10:43 +01:00
ff346ad135
Calendar: small for loop fix
2011-12-18 23:10:43 +01:00
4eb36b0ecf
Calendar: refactor common ajax functions to OC_Calendar_App
2011-12-18 23:10:42 +01:00
9e50cecf27
Fix shared status for files inside a shared folder
2011-12-17 21:13:54 -05:00
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
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
f6ed7a19be
Merge branch 'master' into calendar
2011-12-16 21:21:34 +01:00
f3e8776dc6
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
2011-12-16 17:43:06 +01:00
feeb0c742a
Misc. changes after review by bartv.
2011-12-16 17:42:07 +01:00
65214bed0c
make the sharing app return the corrrect result for is_writable on the shared folder
2011-12-16 17:31:31 +01:00
59ad0a6c9c
Update README
2011-12-13 10:39:31 +01:00
9fdd1bafdc
Merge branch 'master' into filesystem
2011-12-11 23:42:22 +01:00
d55e689261
Added readme.tanghus
2011-12-11 21:17:10 +01:00
3f44a28e28
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-12-11 18:16:14 +00:00
39430c837f
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
2011-12-11 16:29:53 +01:00
c7b7758816
Updating of contact list when activating/adding/deleting address books now works.
2011-12-11 16:26:00 +01:00
56f12cbfb1
delete unused files
2011-12-10 17:54:42 +01:00
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
b7c754cb32
Merge branch 'master' into calendar
2011-12-10 15:03:33 +01:00
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
6e46bd7373
integrated and updated calendar translations
2011-09-23 20:38:19 +02:00
aa4aa40b57
fixed a few calendar words, hack to get shortcode for May translatable
2011-09-23 20:19:39 +02:00
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
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
5559a0dede
updated translations
2011-09-23 19:08:02 +02:00
73d0caf8a4
Add Sabre_DAV_Browser_Plugin to *DAV-servers to ease debugging
2011-09-23 09:40:01 +02:00
917ea58a8c
fix file uploads for IE
2011-09-22 23:25:23 +02:00
aad62919da
Small styling fixes
2011-09-20 14:38:16 +02:00
e990ef3542
Move some common code to OC_Util
...
Created the following function:
- checkLoggedIn
- checkAdminUser
- redirectToDefaultPage
2011-09-18 21:31:56 +02:00
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
d5656716f6
Fix calendar active checkbox
2011-09-18 17:13:48 +02:00
0660133d2e
Fix event error/success json message
2011-09-18 17:13:47 +02:00
7c5e389067
deleteUser function must be static
2011-09-18 17:13:47 +02:00
d0d3fecc95
no need to escape values when using prepared statements
2011-09-17 02:30:00 +02:00
22db68816e
Remove unused function call
2011-09-17 01:55:05 +02:00
079df42103
Disable the Oneday and Fourweeks buttons in calendar interface
2011-09-17 01:55:04 +02:00
fe62c803e2
fix small bugs
2011-09-17 00:46:04 +02:00
54a3b28dce
Split OC_Contacts_Addressbook in _Addressbook and _VCard
2011-09-17 00:26:57 +02:00
2a84f7f07c
Move most javascript to calendar.js
2011-09-16 17:50:55 +02:00
45d42a9654
Move validateEventForm function and fix success handling
2011-09-16 17:06:57 +02:00
73d3dc91fd
Handle multi open of choosecalendar dialog
2011-09-16 14:11:22 +02:00
0fde26c86c
Close event new/edit dialog when clicking outside the dialog
2011-09-16 14:02:21 +02:00
2353f02d9a
Fixes for Calendar app
2011-09-16 00:21:51 +02:00
15559d3e88
First implementation of edit event
2011-09-16 00:21:19 +02:00
b413dcfa7c
Fix conversion of VTODO and VJOURNAL items
2011-09-16 00:19:43 +02:00
388b14604a
Move Calendar Object code to its own class OC_Calendar_Object
2011-09-16 00:19:43 +02:00
d3ee19e675
fix documentation
2011-09-15 23:20:49 +02:00
4d7ed0f2f5
Add documentation to calendar.php
2011-09-15 22:45:58 +02:00
ae622dbbfe
Small fix in documentation
2011-09-15 22:45:40 +02:00
c3ff534b19
Improve reading of vCard files
2011-09-15 11:06:21 +02:00
b6c69e580a
Move php code out of part.eventform
2011-09-14 23:36:23 +02:00
cb9a67906d
Move event form field to part.eventform template
2011-09-14 23:36:23 +02:00
68758f9b2c
Rename calendar javascript functions into Calendar.UI namespace
2011-09-14 23:36:22 +02:00
7c9f1007d5
Fix initial visibility of database settings in setup
2011-09-14 23:36:22 +02:00
0ff9bc4806
Add link and other edit information to newly added bookmarks.
2011-09-13 16:10:52 +04:30
67addb4882
Add support of editing bookmarks.
2011-09-13 15:40:09 +04:30
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
fb96256c63
offer login popup from oauth dialog
2011-09-12 15:17:52 +02:00
d0746d7e32
offer login popup from oauth dialog, correct base uri
2011-09-12 15:04:21 +02:00
6e569c5ed1
correction in webfinger.php activation trap
2011-09-12 14:59:22 +02:00
f928d4af56
correct xml syntax
2011-09-12 14:35:15 +02:00
5685965fdb
improve uninstalled-protection
2011-09-12 14:22:48 +02:00
f93be510a3
check activation and make activation impossible by default
2011-09-12 14:15:19 +02:00
d07f3d548c
improved troubleshooting instructions
2011-09-12 13:47:14 +02:00
cb7cc99302
correct protocol
2011-09-12 01:22:40 +02:00
6e6be3aa8f
putting activation inside activate.php
2011-09-12 00:32:38 +02:00
994c7f3dad
adding webfinger app
2011-09-12 00:12:34 +02:00
de729d8d8b
renamed last CW to Week
2011-09-11 21:50:13 +02:00
cd44dff5af
Better feedback for saving calendar and openid settings
2011-09-11 20:38:52 +02:00
3234597703
Correct copyright notices
2011-09-11 17:25:02 +02:00
e9df292b62
commented out broken code in add event function
2011-09-11 16:49:08 +02:00
72aa1bf75c
Only show used address attributes in contact view
2011-09-11 12:52:40 +02:00
647fab07c7
fixes in german language
2011-09-10 12:26:01 +02:00
97fc236760
Fix a warning and an error
2011-09-10 11:58:08 +02:00
1afeb5cd12
bug fixes in calendar lib
2011-09-10 10:52:35 +02:00
cbb36829e6
Small update Calendars dialog
2011-09-09 22:28:34 +02:00
760b47a62f
Use OC_Helper::linkTo also for absolute urls.
...
One central place to check for https.
2011-09-09 22:19:15 +02:00
80f5942868
translatable categories and other translations added
2011-09-09 20:39:38 +02:00
f031e308cd
show caldav url in choose calendar dialog
2011-09-09 18:44:33 +02:00
5fed5bab4a
Improving contacts
2011-09-08 23:36:47 +02:00
74f6dd5d5a
Add creating calendars with the web interface
2011-09-08 12:29:29 +02:00
f3e98878da
Implement calendar list view
2011-09-07 15:13:26 +02:00
dabf10f99c
Use js Date for holding dates in the whole calendar app
2011-09-07 09:49:23 +02:00
fbde66a56c
Eliminate most global calendar js vars
2011-09-07 09:49:23 +02:00
0df98b9a78
Remove generate_ prefix from vars
2011-09-07 09:49:23 +02:00
9b14c276e3
Store date for click in jQuery.data('date_info')
2011-09-07 09:49:23 +02:00
abb6a15aa4
Change generateDates to use js Date for calculations
2011-09-07 09:49:22 +02:00
b7ba0839c6
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
2011-09-06 17:14:48 +04:30
c5aa139296
Use an animated gif in add-bookmark form, while fetching metadata.
2011-09-06 17:13:03 +04:30
0b5f0ac249
Don't clear bookmark description field, If it is empty in bookmark metadata.
2011-09-06 16:13:23 +04:30
75383a8308
small wording changes
2011-09-04 18:13:53 +02:00
f4b9895cbf
having non-editable stuff as input fields is really confusing. You were right Robin ;)
2011-09-04 10:34:57 +02:00
cfb932b073
Add simple popup to event
...
There is not a lot of infomation to display, yet.
2011-09-03 22:15:24 +02:00
3130234640
Remove execute permissions from source files
2011-09-03 22:15:23 +02:00
2e2bdb449f
Update calendar event label creation
2011-09-03 22:15:23 +02:00
1bf215cd08
updated translations
2011-09-03 15:08:58 +02:00
afb07d3e39
Use css class for view selection radio buttons hilighting
2011-09-02 23:51:18 +02:00
208852abf2
Fix event creation date in oneweekview
2011-09-02 23:50:51 +02:00
d33a5ea5d4
Use css classes to find elements, reduces the html size
2011-09-02 23:28:35 +02:00
6155c758be
Cleanup javascript in calendar template
2011-09-02 23:04:02 +02:00
6eff001ebb
another bugfix in new design of calendar
2011-09-02 21:29:59 +02:00
1940bc3dc0
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-09-02 15:49:43 +02:00
e89d622c3a
bug fixes in new design of calendar
2011-09-02 15:49:03 +02:00
e798c32375
renaming core_unhosted app to just unhosted, and cleaning up unused files in it
2011-09-02 15:25:04 +02:00
71205b8b07
adding core_unhosted app
2011-09-02 14:56:40 +02:00
8cdd9ab81b
export function and style fixes in calendar
2011-09-02 12:55:56 +02:00
62cca8264f
Refactor calendar loadEvents and updateView use
2011-09-01 23:27:00 +02:00
804af7f189
Move generate_dates function to Class/Object
2011-09-01 23:23:57 +02:00
b7e9e7e777
Simplify forward_day and backward_day
2011-09-01 22:29:57 +02:00
e765e7e9e8
Changing the active state of the calendar reloads the events.
...
Change from Georg Ehrke
2011-09-01 22:00:14 +02:00
1bb754299a
Change calendar js rendering to class/object
2011-09-01 22:00:14 +02:00
3d2b4b03af
Convert plain javascript to jQuery for readability
2011-09-01 22:00:13 +02:00
578d1de55d
Fix OC_USER_LDAP::checkPassword() to return the username
...
REVIEW: 102487
2011-09-01 13:56:30 -03:00
b579c812b2
Some commented code was still here
2011-09-01 18:33:19 +02:00
31a094becb
Buttons for play/add albums works. Folding albums too.
2011-09-01 18:31:44 +02:00
0c07312ad8
add some categories in calendar
2011-09-01 18:35:32 +02:00
6fa9be73f8
calendar_calendars.components needs to be longer, adjustments in info.xml
2011-09-01 17:27:12 +02:00
8cbe66b5c1
bug fixes at new event form (categorie and calendar)
2011-09-01 16:54:25 +02:00
58129f9a11
Merge branch 'calendar' of git://gitorious.org/owncloud-dump/owncloud-dump
2011-09-01 16:15:48 +02:00
3972774a2e
Removed db4app and test_db
2011-09-01 15:58:47 +02:00
a7496b1c9d
Create function getnumberofdays to get a list of month lengths
2011-08-31 21:24:08 +02:00
b0ce1ded97
Move date functions to class structure
2011-08-31 21:24:08 +02:00
361861295f
reload page after add event successfully
2011-08-31 20:41:18 +02:00
5678d78d54
new changes (e.g. show events) by Bart Visscher
2011-08-31 20:20:46 +02:00
9a60313c3b
commit changes of Bart Visscher, see http://gitorious.org/owncloud-dump/owncloud-dump/commits/calendar
2011-08-31 17:29:38 +02:00
f758d223a2
Merge branch 'calendar' of git://anongit.kde.org/owncloud into calendar
2011-08-30 21:01:10 +02:00
6ad64c6f8a
Timezone bug fixed
2011-08-29 13:41:19 +02:00
60a5581071
Merge branch 'master' into calendar
2011-08-28 23:38:24 +02:00
281b2187ab
fix detection of empty collection
2011-08-28 23:20:08 +02:00
947216942a
Merge branch 'calendar' of git.kde.org:owncloud into calendar
2011-08-28 20:16:40 +02:00
ca08ccb61c
first add event function in calendar app
2011-08-28 20:13:40 +02:00
d5c73c6d4a
always scan new music files
2011-08-28 19:32:52 +02:00
04eebccc39
apps/user_ldap/user_ldap.php: - Add support for ldapv3 and tls
2011-08-28 12:56:04 +02:00
0054197d02
updated translations
2011-08-28 01:14:32 +02:00
52ca447efc
Merge branch 'master' of git.kde.org:owncloud
2011-08-27 18:11:32 +02:00
e8fa2d3442
Added db4app lib, and apps test_db that shows how it works.
...
Also fixed a typo in db.php
2011-08-27 18:09:14 +02:00
f8fc8eb430
no alert popups, ever. They are just dismissed. Use undo instead.
2011-08-27 16:54:20 +02:00
56399d1d79
Play and add buttons in the collection.
2011-08-25 20:57:17 +02:00
ce1d13c9b6
playlist working
2011-08-25 20:37:51 +02:00
ad053d504c
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-25 17:03:56 +02:00
e6bdd25667
fix: links with parameters get cut off at &
2011-08-25 13:51:48 +02:00
0972606072
fix: URLs without protocol are now linked to via HTTP
2011-08-25 13:23:52 +02:00
e0a69bbeac
Make bookmarks sortable by clicks
2011-08-25 12:55:13 +02:00
55a8ee34bd
Make appeareance of the bookmarklet a bit nicer, still room for improvement left
2011-08-25 12:15:03 +02:00
df560b3d9d
Merge branch 'master' of git://anongit.kde.org/owncloud
...
Conflicts:
apps/media/js/collection.js
2011-08-25 09:07:02 +02:00
3fbc8973ee
My own version of music collection.
2011-08-25 09:04:08 +02:00
8c8490b28e
Show users shared with in the drop down for reshared files
2011-08-24 18:41:36 -04:00
e0ff57e8c2
fix javascript error in media player
2011-08-24 23:38:39 +02:00
7cd592e055
Added a Bookmarklet for the Bookmarks app
2011-08-24 22:16:44 +02:00
365c4fdae2
Allow sharing of files shared with you - Bug: Doesn't show up as being shared in the drop down
2011-08-24 12:32:02 -04:00
4c4b1e4c2d
Clear the folder size cache for the 'Shared' folder when a new item is shared
2011-08-24 11:59:03 -04:00
4028dc984a
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-24 14:36:16 +02:00
0f3ef8aeb0
check if tag is set, might not show bookmarks on some systems without doing so
2011-08-24 14:36:03 +02:00
f4c498edba
Full path for carddav path
2011-08-24 11:21:27 +02:00
112eccfe33
Support for etags in calendar
2011-08-24 10:19:48 +02:00
c87cee6b1f
Add VJOURNAL to objects that are allowed by default
2011-08-23 22:10:08 +02:00
778404fb29
VTODO and VJOURNAL exist as well
2011-08-23 22:07:40 +02:00
84761b1518
CalDAV seems to work now
2011-08-23 21:42:15 +02:00
cdf0d010eb
today hightlight in calendar app (fourweeksview and onemonthview)
2011-08-23 20:30:11 +02:00
bf68cd8ba4
better multiple language support, first integration of new calendar class
2011-08-23 18:02:36 +02:00
b09ba58ca6
autoretrieve title and description after entering new url
2011-08-23 16:30:55 +02:00
847347b58a
autoretrieve title and description after entering new url
2011-08-23 16:30:29 +02:00
672515c23f
Bookmarks DB structure change, description is optional
2011-08-23 15:24:44 +02:00
89839b4c63
fetch bookmarks even if they are not tagged
2011-08-23 15:12:34 +02:00
7e1759e775
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-23 12:03:49 +02:00
3c3a859b89
follow coding style and use single quotes in php
2011-08-23 12:03:20 +02:00
72a4703d82
simplify bookmarks tag filter sql
2011-08-23 11:57:56 +02:00
53f0381f0f
make tag filter compatible with sqlite
2011-08-23 11:43:27 +02:00
f5cef2fcbf
cleaned up LDAP settings
2011-08-23 11:40:00 +02:00
3b10cddceb
added icon for Admin
2011-08-23 11:37:29 +02:00
900382057d
updated translations
2011-08-23 11:20:37 +02:00
391e064e67
allow apps to register form for the settings and admin pages
2011-08-23 01:41:18 +02:00
b2fddc408c
/appinfo/app.php bug fixed
2011-08-22 20:09:33 +02:00
96ad8a15b4
Register OC_Share for autoloading and cleanup hooks
2011-08-22 12:37:44 -04:00
c72187474a
Check that the files exist before adding them to the fakedirs
2011-08-22 12:00:56 -04:00
1b64b7395c
Update documentation for unshareFromMySelf()
2011-08-22 11:31:47 -04:00
fbb63f11e4
Some more work on CalDAV integration
2011-08-22 16:59:16 +02:00
c9a11d0aab
some work on media player interface, artists can be collapsed in the collection view again and single albums/songs can be played
2011-08-21 15:28:20 +02:00
09c8cd17cc
remove reset button (again)
2011-08-20 22:50:43 +02:00
0eda75a193
One more bug fix in clearFolderSizeCache()
2011-08-20 15:48:48 -04:00
f10f916f8c
Clean-up in OC_Filestorage_Shared and bug fixes for calculating folder sizes
2011-08-20 15:43:18 -04:00
ceae4fa7b4
Fix bugs preventing file upload in shared folders with write permission
2011-08-20 12:36:20 -04:00
b05be2f26d
Fix textviewer in search results
2011-08-20 12:18:56 -04:00
6afc17be1a
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-20 12:03:22 -04:00
631152fc3e
Implement searching of files shared with you
2011-08-20 12:03:03 -04:00
d15673f13f
removed single quotes around publicly linked download file
2011-08-20 17:44:28 +02:00
3cb07254e5
allday bug fixed
2011-08-20 16:52:03 +02:00
fc4d31547b
spanish language pack
2011-08-20 16:02:44 +02:00
8e32cfbf15
bug/style fixes, multiple language support, german language pack
2011-08-20 15:19:43 +02:00
eac4d4ff06
When deleting a bookmark, remove its tags from database.
2011-08-20 12:38:15 +04:30
add0a90e1e
single quotes in JavaScript & PHP, double quotes in HTML
2011-08-20 05:56:04 +02:00
389b2775c2
translation update
2011-08-20 05:12:16 +02:00
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
c2f0fe51c4
Add getLocalFile() to OC_Filestorage_Shared
2011-08-19 20:05:57 -04:00
778b8543c1
Remove no longer needed functions in OC_Filestorage_Shared
2011-08-19 20:04:35 -04:00
b3f6eb2224
removed unneeded and dangerous reset button
2011-08-19 23:15:27 +02:00
86f6d2fc25
Merge branch 'master' into calendar
2011-08-19 22:58:45 +02:00
d1daca5029
a lot of new functions (e.g. add event form), style fixes, bug fixes
2011-08-19 20:33:48 +02:00
ca86093270
Full support for viewing public links from sharing drop down
2011-08-19 12:47:00 -04:00
5d310ebf92
* Use encodeEntities() function to check input
...
* Separate tags by space
2011-08-19 16:18:08 +04:30
262a652710
Show new bookmark in the list after insertion, And hide it after deletion.
2011-08-19 13:30:05 +04:30
a57d4726bc
Remove some scripts, now you can actually download the files in a public link folder
2011-08-18 19:44:00 -04:00
d1aebcddf2
Add downloadURL to files templates for both public links and files
2011-08-18 19:32:24 -04:00
498356fcb8
Copy get.php into files_sharing, public links now use files templates
2011-08-18 15:35:31 -04:00
4c49a81c8e
language updates, optimization of Help HTML
2011-08-18 19:22:44 +02:00
594532da9a
Merge public link icon check
2011-08-18 13:14:06 -04:00
2ee9e80afe
Swedish translation, thanks to HakanS
2011-08-18 14:33:05 +02:00
6720a45d65
updated translations
2011-08-18 11:46:49 +02:00
8fb75f379a
Comment rename() and prevent trying to move items if the user doesn't have write permission
2011-08-17 22:10:25 -04:00
b4cf61ee32
Bug fixes for mkdir(), renaming/moving support for files inside a shared folder with write permission
2011-08-17 21:58:53 -04:00
4078e0a242
-1 is now a class constant (UNSHARED), for unsharing files from self
2011-08-17 18:00:37 -04:00
1303e40b6e
Remove navigation entry for shared files
2011-08-17 17:44:10 -04:00
5b8658ca10
New system of unsharing files from self, and a small bug fix when all files inside a shared folder are unshared from self
2011-08-17 17:43:15 -04:00
1c13b2681a
Fix my last commit 9ee4fc
2011-08-17 14:22:14 -04:00
9ee4fcdf2f
Only show 'Shared' directory if files are shared with you
2011-08-17 13:47:10 -04:00
5925697374
Fix bug in getPermissions() and clean-up unlink() and rename()
2011-08-17 12:58:09 -04:00
683e125042
Merge branch 'sharing'
2011-08-17 13:48:36 +02:00
b7b3a49203
Functions to get the token of a public link now stored by OC_Share, remove no longer needed ajax call to getlink.php
2011-08-16 21:32:51 -04:00
0edce1796b
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
2011-08-16 20:21:57 -04:00
582dca4d91
Initial merging of files_sharing and files_publiclink
2011-08-16 20:21:18 -04:00
42ed3c6b7e
fix problem with building the IN query
2011-08-17 00:34:02 +02:00
9f28c20660
fix collection browsing using the ampache api
2011-08-17 00:07:17 +02:00
ea65d90a41
really open website after click
2011-08-16 23:50:46 +02:00
48df7a2a7d
gain compatibility with sqlite3
2011-08-16 23:49:53 +02:00
0573695d05
fix database layout for sqlite3
2011-08-16 21:56:12 +02:00
9c3a836044
hiding public links from navigation now that it's easier to use in the dropdown
2011-08-16 18:36:36 +02:00
717ab56419
Display public icon next to publicly shared files
2011-08-16 12:18:31 -04:00
726933831d
Public link folder uploading not implemented, comment out checkbox for it in dropdown
2011-08-16 12:06:08 -04:00
fd74e43afa
fix expire header for media player
2011-08-16 14:35:05 +02:00
b885bad2ee
wording fix for bookmarks
2011-08-16 12:45:44 +02:00
e4c9871299
This should actually make the 'Shared' directory automatically everytime
2011-08-15 20:45:07 -04:00
5fbed936bf
Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory
2011-08-15 20:33:02 -04:00
1ec75330ec
Merge branch 'master' into sharing
2011-08-15 17:49:36 -04:00
82bd2ad310
Merge branch 'master' into calendar
2011-08-15 23:40:03 +02:00
801e4f8611
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
2011-08-15 17:38:33 -04:00
5b09aef166
Additional user group sharing support and more clean-up in the constructor
2011-08-15 17:37:16 -04:00
5608aaee8a
initial commit of Bookmarks App
2011-08-15 22:05:07 +02:00
6096568da9
Small design changes in Contacts
2011-08-14 23:49:09 +02:00
39ecef39cd
Fix creation of UID in contacts
2011-08-14 23:49:09 +02:00
2cb231d0a4
resolved merge conflict
2011-08-14 19:31:38 +02:00
5cb687d168
Refactor getUserAndGroups() for new user group sharing standard - user@group
2011-08-14 12:16:14 -04:00
e1473cfe83
Change OC_GROUP to OC_Group
2011-08-14 11:44:37 -04:00
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
970888b92d
fix some details in Personal
2011-08-14 15:06:16 +02:00
f2a21398d7
more info in personal, WebDAV, OpenID
2011-08-14 11:09:51 +02:00
6f37f2917d
fix media player controlls not showing
2011-08-13 17:53:31 +02:00
ee8e6d5442
DONT always scan the collection, I would like to keep some cpu cycles to actually use my pc
2011-08-13 17:41:34 +02:00
595329a8a0
some player styling
2011-08-13 16:34:40 +02:00
2ba3793671
updated translations
2011-08-13 12:43:15 +02:00
c144976676
start scanning music automatically when in Music
2011-08-13 07:02:51 +02:00
ccf410c7b0
first styling for leftcontent
2011-08-13 07:02:25 +02:00
3b5f16b23c
NEEDS MORE FADING
2011-08-13 06:05:00 +02:00
0c903c63d8
first replacement of media player controls with svg
2011-08-13 05:58:11 +02:00
7ece8ed314
added global action class for icons
2011-08-13 05:27:50 +02:00
4a5ee765cf
merged admin, help and settings to settings
2011-08-13 05:13:34 +02:00
122018889a
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
2011-08-12 21:00:41 -04:00
3c517499bb
OC_Share constructor refactored for user group sharing
2011-08-12 20:49:44 -04:00
b0b5a46543
style media player controls using em instead of px
2011-08-13 00:23:15 +02:00
382834ec2b
highlight playing songs in collection
2011-08-13 00:23:15 +02:00
497789cdd8
Clean up constructor for OC_Share, add some error handling for sharing files
2011-08-12 17:22:32 -04:00
a8e6be6016
Change the share file action icon if the file is already shared with someone
2011-08-12 11:34:17 -04:00
a61dde9b52
old files deleted
2011-08-12 14:39:24 +02:00
4ae5c4bc33
bug fixes, style fixes
2011-08-12 14:29:45 +02:00
5a26640f63
partly fix media player
2011-08-12 12:54:49 +02:00
4830555cce
Merge branch 'master' into sharing
...
Conflicts:
.gitignore
2011-08-11 17:42:37 -04:00
9e35d5a886
Remove hardcoded http:// when generating public links
2011-08-11 16:56:09 -04:00
ce9b36fd3e
some interaction design for user management
2011-08-11 21:00:48 +02:00
c65046773d
Make unshare work from dropdown
2011-08-11 14:20:50 -04:00
99790d6805
lots of image changes, use svg EVERYWHERE POSSIBLE
2011-08-11 19:00:32 +02:00
6d25943f2f
Fix some areas on dropdown triggering the dropdown to hide
2011-08-11 12:50:29 -04:00
0ad0ed77c5
Hide the dropdown if you click the share file action button
2011-08-11 12:03:48 -04:00
0f91438b80
Don't spawn a new dropdown if there is already one open
2011-08-11 11:52:10 -04:00
2af0269eb9
Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing
...
Conflicts:
apps/files_sharing/js/share.js
2011-08-11 11:15:17 -04:00
103d23b3a3
Refactoring in dropdown javascript
2011-08-11 11:09:14 -04:00
26ac7f0f1d
get rid of some js errors on the login screen
2011-08-11 16:53:00 +02:00
c824572b91
fix the getlink calls
2011-08-11 16:15:55 +02:00
568fd0df83
changed quotes
2011-08-11 13:53:25 +02:00
511c193631
only load share action when in file browser
2011-08-11 13:33:43 +02:00
b4e89871dd
merged master into sharing
2011-08-11 13:29:22 +02:00
c9c1633882
some work on media player
2011-08-11 11:27:20 +02:00
414e5e174d
merge Georgs calendar
2011-08-11 11:22:07 +02:00
4915610b5f
Fix creation of UID in contacts
2011-08-11 11:20:12 +02:00
8639630a18
polished public links a bit
2011-08-11 11:10:41 +02:00
110f96df78
At least dome layout in Contacts
2011-08-11 10:08:02 +02:00
5324d6f7df
Small fixes
2011-08-10 22:27:55 +02:00
e1bde1a78e
Merge branch 'master' into sharing
...
Conflicts:
files/templates/index.php
2011-08-10 13:40:47 -04:00
80660bdc07
Fix shared list for files inside of shared folders
2011-08-10 13:38:58 -04:00
c4931cff34
Delete addressbooks of deleted users
2011-08-10 14:28:14 +02:00
cdf91b6b3e
work in new app management
2011-08-10 14:03:54 +02:00
9059b55979
make more strings translatable
2011-08-10 14:03:54 +02:00
58ab3883b9
Add description to contacts
2011-08-10 11:32:06 +02:00
2b59912b3d
Add CardDAV path
2011-08-10 11:19:12 +02:00
88e338ec23
Only show can edit (if not checked) and unshare button on hover
2011-08-09 17:55:51 -04:00
891ac04c19
Remove references to "multiple addressbooks" :-(
2011-08-09 18:05:52 +02:00
ce76cece09
Remove warning
2011-08-09 18:00:14 +02:00
c6f499c685
Some more fixes. It basically works but looks ugly
2011-08-09 17:42:54 +02:00
7c840e9bbb
Remove users and groups from the select form that have already been shared with
2011-08-09 11:00:14 -04:00
c654442901
No more subnavigation entries, fixing 'Shared'
2011-08-09 10:45:12 -04:00
ec6aed8475
Merge branch 'master' into sharing
2011-08-09 10:42:50 -04:00
cdf2dbcd52
Use chosen select form for selecting users in sharing drop down
2011-08-09 10:34:00 -04:00
6d1c266e1e
You don't always have parameters in vcards!
2011-08-09 15:00:10 +02:00
075db9f7ea
Add default addressbook
2011-08-09 14:49:28 +02:00
5047b6e385
Fix naming bug
2011-08-09 14:15:11 +02:00
76fc062f27
Some more work on the address book
2011-08-09 13:53:58 +02:00
7b38e5d7c7
apps can now add their own forms to the Personal page
2011-08-08 23:46:52 +02:00
6aaa49d386
more media player fixes
2011-08-08 22:31:17 +02:00
23c8d7b3fb
Show which parent folder is shared with the user in the sharing drop down
2011-08-08 15:49:16 -04:00
e6f6d3dabc
dont use a different navigation page for settings stuff
2011-08-08 21:43:31 +02:00
3b34cba4ae
first mediaplayer styling
2011-08-08 21:40:39 +02:00
8c34ea496a
initial work on the media player interface rework
...
it looks bad atm bu should work enough to be stylable
2011-08-08 17:53:03 +02:00
968f1282ce
Merge branch 'master' into sharing
2011-08-08 13:19:40 +02:00
544c61f983
updated public link fix
2011-08-08 13:19:22 +02:00
b9ce564053
Merge branch 'master' into sharing
2011-08-08 13:04:10 +02:00
ecd2738e83
fixed upload button
2011-08-08 12:48:43 +02:00
b1a369b49f
quick fix for public links, removed expiration date and styled correctly
2011-08-08 11:17:03 +02:00
1aa89b7cbb
Merge branch 'master' into sharing
...
Conflicts:
files/css/files.css
lib/base.php
2011-08-07 15:56:26 -04:00
5d521d7c7c
Sharing dropdown changes: show users that have a parent folder shared with them and add the ability to change permissions
2011-08-07 15:20:57 -04:00
5e2f7bfda9
Small details in contacts
2011-08-06 23:29:25 +02:00
77fccc9d00
TEMPORARY update path for carddav testers
2011-08-06 23:09:55 +02:00
42a6549729
Database.xml
2011-08-06 23:09:38 +02:00
2f10598af6
New app: contacts
2011-08-06 22:32:06 +02:00
f039320a0b
move openid settings to Personal
2011-08-06 10:08:26 +02:00
c998bc1215
fix some issues with browsers not supporting html5 localStorage
2011-08-06 10:08:26 +02:00
843f8aca7c
Full support for making and deleting public links from share dropdown
2011-08-05 11:18:35 -04:00
60a7a9d6f0
allow users to use myhost/owncloud/?myusername as openid identity
2011-08-04 18:49:29 +02:00
122c3a3cf8
dont show confusing 'X files scanned' message when we are not scanning files
2011-08-04 01:26:29 +02:00
93b342ee39
only load the music player outside the media app if the media app isnt already open in another tab
2011-08-04 01:19:21 +02:00
8f01abf054
Share dropdown updates, making public links now works
2011-08-03 15:21:53 -04:00
4851a55c1d
cache the collection for the media player again
2011-08-03 15:36:47 +02:00
de0e16a6f3
fix a bug in the media player outside the media app
2011-08-03 14:26:37 +02:00
8e5184a8b9
correctly save the playlist if songs are removed and dont load the player outisde the media app if the playlist is empty
2011-08-03 14:23:35 +02:00
c79af7cc4f
removed icon for public links navigation subentry
2011-08-03 04:44:17 +02:00
fdb944e7a3
send the filename header for public links
2011-08-03 02:29:33 +02:00
6527048164
dont force a download for public links
2011-08-03 01:06:25 +02:00
a2062036d3
selecting a text file from the search results now activates the text viewer
2011-08-03 00:30:21 +02:00
ad51328408
some fixes for the textviewer already
2011-08-03 00:01:31 +02:00
dd5cc8dcaf
add textviewer plugin
2011-08-02 23:56:53 +02:00
96ab35a331
Animate appearance of share drop down
2011-08-02 15:23:17 -04:00
d0b2a3b1ac
moved dialog css to sharing, fixed position
2011-08-02 19:30:18 +02:00
d71cca0e81
first style for sharing dropdown, some html fixes
2011-08-02 18:58:33 +02:00
0d79560e94
New implementation of share dialog
2011-08-02 12:19:49 -04:00
957b9e8b84
send last modified header for media
2011-08-02 17:02:27 +02:00
900adb35d8
make the progres bar for scanning always go to the full 100%
2011-08-02 04:43:08 +02:00
02ebc4879a
rename media to music in the navigation
2011-08-02 04:27:11 +02:00
c0e7cf2e40
remove now useless 'media' entry from settings
2011-08-02 04:26:32 +02:00
c814f10d7f
fix media sub navigation entries
2011-08-02 04:14:54 +02:00
9f981de854
fance collection scanning wip
2011-08-01 23:55:47 +02:00
Bartek Przybylski
Bart Visscher
Michael Gapczynski
Thomas Tanghus
Georg Ehrke
Robin Appelman
Tom Needham
Michiel de Jong
Thomas Olsen
Brice Maron
Insanemal
Ignacio Daniel Rostagno
Markus Kalkbrenner
krzaczek
Weng Xuetian
Jakob Sack
David Iwanowitsch
Georg Ehrke
Frank Karlitschek
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
Bart Visscher
Golnaz Nilieh
Alexander Wigen
Jakob Sack
Caio Marcelo de Oliveira Filho
Côme BERNIGAUD
Sascha Schneider
Arthur Schiwon