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