Commit Graph

14108 Commits

Author SHA1 Message Date
Thomas Müller 730c80ff9c adding additional exceptions for special cases where creating a file might not be allowed 2013-10-07 15:11:47 +02:00
Thomas Müller 1e47468c53 Merge pull request #4974 from owncloud/fixing-4011-master
error handling added in case file_put_contents is failing
2013-10-07 02:58:00 -07:00
Björn Schießle 981608cf6b Merge pull request #5129 from owncloud/remove_deleted_shares_from_db
remove deleted files from oc_share
2013-10-07 02:07:11 -07:00
Bjoern Schiessle 288f01bf62 catch exception if db query execution fails 2013-10-07 11:06:24 +02:00
Bjoern Schiessle 4f67b7a6c3 Merge branch 'master' into remove_deleted_shares_from_db 2013-10-07 11:00:56 +02:00
Bjoern Schiessle 0346167bb2 clean up oc_share table from files which are no longer exists 2013-10-07 10:59:09 +02:00
Frank Karlitschek 46fdb449a4 Merge pull request #4662 from owncloud/fix-4129
Fix 4129
2013-10-06 23:42:44 -07:00
Morris Jobke d986495297 Merge pull request #5148 from owncloud/cache-gc-legacy
Fix loading legacy global filecache gc backgroundjobs
2013-10-06 16:25:38 -07:00
Jenkins for ownCloud 3613e79e10 [tx-robot] updated from transifex 2013-10-06 19:16:10 -04:00
Lennart Rosam 5470700c9a Update file to meet coding standarts 2013-10-07 01:08:39 +02:00
Lennart Rosam 72ad309920 Actually test the connection 2013-10-07 01:08:38 +02:00
Lennart Rosam b9a948b597 Fixes #4129 2013-10-07 01:08:38 +02:00
Morris Jobke e1e16ec3b0 Merge pull request #5088 from owncloud/fix_trashbin_button
trash bin button needs to be an input field
2013-10-06 14:51:08 -07:00
Bernhard Posselt 381b76ebd0 Merge pull request #5144 from owncloud/public_middleware
Make abstract Middleware class public
2013-10-06 14:12:35 -07:00
Morris Jobke 1537410a31 Merge pull request #5154 from owncloud/fix-appimages
fix mobile and desktop app images looking different
2013-10-06 12:31:54 -07:00
kondou bf83b1eb90 Optimize images with optipng 2013-10-06 21:20:49 +02:00
Owen Winkler 08e1147a6b Merge pull request #4982 from syncloud/master
Automatic config can set some of parameters or all of them
2013-10-05 16:13:46 -07:00
Robin Appelman 98ef90ad04 Fix loading legacy global filecache gc backgroundjobs 2013-10-05 23:19:12 +02:00
Thomas Tanghus 47b2007228 Remove misleading IMiddleware interface 2013-10-05 19:13:12 +02:00
Thomas Tanghus 0501a947bc Merge pull request #5116 from owncloud/interfaces2
More Interfaces for the public api
2013-10-05 08:35:50 -07:00
Thomas Tanghus c85621a897 Make abstract Middleware class public
It doesn't make sense for subclasses to have to implement
all methods.
2013-10-05 16:59:06 +02:00
Jan-Christoph Borchardt 11a69fbddf fix mobile and desktop app images looking different 2013-10-05 15:40:00 +03:00
VicDeo 485bb100b3 Merge pull request #5131 from owncloud/fix-5130
Allow "Finishing..." button on setup page to be translated.
2013-10-05 02:32:28 -07:00
Frank Karlitschek e0fb794a87 Merge pull request #5140 from owncloud/settings-beautify
more elegant style for Personal and Admin settings
2013-10-05 02:26:08 -07:00
Frank Karlitschek a82211220c Merge pull request #5125 from owncloud/fixing-5122-master
upload abortion detection only for PUT
2013-10-05 02:25:45 -07:00
Frank Karlitschek 4bce2f8b85 Merge pull request #5123 from owncloud/cache_mimetypes
Load all mimetypes in one go
2013-10-05 02:24:38 -07:00
Jan-Christoph Borchardt 2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
vsapronov 46ca1eb91b Moving Advanced button out of datadirField fieldset 2013-10-04 20:46:00 -04:00
Morris Jobke cc1e69c190 Merge pull request #5136 from owncloud/design-fixes
Design fixes
2013-10-04 14:56:09 -07:00
Victor Dubiniuk 8da1aac1d0 Check result only once 2013-10-04 23:24:38 +03:00
Thomas Müller 414b2eb4b6 upload abortion detection only for PUT
e.g. LOCK would break with this approach
2013-10-04 20:20:33 +02:00
Morris Jobke a927c145be Merge pull request #5102 from owncloud/input-simplify
Input simplify
2013-10-04 10:40:32 -07:00
Jan-Christoph Borchardt 1cae6661df add useful icon from News app to core 2013-10-04 20:27:01 +03:00
Jan-Christoph Borchardt fcb9b49d1f increase font size of file actions for better readability 2013-10-04 20:25:18 +03:00
Jan-Christoph Borchardt 2166d99b53 prevent hover effect when settings are open 2013-10-04 20:24:07 +03:00
Jan-Christoph Borchardt 0b78db4750 fix disabled buttons not showing icons 2013-10-04 20:21:36 +03:00
Bart Visscher 21cbef0d2c passesCSRFCheck added to OCP\IRequest 2013-10-04 18:13:04 +02:00
Bart Visscher 61a9098b7d Add Helper and URLGenerator interfaces to server container 2013-10-04 18:11:02 +02:00
Bart Visscher ce9436c051 OC_Defaults is only used in error reporting 2013-10-04 18:11:02 +02:00
Bart Visscher 9f777fba98 Add L10N interface to server container 2013-10-04 18:11:02 +02:00
Bart Visscher bae121b16d Merge pull request #5068 from owncloud/improved_request
Improved request
2013-10-04 09:05:20 -07:00
Bjoern Schiessle fd34c969d2 increase version number to trigger db update 2013-10-04 17:41:23 +02:00
ringmaster 85f63d4f77 Allow "Finishing..." button on setup page to be translated.
Fixes #5130.
2013-10-04 11:09:59 -04:00
Victor Dubiniuk ef65037211 Make mimetypes static. Jenkis will be happy 2013-10-04 18:09:42 +03:00
Bjoern Schiessle 401740166b add comments 2013-10-04 16:50:53 +02:00
Jan-Christoph Borchardt 0c53269b5e remove specific border-radius for .primary button as it should be specific to log in instead 2013-10-04 17:37:20 +03:00
Jan-Christoph Borchardt da0db7bcb2 fix multiselect bar opacity, webroot 2013-10-04 17:32:06 +03:00
Björn Schießle 2cdf54b77d Merge pull request #4877 from owncloud/ocs_share_api
OCS Share API
2013-10-04 07:10:21 -07:00
Jan-Christoph Borchardt 041837de2c merge master into input-simplify 2013-10-04 17:08:34 +03:00
Victor Dubiniuk 65750cb244 Load all mimetypes in one go 2013-10-04 16:17:19 +03:00