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

2084 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frank Karlitschek
10c5178e31 check for php modules 2011-09-27 19:08:38 +02:00
Frank Karlitschek
bf3248bee9 remove warning by check cookie before accessing it. 2011-09-27 15:31:30 +02:00
Scott Barnett
83ccbbe49f Fixed table gap from appearing. 2011-09-27 06:48:05 +10:00
Scott Barnett
861ef363a5 Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2011-09-27 05:49:49 +10:00
Scott Barnett
f4ecf47e61 Fixed delete cross positioning issue. 2011-09-27 05:26:49 +10:00
Bart Visscher
3fcc7b5949 Use correct name for function state for addScript/addStyle in js 2011-09-26 21:18:56 +02:00
Bart Visscher
2d3c1a3f00 Fix space in comment 2011-09-26 21:18:37 +02:00
Bart Visscher
5fbf378d10 Small textual update to password recovery templates 2011-09-26 21:17:26 +02:00
Bart Visscher
676838ac31 Implement mailing of password reset link 2011-09-26 21:17:26 +02:00
Bart Visscher
f149303895 Add email field to personal preferences 2011-09-26 21:17:26 +02:00
Bart Visscher
950d4e1da4 Move lostpassword code to own app 2011-09-26 21:17:26 +02:00
Bart Visscher
aae6881494 Move display of login page to function in OC_Util 2011-09-26 21:17:17 +02:00
Bartek Przybylski
e4dc33b368 Reverting: initial commit for gallery app 2011-09-26 20:05:36 +02:00
Robin Appelman
bcf92badd1 dont set content type to json for Apps 2011-09-26 00:19:34 +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
Scott Barnett
dbddec9160 Fixed minor issue. 2011-09-26 04:18:33 +10:00
Scott Barnett
1985bfd9eb Fixed uploaded file hover issue. 2011-09-26 04:08:28 +10:00
Robin Appelman
fb01a72693 fix creating users 2011-09-25 15:58:10 +02:00
Robin Appelman
64b68f2474 correctly update the collection when music files are moved around 2011-09-25 01:34:55 +02:00
Robin Appelman
6c2b22406c remove some debug statements 2011-09-25 01:33:53 +02:00
Robin Appelman
57bffdb46a fix uploading files using webdav 2011-09-25 01:20:43 +02:00
Robin Appelman
c16a9a83ba actually check the correct password when changing the password 2011-09-25 01:06:00 +02:00
Robin Appelman
09092dd2d2 check for old password when changing passwords 2011-09-25 01:02:22 +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
ce2c7bad44 widened inputs for language and timezone 2011-09-24 22:14:41 +02:00
Jan-Christoph Borchardt
7f83176306 no mickey mouse hand for quota bar 2011-09-24 22:13:35 +02:00
Jan-Christoph Borchardt
408c391f83 removed deprecated images and icons 2011-09-24 22:09:41 +02:00
Jan-Christoph Borchardt
c09b125131 relabeled Finish setup button with 'Finishing ...' 2011-09-24 21:56:40 +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
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