Bjoern Schiessle
2c8fa54881
set logger in constructor
2015-07-28 16:32:11 +02:00
Jenkins for ownCloud
c683b1d3c9
[tx-robot] updated from transifex
2015-07-28 01:55:00 -04:00
Lukas Reschke
b344e40acc
Allow classes in <h2> tags
...
Previously something like `<h2 class="inlineblock"><?php p($l->t('Some title')) ?></h2>` was shown as `<h2 class="inlineblock">Some title` within the sidebar instead as `Some Title` due to the fact that the regex was catching these classes but was not properly running the string replace function.
2015-07-26 23:00:50 +02:00
Jenkins for ownCloud
5da44c69cb
[tx-robot] updated from transifex
2015-07-26 01:54:56 -04:00
Jenkins for ownCloud
1e48eb8882
[tx-robot] updated from transifex
2015-07-25 01:54:48 -04:00
Jenkins for ownCloud
b757f9c893
[tx-robot] updated from transifex
2015-07-24 01:54:54 -04:00
Roeland Douma
0e6c4e1902
Merge pull request #17818 from owncloud/fix-password-change-error-always-shows-default-error
...
assign password change error message to correct object
2015-07-23 16:15:19 +02:00
Jenkins for ownCloud
9ccf94ca06
[tx-robot] updated from transifex
2015-07-23 01:55:22 -04:00
michag86
3841bb1c07
assign error message to correct object
...
fix for #17817
2015-07-22 18:42:46 +02:00
Jan-Christoph Borchardt
780a2ed093
use arrow to indicate external link, use correct quotes and capitalization
2015-07-22 14:20:55 +02:00
Bjoern Schiessle
50cbb57065
make sure that there is a space between user- and admin-documentation
2015-07-22 14:02:43 +02:00
Bjoern Schiessle
3000f0125f
don't move keys if the key where already moved in a previous migration run
2015-07-17 15:19:10 +02:00
Jenkins for ownCloud
8723410319
[tx-robot] updated from transifex
2015-07-17 01:54:52 -04:00
Thomas Müller
d6f02eb703
Merge pull request #17500 from owncloud/encryption_migration_improvements
...
Only clean up if migration finished succesfully
2015-07-16 14:03:21 +02:00
Morris Jobke
533a23611a
Handle returned null value in app level code
...
* getApplication on OCSClient can also return null
this is now handled properly
* fixes #17587
2015-07-13 15:34:00 +02:00
Jenkins for ownCloud
bfd7194cf9
[tx-robot] updated from transifex
2015-07-11 01:54:51 -04:00
Jenkins for ownCloud
176dabd976
[tx-robot] updated from transifex
2015-07-10 01:54:55 -04:00
Jenkins for ownCloud
6d9bb17360
[tx-robot] updated from transifex
2015-07-09 01:54:53 -04:00
Bjoern Schiessle
85c3b9d5cf
only cleanUp the remaining keys if the migration really finished succesfully
2015-07-08 18:23:18 +02:00
Jenkins for ownCloud
2fd84607ee
[tx-robot] updated from transifex
2015-07-08 01:55:28 -04:00
Jenkins for ownCloud
ee5dd25290
[tx-robot] updated from transifex
2015-07-07 01:55:18 -04:00
Jenkins for ownCloud
55f4d0eea1
[tx-robot] updated from transifex
2015-07-05 01:54:50 -04:00
Thomas Müller
1385b1ec48
Remove OC_Appconfig
2015-07-03 18:00:16 +02:00
Thomas Müller
d3ac73c0c9
Remove OC_Log
2015-07-03 18:00:16 +02:00
Jenkins for ownCloud
b8f5b2c47a
[tx-robot] updated from transifex
2015-07-03 01:54:57 -04:00
Vincent Petry
d5b7e40c19
Unit test for app list
2015-07-02 17:22:56 +02:00
Vincent Petry
2f6dc8743e
Fix global app list state
2015-07-02 17:15:14 +02:00
Jenkins for ownCloud
d2e1cae331
[tx-robot] updated from transifex
2015-07-02 01:59:26 -04:00
Lukas Reschke
1db047a336
Add missing version field
2015-06-29 15:09:57 +02:00
Lukas Reschke
b56af26199
Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store
...
Send OC version to appstore so it can reply with the right links
2015-06-29 15:07:00 +02:00
Lukas Reschke
5810e7ab87
Merge pull request #17050 from owncloud/request-status-from-ocs
...
Request approved state for disabled apps with ocsid
2015-06-29 13:41:11 +02:00
Joas Schilling
ae3d402dbc
Send OC version to appstore so it can reply with the right links
2015-06-29 12:14:07 +02:00
Lukas Reschke
30145c0b52
Also load enabled apps
2015-06-29 11:38:28 +02:00
Jenkins for ownCloud
733d59ed44
[tx-robot] updated from transifex
2015-06-29 01:54:44 -04:00
Jenkins for ownCloud
4d565a8447
[tx-robot] updated from transifex
2015-06-28 01:55:19 -04:00
Lukas Reschke
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
Jenkins for ownCloud
28c223edc6
[tx-robot] updated from transifex
2015-06-27 01:55:58 -04:00
Thomas Müller
8cc88fa64f
Merge pull request #17190 from owncloud/lock-changelabel
...
Rename experimental to transactional file locking
2015-06-26 12:27:16 +02:00
Vincent Petry
eadf789519
Rename experimental to transactional file locking
2015-06-26 11:10:10 +02:00
Jenkins for ownCloud
b1e29c7dde
[tx-robot] updated from transifex
2015-06-26 01:55:35 -04:00
Morris Jobke
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
Jenkins for ownCloud
dddbfb903f
[tx-robot] updated from transifex
2015-06-25 01:55:15 -04:00
Jenkins for ownCloud
ceb80ac123
[tx-robot] updated from transifex
2015-06-24 01:55:55 -04:00
Joas Schilling
e0fb5f4b5e
Accept this language change at your own risk
2015-06-23 10:59:15 +02:00
Jenkins for ownCloud
3cad0d4ed2
[tx-robot] updated from transifex
2015-06-23 01:56:15 -04:00
Jenkins for ownCloud
c77e44117d
[tx-robot] updated from transifex
2015-06-22 01:55:00 -04:00
Jenkins for ownCloud
59513ac377
[tx-robot] updated from transifex
2015-06-21 01:55:06 -04:00
Jenkins for ownCloud
183bd6dd49
[tx-robot] updated from transifex
2015-06-20 01:55:10 -04:00
Lukas Reschke
00a65e30ce
Request approved state for disabled apps with ocsid
...
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.
With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.
Fixes https://github.com/owncloud/core/issues/17003
2015-06-19 19:04:54 +02:00
Joas Schilling
6adddb3095
Merge pull request #16889 from owncloud/group-sorting-fixes
...
Only sort by group name when LDAP is involved
2015-06-19 08:29:25 +02:00