Commit Graph

31991 Commits

Author SHA1 Message Date
Roeland Jago Douma 9504500e5f
Move \OC\User to PSR-4 2016-05-10 19:53:36 +02:00
Roeland Jago Douma c51ebb02fa
Move OC_User_XX to legacy folder 2016-05-10 19:53:36 +02:00
Morris Jobke 0543f8a839 Merge pull request #24397 from owncloud/sort-share-links
Reordered share link settings
2016-05-10 18:42:10 +02:00
Vincent Petry 510724716d Merge pull request #24401 from owncloud/trash-list-cache
use the cache for trash listing
2016-05-10 17:12:49 +02:00
Thomas Müller 67163262e4 Merge pull request #24534 from owncloud/fix_phpdoc
Fix phpdoc
2016-05-10 14:36:54 +02:00
Roeland Jago Douma e74323ca90
Fix phpdoc 2016-05-10 12:43:35 +02:00
Lukas Reschke e8e72aa910 Merge pull request #24434 from owncloud/permalinks
Permalinks
2016-05-10 09:44:50 +02:00
Jenkins for ownCloud 1fb7be42e5 [tx-robot] updated from transifex 2016-05-10 03:30:51 -04:00
Thomas Müller 51d7c87551 Merge pull request #24500 from owncloud/updater-server-configurable
Make update server URL configurable
2016-05-09 17:41:25 +02:00
Thomas Müller 885c842100 Merge pull request #24491 from owncloud/new-animated-full-css-spinner
New animated loader: full css
2016-05-09 11:32:32 +02:00
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
skjnldsv ea3cc2661d New animated loader 2016-05-09 07:54:43 +02: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
Vincent Petry 254576e1f7
Do not encode slashes in "dir" URL param in files JS 2016-05-06 17:00:22 +02:00
Vincent Petry caefe23bb6
Send permalink in internal share notification emails 2016-05-06 16:46:59 +02:00
Vincent Petry 112b703df0
Add anchor icon in sidebar to copy permalink 2016-05-06 16:46:59 +02:00
Vincent Petry fdeafef6a0
Auto-add fileid in URL for currently displayed folder 2016-05-06 16:46:59 +02:00
Vincent Petry 093e9dd422
Add route to resolve fileid to files app URL
The following routes will redirect to the files app and display the
matching folder. If the fileid is a file, it will scroll to it.
- http://localhost/owncloud/index.php/f/$fileid
- http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid
2016-05-06 16:46:59 +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