Commit Graph

14045 Commits

Author SHA1 Message Date
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
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
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 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
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 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
Thomas Tanghus 0f13ffb773 Remove JSON request parsing from Server 2013-10-01 20:15:04 +02:00
Thomas Tanghus 7cd8088845 Add assertions for ->params and array access with json 2013-10-01 20:15:03 +02:00
Thomas Tanghus 973bcccd7c Implement PUT an PATCH support 2013-10-01 20:13:13 +02:00
Thomas Tanghus 36d1156cf8 Add interface docs to IRequest. 2013-10-01 20:13:13 +02:00
Thomas Tanghus cd2e1d0cfe Add patch method to OC_Route 2013-10-01 20:13:13 +02:00
Thomas Tanghus bdad7697ac Check if accessor matched request method.
It's easier to find errors in the code if an exception is thrown.
2013-10-01 20:13:13 +02:00
Morris Jobke 5ade595911 Merge pull request #5039 from owncloud/lib-private-master-2
Public API OC6 - introduce lib/private
2013-10-01 09:15:24 -07:00
Thomas Müller e2fe71b6e7 Merge branch 'master' into lib-private-master-2 2013-10-01 16:11:59 +02:00
Thomas Müller b66e492d6e Merge pull request #5026 from owncloud/channels
put the current version and edition into a seperate file to simplify
2013-10-01 05:36:00 -07:00
Frank Karlitschek 6cda88b49d add explanation 2013-10-01 14:28:59 +02:00
Frank Karlitschek bf0f3bf0da use a 4 digit number 2013-10-01 12:37:19 +02:00
Thomas Müller 02d6976263 Merge branch 'master' into lib-private-master-2 2013-09-30 21:29:58 +02:00
Thomas Müller 7c659eb291 use public api for session access from server container 2013-09-30 20:28:00 +02:00
Thomas Müller bed27b603d Merge branch 'master' into channels
Conflicts:
	lib/util.php
2013-09-30 20:21:51 +02:00
Frank Karlitschek 2cf26ee0b1 put the current version and edition into a seperate file to simplify packaging. introduce update channels and build version for automated channel updates. More about that later
Conflicts:
	lib/ocsclient.php
	lib/util.php
2013-09-30 20:19:26 +02:00
Frank Karlitschek 69dd6af574 use ===
Shoudn't make a difference in this case but just in case

Conflicts:
	lib/ocsclient.php
2013-09-30 20:15:16 +02:00
Frank Karlitschek b948c1a1b6 prepare the updater for the new update channels 2013-09-30 20:14:18 +02:00
Thomas Müller b58a464b86 Merge pull request #4967 from owncloud/dont_remember_login_if_enc_enabled
don't remember login if the encrypion app is enabled
2013-09-30 10:53:41 -07:00
Thomas Müller 8e0060405d reorganize file in lib 2013-09-30 16:39:03 +02:00
Thomas Müller 9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
	lib/private/vcategories.php
2013-09-30 16:36:59 +02:00
Thomas Tanghus 26785c9e0d Remove getContent() from IRequest 2013-09-30 16:30:36 +02:00
Thomas Tanghus 4e9a95f3e9 Merge branch 'enhance_request' of github.com:owncloud/core into enhance_request
Conflicts:
	lib/appframework/http/request.php
	tests/lib/appframework/http/RequestTest.php
2013-09-30 16:27:00 +02:00