Commit Graph

4046 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 6ac677f17a fix checkbox alignment in share dialog, fix #11515 2015-03-17 18:18:07 +01:00
Lukas Reschke b1c19f74a1 Merge pull request #12085 from owncloud/add-swift-mailer
Migrate OC_Mail to SwiftMailer
2015-03-17 11:15:39 +01:00
Jenkins for ownCloud b51b4f0a2c [tx-robot] updated from transifex 2015-03-17 01:55:43 -04:00
Lukas Reschke 283476a2f7 Use new IMailer and add unit-tests for lostcontroller 2015-03-16 12:47:05 +01:00
Lukas Reschke 13486a5ada Migrate to SwiftMail
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
	3rdparty
	lib/private/server.php
	lib/public/iservercontainer.php
	tests/lib/mail.php
	tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
	3rdparty
	lib/private/mail.php
	lib/private/server.php
	lib/public/iservercontainer.php
	settings/ajax/lostpassword.php
	settings/application.php
2015-03-16 12:47:05 +01:00
Joas Schilling 8ed27d2ce0 Create an interface for OC_Image and OCP\Image for the public API 2015-03-16 12:45:15 +01:00
Joas Schilling 4c4c0fa120 Use the PreviewManager where possible 2015-03-16 12:44:10 +01:00
Thomas Müller c262d0d966 Update shipped.json 2015-03-16 11:59:40 +01:00
Jenkins for ownCloud c1a3394f48 [tx-robot] updated from transifex 2015-03-16 01:55:15 -04:00
Joas Schilling 5d71eb5670 Color avatars of non-existing users gray and display X instead 2015-03-13 15:29:52 +01:00
Joas Schilling 8304f5f508 Fix getting the avatar of a non-existing user 2015-03-13 15:29:52 +01:00
Thomas Müller 40b2889785 shipped apps are now defined in core/shipped.json - the shipped tag in info.xml is ignored from now on - never trust an app 🙊 2015-03-13 11:18:39 +01:00
Jenkins for ownCloud d17630d6be [tx-robot] updated from transifex 2015-03-13 01:54:55 -04:00
Vincent Petry ce94a998dd Use storage id + appframework for ext storage CRUD
- Added StorageConfig class to replace ugly arrays
- Implemented StorageService and StorageController for Global and User
  storages
- Async status checking for storages (from Xenopathic)
- Auto-generate id for external storage configs (not the same as
  storage_id)
- Refactor JS classes for external storage settings, this mostly
  moves/encapsulated existing global event handlers into the
  MountConfigListView class.
- Added some JS unit tests for the external storage UI
2015-03-12 18:51:02 +01:00
Morris Jobke 89e1b920cc Merge pull request #14613 from kampka/no-table-prefix
Install command should not require table prefix
2015-03-12 10:06:21 +01:00
Jenkins for ownCloud 454a2563bc [tx-robot] updated from transifex 2015-03-12 01:55:59 -04:00
Christian Kampka 277503209a Install command should not require table prefix 2015-03-11 21:06:25 +01:00
Lukas Reschke f9fd1629da Merge pull request #14705 from rullzer/avatarcontroller
Move AvatarController to AppFramework
2015-03-11 17:15:42 +01:00
Roeland Jago Douma 1a0f9c375b Avatar controller moved to AppFrameWork
* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
  to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller
2015-03-11 16:37:42 +01:00
Lukas Reschke 73dc02d42c Merge pull request #14798 from owncloud/enable-oci-autotest-master
Setting oci as supported database
2015-03-11 16:14:54 +01:00
Morris Jobke caa672ceeb Merge pull request #14794 from owncloud/add-console-command-user-add
Add a console command user:add to create users over the console
2015-03-11 16:09:23 +01:00
Thomas Müller 96b223676d Don't play with config values ... 2015-03-11 15:47:24 +01:00
Thomas Müller cba3ec2c7f Setting oci as supported database 2015-03-11 14:29:22 +01:00
Joas Schilling b1ff21ee28 Add a console command user:add to create users over the console 2015-03-11 14:22:23 +01:00
Morris Jobke ad97ceb787 Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail
Do not abort when meeting unfixable legacy storages
2015-03-11 13:32:33 +01:00
Thomas Müller b3bb65eae5 Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist
Add an option to include the installed app version in "occ app:list"
2015-03-11 12:23:22 +01:00
Joas Schilling 560137ca23 Always include the installed app version in "occ app:list" 2015-03-11 09:47:41 +01:00
Thomas Müller 6c1a1234f8 Properly handle available databases at runtime and respect setup checks in command line as well 2015-03-11 09:27:12 +01:00
Jenkins for ownCloud 01ea056ac8 [tx-robot] updated from transifex 2015-03-11 01:55:38 -04:00
Jenkins for ownCloud e069d9d3f9 [tx-robot] updated from transifex 2015-03-10 01:55:39 -04:00
Lukas Reschke c0a02f1615 Verify CSRF token already in update.php and not the EventSource code
Issue report:
> Hum, well I upgraded the package then visited the web interface to
trigger the update and it failed; the UI would say there was a
possible CSRF attack and after that it'd be stuck in maintenance mode.
Tried a few times (by editing maintenance to false in owncloud.conf)
and same result each time.

That smells partially like an issue caused by our EventSource implementation, due to legacy concerns the CSRF verification happens within the EventSource handling and not when the actual endpoint is called, what happens here then is:

1. User has somehow an invalid CSRF token in session (or none at all)
2. User clicks the update button
3. Invalid CSRF token is sent to update.php - no CSRF check there => Instance gets set in maintenance mode
4. Invalid CSRF token is processed by the EventSource code => Code Execution is stopped and ownCloud is stuck in maintenance mode

I have a work-around for this problem, basically it verifies the CSRF token already in step 3 and cancels execution then. The same error will be shown to the user however he can work around it by refreshing the page – as stated by the error. I think that’s an acceptable behaviour for now: INSERT LINK

To verify this test:

1. Delete your ownCloud cookies
2. Increment the version in version.php
3. Try to upgrade
=> Before the patch: Instance shows an error, is set to upgrade mode and a refresh does not help
=> After the patch: Instance shows an error, a refresh helps though.

This is not really the best fix as a better solution would be to catch such situations when bootstrapping ownCloud, however, I don’t dare to touch base.php for this sake only, you never know what breaks then…

That said: There might be other bugs as well, especially the stacktrace is somewhat confusing but then again it installing ownCloud under /usr/share/owncloud/ and I bet that is part of the whole issue ;-)
2015-03-09 10:07:30 +01:00
Morris Jobke 674654c210 Merge pull request #14743 from owncloud/autoconfig-password
Convert 'abcpassword' to 'abcpass' during setup
2015-03-09 07:54:22 +01:00
Jenkins for ownCloud 174f8cef64 [tx-robot] updated from transifex 2015-03-09 01:54:36 -04:00
Jenkins for ownCloud 377165ae51 [tx-robot] updated from transifex 2015-03-08 01:54:36 -05:00
Robin McCorkell f43b047636 Convert 'abcpassword' to 'abcpass' during setup
This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php
2015-03-07 13:10:43 +00:00
Jenkins for ownCloud 73c2157171 [tx-robot] updated from transifex 2015-03-07 01:54:37 -05:00
Jenkins for ownCloud d11f040720 [tx-robot] updated from transifex 2015-03-06 01:54:52 -05:00
Morris Jobke f507601e25 Merge pull request #14582 from rullzer/avatar_fixes
Avatars in share dialog fixes
2015-03-04 10:30:09 +01:00
Morris Jobke f1d74e8803 Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins
Let users configure security headers in their Webserver
2015-03-04 09:36:01 +01:00
Jenkins for ownCloud 84785a6a39 [tx-robot] updated from transifex 2015-03-04 01:55:19 -05:00
Roeland Jago Douma c9272be0b9 Avatars in share dialog fixes
* Avatar for "xxxx share with you..." to the left
* Avatars for groups and remote shares (use default placeholder)
* Modified and added unit tests
* Use the same css for all the avatars in the dropdown
2015-03-03 20:57:50 +01:00
Vincent Petry b4cfc79b5a Added missing done() calls for async tests 2015-03-03 13:59:03 +01:00
Morris Jobke 9ddff4cec0 Merge pull request #14653 from sebomoto/fix_loading_feedback
fix for loading spinner reappearing after errors in db-connection
2015-03-03 10:12:48 +01:00
Jenkins for ownCloud e271fa3ee8 [tx-robot] updated from transifex 2015-03-03 01:55:50 -05:00
Sebastian Bolt 834f7039f0 fix for loading spinner reappearing after errors in db-connection 2015-03-02 21:58:06 +01:00
Lukas Reschke d620fc8798 Merge pull request #14615 from kampka/cron-command
Allow configuring background job mode from the console
2015-03-02 21:35:57 +01:00
Christian Kampka 83e0f84fef Allow configuring background job mode from the console 2015-03-02 20:51:40 +01:00
Lukas Reschke bbd5f28415 Let users configure security headers in their Webserver
Doing this in the PHP code is not the right approach for multiple reasons:

1. A bug in the PHP code prevents them from being added to the response.
2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud)
3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations.

This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
2015-03-02 19:07:46 +01:00
Joas Schilling 0f09989824 Maintenance mode message might be misleading 2015-03-02 09:51:25 +01:00
Jenkins for ownCloud 3f91e3757f [tx-robot] updated from transifex 2015-03-02 01:55:00 -05:00
Jenkins for ownCloud ff85d38c2a [tx-robot] updated from transifex 2015-03-01 01:54:38 -05:00
Jenkins for ownCloud 42f6448da2 [tx-robot] updated from transifex 2015-02-28 01:55:32 -05:00
Lukas Reschke 13b0b7dfaf Merge pull request #14585 from owncloud/fix-avatars-for-users-with-at
Use custom attribute instead of the div identifier
2015-02-27 18:40:53 +01:00
Lukas Reschke 92b5517229 Use custom attribute instead of the div identifier
Otherwise problems arrive when a username contains characters such as an `@`

Fixes https://github.com/owncloud/user_shibboleth/issues/38
2015-02-27 17:38:59 +01:00
Vincent Petry 22bc37cb82 Properly forward repair errors and warnings
This makes repair errors and warnings visible for the user when
upgrading on the command line or in the web UI.
2015-02-27 12:44:04 +01:00
Lukas Reschke 8818165e07 Fix avatars in master 2015-02-27 12:03:58 +01:00
Thomas Müller f72f9e0159 Merge pull request #14530 from owncloud/revert-14403
Revert "Updating license headers"
2015-02-27 00:39:29 -08:00
Jenkins for ownCloud d20061e5b1 [tx-robot] updated from transifex 2015-02-27 01:55:28 -05:00
Morris Jobke 55b3f6b986 Merge pull request #13969 from raimund-schluessler/master
Append search results to custom container
2015-02-26 15:16:23 +01:00
Morris Jobke a183b5d7e2 Merge pull request #14208 from owncloud/oc-msg-remove-object-dependency
Remove dependency from arbitrary data object structure for easier usage
2015-02-26 14:57:21 +01:00
Morris Jobke 06aef4e8b1 Revert "Updating license headers"
This reverts commit 6a1a4880f0.
2015-02-26 11:37:37 +01:00
Jenkins for ownCloud 8a4fddeb4a [tx-robot] updated from transifex 2015-02-26 01:55:50 -05:00
Lukas Reschke 921a76ae2e Merge pull request #14245 from cmeh/master
Message clean-up
2015-02-25 17:46:41 +01:00
Jenkins for ownCloud 31f881415b [tx-robot] updated from transifex 2015-02-25 01:55:51 -05:00
Thomas Müller 58cedc07b5 print app upgrade information to console as well 2015-02-24 12:52:16 +01:00
Thomas Müller bbf7f56f94 3rd-party apps are disabled on upgrade - refs #14026 2015-02-24 12:02:36 +01:00
Lukas Reschke e5c6af5102 Merge pull request #10599 from owncloud/move_passwordchange_text
Make the password changed msg inline to fix #10242
2015-02-24 11:54:17 +01:00
Jenkins for ownCloud cdb4cfd939 [tx-robot] updated from transifex 2015-02-24 01:54:58 -05:00
Thomas Müller e87ada86d1 Merge pull request #14416 from owncloud/setup-command
Setup command
2015-02-23 22:41:10 +01:00
Thomas Müller 66e3211fd8 Merge pull request #13439 from owncloud/app-filter
Make the search box filter apps
2015-02-23 21:51:53 +01:00
Thomas Müller eae6471105 Fix error handling 2015-02-23 17:46:08 +01:00
Thomas Müller bcd10d3dc5 implement command maintenance:install 2015-02-23 16:47:47 +01:00
Thomas Müller 1fd1b355e4 Fix namespace of OC_Setup -> \OC\Setup 2015-02-23 16:44:40 +01:00
Vincent Petry e144d3aa49 Added unit test for app filter 2015-02-23 15:29:25 +01:00
Jenkins for ownCloud 6a1a4880f0 Updating license headers 2015-02-23 12:13:59 +01:00
Jenkins for ownCloud ef09e5d395 [tx-robot] updated from transifex 2015-02-22 01:54:42 -05:00
Jenkins for ownCloud 906c0e7798 [tx-robot] updated from transifex 2015-02-21 01:54:38 -05:00
Joas Schilling c201bc01bb Remove dependency from arbitrary data object structure for easier usage 2015-02-20 10:43:39 +01:00
Jenkins for ownCloud 79ef5eda96 [tx-robot] updated from transifex 2015-02-20 01:55:01 -05:00
Lukas Reschke 602e563d99 Merge pull request #14366 from owncloud/remove-old-l10n-files
Remove some old l10n files they arent loaded anymore
2015-02-19 23:31:21 +01:00
Morris Jobke 75a7bcb10c Merge pull request #14199 from owncloud/cast-type-manually
Manually type-cast all AJAX files
2015-02-19 17:19:54 +01:00
Thomas Müller 767dd4bde7 Merge pull request #14267 from owncloud/encode-eventsource
Encode requesttoken
2015-02-19 16:21:12 +01:00
Thomas Müller 7cd3f17d9c Merge pull request #14311 from raimund-schluessler/Fix#14310
Fix #14310
2015-02-19 16:17:19 +01:00
Morris Jobke 0e47d1fcca Merge pull request #14338 from owncloud/fix-nav-heigt
If no link text has been set for the navigation show the link nonetheless
2015-02-19 13:11:53 +01:00
Joas Schilling e52a63eccb Remove some old l10n files they arent loaded anymore 2015-02-19 11:58:40 +01:00
Jenkins for ownCloud 294137dda6 [tx-robot] updated from transifex 2015-02-19 01:55:43 -05:00
Jan-Christoph Borchardt 83bc951630 Merge pull request #12213 from sebomoto/add-loadfeedback
Add loadfeedback
2015-02-18 19:42:18 +01:00
Bernhard Posselt a5074fa629 if no link text has been set for the navigation show the link nonetheless 2015-02-18 15:34:31 +01:00
cmeh 46c34d6867 Cleaning-up messages
**Changes:**

* In line 103, the middle "c" of "owncloud" is capitalised to "ownCloud".
* A space is inserted between value and unit in lines 177 and 187 ("4 GB" instead of "4GB").
2015-02-18 12:26:42 +01:00
Jenkins for ownCloud b9c39b60ec [tx-robot] updated from transifex 2015-02-18 01:55:40 -05:00
Raimund Schlüßler 958c1858f8 Fix #14310 2015-02-17 21:48:10 +01:00
Clark Tomlinson ac13cf04ba Merge pull request #14266 from owncloud/encodeUriComponentPerDefault
Encode parameters in `OC.generateUrl` by itself
2015-02-17 10:37:06 -05:00
Lukas Reschke 27c1409be5 Encode parameters in `OC.generateUrl` by itself
This function is often used in a wrong and potential dangerous way... Thus we should escape the URL per default and offer developers to disable the automatic escaping via an option parameter if they really want that behaviour.

Might break some things, however, those things are then easy to fix and we really have a ton of bugs caused by this...

Fixes https://github.com/owncloud/core/issues/14228
2015-02-17 14:41:06 +01:00
Lukas Reschke 20d57c8bfe Remove Null Byte Check
This is not relevant anymore since we require PHP 5.4
2015-02-17 14:19:20 +01:00
Vincent Petry e8f16db49d Merge pull request #13866 from rullzer/avatar_share_dialog
Avatars in share dialog
2015-02-17 10:17:36 +01:00
Jenkins for ownCloud 30ca14021c [tx-robot] updated from transifex 2015-02-17 01:56:23 -05:00
Lukas Reschke 912a536c17 Encode requesttoken
One cannot make any assumptions about the requesttoken content. Thus we need to encode it.
2015-02-16 20:28:30 +01:00
Thomas Müller 9271059195 Merge pull request #13750 from owncloud/enhanced-code-checker
Implement php code checker to detect usage of not allowed private ...
2015-02-16 16:55:57 +01:00
Lukas Reschke c6705ab574 Merge pull request #13890 from owncloud/add-no-referrer
Add `rel="noreferrer"` where possible and switch to HTTPS
2015-02-16 14:36:44 +01:00
cmeh 09a0bf22df Update setupchecks.js
Changed *"won't work"* to "will not work" (as proposed by @DeepDiver1975).
2015-02-16 10:25:01 +01:00
cmeh d89cf737ae Message clean-up
*Changes:*

* "… is not yet properly setup" in line 24 is changed to " … is not yet set up properly" (better word order and space in the middle of "set up", as it is a participle of the verb "to set up").
* "internet" is corrected to "Internet" with a capitalized "I" in lines 54 and 59.
* Also in line 54: "3rd party" is changed to "third-party" to for a more coherent spelling across the different ownCloud components.
* "… apps don´t work" is corrected to "… apps won't work" (with a proper (and hopefully correctly escaped) (apostrophe)[http://en.wikipedia.org/wiki/Apostrophe#Typographic_form] instead of the (acute accent)[http://en.wikipedia.org/wiki/Acute_accent]).
* Still in line 54: The negation is corrected from "… might also not work" to "… might not work, either".
2015-02-16 09:59:41 +01:00
Jenkins for ownCloud 786ff6a5a3 [tx-robot] updated from transifex 2015-02-16 01:54:30 -05:00
Jenkins for ownCloud 31c0cce092 [tx-robot] updated from transifex 2015-02-15 01:54:31 -05:00
Jenkins for ownCloud 2f851ff8bb [tx-robot] updated from transifex 2015-02-14 01:54:42 -05:00
Lukas Reschke a7df23ceba Manually type-case all AJAX files
This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support 🙈

Fixes https://github.com/owncloud/core/issues/14196 for core
2015-02-13 13:33:20 +01:00
Roeland Jago Douma 9a6da8e6e2 Extended avatar unit tests 2015-02-13 12:57:24 +01:00
Roeland Jago Douma 90218dcd4c Added config check 2015-02-13 12:17:22 +01:00
Jenkins for ownCloud 6b1ed4d688 [tx-robot] updated from transifex 2015-02-13 01:55:06 -05:00
Lukas Reschke dfcd4acd5a Merge pull request #13771 from owncloud/fix-humanfileSize
generate valid human readable text for 0
2015-02-12 18:34:54 +01:00
Roeland Jago Douma ecb7d44775 Small unit test rewrite 2015-02-12 17:05:59 +01:00
Roeland Jago Douma e952687dcd Added unit test 2015-02-12 16:50:14 +01:00
Roeland Jago Douma 47b96c9fa1 Added dependancy for the JS unit tests
Still not correct but it is a small step
2015-02-12 16:50:14 +01:00
Roeland Jago Douma 639a634cfd Display user avatar in share dialog 2015-02-12 16:50:14 +01:00
Morris Jobke c751ba0409 Merge pull request #14121 from Zillode/app-favicon
Disable application-specific favicons for non-user pages
2015-02-12 13:19:07 +01:00
Morris Jobke 4b2d80a34b add fix for checkmark icon for IE8 2015-02-12 10:31:55 +01:00
Jenkins for ownCloud e929d43bb6 [tx-robot] updated from transifex 2015-02-12 01:54:41 -05:00
Lode Hoste 27b35500a7 Disable application-specific favicons for non-user pages 2015-02-11 20:09:03 +01:00
Lukas Reschke 0119d429fc Second parameter is optional
Makes my IDE happier.
2015-02-11 14:01:22 +01:00
Jenkins for ownCloud 9baf7a0a3f [tx-robot] updated from transifex 2015-02-11 01:55:07 -05:00
Thomas Müller d74662df7d implement php code checker to detect usage of not allowed private APIs - including console command to check local code to be used by developers 2015-02-10 11:51:24 +01:00
Jenkins for ownCloud 124e48aec0 [tx-robot] updated from transifex 2015-02-10 01:55:06 -05:00
Joas Schilling 4172ba48d4 Deduplicate template code and do not translate the links 2015-02-09 16:01:52 +01:00
Jan-Christoph Borchardt 0d8b3afc32 Merge pull request #13958 from owncloud/fix-resize-overlap
Avoid dropdown to float under sidebar for mid narrow screens
2015-02-09 14:23:19 +01:00
Jenkins for ownCloud e2d4b3c123 [tx-robot] updated from transifex 2015-02-09 01:54:53 -05:00
Raimund Schlüßler c398e8e42e Fix variable already defined 2015-02-09 07:52:10 +01:00
Raimund Schlüßler fcc144ca74 Append search results to custom container
fixes #13968
2015-02-08 22:42:30 +01:00
Jenkins for ownCloud 60e771685e [tx-robot] updated from transifex 2015-02-08 01:54:53 -05:00
Morris Jobke b05e4e085c Merge pull request #13435 from Zillode/app-favicon
Allow application-specific favicons
2015-02-07 13:29:18 +01:00
Jenkins for ownCloud 4bf7b2c130 [tx-robot] updated from transifex 2015-02-07 01:54:35 -05:00
Morris Jobke 8b2e09a77e Avoid dropdown to float under sidebar for mid narrow screens 2015-02-06 22:44:08 +01:00
Jenkins for ownCloud 80e38b84dc [tx-robot] updated from transifex 2015-02-06 06:49:06 -05:00
cmeh 6abb28e2a6 Update installation.php
In line 161, "SQLite" has now the same capitalisation as in line 159.
2015-02-06 11:19:56 +01:00
Jenkins for ownCloud 988027fdca [tx-robot] updated from transifex 2015-02-06 15:26:04 -05:00
Jenkins for ownCloud bd60abbefc [tx-robot] updated from transifex 2015-02-06 01:57:07 -05:00
Thomas Müller d748368ecb Don't highly discourage 2015-02-05 17:21:10 +01:00
Bernhard Posselt 7a9d428d6f Merge pull request #13907 from owncloud/enhance-sqlite-warning
enhance sqlite warning on admin page as well as during setup
2015-02-05 13:07:56 +01:00
Jenkins for ownCloud 9adff77040 [tx-robot] updated from transifex 2015-02-05 01:54:49 -05:00
Sebastian Bolt 7ffd2557ff changed image to classed div for spinner animation 2015-02-04 22:27:38 +01:00
Thomas Müller f86c73c9f6 enhance sqlite warning on admin page as well as during setup - fixes #13906 2015-02-04 20:55:54 +01:00
Lukas Reschke b432ea29c9 Add `rel="noreferrer"` where possible and switch to HTTPS
Just to follow good practise and prevent some automated scanners to complain about "Cross-domain Referer leakage".
2015-02-04 16:25:37 +01:00
Jenkins for ownCloud 77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Thomas Müller 23c6a0cf99 Merge pull request #13843 from owncloud/fix-files-disabled
Fix disabled files app
2015-02-03 16:13:15 +01:00
Jenkins for ownCloud 6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Morris Jobke a7eedf0149 Disallow disabling of files app 2015-02-03 00:39:01 +01:00
Lukas Reschke ba29ea178f Add unit tests for empty token 2015-02-01 17:34:03 +01:00
Lukas Reschke 35afb0d22e Default to `null` for lostpassword
We oC 8 we use the `StringUtils::equals` method which will also verify the type, since we don't anylonger hash the token twice this is required in case somebody is able to invoke this route with an empty `$token`.
2015-02-01 17:07:10 +01:00
Jenkins for ownCloud a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Jenkins for ownCloud c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Thomas Müller ccc1f09627 generate valid human readable text for 0 - fixed #9342 2015-01-29 17:27:28 +01:00
Jenkins for ownCloud 55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Jenkins for ownCloud f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Morris Jobke 5b4fd12b5b add CSS to exception page - fixes #13747 2015-01-29 20:18:08 +01:00
Joas Schilling 3f8e850dc6 Indicate that the share owner is remote in the filelist 2015-01-27 12:32:32 +01:00
Thomas Müller 5da4071c45 Merge pull request #13621 from owncloud/system-config-multiset
Add a method to set/unset multiple config values with one write
2015-01-26 13:36:22 +01:00
Thomas Müller 9ad9d7bfbb naming fixes while reviewing 2015-01-26 12:59:25 +01:00
Jenkins for ownCloud a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Jenkins for ownCloud b8e1dd9c87 [tx-robot] updated from transifex 2015-01-24 01:54:51 -05:00
Joas Schilling 039397bd31 Use setConfigs() instead of calling setConfig() multiple times 2015-01-23 14:52:21 +01:00
Jenkins for ownCloud bc93a8f140 [tx-robot] updated from transifex 2015-01-23 01:55:06 -05:00
Morris Jobke 254a1fa12a Merge pull request #13314 from owncloud/login-hook-logout
Return false if the login is canceled in a hook
2015-01-22 23:34:19 +01:00
Robin Appelman 8a9acc5083 Allow custom error messages for the login page 2015-01-22 14:13:02 +01:00
Jenkins for ownCloud 5f3c6a97b2 [tx-robot] updated from transifex 2015-01-22 01:55:09 -05:00
Jenkins for ownCloud b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Morris Jobke ce47065d8f kill ancient code 2015-01-20 14:14:01 +01:00
Jenkins for ownCloud 2ac015256f [tx-robot] updated from transifex 2015-01-20 01:54:37 -05:00
Jenkins for ownCloud 3404bd8cdd [tx-robot] updated from transifex 2015-01-19 01:54:31 -05:00
Jenkins for ownCloud 31cd5185f1 [tx-robot] updated from transifex 2015-01-18 01:54:34 -05:00
Lode Hoste 96f81961ed Allow application-specific favicons 2015-01-18 00:19:33 +01:00
Jenkins for ownCloud 60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Jenkins for ownCloud a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Lukas Reschke 1b671afa17 Merge pull request #13323 from owncloud/move-search
Move search to core/search
2015-01-15 20:41:57 +01:00
Jenkins for ownCloud 4c233fef2a [tx-robot] updated from transifex 2015-01-15 01:54:41 -05:00
Morris Jobke dc17019536 adjust paths for search 2015-01-14 15:15:39 +01:00
Vincent Petry 99304be4ef Read version and product name from update template
During upgrade, the config settings aren't always available due to
base.php changes. This fix makes the update info page read the product
name and version from the update template, which already had them.
2015-01-14 11:31:42 +01:00
Jenkins for ownCloud f367bbb49d [tx-robot] updated from transifex 2015-01-14 01:55:16 -05:00
Morris Jobke a836479287 move search folder into core/ 2015-01-13 16:27:05 +01:00
Morris Jobke dc86cbd1e2 Merge pull request #13271 from owncloud/fix-table-prefix-oracle-master
Use a special filter expression for Oracle to filter the prefix - fixes ...
2015-01-13 10:31:04 +01:00
Jenkins for ownCloud 3ece0a7767 [tx-robot] updated from transifex 2015-01-13 01:56:58 -05:00
Thomas Müller 1d2bef0a01 Use a special filter expression for Oracle to filter the prefix - fixes #13220 2015-01-12 16:28:11 +01:00
Jenkins for ownCloud 9e550ab844 [tx-robot] updated from transifex 2015-01-12 01:55:52 -05:00
Volkan Gezer a1d86aab20 32-bit typo fix 2015-01-11 13:36:19 +01:00
Jenkins for ownCloud 3425c73815 [tx-robot] updated from transifex 2015-01-11 01:54:32 -05:00
Jenkins for ownCloud 22e5220c1f [tx-robot] updated from transifex 2015-01-10 01:54:35 -05:00
Morris Jobke da8228fa14 Merge pull request #13195 from owncloud/resharepermfix
Fix reshare permission issue
2015-01-09 18:05:05 +01:00
Thomas Müller 847dd6d04c Merge pull request #13205 from owncloud/remove-shared-icon
replace outdated 'shared' people icon with regular share icon as fallback
2015-01-09 16:40:26 +01:00
Jan-Christoph Borchardt c26e669c4c replace outdated 'shared' people icon with regular share icon as fallback 2015-01-09 16:18:42 +01:00
Vincent Petry c897a14d56 Fix reshare permission issue
The actual share permissions sent to the server on reshare are now based
on possiblePermissions + permissions inherited from parent share
2015-01-09 15:19:53 +01:00
Thomas Müller 1f1643b35f Merge pull request #12995 from owncloud/tbelau666-master
Use Doctrines filter by table name
2015-01-09 14:17:14 +01:00
Lukas Reschke a5099b01f9 Merge pull request #12984 from owncloud/ldap-user-cleanup-master
Ldap user cleanup master
2015-01-09 10:47:02 +01:00
Jenkins for ownCloud d4fc2f555b [tx-robot] updated from transifex 2015-01-09 01:55:22 -05:00
Lukas Reschke 6c59253978 Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-files
Verify whether type is correct
2015-01-09 02:27:51 +01:00
Lukas Reschke ceaaab6295 Verify whether type is correct
`$this->info` can very well contain an empty array or possibly other values. This means that when this code path is called a PHP Fatal error might get thrown which is not what we want.
2015-01-08 18:38:17 +01:00
Morris Jobke 8e1904386f Add timeout for notifications
* options for timeout in seconds and if it contains HTML
* if timeout is 0 it will show the message permanently
* removes the notification after a given (default: 5 seconds) timeframe
* based on work by @brantje
* provide JS unit tests for notifications
2015-01-08 13:06:45 +01:00
Jenkins for ownCloud 6bda95037f [tx-robot] updated from transifex 2015-01-08 01:56:00 -05:00
Morris Jobke bfb6e350d5 Merge pull request #13016 from owncloud/sharing_fixes
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 18:14:53 +01:00
Bjoern Schiessle e9e7ee67d3 shareType and permissions are integers 2015-01-07 16:36:13 +01:00
Morris Jobke 5ce295907f Merge pull request #12687 from owncloud/auto-escape-t-placeholders
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
Morris Jobke bfdf0db7c0 Autoescape of placeholders in t() and p() - for JS
* add disableEscape parameter to disable this functionality
* drop usage of escapeHTML() that is now done inside t()
* add unit test for escaped and not escaped placeholder
* proper JSDoc
2015-01-07 12:56:32 +01:00
Arthur Schiwon ae9c9a46b8 inject and use user manager to delete command instead of using old static oc_user way 2015-01-07 12:21:28 +01:00
Jenkins for ownCloud 2daf90dae6 [tx-robot] updated from transifex 2015-01-07 01:55:42 -05:00