Tom Needham
86825ee3b5
Cleanup of code. Fixed breadcrumb removal issue
2011-10-05 16:10:11 +01:00
Jan-Christoph Borchardt
28dcbe3cb0
disabled gallery app by default until it's in a branch
2011-10-05 14:54:34 +02:00
Jan-Christoph Borchardt
8e532b5ceb
removed extra calendar settings. Also, table layout?
2011-10-05 14:32:25 +02:00
Borjan Tchakaloff
5570222b40
Added the missing quotes on the filename.
2011-10-05 15:20:32 +04:00
Borjan Tchakaloff
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
Robin Appelman
15e5bd16ab
use texteditor for search results
2011-10-05 02:44:24 +02:00
Robin Appelman
c6a73bee5e
remove now unneeded textviewer
2011-10-05 02:38:55 +02:00
Robin Appelman
1fba8619d4
move some code to where it belongs and remove duplicated editor app
2011-10-05 02:36:54 +02:00
Robin Appelman
a8621265e2
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-05 02:11:44 +02:00
Florian Jacob
813e8b274a
Added all the remaining extensions to filetypes
...
mapping which ace-editor supports.
2011-10-05 00:23:16 +02:00
Marvin Thomas Rabe
7579fc7bc9
updated margins
2011-10-04 21:39:13 +02:00
Tom Needham
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
Bart Visscher
2c95c799e6
Add new contact name to end of cantact list
2011-10-04 21:16:57 +02:00
Bart Visscher
fada3517b0
All the basic field for add contact added
2011-10-04 21:16:57 +02:00
Tom Needham
39d42fc62b
Save button now removed after closing editor
2011-10-04 20:15:20 +01:00
Marvin Thomas Rabe
0179b61f69
fixed another bug with breadcrumbs
2011-10-04 21:05:49 +02:00
Marvin Thomas Rabe
451b5940ea
fixed scrollbar issues. fixed missing breadcrumb image.
2011-10-04 21:01:05 +02:00
Tom Needham
fa203d186e
Added fillHeight() js function for resizing editor
2011-10-04 19:46:27 +01:00
Tom Needham
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
Tom Needham
09c1179094
Fixed breadcrumb issue.
2011-10-04 19:07:22 +01:00
Marvin Thomas Rabe
340f6bbaba
Merge branch 'master' of gitorious.org:owncloud/owncloud
2011-10-04 19:37:54 +02:00
Marvin Thomas Rabe
d1518f2901
updated calendar settings
2011-10-04 19:37:26 +02:00
Marvin Thomas Rabe
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
Tom Needham
5c9b069fe5
Updated saving feedback to use loading.gif
2011-10-04 17:43:13 +01:00
Tom Needham
9d918b5ac8
Updated control bar styling and save feedback.
2011-10-04 16:31:26 +01:00
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