wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2374 commits 157 branches 562 tags 714 MiB
Commit graph

902 commits

Author SHA1 Message Date
Tom Needham
58d284419c HTML data is now encoded before being shown. 2011-10-04 15:27:29 +01:00
Georg Ehrke
70091ec649 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-04 10:17:55 +02:00
Georg Ehrke
33b660857a fix ical import 2011-10-04 10:17:11 +02:00
Jan-Christoph Borchardt
79da90bb08 renamed unhosted to remoteStorage (needs to be updated with coming protocol version) 2011-10-04 10:07:46 +02:00
Tom Needham
45fda6f43e Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-03 23:43:58 +01:00
Tom Needham
6c9ff0e47e Fixed ajax urls 2011-10-03 23:41:32 +01:00
Tom Needham
32ce0d3c6e Fixed file saving issue. 2011-10-03 23:28:47 +01:00
Tom Needham
02d7b1a1fc Added breadcrumb and control bar. 2011-10-03 22:59:40 +01:00
Georg Ehrke
77e12a15b1 fix checkLoggedIn function in import of ical files 2011-10-03 22:52:13 +02:00
Georg Ehrke
c40a1fcede added import function as filehandler 2011-10-03 22:50:10 +02:00
Bart Visscher
dec8106665 Add user friendly calendar color chooser 2011-10-03 20:42:47 +02:00
Bart Visscher
6159b79715 Take setting default value out of loop 2011-10-03 20:42:47 +02:00
Marvin Thomas Rabe
ffc5c4dabe Merge commit 'refs/merge-requests/51' of git://gitorious.org/owncloud/owncloud into merge-requests/51 2011-10-03 15:18:48 +02:00
Weng Xuetian
acbd31255e fix add bookmark bug. 2011-10-03 20:44:03 +08:00
Marvin Thomas Rabe
a2bcbec791 Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-10-03 02:01:24 +02:00
Robin Appelman
36196b6c2d use browsercache for gallery covers 2011-10-02 19:42:14 +02:00
Robin Appelman
7bcc0efd6a show galleries in search results 2011-10-02 19:33:55 +02:00
Frank Karlitschek
39c4d9b2ca enable by default 2011-10-02 18:53:47 +02:00
Bartek Przybylski
c3d7ffc877 adding tmp icon for app, extending memory size for php in .htaccess 2011-10-02 17:52:11 +02:00
Bartek Przybylski
ee62eb7bb0 adding missing files, don know why they disappeared 2011-10-02 17:48:02 +02:00
Bartek Przybylski
6643f68663 merge 'gallery_app_devel' to 'master' 2011-10-02 17:17:46 +02:00
Marvin Thomas Rabe
bdcf31cc73 Added translatable text. 2011-10-02 16:06:30 +02:00
Marvin Thomas Rabe
213275a1f8 Add translation and fixed some css problems 2011-10-02 15:55:23 +02:00
Marvin Thomas Rabe
daee88fd26 Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone. 2011-10-02 15:51:24 +02:00
Robin Appelman
fef31bc6c7 Merge commit 'refs/merge-requests/39' of git://gitorious.org/owncloud/owncloud 2011-10-02 14:00:55 +02:00
Bartek Przybylski
54e5a10846 avoid creating empty albums, removing od depreciated code openings 2011-10-02 13:52:04 +02:00
Bartek Przybylski
07b3b103ce changing <? to <?php 2011-10-02 12:24:02 +02:00
Tom Needham
0825073e8c Editor now loads on top of files app. 2011-10-01 22:48:00 +01:00
Georg Ehrke
0ebe9ad70c added function to export single events 2011-10-01 23:19:06 +02:00
Georg Ehrke
f9824f6108 choosable default duration of event 2011-10-01 22:53:18 +02:00
Bartek Przybylski
339d417420 removing add new album button, removing logs, and unused code 2011-10-01 22:36:01 +02:00
Georg Ehrke
1ea183a0f7 fix duration bug 2011-10-01 21:09:08 +02:00
Georg Ehrke
8219516ec0 removed bug, that the drag and drop function added 24h to the duration of the event, after moving an event from allday to a time 2011-10-01 20:44:08 +02:00
Georg Ehrke
50007f2d40 removed bug, that you can't change time in week view, when event was an allday event 2011-10-01 20:36:20 +02:00
Georg Ehrke
a7431d99e5 remove debugging text in drag and drop function 2011-10-01 20:31:58 +02:00
Georg Ehrke
43a3e46369 added drag and drop function for events in calendar app 2011-10-01 20:27:30 +02:00
Bartek Przybylski
83e7f9d54a showing galleries bahaviour change 2011-10-01 11:26:47 +02:00
Marvin Thomas Rabe
5a40804773 bookmarks are now translatable 2011-10-01 11:14:43 +02:00
Georg Ehrke
bf6414d3ad choosable time format 2011-10-01 10:39:07 +02:00
Georg Ehrke
0514a1925b choosable first day of week & choosable days of weekend 2011-10-01 09:54:52 +02:00
Bart Visscher
ddd28aae67 Remove test data from calendar creation 2011-09-30 23:17:30 +02:00
Bart Visscher
9a5d517ec2 Add more checks for admin user 2011-09-30 23:17:30 +02:00
Bart Visscher
f4782a7690 Check if the application is actually enabled 2011-09-30 23:17:18 +02:00
Robin Appelman
35d490f8e9 fix playing songs from search results 2011-09-29 23:55:00 +02:00
Bart Visscher
d59c48217d Change colspan in choose calendar dialog to 6 2011-09-29 22:15:42 +02:00
Thomas Schmidt
84e209f1e0 added app for admins to create a zipfile containing the owncloud data 2011-09-29 17:11:07 +02:00
Robin Appelman
fcc6d61fe1 only play the music once 2011-09-29 00:48:45 +02:00
Robin Appelman
0d40617c07 improvements in media collection viewer 2011-09-29 00:42:30 +02:00
Robin Appelman
8d3c3785bc sort music collection 2011-09-28 23:50:28 +02:00
Bart Visscher
f29f601ec4 Revert "commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user)" 
Implemented the calendar color as background of the events.

This reverts commit 59d4ddd905.
 2011-09-28 23:25:22 +02:00
Tom Needham
3c361cec92 Removed unnecessary theme files. 2011-09-28 22:23:50 +01:00
Bart Visscher
c9c7d5e1aa Add support for DURATION in VEVENT 2011-09-28 23:17:26 +02:00
Bart Visscher
5875b50de0 Use .empty function instead of .html("") 2011-09-28 23:17:26 +02:00
Bart Visscher
7c20aea96c Use OC.filePath to locate ajax entry points 2011-09-28 23:17:25 +02:00
Bart Visscher
3f7d964acd Color event background with calendar color 2011-09-28 23:17:25 +02:00
Bart Visscher
45c983e899 Add missing datetime type 2011-09-28 23:17:25 +02:00
Robin Appelman
93a0e668a6 styling fixes for playback controlls 2011-09-28 22:36:15 +02:00
Tom Needham
98ded8d168 Added support for more file types 2011-09-28 21:31:13 +01:00
Tom Needham
bc7289bb28 Changed theme. Editing is now default action for all supported types. Fixed static url. 2011-09-28 21:25:25 +01:00
Robin Appelman
1639a1ca49 fix persistent playlist for media player 2011-09-28 22:21:06 +02:00
Jan-Christoph Borchardt
c39c6d36df do not use 'URL' but 'address' 2011-09-28 22:11:47 +02:00
Tom Needham
4fe993a55d Replaced urlencode() and urldecode() with htmlspecialchars() and htmlspecialchars_decode() 2011-09-28 20:26:30 +01:00
Tom Needham
2ca74dc334 Ficed text encoding bug. Removed unnecessary file retrival call 2011-09-28 20:23:00 +01:00
Tom Needham
3129855cc4 Fixed typo. Added translation support. 2011-09-28 20:17:45 +01:00
Tom Needham
3886a749fb Updated copyright info and ajax responses 2011-09-28 19:52:08 +01:00
Georg Ehrke
61c4f9b3c8 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 18:44:17 +02:00
Georg Ehrke
59d4ddd905 commented out colorfield in edit calendar dialog, because colors aren't implemented yet (it would just confuse the user) 2011-09-28 18:43:59 +02:00
Tom Needham
3ab8739809 Implemented ace-editor for basic file editing. 2011-09-28 15:26:54 +01:00
Frank Karlitschek
98c59605aa show the syncing and ampache urls on the settings page. not very pretty but otherwise the user has no way to configure the desktop integration 2011-09-28 16:05:01 +02:00
Thomas Schmidt
e30220e287 media app: show current song, add margin, enable tooltip 2011-09-28 11:46:04 +02:00
Georg Ehrke
8e42b02a22 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-28 10:29:07 +02:00
Georg Ehrke
8c405a59d8 little bug fixes in calendar app 2011-09-28 23:28:14 +02:00
Bart Visscher
c6f78fbe43 Add flag in info.xml to control the apps that are installed by default 2011-09-27 22:36:14 +02:00
Georg Ehrke
61aa00899d show only most essential stuff in add and edit event form 2011-09-27 21:56:16 +02:00
Scott Barnett
f4ecf47e61 Fixed delete cross positioning issue. 2011-09-27 05:26:49 +10:00
Bartek Przybylski
e4dc33b368 Reverting: initial commit for gallery app 2011-09-26 20:05:36 +02:00
Bartek Przybylski
63e6863222 Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-09-25 22:32:16 +02:00
Bartek Przybylski
bc43851d74 initial commit for gallery app 2011-09-25 22:32:08 +02:00
Bart Visscher
17e631bc5e Use OC_JSON for json responses 
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
 2011-09-25 22:19:28 +02:00
Robin Appelman
64b68f2474 correctly update the collection when music files are moved around 2011-09-25 01:34:55 +02:00
Jan-Christoph Borchardt
ae4c83af91 moved scanning to controls bar 2011-09-25 00:17:54 +02:00
Jan-Christoph Borchardt
368412a730 lots of music improvements, might break some things though 2011-09-25 00:02:50 +02:00
Jan-Christoph Borchardt
700ac75565 updated translations 2011-09-24 23:12:18 +02:00
Jan-Christoph Borchardt
a54ea3246c removed 'share by publiclink' app as it has been superseded by Sharing 2011-09-24 23:03:28 +02:00
Jan-Christoph Borchardt
408c391f83 removed deprecated images and icons 2011-09-24 22:09:41 +02:00
Georg Ehrke
da63140b04 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-24 19:53:37 +02:00
Georg Ehrke
4aeb2990c0 delete calendar function for userinterface 2011-09-24 19:52:55 +02:00
Robin Appelman
260893816b remove getID3 demos due to security issue caused by one of them 2011-09-24 19:09:54 +02:00
Florian Pritz
842ce24d2b apps/calendar: check for unset variable 
Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:42:07 +02:00
Florian Pritz
c7d4e72341 set cookie secure if forcessl is enabled 
This also moves session_start in lib/base.php down a bit because we need
OC::$SERVERROOT to get the config settings.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:42:00 +02:00
Florian Pritz
037d0e9640 apps/contacts: only display buttons if there is a contact 
If you don't have any contacts, it would display a non-functioning
delete button.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:59 +02:00
Florian Pritz
983445cd39 apps/contacts: fix wrapping issue in addpropertyform 
The browser added random line breaks between the label and input field
making it hard to see what's what.

Now we break lines intentionally just like in setpropertyform.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:58 +02:00
Florian Pritz
d7c165eb35 apps/bookmarks: use curl instead of file_get_contents 
Don't depend on allow_url_fopen being enabled when we already use curl
elsewhere in the code.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:57 +02:00
Florian Pritz
934b18405a fix apps/bookmarks if oc_bookmarks_tags is empty 
If you have bookmarks, but there are no tags in oc_bookmarks_tags, the
query doesn't return any results. Using a left join fixes this.

Reference:
http://stackoverflow.com/questions/3171276/select-multiple-tables-when-one-table-is-empty-in-mysql

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:56 +02:00
Florian Pritz
ff10303755 apps/calendar: change ctag after modifying event 
edit() tried to do that, but it used $id which is the event id and not
the calendar id.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:55 +02:00
Florian Pritz
d928cd3636 files: hide non functioning code when called from a/f_s/get.php 
The checkboxes don't work because files.js is missing. Adding it leads
to the problem that it relies on files/ajax and most of the code only
works for logged in users.

The actions div contains undefined variables and doesn't work either.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:54 +02:00
Florian Pritz
b0e23a1634 apps/calendar: add delete button to edit event form 
Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:51 +02:00
Florian Pritz
761ba4a379 don't escape new lines in vevent description 
This ended up as "\n\\n" in the data base and the escaped \n was also
visible in the edit form.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:50 +02:00
Florian Pritz
8648e3c43c only call error_log() if DEBUG is true 
Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:47 +02:00
Florian Pritz
9c550e8e9f fix error when uploading music 
These methods are called statically so make them static.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:44 +02:00
Florian Pritz
6f3c118038 apps/calendar: check if variables are set before using them 
Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:41:42 +02:00
Bart Visscher
782069e1fa Change copyright notice to short form 2011-09-23 22:59:54 +02:00
Bart Visscher
5741811d36 Fix use of reserved javascript keyword 'new' 2011-09-23 22:22:03 +02:00
Jan-Christoph Borchardt
6e46bd7373 integrated and updated calendar translations 2011-09-23 20:38:19 +02:00
Jan-Christoph Borchardt
aa4aa40b57 fixed a few calendar words, hack to get shortcode for May translatable 2011-09-23 20:19:39 +02:00
Jan-Christoph Borchardt
d3fedc14e2 fixed contacts strings (no technical stuff in the interface, don't scream at people, ...), ready for translation 2011-09-23 20:13:27 +02:00
Bart Visscher
e9950defb2 Make event category choice multiselect 2011-09-23 19:40:06 +02:00
Jan-Christoph Borchardt
5559a0dede updated translations 2011-09-23 19:08:02 +02:00
Jakob Sack
73d0caf8a4 Add Sabre_DAV_Browser_Plugin to *DAV-servers to ease debugging 2011-09-23 09:40:01 +02:00
Robin Appelman
917ea58a8c fix file uploads for IE 2011-09-22 23:25:23 +02:00
Bart Visscher
aad62919da Small styling fixes 2011-09-20 14:38:16 +02:00
Bart Visscher
e990ef3542 Move some common code to OC_Util 
Created the following function:
 - checkLoggedIn
 - checkAdminUser
 - redirectToDefaultPage
 2011-09-18 21:31:56 +02:00
Bart Visscher
82c7598861 Remove global vars and use the OC static version. 
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
 2011-09-18 19:37:54 +02:00
Bart Visscher
d5656716f6 Fix calendar active checkbox 2011-09-18 17:13:48 +02:00
Bart Visscher
0660133d2e Fix event error/success json message 2011-09-18 17:13:47 +02:00
Bart Visscher
7c5e389067 deleteUser function must be static 2011-09-18 17:13:47 +02:00
Robin Appelman
d0d3fecc95 no need to escape values when using prepared statements 2011-09-17 02:30:00 +02:00
Bart Visscher
22db68816e Remove unused function call 2011-09-17 01:55:05 +02:00
Bart Visscher
079df42103 Disable the Oneday and Fourweeks buttons in calendar interface 2011-09-17 01:55:04 +02:00
Jakob Sack
fe62c803e2 fix small bugs 2011-09-17 00:46:04 +02:00
Jakob Sack
54a3b28dce Split OC_Contacts_Addressbook in _Addressbook and _VCard 2011-09-17 00:26:57 +02:00
Bart Visscher
2a84f7f07c Move most javascript to calendar.js 2011-09-16 17:50:55 +02:00
Bart Visscher
45d42a9654 Move validateEventForm function and fix success handling 2011-09-16 17:06:57 +02:00
Bart Visscher
73d3dc91fd Handle multi open of choosecalendar dialog 2011-09-16 14:11:22 +02:00
Bart Visscher
0fde26c86c Close event new/edit dialog when clicking outside the dialog 2011-09-16 14:02:21 +02:00
Bart Visscher
2353f02d9a Fixes for Calendar app 2011-09-16 00:21:51 +02:00
Bart Visscher
15559d3e88 First implementation of edit event 2011-09-16 00:21:19 +02:00
Bart Visscher
b413dcfa7c Fix conversion of VTODO and VJOURNAL items 2011-09-16 00:19:43 +02:00
Bart Visscher
388b14604a Move Calendar Object code to its own class OC_Calendar_Object 2011-09-16 00:19:43 +02:00
Jakob Sack
d3ee19e675 fix documentation 2011-09-15 23:20:49 +02:00
Jakob Sack
4d7ed0f2f5 Add documentation to calendar.php 2011-09-15 22:45:58 +02:00
Jakob Sack
ae622dbbfe Small fix in documentation 2011-09-15 22:45:40 +02:00
Jakob Sack
c3ff534b19 Improve reading of vCard files 2011-09-15 11:06:21 +02:00
Bart Visscher
b6c69e580a Move php code out of part.eventform 2011-09-14 23:36:23 +02:00
Bart Visscher
cb9a67906d Move event form field to part.eventform template 2011-09-14 23:36:23 +02:00
Bart Visscher
68758f9b2c Rename calendar javascript functions into Calendar.UI namespace 2011-09-14 23:36:22 +02:00
Bart Visscher
7c9f1007d5 Fix initial visibility of database settings in setup 2011-09-14 23:36:22 +02:00
Golnaz Nilieh
0ff9bc4806 Add link and other edit information to newly added bookmarks. 2011-09-13 16:10:52 +04:30
Golnaz Nilieh
67addb4882 Add support of editing bookmarks. 2011-09-13 15:40:09 +04:30
Florian Jacob
9a5530a48f Correct deleting events over CalDAV 
A quick patch that corrects not being able to delete
calendar events. (misnamed variable). Thanks to Robert J. Clark.
 2011-09-12 19:50:07 +02:00
Michiel@unhosted
fb96256c63 offer login popup from oauth dialog 2011-09-12 15:17:52 +02:00
Michiel@unhosted
d0746d7e32 offer login popup from oauth dialog, correct base uri 2011-09-12 15:04:21 +02:00
Michiel@unhosted
6e569c5ed1 correction in webfinger.php activation trap 2011-09-12 14:59:22 +02:00
Michiel@unhosted
f928d4af56 correct xml syntax 2011-09-12 14:35:15 +02:00
Michiel@unhosted
5685965fdb improve uninstalled-protection 2011-09-12 14:22:48 +02:00
Michiel@unhosted
f93be510a3 check activation and make activation impossible by default 2011-09-12 14:15:19 +02:00
Michiel@unhosted
d07f3d548c improved troubleshooting instructions 2011-09-12 13:47:14 +02:00
Michiel@unhosted
cb7cc99302 correct protocol 2011-09-12 01:22:40 +02:00
Michiel@unhosted
6e6be3aa8f putting activation inside activate.php 2011-09-12 00:32:38 +02:00
Michiel@unhosted
994c7f3dad adding webfinger app 2011-09-12 00:12:34 +02:00
Jan-Christoph Borchardt
de729d8d8b renamed last CW to Week 2011-09-11 21:50:13 +02:00
Bart Visscher
cd44dff5af Better feedback for saving calendar and openid settings 2011-09-11 20:38:52 +02:00
Bart Visscher
3234597703 Correct copyright notices 2011-09-11 17:25:02 +02:00
Georg Ehrke
e9df292b62 commented out broken code in add event function 2011-09-11 16:49:08 +02:00
Alexander Wigen
72aa1bf75c Only show used address attributes in contact view 2011-09-11 12:52:40 +02:00
Georg Ehrke
647fab07c7 fixes in german language 2011-09-10 12:26:01 +02:00
Bart Visscher
97fc236760 Fix a warning and an error 2011-09-10 11:58:08 +02:00
Georg Ehrke
1afeb5cd12 bug fixes in calendar lib 2011-09-10 10:52:35 +02:00
Bart Visscher
cbb36829e6 Small update Calendars dialog 2011-09-09 22:28:34 +02:00
Bart Visscher
760b47a62f Use OC_Helper::linkTo also for absolute urls. 
One central place to check for https.
 2011-09-09 22:19:15 +02:00
Georg Ehrke
80f5942868 translatable categories and other translations added 2011-09-09 20:39:38 +02:00
Georg Ehrke
f031e308cd show caldav url in choose calendar dialog 2011-09-09 18:44:33 +02:00
Jakob Sack
5fed5bab4a Improving contacts 2011-09-08 23:36:47 +02:00
Bart Visscher
74f6dd5d5a Add creating calendars with the web interface 2011-09-08 12:29:29 +02:00
Bart Visscher
f3e98878da Implement calendar list view 2011-09-07 15:13:26 +02:00
Bart Visscher
dabf10f99c Use js Date for holding dates in the whole calendar app 2011-09-07 09:49:23 +02:00
Bart Visscher
fbde66a56c Eliminate most global calendar js vars 2011-09-07 09:49:23 +02:00
Bart Visscher
0df98b9a78 Remove generate_ prefix from vars 2011-09-07 09:49:23 +02:00
Bart Visscher
9b14c276e3 Store date for click in jQuery.data('date_info') 2011-09-07 09:49:23 +02:00
Bart Visscher
abb6a15aa4 Change generateDates to use js Date for calculations 2011-09-07 09:49:22 +02:00
Golnaz Nilieh
b7ba0839c6 Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-09-06 17:14:48 +04:30
Golnaz Nilieh
c5aa139296 Use an animated gif in add-bookmark form, while fetching metadata. 2011-09-06 17:13:03 +04:30
Golnaz Nilieh
0b5f0ac249 Don't clear bookmark description field, If it is empty in bookmark metadata. 2011-09-06 16:13:23 +04:30
Jan-Christoph Borchardt
75383a8308 small wording changes 2011-09-04 18:13:53 +02:00
Jan-Christoph Borchardt
f4b9895cbf having non-editable stuff as input fields is really confusing. You were right Robin ;) 2011-09-04 10:34:57 +02:00
Bart Visscher
cfb932b073 Add simple popup to event 
There is not a lot of infomation to display, yet.
 2011-09-03 22:15:24 +02:00
Bart Visscher
3130234640 Remove execute permissions from source files 2011-09-03 22:15:23 +02:00
Bart Visscher
2e2bdb449f Update calendar event label creation 2011-09-03 22:15:23 +02:00
Jan-Christoph Borchardt
1bf215cd08 updated translations 2011-09-03 15:08:58 +02:00
Bart Visscher
afb07d3e39 Use css class for view selection radio buttons hilighting 2011-09-02 23:51:18 +02:00
Bart Visscher
208852abf2 Fix event creation date in oneweekview 2011-09-02 23:50:51 +02:00
Bart Visscher
d33a5ea5d4 Use css classes to find elements, reduces the html size 2011-09-02 23:28:35 +02:00
Bart Visscher
6155c758be Cleanup javascript in calendar template 2011-09-02 23:04:02 +02:00
Georg Ehrke
6eff001ebb another bugfix in new design of calendar 2011-09-02 21:29:59 +02:00
Georg Ehrke
1940bc3dc0 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-09-02 15:49:43 +02:00
Georg Ehrke
e89d622c3a bug fixes in new design of calendar 2011-09-02 15:49:03 +02:00
Michiel@unhosted
e798c32375 renaming core_unhosted app to just unhosted, and cleaning up unused files in it 2011-09-02 15:25:04 +02:00
Michiel@unhosted
71205b8b07 adding core_unhosted app 2011-09-02 14:56:40 +02:00
Georg Ehrke
8cdd9ab81b export function and style fixes in calendar 2011-09-02 12:55:56 +02:00
Bart Visscher
62cca8264f Refactor calendar loadEvents and updateView use 2011-09-01 23:27:00 +02:00
Bart Visscher
804af7f189 Move generate_dates function to Class/Object 2011-09-01 23:23:57 +02:00
Bart Visscher
b7e9e7e777 Simplify forward_day and backward_day 2011-09-01 22:29:57 +02:00
Bart Visscher
e765e7e9e8 Changing the active state of the calendar reloads the events. 
Change from Georg Ehrke
 2011-09-01 22:00:14 +02:00
Bart Visscher
1bb754299a Change calendar js rendering to class/object 2011-09-01 22:00:14 +02:00
Bart Visscher
3d2b4b03af Convert plain javascript to jQuery for readability 2011-09-01 22:00:13 +02:00
Caio Marcelo de Oliveira Filho
578d1de55d Fix OC_USER_LDAP::checkPassword() to return the username 
REVIEW: 102487
 2011-09-01 13:56:30 -03:00
Côme BERNIGAUD
b579c812b2 Some commented code was still here 2011-09-01 18:33:19 +02:00
Côme BERNIGAUD
31a094becb Buttons for play/add albums works. Folding albums too. 2011-09-01 18:31:44 +02:00
Georg Ehrke
0c07312ad8 add some categories in calendar 2011-09-01 18:35:32 +02:00
Jakob Sack
6fa9be73f8 calendar_calendars.components needs to be longer, adjustments in info.xml 2011-09-01 17:27:12 +02:00
Georg Ehrke
8cbe66b5c1 bug fixes at new event form (categorie and calendar) 2011-09-01 16:54:25 +02:00
Georg Ehrke
58129f9a11 Merge branch 'calendar' of git://gitorious.org/owncloud-dump/owncloud-dump 2011-09-01 16:15:48 +02:00
Côme BERNIGAUD
3972774a2e Removed db4app and test_db 2011-09-01 15:58:47 +02:00
Bart Visscher
a7496b1c9d Create function getnumberofdays to get a list of month lengths 2011-08-31 21:24:08 +02:00
Bart Visscher
b0ce1ded97 Move date functions to class structure 2011-08-31 21:24:08 +02:00
Georg Ehrke
361861295f reload page after add event successfully 2011-08-31 20:41:18 +02:00
Georg Ehrke
5678d78d54 new changes (e.g. show events) by Bart Visscher 2011-08-31 20:20:46 +02:00
Georg Ehrke
9a60313c3b commit changes of Bart Visscher, see http://gitorious.org/owncloud-dump/owncloud-dump/commits/calendar 2011-08-31 17:29:38 +02:00
Jan-Christoph Borchardt
f758d223a2 Merge branch 'calendar' of git://anongit.kde.org/owncloud into calendar 2011-08-30 21:01:10 +02:00
Georg Ehrke
6ad64c6f8a Timezone bug fixed 2011-08-29 13:41:19 +02:00
Jan-Christoph Borchardt
60a5581071 Merge branch 'master' into calendar 2011-08-28 23:38:24 +02:00
Robin Appelman
281b2187ab fix detection of empty collection 2011-08-28 23:20:08 +02:00
Georg Ehrke
947216942a Merge branch 'calendar' of git.kde.org:owncloud into calendar 2011-08-28 20:16:40 +02:00
Georg Ehrke
ca08ccb61c first add event function in calendar app 2011-08-28 20:13:40 +02:00
Robin Appelman
d5c73c6d4a always scan new music files 2011-08-28 19:32:52 +02:00
Sascha Schneider
04eebccc39 apps/user_ldap/user_ldap.php: - Add support for ldapv3 and tls 2011-08-28 12:56:04 +02:00
Jan-Christoph Borchardt
0054197d02 updated translations 2011-08-28 01:14:32 +02:00
Côme BERNIGAUD
52ca447efc Merge branch 'master' of git.kde.org:owncloud 2011-08-27 18:11:32 +02:00
Côme BERNIGAUD
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
Jan-Christoph Borchardt
f8fc8eb430 no alert popups, ever. They are just dismissed. Use undo instead. 2011-08-27 16:54:20 +02:00
Côme BERNIGAUD
56399d1d79 Play and add buttons in the collection. 2011-08-25 20:57:17 +02:00
Côme BERNIGAUD
ce1d13c9b6 playlist working 2011-08-25 20:37:51 +02:00
Côme BERNIGAUD
ad053d504c Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-25 17:03:56 +02:00
Arthur Schiwon
e6bdd25667 fix: links with parameters get cut off at & 2011-08-25 13:51:48 +02:00
Arthur Schiwon
0972606072 fix: URLs without protocol are now linked to via HTTP 2011-08-25 13:23:52 +02:00
Arthur Schiwon
e0a69bbeac Make bookmarks sortable by clicks 2011-08-25 12:55:13 +02:00
Arthur Schiwon
55a8ee34bd Make appeareance of the bookmarklet a bit nicer, still room for improvement left 2011-08-25 12:15:03 +02:00
Côme BERNIGAUD
df560b3d9d Merge branch 'master' of git://anongit.kde.org/owncloud 
Conflicts:
	apps/media/js/collection.js
 2011-08-25 09:07:02 +02:00
Côme BERNIGAUD
3fbc8973ee My own version of music collection. 2011-08-25 09:04:08 +02:00
Michael Gapczynski
8c8490b28e Show users shared with in the drop down for reshared files 2011-08-24 18:41:36 -04:00
Robin Appelman
e0ff57e8c2 fix javascript error in media player 2011-08-24 23:38:39 +02:00
Arthur Schiwon
7cd592e055 Added a Bookmarklet for the Bookmarks app 2011-08-24 22:16:44 +02:00
Michael Gapczynski
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
Michael Gapczynski
4c4b1e4c2d Clear the folder size cache for the 'Shared' folder when a new item is shared 2011-08-24 11:59:03 -04:00
Arthur Schiwon
4028dc984a Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-24 14:36:16 +02:00
Arthur Schiwon
0f3ef8aeb0 check if tag is set, might not show bookmarks on some systems without doing so 2011-08-24 14:36:03 +02:00
Jakob Sack
f4c498edba Full path for carddav path 2011-08-24 11:21:27 +02:00
Jakob Sack
112eccfe33 Support for etags in calendar 2011-08-24 10:19:48 +02:00
Jakob Sack
c87cee6b1f Add VJOURNAL to objects that are allowed by default 2011-08-23 22:10:08 +02:00
Jakob Sack
778404fb29 VTODO and VJOURNAL exist as well 2011-08-23 22:07:40 +02:00
Jakob Sack
84761b1518 CalDAV seems to work now 2011-08-23 21:42:15 +02:00
Georg Ehrke
cdf0d010eb today hightlight in calendar app (fourweeksview and onemonthview) 2011-08-23 20:30:11 +02:00
Georg Ehrke
bf68cd8ba4 better multiple language support, first integration of new calendar class 2011-08-23 18:02:36 +02:00
Arthur Schiwon
b09ba58ca6 autoretrieve title and description after entering new url 2011-08-23 16:30:55 +02:00
Arthur Schiwon
847347b58a autoretrieve title and description after entering new url 2011-08-23 16:30:29 +02:00
Arthur Schiwon
672515c23f Bookmarks DB structure change, description is optional 2011-08-23 15:24:44 +02:00
Arthur Schiwon
89839b4c63 fetch bookmarks even if they are not tagged 2011-08-23 15:12:34 +02:00
Arthur Schiwon
7e1759e775 Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-23 12:03:49 +02:00
Arthur Schiwon
3c3a859b89 follow coding style and use single quotes in php 2011-08-23 12:03:20 +02:00
Arthur Schiwon
72a4703d82 simplify bookmarks tag filter sql 2011-08-23 11:57:56 +02:00
Arthur Schiwon
53f0381f0f make tag filter compatible with sqlite 2011-08-23 11:43:27 +02:00
Jan-Christoph Borchardt
f5cef2fcbf cleaned up LDAP settings 2011-08-23 11:40:00 +02:00
Jan-Christoph Borchardt
3b10cddceb added icon for Admin 2011-08-23 11:37:29 +02:00
Jan-Christoph Borchardt
900382057d updated translations 2011-08-23 11:20:37 +02:00
Robin Appelman
391e064e67 allow apps to register form for the settings and admin pages 2011-08-23 01:41:18 +02:00
Georg Ehrke
b2fddc408c /appinfo/app.php bug fixed 2011-08-22 20:09:33 +02:00
Michael Gapczynski
96ad8a15b4 Register OC_Share for autoloading and cleanup hooks 2011-08-22 12:37:44 -04:00
Michael Gapczynski
c72187474a Check that the files exist before adding them to the fakedirs 2011-08-22 12:00:56 -04:00
Michael Gapczynski
1b64b7395c Update documentation for unshareFromMySelf() 2011-08-22 11:31:47 -04:00
Jakob Sack
fbb63f11e4 Some more work on CalDAV integration 2011-08-22 16:59:16 +02:00
Robin Appelman
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
Georg Ehrke
09c8cd17cc remove reset button (again) 2011-08-20 22:50:43 +02:00
Michael Gapczynski
0eda75a193 One more bug fix in clearFolderSizeCache() 2011-08-20 15:48:48 -04:00
Michael Gapczynski
f10f916f8c Clean-up in OC_Filestorage_Shared and bug fixes for calculating folder sizes 2011-08-20 15:43:18 -04:00
Michael Gapczynski
ceae4fa7b4 Fix bugs preventing file upload in shared folders with write permission 2011-08-20 12:36:20 -04:00
Michael Gapczynski
b05be2f26d Fix textviewer in search results 2011-08-20 12:18:56 -04:00
Michael Gapczynski
6afc17be1a Merge branch 'master' of git://anongit.kde.org/owncloud 2011-08-20 12:03:22 -04:00
Michael Gapczynski
631152fc3e Implement searching of files shared with you 2011-08-20 12:03:03 -04:00
Jan-Christoph Borchardt
d15673f13f removed single quotes around publicly linked download file 2011-08-20 17:44:28 +02:00
Georg Ehrke
3cb07254e5 allday bug fixed 2011-08-20 16:52:03 +02:00
Georg Ehrke
fc4d31547b spanish language pack 2011-08-20 16:02:44 +02:00
Georg Ehrke
8e32cfbf15 bug/style fixes, multiple language support, german language pack 2011-08-20 15:19:43 +02:00
Golnaz Nilieh
eac4d4ff06 When deleting a bookmark, remove its tags from database. 2011-08-20 12:38:15 +04:30
Jan-Christoph Borchardt
add0a90e1e single quotes in JavaScript & PHP, double quotes in HTML 2011-08-20 05:56:04 +02:00
Jan-Christoph Borchardt
389b2775c2 translation update 2011-08-20 05:12:16 +02:00
Jan-Christoph Borchardt
d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Michael Gapczynski
c2f0fe51c4 Add getLocalFile() to OC_Filestorage_Shared 2011-08-19 20:05:57 -04:00
Michael Gapczynski
778b8543c1 Remove no longer needed functions in OC_Filestorage_Shared 2011-08-19 20:04:35 -04:00
Jan-Christoph Borchardt
b3f6eb2224 removed unneeded and dangerous reset button 2011-08-19 23:15:27 +02:00
Jan-Christoph Borchardt
86f6d2fc25 Merge branch 'master' into calendar 2011-08-19 22:58:45 +02:00
Georg Ehrke
d1daca5029 a lot of new functions (e.g. add event form), style fixes, bug fixes 2011-08-19 20:33:48 +02:00
Michael Gapczynski
ca86093270 Full support for viewing public links from sharing drop down 2011-08-19 12:47:00 -04:00
Golnaz Nilieh
5d310ebf92 * Use encodeEntities() function to check input 
* Separate tags by space
 2011-08-19 16:18:08 +04:30
Golnaz Nilieh
262a652710 Show new bookmark in the list after insertion, And hide it after deletion. 2011-08-19 13:30:05 +04:30
Michael Gapczynski
a57d4726bc Remove some scripts, now you can actually download the files in a public link folder 2011-08-18 19:44:00 -04:00
Michael Gapczynski
d1aebcddf2 Add downloadURL to files templates for both public links and files 2011-08-18 19:32:24 -04:00
Michael Gapczynski
498356fcb8 Copy get.php into files_sharing, public links now use files templates 2011-08-18 15:35:31 -04:00
Jan-Christoph Borchardt
4c49a81c8e language updates, optimization of Help HTML 2011-08-18 19:22:44 +02:00
Michael Gapczynski
594532da9a Merge public link icon check 2011-08-18 13:14:06 -04:00
Jan-Christoph Borchardt
2ee9e80afe Swedish translation, thanks to HakanS 2011-08-18 14:33:05 +02:00
Jan-Christoph Borchardt
6720a45d65 updated translations 2011-08-18 11:46:49 +02:00
Michael Gapczynski
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
Michael Gapczynski
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
Michael Gapczynski
4078e0a242 -1 is now a class constant (UNSHARED), for unsharing files from self 2011-08-17 18:00:37 -04:00
Michael Gapczynski
1303e40b6e Remove navigation entry for shared files 2011-08-17 17:44:10 -04:00
Michael Gapczynski
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
Michael Gapczynski
1c13b2681a Fix my last commit 9ee4fc 2011-08-17 14:22:14 -04:00
Michael Gapczynski
9ee4fcdf2f Only show 'Shared' directory if files are shared with you 2011-08-17 13:47:10 -04:00
Michael Gapczynski
5925697374 Fix bug in getPermissions() and clean-up unlink() and rename() 2011-08-17 12:58:09 -04:00
Jan-Christoph Borchardt
683e125042 Merge branch 'sharing' 2011-08-17 13:48:36 +02:00
Michael Gapczynski
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
Michael Gapczynski
0edce1796b Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing 2011-08-16 20:21:57 -04:00
Michael Gapczynski
582dca4d91 Initial merging of files_sharing and files_publiclink 2011-08-16 20:21:18 -04:00
Robin Appelman
42ed3c6b7e fix problem with building the IN query 2011-08-17 00:34:02 +02:00
Robin Appelman
9f28c20660 fix collection browsing using the ampache api 2011-08-17 00:07:17 +02:00
Arthur Schiwon
ea65d90a41 really open website after click 2011-08-16 23:50:46 +02:00
Arthur Schiwon
48df7a2a7d gain compatibility with sqlite3 2011-08-16 23:49:53 +02:00
Arthur Schiwon
0573695d05 fix database layout for sqlite3 2011-08-16 21:56:12 +02:00
Jan-Christoph Borchardt
9c3a836044 hiding public links from navigation now that it's easier to use in the dropdown 2011-08-16 18:36:36 +02:00
Michael Gapczynski
717ab56419 Display public icon next to publicly shared files 2011-08-16 12:18:31 -04:00
Michael Gapczynski
726933831d Public link folder uploading not implemented, comment out checkbox for it in dropdown 2011-08-16 12:06:08 -04:00
Robin Appelman
fd74e43afa fix expire header for media player 2011-08-16 14:35:05 +02:00
Jan-Christoph Borchardt
b885bad2ee wording fix for bookmarks 2011-08-16 12:45:44 +02:00
Michael Gapczynski
e4c9871299 This should actually make the 'Shared' directory automatically everytime 2011-08-15 20:45:07 -04:00
Michael Gapczynski
5fbed936bf Automatic creation of 'Shared' directory, bug fixes for an empty 'Shared' directory 2011-08-15 20:33:02 -04:00
Michael Gapczynski
1ec75330ec Merge branch 'master' into sharing 2011-08-15 17:49:36 -04:00
Jan-Christoph Borchardt
82bd2ad310 Merge branch 'master' into calendar 2011-08-15 23:40:03 +02:00
Michael Gapczynski
801e4f8611 Merge branch 'sharing' of git://anongit.kde.org/owncloud into sharing 2011-08-15 17:38:33 -04:00
Michael Gapczynski
5b09aef166 Additional user group sharing support and more clean-up in the constructor 2011-08-15 17:37:16 -04:00
Arthur Schiwon
5608aaee8a initial commit of Bookmarks App 2011-08-15 22:05:07 +02:00
Jakob Sack
6096568da9 Small design changes in Contacts 2011-08-14 23:49:09 +02:00
Jakob Sack
39ecef39cd Fix creation of UID in contacts 2011-08-14 23:49:09 +02:00
Jan-Christoph Borchardt
2cb231d0a4 resolved merge conflict 2011-08-14 19:31:38 +02:00
Michael Gapczynski
5cb687d168 Refactor getUserAndGroups() for new user group sharing standard - user@group 2011-08-14 12:16:14 -04:00
Michael Gapczynski
e1473cfe83 Change OC_GROUP to OC_Group 2011-08-14 11:44:37 -04:00
Jan-Christoph Borchardt
7bb261f810 more fixes for Personal and Tipsy 2011-08-14 16:12:31 +02:00
Robin Appelman
970888b92d fix some details in Personal 2011-08-14 15:06:16 +02:00
Jan-Christoph Borchardt
f2a21398d7 more info in personal, WebDAV, OpenID 2011-08-14 11:09:51 +02:00
Robin Appelman
6f37f2917d fix media player controlls not showing 2011-08-13 17:53:31 +02:00
Robin Appelman
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
Jan-Christoph Borchardt
595329a8a0 some player styling 2011-08-13 16:34:40 +02:00
Jan-Christoph Borchardt
2ba3793671 updated translations 2011-08-13 12:43:15 +02:00
Jan-Christoph Borchardt
c144976676 start scanning music automatically when in Music 2011-08-13 07:02:51 +02:00
Jan-Christoph Borchardt
ccf410c7b0 first styling for leftcontent 2011-08-13 07:02:25 +02:00
Jan-Christoph Borchardt
3b5f16b23c NEEDS MORE FADING 2011-08-13 06:05:00 +02:00
Jan-Christoph Borchardt
0c903c63d8 first replacement of media player controls with svg 2011-08-13 05:58:11 +02:00
Jan-Christoph Borchardt
7ece8ed314 added global action class for icons 2011-08-13 05:27:50 +02:00
Jan-Christoph Borchardt
4a5ee765cf merged admin, help and settings to settings 2011-08-13 05:13:34 +02:00
Michael Gapczynski
122018889a Merge branch 'master' into sharing 
Conflicts:
	files/css/files.css
 2011-08-12 21:00:41 -04:00
Michael Gapczynski
3c517499bb OC_Share constructor refactored for user group sharing 2011-08-12 20:49:44 -04:00
Robin Appelman
b0b5a46543 style media player controls using em instead of px 2011-08-13 00:23:15 +02:00
Robin Appelman
382834ec2b highlight playing songs in collection 2011-08-13 00:23:15 +02:00
Michael Gapczynski
497789cdd8 Clean up constructor for OC_Share, add some error handling for sharing files 2011-08-12 17:22:32 -04:00
Michael Gapczynski
a8e6be6016 Change the share file action icon if the file is already shared with someone 2011-08-12 11:34:17 -04:00
Georg Ehrke
a61dde9b52 old files deleted 2011-08-12 14:39:24 +02:00
Georg Ehrke
4ae5c4bc33 bug fixes, style fixes 2011-08-12 14:29:45 +02:00
Robin Appelman
5a26640f63 partly fix media player 2011-08-12 12:54:49 +02:00
Michael Gapczynski
4830555cce Merge branch 'master' into sharing 
Conflicts:
	.gitignore
 2011-08-11 17:42:37 -04:00
Michael Gapczynski
9e35d5a886 Remove hardcoded http:// when generating public links 2011-08-11 16:56:09 -04:00
Jan-Christoph Borchardt
ce9b36fd3e some interaction design for user management 2011-08-11 21:00:48 +02:00