Commit Graph

21487 Commits

Author SHA1 Message Date
Vincent Petry e306b588d2 Merge pull request #12433 from owncloud/appstore
added comment that App Store is disabled for EE
2014-11-26 17:56:25 +01:00
Vincent Petry cc67e0fe5f Merge pull request #12304 from oparoz/patch-1
Use a more universal shebang
2014-11-26 17:16:46 +01:00
Morris Jobke 60f7a86323 Merge pull request #12448 from owncloud/no503forRoot
Don't show favicon to prevent iteration through subfolders
2014-11-26 17:06:43 +01:00
Thomas Müller bb240209c6 Merge pull request #12453 from owncloud/kill-session-global
remove deprecated \OC:$session
2014-11-26 16:51:26 +01:00
Thomas Müller 5097d4dc05 remove deprecated \OC:$session 2014-11-26 15:32:47 +01:00
Lukas Reschke 8af346a84d Don't show favicon to prevent iteration through subfolders
The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
2014-11-26 12:38:26 +01:00
Robin Appelman a2457b5fb9 Merge pull request #6989 from AdamWill/google-1
Migrate Google Drive external storage app to v1.0.6-beta of the google-api-php-client library
2014-11-26 12:17:57 +01:00
Morris Jobke 4ed0a418a0 Merge pull request #12414 from owncloud/delay-autoconfig-kill-2
autoconfig.php only to be deleted on successful installation
2014-11-26 11:05:23 +01:00
Lukas Reschke c749570a06 Merge pull request #12411 from owncloud/unknown-command-windows
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
Morris Jobke 1da46b1a58 Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-api
because OC_User::login will create a new session we shall only try to lo...
2014-11-26 10:22:16 +01:00
Morris Jobke 60e4aa120f Merge pull request #12350 from mprokop/link_expiration
fix calculation of expiration date if there is a default expiration date...
2014-11-26 10:19:12 +01:00
Thomas Müller 320a3c3784 because OC_User::login will create a new session we shall only try to login if user and pass are set
ensure to never destroy an existing session
2014-11-26 09:19:10 +01:00
Morris Jobke c5fa8f1bdc Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Jenkins for ownCloud 3766d98df6 [tx-robot] updated from transifex 2014-11-26 01:54:31 -05:00
Carla Schroder 06041e3323 added comment that App Store is disabled for EE 2014-11-25 16:31:02 -08:00
Morris Jobke e9696a8c9a Merge pull request #12420 from owncloud/sqlite-wal-2
adding new config parameter for sqlite to specify the journal mode
2014-11-26 00:47:22 +01:00
Thomas Müller e6a7022037 Merge pull request #12410 from owncloud/no_session_for_public_share_key
don't store private public-share-key in session
2014-11-25 22:26:40 +01:00
Thomas Müller 5d4b7e0e2b fix failing unit test for the temp manager - concurrently executed unit tests influence each other 2014-11-25 22:16:48 +01:00
Joas Schilling 0274dcba57 Replace some more "command -v" calls with the Helper method 2014-11-25 18:10:03 +01:00
Joas Schilling 2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Thomas Müller a6c088a1ef adding new config parameter for sqlite to specify the journal mode 2014-11-25 16:29:06 +01:00
Joas Schilling 711912a7b3 Move namespaced constants to namespaced class 2014-11-25 16:27:27 +01:00
Bjoern Schiessle 4643a5d238 replace \OC:: with \OC::->getSession() 2014-11-25 16:15:32 +01:00
Thomas Müller 0f18274ca5 Merge pull request #12416 from owncloud/app-info-xml-parser-2
App info xml parser 2
2014-11-25 15:56:52 +01:00
Bjoern Schiessle 1d33503487 we no longer need to keep the session open for encryption 2014-11-25 13:37:11 +01:00
Thomas Müller 553188273c Merge pull request #12313 from oparoz/patch-2
The class name is Movie NOT Movies
2014-11-25 12:40:25 +01:00
Bjoern Schiessle 917bef39b7 don't store private public-share-key in session 2014-11-25 12:32:25 +01:00
Thomas Müller 5ce34fbaf6 handle invalid xml file 2014-11-25 11:53:28 +01:00
Thomas Müller d4f107d4dd simplify xml parser code 2014-11-25 11:53:28 +01:00
Thomas Müller c503ecd544 Introduce app info xml parser including basic unit test - necessary for #10777 2014-11-25 11:53:28 +01:00
Olivier Paroz 93a6cc17a5 The class name is Movie NOT Movies 2014-11-25 11:35:38 +01:00
Thomas Müller b68c07d687 autoconfig.php only to be deleted on successful installation 2014-11-25 11:14:35 +01:00
Bjoern Schiessle f274833403 remove unused variable 2014-11-25 10:12:10 +01:00
Morris Jobke 6fb2477fb7 Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate
Don't disclose relative directory path for single shared files of user
2014-11-25 10:09:16 +01:00
Morris Jobke bc3c835f6a Merge pull request #12390 from owncloud/use-session-in-case
Close session only if encryption app is not enabled
2014-11-25 09:32:16 +01:00
Morris Jobke 53b2d85709 Merge pull request #12402 from owncloud/fix-phpdoc
Fix PHPDoc and deprecated code
2014-11-25 09:20:36 +01:00
Lukas Reschke eb1dcb87c1 Merge pull request #12380 from owncloud/remove-oc-migrate
Remove OC_Migrate
2014-11-25 00:25:37 +01:00
Lukas Reschke b947b65e5b Fix PHPDoc and deprecated code
Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.
2014-11-24 23:09:49 +01:00
Morris Jobke 02095d4f20 Merge pull request #11837 from owncloud/fix-11328
unify count filters and introduce display name attribute detection
2014-11-24 18:13:01 +01:00
Björn Schießle 949d7b3312 Merge pull request #12391 from owncloud/fix_12361
use login name to verify password
2014-11-24 17:06:48 +01:00
Thomas Müller ddacd7f900 Merge pull request #12294 from owncloud/route-postfix
Add route postfix to allow url versioning when only the http method changed
2014-11-24 16:32:54 +01:00
Bjoern Schiessle 1645c8f819 use login name to verify password 2014-11-24 15:44:43 +01:00
Lukas Reschke 8589079590 Close session only if encryption app is not enabled
Fixes https://github.com/owncloud/core/issues/12389
2014-11-24 15:02:49 +01:00
Morris Jobke 168fce0b18 Merge pull request #12303 from owncloud/windows-unknown-command-command
Deduplicate findBinaryPath() and do not try "command -v" on windows
2014-11-24 14:03:07 +01:00
Morris Jobke 1b17429c1d Merge pull request #12142 from owncloud/DeprecateOldIAPICalls
Deprecate older API wrappers and calls
2014-11-24 14:01:49 +01:00
Morris Jobke 8782b2237c Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
Thomas Müller e956bd1094 Merge pull request #12359 from owncloud/fix-redirect-url-for-password-change
Use `/` as redirect location if webroot is set to an empty value
2014-11-24 11:09:17 +01:00
Vincent Petry 49ad10cfd0 Merge pull request #12362 from owncloud/add-ocs-header-per-default
Add OCS API header per default
2014-11-24 11:09:00 +01:00
Lukas Reschke 216d617938 Remove OC_Migrate
This is unused legacy code. Let it die with ~~~honor~~ fire.

Fixes https://github.com/owncloud/core/issues/12346
2014-11-24 10:53:45 +01:00
Lukas Reschke c556382160 Merge pull request #12374 from owncloud/vagrant_puphpet_gitignore
add puphpet and vagrant to gitignore
2014-11-24 09:01:23 +01:00