Commit Graph

26380 Commits

Author SHA1 Message Date
Lukas Reschke db4cb1dd4d Expire token after 12h and if user logged-in again
As an hardening measure we should expire password reset tokens after 12h and if the user has logged-in again successfully after the token was requested.
2015-08-22 20:42:45 +02:00
Robin McCorkell 510010e774 Merge pull request #18472 from owncloud/ext-array-filter
Replace array_filter() with foreach for PHP <5.6
2015-08-21 11:39:08 +01:00
Robin McCorkell 2992a1aa88 Merge pull request #18395 from owncloud/hide-empty-security-warning
[admin settings] Show success message if security warnings are empty
2015-08-21 11:38:40 +01:00
Robin McCorkell 843135e4ff Replace array_filter() with foreach for PHP <5.6
ARRAY_FILTER_USE_KEY is PHP 5.6+
2015-08-21 10:13:15 +01:00
Morris Jobke 63a1f9afac add success message 2015-08-21 11:09:01 +02:00
Thomas Müller f5bbe727df Merge pull request #18456 from owncloud/fix-unrelated-cron-errors
Clear cron errors on change of background job mode
2015-08-21 10:52:09 +02:00
Vincent Petry a930fe5864 Merge pull request #18471 from hasso/shorts-fix
Make short versions of weekday/month names translatable
2015-08-21 10:48:10 +02:00
Morris Jobke ac086a11c1 Merge pull request #18426 from owncloud/joblist-next-non-existing
handle non existing job classes in $jobList->getNext
2015-08-21 10:34:33 +02:00
Morris Jobke c87042905c Merge pull request #18468 from owncloud/sharing_availability_fix
Storage availability fixes for files_sharing and FailedStorage
2015-08-21 10:23:10 +02:00
Hasso Tepper acc5a7d6cc Make short versions of weekday/month names translatable 2015-08-21 10:17:36 +03:00
Robin McCorkell 5ded5c6fc1 Add availability methods to files_external FailedStorage 2015-08-20 22:47:57 +01:00
Robin McCorkell 99b54e102d Prevent shares being added to oc_storages via availability 2015-08-20 22:43:46 +01:00
Robin McCorkell 5f5c3520c9 Merge pull request #18457 from owncloud/test-traits
Move common test logic to re-usable traits
2015-08-20 22:28:54 +01:00
Thomas Müller 0451cc0060 Merge pull request #18459 from owncloud/files-detailtabview-namespace
Add namespace in case the file is loaded individually
2015-08-20 18:16:11 +02:00
Vincent Petry 7c64ae4663 Add namespace in case the file is loaded individually
Some apps might load this file in JS unit tests and need the OCA.Files
namespace to exist.
2015-08-20 17:54:52 +02:00
Robin Appelman 24a2fff946 add test mountprovider logic to a trait 2015-08-20 16:39:32 +02:00
Joas Schilling 9573d7d60d Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-activities
Issue 18358 object type and id for activities
2015-08-20 15:53:36 +02:00
Joas Schilling c58316b1ae Expand the doc blocks on the new methods 2015-08-20 15:35:24 +02:00
Robin Appelman 3dbfbdaf54 allow moving common test logic into traits 2015-08-20 15:17:14 +02:00
Robin McCorkell 337898343c Merge pull request #18453 from owncloud/update-wording
fix wording of update header
2015-08-20 14:16:26 +01:00
Morris Jobke e8c3eb7473 Clear cron errors on change of background job mode
* fixes #18454
2015-08-20 14:51:28 +02:00
Robin McCorkell d93bf35482 Merge pull request #18408 from owncloud/ext-ocp
Use OCP classes as much as possible in files_external v2
2015-08-20 13:09:12 +01:00
Robin McCorkell 67893ca839 Merge pull request #18380 from owncloud/files-sidebar-selectbar
Fix files select bar width when app sidebar is visible
2015-08-20 12:35:33 +01:00
Morris Jobke d725de505e Merge pull request #18439 from owncloud/fix-appmanagement-install
[app management] fix dependency check on install
2015-08-20 13:26:55 +02:00
Joas Schilling 6697844c01 Remove unnecessary code 2015-08-20 13:10:11 +02:00
Jan-Christoph Borchardt f21cf516da fix wording of update header 2015-08-20 12:59:13 +02:00
Morris Jobke c7b0d50cb2 Merge pull request #18369 from owncloud/occ-log
occ commands to manage logging
2015-08-20 12:57:05 +02:00
Vincent Petry 28e58594ba Merge pull request #18437 from owncloud/ext-auth-trigger
Trigger storage recheck on auth mechanism change
2015-08-20 11:58:18 +02:00
Morris Jobke 06d8edd963 Merge pull request #17434 from owncloud/update-showappnameonappupdate
Display app names in update page for app updates
2015-08-20 11:50:01 +02:00
Morris Jobke 2fe070ca37 Merge pull request #18447 from owncloud/ext-fix-empty-var
Don't use `empty()` with a return value, PHP 5.4
2015-08-20 11:36:12 +02:00
Vincent Petry a2674b2b30 Additions to update page
Apps to update and to disable will always be shown.
Main title changes only when apps need updated, not core.
Added bullet style.
Exclude incompatible apps from updated apps list.
2015-08-20 11:14:30 +02:00
Joas Schilling 389a32e92a Add test coverage for Activity Event and Manager 2015-08-20 10:25:49 +02:00
Vincent Petry 3e7e7511ca Merge pull request #18438 from owncloud/ext-session-fix
Fix 'Declaration of SessionStorageWrapper::__construct()...'
2015-08-20 10:23:16 +02:00
Robin McCorkell 6907a88d14 Don't use `empty()` with a return value, PHP 5.4 2015-08-20 01:03:45 +01:00
Morris Jobke 29decf698c [app management] fix dependency check on install 2015-08-19 21:32:56 +02:00
Robin McCorkell 8cd47e4f03 Fix 'Declaration of SessionStorageWrapper::__construct()...' 2015-08-19 20:14:56 +01:00
Robin McCorkell dc335ba5a9 Trigger storage recheck on auth mechanism change 2015-08-19 20:11:29 +01:00
Morris Jobke 08161027c4 Merge pull request #18403 from owncloud/do-not-delete-group-if-empty
Do not delete group if empty, hide delete icon for group admin
2015-08-19 21:07:04 +02:00
michag86 3a6d273265 do not remove empty group in gui by js 2015-08-19 20:05:52 +02:00
Morris Jobke b3356b1288 Merge pull request #18432 from owncloud/ext-backends.simple
Migrate simple external storage backends to new registration API [part 1]
2015-08-19 20:04:20 +02:00
Robin Appelman 9dda39bf48 Merge pull request #18433 from owncloud/get-mountpoints-return
add missing return statements in getSystem/getPersonalMountPoints
2015-08-19 19:31:36 +02:00
Thomas Müller 313cb092f9 Merge pull request #18427 from owncloud/fix-format-ocs
Fix format of log/private/ocs.php
2015-08-19 19:09:32 +02:00
Vincent Petry b919ae96f0 Display app names in update page for app updates
Whenever the update page is displayed for apps, show app names instead
of the core update text.
2015-08-19 18:03:35 +02:00
Morris Jobke 6900dbdaff Merge pull request #18430 from owncloud/add-warning-ca-bundle
Add warning for not existing CA bundle when updating
2015-08-19 17:51:26 +02:00
Joas Schilling 4314c8fc6f Use an IEvent object instead of a huge parameter list 2015-08-19 17:44:57 +02:00
Joas Schilling e985dcc5a0 Send the file id when dealing with remote share responses 2015-08-19 17:44:57 +02:00
Joas Schilling bc2aa14849 Extend the interfaces IManager and IConsumer to allow passing in the object 2015-08-19 17:44:57 +02:00
Robin McCorkell d577aad4ac Use OCP classes as much as possible in files_external 2015-08-19 15:26:38 +01:00
Robin Appelman 273c776eb7 add missing return statements in getSystem/getPersonalMountPoints 2015-08-19 16:26:33 +02:00
Morris Jobke 4c93a07196 Merge pull request #18424 from owncloud/filter-objectstore-password-from-config-list
Filter the objectstore password from the config list as well
2015-08-19 16:24:01 +02:00