Commit graph

14355 commits

Author SHA1 Message Date
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
Thomas Müller
131d82e41e move call to print_unescaped() to template 2013-10-07 11:49:43 +02:00
Jörn Friedrich Dreyer
4ccbace68d remove double uri encoding 2013-10-07 11:15:58 +02:00
Jörn Friedrich Dreyer
0683372200 canceling individual uploads is currently impossible because there is no placeholder 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer
5a174eba83 use correct property for mimetype of existing files 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer
3be8e3f8d3 remove obsolete comment 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer
8899543b7f use !== comparison 2013-10-07 11:14:10 +02:00
Vincent Petry
6a4563f203 Fix breadcrumb to reinit dnd after ajax nav #5064
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.

This also fixes dropping onto the "files" app icon.
2013-10-07 11:07:33 +02: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
Thomas Müller
d2371f0cc2 update version to 6.0.0 and adding comment option 2013-10-07 10:00:43 +02:00
Thomas Müller
4e0c4c8f34 move l10n factory into private 2013-10-07 10:00:23 +02:00
Thomas Müller
dbdf34402c remove outdated translation files 2013-10-07 09:59:15 +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
Bart Visscher
8115c38670 Remove the exception catch, this should be handled by a higher layer
And is when using index.php as entry point
2013-10-07 00:09:25 +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
Jan-Christoph Borchardt
94ae66c651 fix web interface showing very small when accessed on smartphone 2013-10-06 22:50:11 +03:00
Jan-Christoph Borchardt
676ded0c63 properly indent contents of folders for app styles, to line up with text 2013-10-06 22:40:29 +03:00
Jan-Christoph Borchardt
c8c83e0e02 improve clickability of footer link 2013-10-06 22:35:24 +03: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
Markus Goetz
e564a3a266 OC_App: Cache list of enabled apps
In my test here 1 SELECT instead of 5 (when doing a DAV request,
probably similar for other requests)
2013-10-05 19:18:18 +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
Frank Karlitschek
72b30e3e45 correctly expire cache if version file changed. Fixes problem that ownCloud only starts upgrading during login 2013-10-05 12:50:36 +02: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
Thomas Tanghus
9c230f8c85 Merge branch 'js_vcategories_to_tags' of github.com:owncloud/core into js_vcategories_to_tags 2013-10-04 20:03:31 +02:00
Thomas Tanghus
0e0927a887 It's 'status', not 'result'! 2013-10-04 20:02:33 +02:00
Thomas Tanghus
6d3bbc5eeb Fix typo 2013-10-04 19:55:03 +02:00
Morris Jobke
a927c145be Merge pull request #5102 from owncloud/input-simplify
Input simplify
2013-10-04 10:40:32 -07:00