Bjoern Schiessle
|
b6fa0e4eef
|
working decrypt files method
|
2013-07-29 17:06:05 +02: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 +02:00 |
|
Björn Schießle
|
75fd6d4fde
|
initialize OC_Defaults in template constructorX
|
2013-07-24 11:51:21 +02:00 |
|
Thomas Müller
|
1a73e607bd
|
Merge branch 'master' into more-themable-strings
Conflicts:
lib/template.php
|
2013-07-24 09:35:33 +02:00 |
|
Thomas Müller
|
840e96cda3
|
Merge branch 'master' into disable-anon-upload-master
Conflicts:
settings/templates/admin.php
|
2013-07-22 11:55:20 +02:00 |
|
Thomas Müller
|
934f2e94a3
|
Merge branch 'master' into disable-anon-upload-master
|
2013-07-22 11:36:52 +02:00 |
|
kondou
|
05084e03a0
|
Use !== and === in settings.
|
2013-07-21 13:55:25 +02: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 +02: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 +02:00 |
|
rolandgeider
|
995feea42a
|
Use transifex.com on link to translations
|
2013-07-14 11:54:39 +02:00 |
|
Thomas Mueller
|
7a44d45714
|
change anonymous to public
|
2013-07-12 21:34:38 +02:00 |
|
Thomas Müller
|
fc2d538311
|
new admin setting added which allows to turn off anonymous uploads
|
2013-07-12 17:03:51 +02:00 |
|
Jan-Christoph Borchardt
|
7741ca0bcc
|
use themable strings for admin page, simplify admin export, fix rest of #3791
|
2013-07-11 17:41:36 +02:00 |
|
Björn Schießle
|
9b9ea7cd8e
|
Merge https://github.com/owncloud/core/pull/3827
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:56 2013 +0200
Merge branch 'master' into better-messages
commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:41 2013 +0200
move to non-static defaults.php
commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 2 10:32:13 2013 +0200
no sprintf here, lets t() handle it
commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:13:38 2013 +0200
Merge branch 'master' into better-messages
commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:10:57 2013 +0200
use document base url from defaults.php
commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:00:15 2013 +0200
Merge branch 'master' into better-messages
commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:21:12 2013 +0200
link to docs in WebDAV message, ref #3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
|
2013-07-08 10:07:57 +02:00 |
|
Björn Schießle
|
5f2378be5b
|
revert changes which where introduced by accident during merge 23cc69b816
|
2013-07-04 12:06:36 +02:00 |
|
Björn Schießle
|
3c691c9ec9
|
move to non-static OC_Defaults
Conflicts:
lib/mail.php
|
2013-07-04 10:11:16 +02:00 |
|
Björn Schießle
|
d46e62886a
|
Add init funtion to OC_Defaults to be able to wrap translatable strings
|
2013-07-04 10:09:28 +02:00 |
|
Thomas Müller
|
a20e9dee89
|
Merge pull request #3894 from owncloud/ie8_compatibility_fixes
Ie8 compatibility fixes
|
2013-07-01 11:57:29 -07:00 |
|
Björn Schießle
|
87bbdc1ed9
|
check for updates only in the community edition
|
2013-07-01 10:46:16 +02:00 |
|
Björn Schießle
|
23cc69b816
|
construct the foother in defaults.php so that we use always the same footer
Conflicts:
settings/templates/admin.php
|
2013-07-01 10:46:00 +02:00 |
|
Victor Dubiniuk
|
d110e60316
|
Hide a ghost image on the apps management page
|
2013-06-28 21:53:56 +03:00 |
|
Arthur Schiwon
|
4dd0076e7c
|
Users page: username instead of login name as col header to avoid confusion with other backends
|
2013-06-18 14:32:28 +02:00 |
|
Björn Schießle
|
7889f2ef5c
|
Merge pull request #3687 from owncloud/template_updates
Make templates aware of different owncloud editions
|
2013-06-13 07:32:41 -07:00 |
|
Jan-Christoph Borchardt
|
a178de8501
|
Merge pull request #3677 from owncloud/apps-buttons
remove App management top bar and move buttons more contextually in the interface
|
2013-06-13 01:44:48 -07:00 |
|
Björn Schießle
|
63472aed3f
|
Merge branch 'template_updates' of github.com:owncloud/core into template_updates
|
2013-06-12 17:26:38 +02:00 |
|
Björn Schießle
|
2e1836c1da
|
don't show translation hints in enterprise edition
|
2013-06-12 17:07:43 +02:00 |
|
Jan-Christoph Borchardt
|
f565e4c25b
|
move common settings footer fieldset out of conditional
|
2013-06-12 16:59:23 +02:00 |
|
Björn Schießle
|
e1e798c623
|
make footer and urls aware of ownCloud editions
|
2013-06-12 15:44:11 +02:00 |
|
Jan-Christoph Borchardt
|
4cafe21aa4
|
apps management: change misleading + to ...
|
2013-06-12 14:49:23 +02:00 |
|
Jan-Christoph Borchardt
|
c0568e0443
|
remove App management top bar and move buttons more contextually in the interface
|
2013-06-12 13:36:17 +02:00 |
|
Jan-Christoph Borchardt
|
b014509f41
|
move storage bar below clients showcase to make it more visible
|
2013-06-11 16:05:02 +02:00 |
|
Björn Schießle
|
97e05b71f8
|
add hint about what the recovery password field is for
|
2013-06-06 12:26:05 +02:00 |
|
zafi
|
f314eb8f72
|
The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD
so it should only be visible for users with a supporting backend.
|
2013-05-25 09:03:07 +02:00 |
|
Björn Schießle
|
9d1e60325c
|
allow admin to recover users files in case of password lost
|
2013-05-16 14:53:04 +02:00 |
|
Björn Schießle
|
135991474b
|
fix inconsistent post parameters in change password operation
|
2013-05-08 12:38:09 +02:00 |
|
Raghu Nayyar
|
2bcb64e781
|
Merge pull request #3114 from owncloud/update-notification
Add an update notification
|
2013-04-26 21:12:38 -07:00 |
|
Bart Visscher
|
d825669265
|
Merge pull request #3002 from owncloud/priorize_common_languages
Priorize common languages.
|
2013-04-26 06:30:59 -07:00 |
|
Morris Jobke
|
e6f84397aa
|
Merge pull request #3098 from jerrac/displaynamesaveontimeout
On the Personal Settings page, made the display name save like the email address saves
|
2013-04-25 14:10:16 -07:00 |
|
Lukas Reschke
|
d41b600725
|
Add an update notification on every page for admin users
|
2013-04-24 18:47:38 +02:00 |
|
kondou
|
e8bb998ecc
|
Fix #3095.
|
2013-04-24 11:13:12 +02:00 |
|
David Reagan
|
7312cbec91
|
Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages.
|
2013-04-23 12:45:12 -07:00 |
|
kondou
|
7a2be0c5dc
|
Make divider not selectable
Very hacky
|
2013-04-19 00:39:42 +02:00 |
|
kondou
|
79218be1d2
|
Priorize common languages.
|
2013-04-18 15:14:42 +02:00 |
|
Bernhard Posselt
|
4679e789e1
|
also adjust template properly for log date fix
|
2013-04-17 15:31:05 +02:00 |
|
Bernhard Posselt
|
18c873d1e5
|
Merge pull request #2554 from owncloud/hide-toggle-checkbox
Implements Hide / Display for the Password Toggle Button
|
2013-04-11 01:18:40 -07:00 |
|
raghunayyar
|
3d008b2ff3
|
New Password in Personal Password Page loads fine.
|
2013-04-11 12:34:46 +05:30 |
|
Robin Appelman
|
27f710d860
|
Users: fix "Other.." quota option for the default quota
|
2013-04-09 12:47:08 +02:00 |
|
Lukas Reschke
|
8000f9db74
|
Unescape the update hint
Fixes #2647
|
2013-04-02 16:39:21 +03:00 |
|
Morris Jobke
|
df74c0e43a
|
apply code review hints
|
2013-03-28 15:02:31 +01:00 |
|
Morris Jobke
|
d3ca97dd2f
|
Make it possible to show less log entries again - fix owncloud/core#1593
* show "less" button only if there are more than 3 entries
* only "remove" logs till last 3 entries
|
2013-03-27 15:14:09 +01:00 |
|