Commit Graph

1894 Commits

Author SHA1 Message Date
Robin Appelman 63907a7508 dont submit the setup form to a new tab 2011-09-24 19:07:24 +02:00
Robin Appelman 3bccebacbc prevent people from triggering the setup manually 2011-09-24 19:06:08 +02:00
Florian Pritz 793e29e124 Merge branch 'working' 2011-09-24 18:43:02 +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 152fc7d94d files: fix max filesize check
php check both, upload_max_filesize and post_max_size, when uploading a
file so we should do the same when figuring out the maximum size.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:06 +02:00
Florian Pritz ef07b599cb files/ajax: catch upload errors
If the file wasn't uploaded successfully bail early.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:05 +02:00
Florian Pritz b23d030925 settings/personal: calculate the relative usage with 2 decimals
Normally a browser window will be large enough that the bar is wider
than 100px so we can use decimals to display the real usage more
closely.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:04 +02:00
Florian Pritz e0d013b25e settings/personal: remove padding from quota bar
The text will stay in it's place, but 0% usage will lead to an empty
bar.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:02 +02:00
Florian Pritz 36c31b0e83 fix warning when uploading file using webdav
When uploading a file using davfs php warned about a missing argument to
OC_FileProxy_Quota::preFile_put_contents(). Since we get a resource from
OC_Connector_Sabre_File->put(), we have to convert that before running
strlen because it expects a string.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:01 +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 71706282f7 change DATETIME to DATE-TIME in vcards
The rfc [1] only mentions "DATE-TIME" and after this change events
created in the web ui can be imported by lightning. Before it threw a
syntax error.

[1]: https://tools.ietf.org/html/rfc5545

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:52 +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 652b744201 don't print empty folder warning if it will be hidden
No point in wasting resources if you don't show it.

This also fixes an undefined variable notice.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:49 +02:00
Florian Pritz 2ff5df192b files: fix wrong image paths if called from files_shareing/get.php
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:48 +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 2267b6e97d use jquery 1.6.4
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +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
Jan-Christoph Borchardt f65d0e4f80 moved copyright and license notices in one place 2011-09-24 16:30:11 +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 b73f72f62c After clicking Finish button:
- change value to "Please wait...."
- disable all the inputs & buttons
- submit new form, because disabled inputs are not submitted to the server
2011-09-23 19:40:06 +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 8966ed5a00 Cleanup lib/base.php 2011-09-18 20:57:05 +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
Bartek Przybylski 6e980d419c Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-09-18 15:06:51 +02:00
Bartek Przybylski 94696ea7de remember changed not to store password in cookie 2011-09-18 15:05:53 +02:00
Robin Appelman 0714e83a8e fix creating groups 2011-09-18 13:35:27 +02:00
Bartek Przybylski 68e7666293 Changed behaviour of remember checkbox 2011-09-18 09:15:30 +02:00
Robin Appelman 8c7aa06088 dont use numRows when it's not needed since it can be expensive 2011-09-17 02:49:40 +02:00
Robin Appelman d0d3fecc95 no need to escape values when using prepared statements 2011-09-17 02:30:00 +02:00
Bart Visscher f0da2a2258 Add class versions for leftcontent and rightcontent in css 2011-09-17 01:55:05 +02:00