Thomas Tanghus
aedc427ffd
Fix fix of POST :P
2013-10-03 03:56:37 +02:00
Thomas Tanghus
8a018d7a59
Fix POST decoding
2013-10-03 01:43:33 +02:00
Thomas Müller
9c23c3449b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
core/css/share.css
2013-10-02 23:33:50 +02:00
Thomas Müller
de175a4b0f
Merge pull request #5077 from owncloud/no-upgrade-if-there-is-no-fscache-table-master
...
only perform files upgrade in case there are actually entries in the old...
2013-10-02 14:24:38 -07:00
Robin Appelman
51c34777c4
extend test case
2013-10-02 22:28:19 +02:00
Thomas Tanghus
965ce5719f
Modified PUT behaviour
...
Now only non-parable PUT requests return a stream resource.
2013-10-02 22:13:40 +02:00
Jan-Christoph Borchardt
f8093699f7
Merge pull request #5093 from owncloud/file-actions
...
File Selected on Click instead of download.
2013-10-02 09:56:08 -07:00
Raghu Nayyar
c87b9fafc4
Merge pull request #5095 from owncloud/design-finetune
...
Whitespace fix for share.css
2013-10-02 09:47:02 -07:00
raghunayyar
0d5653c6b1
Takes nametext inside the anchor tag to fix the issue completely.
2013-10-02 22:11:03 +05:30
Morris Jobke
99fa4898fd
just fix whitespace stuff
2013-10-02 18:27:55 +02:00
Frank Karlitschek
6d150b8d3c
Merge pull request #5092 from owncloud/design-finetune
...
Design finetune
2013-10-02 09:27:29 -07:00
raghunayyar
4a5f3442b5
Closes Label inside the a tag for not hiding the fileactions.
2013-10-02 21:40:34 +05:30
raghunayyar
81b4904c78
File Selected on Click instead of download.
2013-10-02 21:13:07 +05:30
Jan-Christoph Borchardt
5feaa55779
simplify From Link icon in New menu
2013-10-02 18:27:39 +03:00
Jan-Christoph Borchardt
9853b33420
reduce rounded corners of New dropdown
2013-10-02 18:04:08 +03:00
Jan-Christoph Borchardt
c548edd90f
remove box-shadows for header, navigation and controls bar - looks sharper and less washed out
2013-10-02 17:59:38 +03:00
Jan-Christoph Borchardt
8ce26297b9
reduce rounded corners of Share and Versions dropdown
2013-10-02 17:53:54 +03:00
Vincent Petry
ed14541aea
Removed stray debug log write
2013-10-02 16:44:38 +02:00
Bjoern Schiessle
b0a71bde15
maxX and maxY should be a integer
2013-10-02 16:34:05 +02:00
Bjoern Schiessle
9be6114a52
trash bin button needs to be an input field
2013-10-02 16:13:08 +02:00
Vincent Petry
31e1c15db7
Added dateOnly argument to relative_modified_date
...
Improved the template function relative_modified_date by adding an
optional dateOnly argument which will output "today" or "yesterday" or
"x days ago".
2013-10-02 15:52:44 +02:00
Bjoern Schiessle
eb1216f949
add previews to versions dialog
2013-10-02 15:23:51 +02:00
Andreas Fischer
aa34438d06
Also replace ApacheBackend with Authentication\IApacheBackend in user.
2013-10-02 15:11:49 +02:00
Thomas Müller
621ab1c7ee
fixing various PHPDoc comments
2013-10-02 15:04:42 +02:00
Thomas Müller
4d4eda0f06
fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBackend
2013-10-02 15:03:52 +02:00
Morris Jobke
551e809790
Merge pull request #5076 from owncloud/fix_filepicker_kondou
...
Fix require in apps/files/ajax/rawlist.php
2013-10-02 05:59:24 -07:00
Thomas Müller
8c77cd1901
remove obsolete function login()
2013-10-02 14:49:14 +02:00
Bjoern Schiessle
aa660a3475
remove deleted shares from the database table oc_share
2013-10-02 13:26:38 +02:00
Thomas Müller
78c60c25c8
only perform files upgrade in case there are actually entries in the old fscache table
2013-10-02 13:00:05 +02:00
kondou
feb7028a78
Remove require in rawlist.php
...
Thanks @tanghus for pointing out the unneccessity of it.
2013-10-02 12:45:30 +02:00
kondou
013e9c27d2
Fix require in apps/files/ajax/rawlist.php
2013-10-02 12:21:52 +02:00
Thomas Müller
1adadf36fc
Merge pull request #5071 from owncloud/fix-autoloader-master
...
Fix autoloader regression
2013-10-02 03:10:10 -07:00
Morris Jobke
ceeb22aa5f
fix unit tests
2013-10-02 11:25:44 +02:00
Bjoern Schiessle
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
Owen Winkler
535ed8369f
Merge pull request #4894 from owncloud/fixing-4620-master
...
Fixing broken layout in master due to APC enabled
2013-10-01 17:51:33 -07:00
Thomas Müller
0d7c36c9f1
adding PHPDoc comment
2013-10-02 01:13:02 +02:00
Thomas Müller
3e4d56d7bb
adding warning about failed apache module auth
2013-10-02 01:02:46 +02:00
Thomas Müller
4cecede13d
code cleanup - remove special case for webdav in handleApacheAuth()
2013-10-02 00:55:35 +02:00
Thomas Müller
493e948146
$defaults is not necessary here - merge artifact
2013-10-02 00:34:13 +02:00
Thomas Müller
173f32e6ef
Revert "use $defaults instead of $theme"
...
This reverts commit d5038e93db
.
2013-10-02 00:32:11 +02:00
Thomas Müller
7e9e23f210
Merge branch 'master' into apache-auth-master
2013-10-02 00:21:11 +02:00
Victor Dubiniuk
5bb4330ea4
Fix autoloader regression
2013-10-02 00:58:51 +03:00
Thomas Müller
9eab8b39df
Merge branch 'master' into fixing-4620-master
2013-10-01 22:57:46 +02:00
Thomas Müller
0537960dcc
adding getCurrentUserId() to ApacheBackend
2013-10-01 22:56:47 +02:00
Robin Appelman
de43515cfa
fix recursive delete for smb
2013-10-01 22:33:58 +02:00
Robin Appelman
29deef38b2
fix using touch to create a file for smb
2013-10-01 22:31:22 +02:00
Robin Appelman
ea566868a8
return the correct result when doing an smb rename
2013-10-01 22:29:33 +02:00
Robin Appelman
ea6115bfaa
fix smb streamwrapper on non existing files
2013-10-01 22:18:03 +02:00
Thomas Tanghus
8035787cb9
Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
2013-10-01 20:16:11 +02:00
Thomas Tanghus
a2cabd4c2a
Remove getContent() from IRequest
2013-10-01 20:15:04 +02:00