Lukas Reschke
e704bc2bf0
Merge pull request #7807 from sarciszewski/patch-1
...
Update crypt.php
2014-04-11 19:19:02 +02:00
Björn Schießle
10dc1de644
Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
...
Fix some localization issues with file encryption/decryption strings
2014-04-11 17:22:13 +02:00
Vincent Petry
e92fe47d2a
Remove annoying karma 404 warnings for images
...
Karma now serves images from core to avoid polluting the logs with a lot
of 404 warnings.
This also makes it easier to read the test errors during development.
2014-04-11 15:25:40 +02:00
Volkan Gezer
d67cba973e
Typo fix.
2014-04-11 15:23:43 +02:00
Thomas Müller
07ea57465b
drop folder support on public shared folders
2014-04-11 14:54:13 +02:00
Jenkins for ownCloud
36107e1bad
[tx-robot] updated from transifex
2014-04-11 01:55:15 -04:00
Thomas Müller
dcca5f7bdd
Merge pull request #5857 from owncloud/type-ahead-share-by-mail-master
...
introduce auto completion on share email - integrated with the contactsm...
2014-04-11 00:04:58 +02:00
Lukas Reschke
d229856fc5
Merge pull request #8076 from owncloud/enable-dav-browser
...
Re-enable the sabredav browser plugin to fix sync client setup
2014-04-10 21:47:03 +02:00
Bernhard Posselt
763da4258e
fix the middleware registration process in the container
2014-04-10 20:51:03 +02:00
Bernhard Posselt
2fc6fb36ad
Merge pull request #8139 from owncloud/fix-middleware-registration
...
register middleware as string to not force request to be instantiated to...
2014-04-10 20:24:30 +02:00
Thomas Müller
0edacf372c
fix single file upload in firefox
2014-04-10 18:07:36 +02:00
Thomas Müller
e401df26bc
Merge pull request #8107 from owncloud/dav-negativetimestampfix
...
Fixed Sabre Node implementation to correctly return timestamps as int
2014-04-10 17:37:53 +02:00
Thomas Müller
7325aefbd1
Merge pull request #8112 from owncloud/karma-enableautowatch
...
Enable autowatch for karma
2014-04-10 16:57:28 +02:00
Thomas Müller
26a89e369e
Merge pull request #8137 from owncloud/routeing-requirements
...
add requirements to routing
2014-04-10 16:23:01 +02:00
Thomas Müller
ecd74d3630
Merge pull request #8138 from owncloud/allow-app-in-routes.php
...
To isolate the variable scope used inside the $file it is required in it...
2014-04-10 16:09:23 +02:00
Tom Needham
654d5af394
Merge pull request #8027 from owncloud/routes-ocs
...
Load all routes when matching an ocs route
2014-04-10 12:22:34 +01:00
Vincent Petry
6cc578d1a7
Merge pull request #8018 from owncloud/ocs_result_success_is_100
...
OC_OCS_Result Class, Only accept 100 code as success
2014-04-10 13:03:10 +02:00
Vincent Petry
8d05848391
Merge pull request #7825 from owncloud/hash-stream
...
Use streams when generating hashes of remote files
2014-04-10 10:42:04 +02:00
Vincent Petry
9a8457aca0
Merge pull request #8053 from owncloud/preview-hook-root
...
Pass the correct root to the preview on post_write
2014-04-10 10:31:40 +02:00
Jenkins for ownCloud
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
Bernhard Posselt
f06ef8aa4b
register middleware as string to not force request to be instantiated too early and thus not having url parameters
2014-04-09 23:59:57 +02:00
Thomas Müller
e8be2ac554
In cases folder drag and drop is not supported a proper message is displayed
2014-04-09 23:32:12 +02:00
Thomas Müller
98a5f121fd
To isolate the variable scope used inside the $file it is required in it's own method
2014-04-09 22:45:34 +02:00
Thomas Müller
2fc9e27ced
use FileList.findFileEl
2014-04-09 22:16:41 +02:00
Thomas Müller
d2961dcf11
Merge branch 'master' into lukepolo-master
...
Conflicts:
apps/files/js/filelist.js
2014-04-09 22:00:25 +02:00
Bernhard Posselt
70c88027db
add requirements to routing
2014-04-09 21:57:32 +02:00
Thomas Tanghus
5b8c7a01e9
Merge pull request #8129 from owncloud/core-svgsupport
...
Moved SVGSupport call to use OC.Util.SVGSupport()
2014-04-09 19:15:37 +02:00
Joas Schilling
4c309b05ba
Merge pull request #8128 from owncloud/fix/undefined-index-storage
...
Fix Undefined index: storage in share.php
2014-04-09 18:26:17 +02:00
Vincent Petry
4f11786a3d
Fixed Sabre Node implementation to correctly return timestamps as int
...
Negative timestamps were returned as string and were confusing other
Sabre API like Sabre_DAV_Property_GetLastModified.
This fix makes sure the timestamp is returned as int when defined.
2014-04-09 15:46:51 +02:00
Vincent Petry
f84d66a24f
Moved SVGSupport call to use OC.Util.SVGSupport()
2014-04-09 15:23:09 +02:00
Joas Schilling
352063cf0a
Fix Undefined index: storage in share.php
...
There parameter was removed when the code was cleaned up:
{"app":"PHP","message":"Undefined index: storage at
E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160",
"level":0,"time":"2014-04-09T12:56:23+00:00"}
2014-04-09 15:14:44 +02:00
Morris Jobke
d8f56e3c00
Merge pull request #8049 from owncloud/filepickersvg
...
Fix file picker SVG issues
2014-04-09 15:05:40 +02:00
Vincent Petry
b19671d204
Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js
...
remove obsolete code
2014-04-09 14:50:15 +02:00
Jan-Christoph Borchardt
1258cde020
fix search box wrapping on very narrow screens
2014-04-09 13:20:46 +02:00
Jan-Christoph Borchardt
0ad8e1b1e6
search: change date color to grey for less distraction
2014-04-09 12:58:14 +02:00
Jan-Christoph Borchardt
d72269d361
increase height of result for better clickability
2014-04-09 12:55:10 +02:00
Jan-Christoph Borchardt
ee6fe9718e
make search results work on mobile as well
2014-04-09 12:51:41 +02:00
blizzz
9feebeaf40
Merge pull request #7837 from owncloud/fix_7530
...
LDAP: fix determining objectclasses takes long
2014-04-09 12:27:17 +02:00
Arthur Schiwon
dbebf6bb5e
add comment to clearify when a skip in the foreach happens
2014-04-09 12:25:48 +02:00
Jörn Friedrich Dreyer
9b0f289143
remove obsolete code
2014-04-09 12:09:28 +02:00
Joas Schilling
fbb9e11a7e
Merge pull request #8122 from owncloud/issue/8048
...
Always define sendmail_is_available in settings/admin.php
2014-04-09 11:14:24 +02:00
Joas Schilling
e79a027e77
Always define sendmail_is_available
...
Fix #8048
2014-04-09 10:18:46 +02:00
Jenkins for ownCloud
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
Thomas Müller
1a09d64a77
Merge pull request #8117 from owncloud/fix-hard-coded-uman-str
...
Make hardcoded exception messages translatable
2014-04-08 22:45:19 +02:00
Thomas Müller
73ac3d0fcd
Merge pull request #7643 from owncloud/chainable_response
...
Chainable Response in AppFramework
2014-04-08 22:42:43 +02:00
Vincent Petry
c1345d3a2d
Merge pull request #8111 from owncloud/trash-disablesharing
...
Disable sharing in trashbin app
2014-04-08 21:00:44 +02:00
Volkan Gezer
a4f42676ea
Make hardcoded exception messages translatable
2014-04-08 20:07:25 +02:00
Vincent Petry
bfb1e0867f
Enable autowatch for karma
...
This way unit tests can be run in multiple browsers with the command
line and tests will re-run automatically when files are changed.
2014-04-08 17:21:11 +02:00
Vincent Petry
35ab6fe5a9
Disable sharing in trashbin app
2014-04-08 17:13:59 +02:00
Thomas Müller
618914282a
Merge pull request #8110 from owncloud/fix-failing-config-unit-test
...
class Test_Config is already declared
2014-04-08 16:26:35 +02:00