Bjoern Schiessle
|
cabe92ef12
|
Merge branch 'master' into decrypt_files_again
Conflicts:
apps/files_encryption/tests/keymanager.php
|
2013-08-17 13:15:22 +07:00 |
Thomas Müller
|
264ee9df9a
|
Merge pull request #4476 from owncloud/doc-on-master
fix difference between packaged version and master
|
2013-08-17 03:13:17 +07:00 |
|
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +07:00 |
Morris Jobke
|
746d32eb05
|
fix difference between packaged version and master
|
2013-08-17 10:33:11 +07:00 |
Jan-Christoph Borchardt
|
1e8849b04e
|
Merge pull request #4314 from owncloud/css-fixes
Design fixes
|
2013-08-16 01:05:29 +07:00 |
|
Jenkins for ownCloud
|
6bd0ba79df
|
[tx-robot] updated from transifex
|
2013-08-16 01:32:30 +07:00 |
|
Jan-Christoph Borchardt
|
399adf67b0
|
merge master into css-fixes
|
2013-08-16 00:29:43 +07:00 |
|
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 +07:00 |
|
Bjoern Schiessle
|
53bb89824d
|
check if some encrypted files are left after the app was disabled and warn the user
|
2013-08-12 17:25:27 +07:00 |
|
Jan-Christoph Borchardt
|
4c0ec974b9
|
Merge pull request #4344 from owncloud/appmgmt-in-navigation
show 'More apps' link to app administration directly in app navigation
|
2013-08-09 08:49:41 +07:00 |
|
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 +07:00 |
|
Jan-Christoph Borchardt
|
8652137ad6
|
Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
|
2013-08-08 07:31:01 +07:00 |
|
Jan-Christoph Borchardt
|
31d50288a5
|
draw attention to the newly added app entry by flashing it twice
|
2013-08-07 21:54:28 +07:00 |
|
Jan-Christoph Borchardt
|
7a9daa99d1
|
scroll the app navigation down so the newly added app is seen
|
2013-08-07 21:53:53 +07:00 |
|
Jan-Christoph Borchardt
|
775f33cc1b
|
prepend the new app before the 'More apps' function
|
2013-08-07 21:53:25 +07:00 |
|
Jan-Christoph Borchardt
|
367b248bc0
|
show 'More apps' link to app administration directly in app navigation
|
2013-08-07 18:18:09 +07:00 |
|
Jenkins for ownCloud
|
0deae7b86f
|
[tx-robot] updated from transifex
|
2013-08-07 09:04:32 +07:00 |
|
Jenkins for ownCloud
|
9923fe655b
|
[tx-robot] updated from transifex
|
2013-08-04 02:01:28 +07:00 |
|
Jenkins for ownCloud
|
17fe748abc
|
[tx-robot] updated from transifex
|
2013-08-03 01:56:46 +07:00 |
|
Jenkins for ownCloud
|
16726ab793
|
[tx-robot] updated from transifex
|
2013-08-02 02:00:45 +07:00 |
Victor Dubiniuk
|
0c1008bb69
|
Some styling to user list
|
2013-08-01 19:53:41 +07:00 |
|
Jenkins for ownCloud
|
b037f2dc6e
|
[tx-robot] updated from transifex
|
2013-08-01 01:57:04 +07:00 |
|
Jan-Christoph Borchardt
|
8eaa0e7336
|
remove table layout for background jobs
|
2013-07-31 10:04:02 +07:00 |
|
Jenkins for ownCloud
|
761f40328c
|
[tx-robot] updated from transifex
|
2013-07-31 02:01:45 +07:00 |
|
Bjoern Schiessle
|
c7eba69aea
|
only show decrypt all files option if encrypted files are available
|
2013-07-30 12:26:07 +07:00 |
|
Bjoern Schiessle
|
a7a7ef2b3a
|
improved error handling
|
2013-07-30 09:48:30 +07:00 |
|
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 +07:00 |
|
Bjoern Schiessle
|
b6fa0e4eef
|
working decrypt files method
|
2013-07-29 17:06:05 +07:00 |
|
Björn Schießle
|
830f5d24c7
|
add decryptall.php
|
2013-07-29 13:39:56 +07:00 |
|
Björn Schießle
|
0a3d662dd0
|
register decrypt all route
|
2013-07-29 13:39:37 +07:00 |
|
Björn Schießle
|
e15e394fcc
|
add ajax call to decrypt all files
Conflicts:
apps/files_encryption/lib/crypt.php
|
2013-07-29 13:39:05 +07:00 |
|
Björn Schießle
|
2c8e5ec84f
|
user interface to allow user to decrypt all his files once the encryption app was disabled
Conflicts:
settings/templates/personal.php
|
2013-07-29 13:36:06 +07:00 |
|
Jenkins for ownCloud
|
0fde473cb7
|
[tx-robot] updated from transifex
|
2013-07-29 01:57:04 +07:00 |
|
Jenkins for ownCloud
|
48621115c1
|
[tx-robot] updated from transifex
|
2013-07-28 01:58:28 +07:00 |
|
Jenkins for ownCloud
|
fa35650e0a
|
[tx-robot] updated from transifex
|
2013-07-27 02:03:03 +07:00 |
kondou
|
92af840a51
|
Merge branch 'master' into css_cleanup_kondou
Conflicts:
core/css/styles.css
settings/templates/personal.php
|
2013-07-24 20:35:00 +07:00 |
|
Björn Schießle
|
75fd6d4fde
|
initialize OC_Defaults in template constructorX
|
2013-07-24 11:51:21 +07:00 |
|
Thomas Müller
|
1a73e607bd
|
Merge branch 'master' into more-themable-strings
Conflicts:
lib/template.php
|
2013-07-24 09:35:33 +07:00 |
|
Jenkins for ownCloud
|
7bb6aab8ee
|
[tx-robot] updated from transifex
|
2013-07-24 01:57:21 +07:00 |
|
Thomas Müller
|
840e96cda3
|
Merge branch 'master' into disable-anon-upload-master
Conflicts:
settings/templates/admin.php
|
2013-07-22 11:55:20 +07:00 |
|
Thomas Müller
|
934f2e94a3
|
Merge branch 'master' into disable-anon-upload-master
|
2013-07-22 11:36:52 +07:00 |
|
Morris Jobke
|
342a54bf7b
|
Merge pull request #2980 from owncloud/===_and_!==_in_settings
Use !== and === in settings.
|
2013-07-22 02:32:40 +07:00 |
|
Jenkins for ownCloud
|
01f3f8e0cc
|
[tx-robot] updated from transifex
|
2013-07-22 02:03:23 +07:00 |
|
kondou
|
05084e03a0
|
Use !== and === in settings.
|
2013-07-21 13:55:25 +07:00 |
|
Jenkins for ownCloud
|
9a13b687cc
|
[tx-robot] updated from transifex
|
2013-07-21 02:02:41 +07:00 |
|
Jenkins for ownCloud
|
ae82f7fd17
|
[tx-robot] updated from transifex
|
2013-07-19 02:03:14 +07:00 |
|
Jenkins for ownCloud
|
279a71acb3
|
[tx-robot] updated from transifex
|
2013-07-18 02:02:51 +07:00 |
|
Jenkins for ownCloud
|
a8acbfdf7b
|
[tx-robot] updated from transifex
|
2013-07-16 02:06:21 +07:00 |
|
Thomas Müller
|
2964027cad
|
Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master
|
2013-07-14 22:00:42 +07:00 |
|
Thomas Müller
|
79d23463f8
|
No admin option to enable public upload in case encryption is enabled
No upload on pubic page if public upload is disabled
|
2013-07-14 21:58:08 +07:00 |