Lukas Reschke
8b428d84c0
Make update server URL configurable
...
Currently testing the updates is a big problem and not really super easy possible. Since we now have a new updater server we should also make this configurable so that people can properly test updates.
2016-05-09 11:25:58 +02:00
Thomas Müller
a502de0d28
Merge pull request #24419 from owncloud/allow-di-for-migration-steps
...
Allow migration steps to use automatic DI
2016-05-09 09:56:56 +02:00
Morris Jobke
5ff2d59cd4
Merge pull request #24473 from owncloud/fix-oracle-ci
...
Wait a while even after successful conect ...
2016-05-09 09:43:04 +02:00
Thomas Müller
0f87318462
Merge pull request #24492 from owncloud/fix_unit_tests_24457
...
Fix unit tests broken after #24457
2016-05-09 09:03:00 +02:00
Roeland Jago Douma
108bd26856
Fix unit tests broken after #24457
...
Timeout was increased but tests were not updated.
2016-05-09 08:54:30 +02:00
Morris Jobke
fdda980c2f
Merge pull request #24466 from owncloud/issue_13936_wording_ldap
...
wording in LDAP wizard
2016-05-09 08:27:00 +02:00
Thomas Müller
2c76b9ba77
Merge pull request #24457 from JetUni/patch-1
...
Set higher timeout limit
2016-05-09 08:24:37 +02:00
Thomas Müller
50c5a750ee
Merge pull request #24490 from owncloud/capability_psr4
...
Move \OCP\Capabilities to PSR-4
2016-05-09 08:24:10 +02:00
Jenkins for ownCloud
10e0fc0629
[tx-robot] updated from transifex
2016-05-09 02:08:23 -04:00
Roeland Jago Douma
b6b35b55c7
Move \OCP\Capabilities to PSR-4
2016-05-09 07:30:56 +02:00
Thomas Müller
6b10693602
Merge pull request #24483 from owncloud/backgroundjob_psr4
...
Move \OCP\BackgroundJob to PSR-4
2016-05-09 07:22:46 +02:00
Jenkins for ownCloud
5d35844aff
[tx-robot] updated from transifex
2016-05-08 01:54:53 -04:00
Roeland Jago Douma
fd371700a2
Move \OCP\BackgroundJob to PSR-4
2016-05-07 12:15:59 +02:00
Morris Jobke
d30fdb5f2d
Merge pull request #24475 from owncloud/appframework_psr4
...
Move \OCP\AppFramework to PSR-4
2016-05-07 11:04:05 +02:00
Jenkins for ownCloud
956c3f2719
[tx-robot] updated from transifex
2016-05-07 01:54:56 -04:00
Roeland Jago Douma
e47b186d51
Move \OCP\AppFramework to PSR-4
2016-05-06 20:38:34 +02:00
Thomas Müller
59c4ea2c8d
Use docker for mysql as well - optionally
2016-05-06 19:36:44 +02:00
Thomas Müller
e2d8a4544d
Wait a while even after successful conect ...
2016-05-06 17:57:28 +02:00
Lukas Reschke
09c507246d
Merge pull request #24468 from owncloud/app_psr4
...
Move \OCP\App to PSR-4
2016-05-06 16:18:17 +02:00
Vincent Petry
47157bcd76
Merge pull request #24400 from owncloud/cache_shareManager
...
Cache shareManager
2016-05-06 14:25:30 +02:00
Roeland Jago Douma
ec8298c493
Move \OCP\App to PSR-4
2016-05-06 13:32:46 +02:00
Thomas Müller
c9601efe95
Merge pull request #24455 from owncloud/activity_psr4
...
Move \OCP\Activity to PSR-4
2016-05-06 12:59:12 +02:00
Roeland Jago Douma
5f0aff5232
Update .mention-bot for lib/public/Activity
2016-05-06 09:28:29 +02:00
Jenkins for ownCloud
6a95af0a4b
[tx-robot] updated from transifex
2016-05-06 01:54:56 -04:00
Jarrett
482bfae123
Set higher timeout limit
...
Set the timeout limit to be 20 instead of 5 for machines that take longer to load the apps from apps.owncloud.org so that it doesn't show up blank.
2016-05-05 14:20:46 -06:00
Roeland Jago Douma
9185517bf0
Move \OCP\Activity to PSR-4
2016-05-05 20:25:08 +02:00
Jenkins for ownCloud
48be0b781a
[tx-robot] updated from transifex
2016-05-05 01:55:08 -04:00
davicente
452eeeb344
wording in LDAP wizard
2016-05-04 17:25:44 +01:00
Thomas Müller
ba99867033
Merge pull request #24435 from owncloud/fix-log-usage
...
Fix usages of OC\Log\Owncloud
2016-05-04 15:39:32 +02:00
Morris Jobke
873849e843
Merge pull request #24432 from owncloud/issue-24270-never-save-app-language-into-request-lang
...
Do not save the language as request lang for apps when we didn't find…
2016-05-04 13:47:08 +02:00
Joas Schilling
3ff314c6f2
Fix usages of OC\Log\Owncloud
2016-05-04 10:37:52 +02:00
Björn Schießle
61be98f554
Merge pull request #24410 from owncloud/fix_24182
...
first call the post_login hooks, before we call getUserFolder.
2016-05-04 10:23:38 +02:00
Joas Schilling
9fbb8ce302
Do not save the language as request lang for apps when we didn't find any
2016-05-04 08:28:13 +02:00
Jenkins for ownCloud
cd7f4ed96f
[tx-robot] updated from transifex
2016-05-04 02:11:59 -04:00
Roeland Douma
2e4b41550e
Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifications
...
Move comments, systemtags and updatenotifications to PSR-4
2016-05-04 08:03:11 +02:00
Roeland Douma
b059aac143
Merge pull request #24411 from owncloud/share_psr4
...
Move \OC\Share to PSR-4
2016-05-04 07:47:52 +02:00
blizzz
2fd4f1a775
Merge pull request #24396 from owncloud/ctrlEnter-submit-comment
...
Adds functionality to submit comment on ctrl+Enter
2016-05-03 22:24:17 +02:00
Thomas Müller
4b2544925f
Merge pull request #23844 from owncloud/disable-user
...
Add occ commands to enable and disable a user + a disabled user can n…
2016-05-03 15:22:41 +02:00
Joas Schilling
dda949e915
Allow migration steps to use automatic DI
2016-05-03 15:16:39 +02:00
Lukas Reschke
df2eb96cc4
Merge pull request #24389 from owncloud/login-by-email
...
Allow login by email address
2016-05-03 13:44:38 +02:00
Roeland Jago Douma
f90acb1b53
Move \OC\Share to PSR-4
2016-05-03 12:39:13 +02:00
Vincent Chan
5f2a19e965
fixes indentation
2016-05-03 12:29:43 +02:00
Vincent Chan
bc0d136511
adds functionality to submit comments with cmd+Enter
2016-05-03 12:26:05 +02:00
Thomas Müller
06293783e0
Merge pull request #24387 from owncloud/locking-mark-reload-free
...
free up memory when releasing the last shared lock
2016-05-03 12:03:41 +02:00
Thomas Müller
f8c04a4219
Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xml
...
Declare cron jobs in info.xml
2016-05-03 12:03:28 +02:00
Thomas Müller
15a479fb96
Merge pull request #24408 from owncloud/improve-server-container
...
Improve server container
2016-05-03 12:03:09 +02:00
Thomas Müller
66bc092724
Merge pull request #24405 from owncloud/user_db_capped_cache
...
Use a CappedCache in the user database backend
2016-05-03 11:54:21 +02:00
Thomas Müller
3f944753e6
Merge pull request #24404 from owncloud/log_psr4
...
Move from OC_Log_XX to \OC\Log
2016-05-03 11:45:27 +02:00
Björn Schießle
8c0984d605
first call the post_login hooks, before we call getUserFolder.
...
The login process needs to be completed before we can safely create
the users home folder. For example we need to give encryption a chance
to initialize the users encryption keys in order to copy the skeleton
files correctly
2016-05-03 10:46:05 +02:00
Joas Schilling
61ce4f4ef3
Add methods to public interface
2016-05-03 10:30:15 +02:00