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

551 commits

Author SHA1 Message Date
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
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
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
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
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