Jan-Christoph Borchardt
|
399adf67b0
|
merge master into css-fixes
|
2013-08-16 00:29:43 +02:00 |
kondou
|
9c5416fe4a
|
Clean up \OC\Util
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
|
2013-08-15 15:57:32 +02:00 |
Owen Winkler
|
cd7e57e8ec
|
Use JSON to send/receive group data.
Squashed commits from PR #4364 for master.
|
2013-08-15 06:19:40 -04:00 |
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04: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 +02:00 |
kondou
|
80e9744da0
|
Merge branch 'master' into improve_app-management
|
2013-08-09 18:02:40 +02:00 |
kondou
|
605050df9b
|
Log exception at the catching code
|
2013-08-09 18:01:49 +02: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 -04: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 +02:00 |
Jan-Christoph Borchardt
|
7a9daa99d1
|
scroll the app navigation down so the newly added app is seen
|
2013-08-07 21:53:53 +02:00 |
Jan-Christoph Borchardt
|
775f33cc1b
|
prepend the new app before the 'More apps' function
|
2013-08-07 21:53:25 +02:00 |
Jan-Christoph Borchardt
|
367b248bc0
|
show 'More apps' link to app administration directly in app navigation
|
2013-08-07 18:18:09 +02:00 |
Jenkins for ownCloud
|
0deae7b86f
|
[tx-robot] updated from transifex
|
2013-08-07 09:04:32 -04:00 |
kondou
|
1a4465f41d
|
Improve app-management
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
|
2013-08-06 17:19:18 +02:00 |
Jenkins for ownCloud
|
9923fe655b
|
[tx-robot] updated from transifex
|
2013-08-04 02:01:28 -04:00 |
Jenkins for ownCloud
|
17fe748abc
|
[tx-robot] updated from transifex
|
2013-08-03 01:56:46 -04:00 |
Jenkins for ownCloud
|
16726ab793
|
[tx-robot] updated from transifex
|
2013-08-02 02:00:45 -04:00 |
Victor Dubiniuk
|
0c1008bb69
|
Some styling to user list
|
2013-08-01 19:53:41 +03:00 |
kondou
|
1348330c7d
|
Fix a syntax error & have if-conds in an own line
|
2013-08-01 18:44:01 +02:00 |
Jenkins for ownCloud
|
b037f2dc6e
|
[tx-robot] updated from transifex
|
2013-08-01 01:57:04 -04:00 |
kondou
|
aaf0fec9f5
|
Fix some JSLint warnings
|
2013-07-31 21:21:02 +02:00 |
Jan-Christoph Borchardt
|
8eaa0e7336
|
remove table layout for background jobs
|
2013-07-31 10:04:02 +02:00 |
Jenkins for ownCloud
|
761f40328c
|
[tx-robot] updated from transifex
|
2013-07-31 02:01:45 -04:00 |
Bjoern Schiessle
|
c7eba69aea
|
only show decrypt all files option if encrypted files are available
|
2013-07-30 12:26:07 +02:00 |
Bjoern Schiessle
|
a7a7ef2b3a
|
improved error handling
|
2013-07-30 09:48:30 +02:00 |
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 -04:00 |
Bjoern Schiessle
|
b6fa0e4eef
|
working decrypt files method
|
2013-07-29 17:06:05 +02:00 |
Björn Schießle
|
830f5d24c7
|
add decryptall.php
|
2013-07-29 13:39:56 +02:00 |
Björn Schießle
|
0a3d662dd0
|
register decrypt all route
|
2013-07-29 13:39:37 +02: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 +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 |
Jenkins for ownCloud
|
0fde473cb7
|
[tx-robot] updated from transifex
|
2013-07-29 01:57:04 -04:00 |
Jenkins for ownCloud
|
48621115c1
|
[tx-robot] updated from transifex
|
2013-07-28 01:58:28 -04:00 |
Jenkins for ownCloud
|
fa35650e0a
|
[tx-robot] updated from transifex
|
2013-07-27 02:03:03 -04: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 +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 |
Jenkins for ownCloud
|
7bb6aab8ee
|
[tx-robot] updated from transifex
|
2013-07-24 01:57:21 -04: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 |
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 -04:00 |
kondou
|
05084e03a0
|
Use !== and === in settings.
|
2013-07-21 13:55:25 +02:00 |
Jenkins for ownCloud
|
9a13b687cc
|
[tx-robot] updated from transifex
|
2013-07-21 02:02:41 -04:00 |
Jenkins for ownCloud
|
ae82f7fd17
|
[tx-robot] updated from transifex
|
2013-07-19 02:03:14 -04:00 |
Jenkins for ownCloud
|
279a71acb3
|
[tx-robot] updated from transifex
|
2013-07-18 02:02:51 -04:00 |
Jenkins for ownCloud
|
a8acbfdf7b
|
[tx-robot] updated from transifex
|
2013-07-16 02:06:21 -04: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 |
Jenkins for ownCloud
|
29d8ae2f95
|
[tx-robot] updated from transifex
|
2013-07-14 02:10:41 +02:00 |
Jenkins for ownCloud
|
583addaea1
|
[tx-robot] updated from transifex
|
2013-07-13 02:07:35 +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 |
Jenkins for ownCloud
|
3fbf7ab189
|
[tx-robot] updated from transifex
|
2013-07-12 02:12:25 +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 |
Jenkins for ownCloud
|
f74659f3f6
|
[tx-robot] updated from transifex
|
2013-07-11 02:26:22 +02:00 |
kondou
|
efb707a431
|
Use OC instead of oc to show alert at an error.
Related to #4001
|
2013-07-10 04:28:54 +02:00 |
Jenkins for ownCloud
|
7ec6f3bde9
|
[tx-robot] updated from transifex
|
2013-07-10 02:20:59 +02:00 |
kondou
|
4818e0062e
|
General CSS cleanup
|
2013-07-09 16:08:32 +02:00 |
Jenkins for ownCloud
|
439cad07b5
|
[tx-robot] updated from transifex
|
2013-07-09 02:12:22 +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 |
Jenkins for ownCloud
|
3cb4a72960
|
[tx-robot] updated from transifex
|
2013-07-08 02:09:41 +02:00 |
Jenkins for ownCloud
|
096d7674fc
|
[tx-robot] updated from transifex
|
2013-07-07 02:06:06 +02:00 |
Jenkins for ownCloud
|
c8ad3df1fa
|
[tx-robot] updated from transifex
|
2013-07-06 02:08:38 +02:00 |
Raghu Nayyar
|
b2afbe0e8b
|
Merge pull request #3927 from owncloud/Fix_new_user_empty_group
Do not add groups if user has no groups
|
2013-07-04 11:50:19 -07: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 |
Jenkins for ownCloud
|
51cfacd789
|
[tx-robot] updated from transifex
|
2013-07-04 09:33:58 +02:00 |
Victor Dubiniuk
|
a20f7f1d67
|
Do not add groups if user has no groups
|
2013-07-03 22:06:09 +03:00 |
Jenkins for ownCloud
|
cec8384b1a
|
[tx-robot] updated from transifex
|
2013-07-02 15:35:55 +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 |
Jenkins for ownCloud
|
d2f50bc089
|
[tx-robot] updated from transifex
|
2013-06-29 02:09:10 +02:00 |
Victor Dubiniuk
|
13bfa3be27
|
Use svg to png fallback on demand only
|
2013-06-28 23:18:11 +03:00 |
Victor Dubiniuk
|
6ecbae7da9
|
Add fallback for svg app icons
|
2013-06-28 23:10:40 +03:00 |
Victor Dubiniuk
|
d110e60316
|
Hide a ghost image on the apps management page
|
2013-06-28 21:53:56 +03:00 |
Jenkins for ownCloud
|
29caae3491
|
[tx-robot] updated from transifex
|
2013-06-27 02:12:00 +02:00 |
Jenkins for ownCloud
|
c3b8f2bf64
|
[tx-robot] updated from transifex
|
2013-06-25 02:13:40 +02:00 |
Jenkins for ownCloud
|
073464af0b
|
[tx-robot] updated from transifex
|
2013-06-24 02:11:03 +02:00 |
Thomas Müller
|
d6650a51fe
|
Merge pull request #3766 from owncloud/fix_display_name_edit
Correct new user display name output
|
2013-06-21 12:45:09 -07:00 |
Jenkins for ownCloud
|
8c923a85de
|
[tx-robot] updated from transifex
|
2013-06-21 08:53:57 +02:00 |
Jenkins for ownCloud
|
01ab79d460
|
[tx-robot] updated from transifex
|
2013-06-20 02:43:39 +02: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 |
Jenkins for ownCloud
|
d991a9372b
|
[tx-robot] updated from transifex
|
2013-06-18 02:11:10 +02:00 |
Victor Dubiniuk
|
b2cb81f857
|
Replace display name only
|
2013-06-18 00:17:08 +03:00 |
Jenkins for ownCloud
|
8243d19050
|
[tx-robot] updated from transifex
|
2013-06-16 02:07:45 +02:00 |
Jenkins for ownCloud
|
ab411d2700
|
[tx-robot] updated from transifex
|
2013-06-15 02:07:18 +02:00 |
Jenkins for ownCloud
|
6c534c8165
|
[tx-robot] updated from transifex
|
2013-06-14 02:52:34 +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 |
Björn Schießle
|
7cfb0dc406
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
|
2013-06-13 13:17:35 +02: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 |
Jenkins for ownCloud
|
c989e32adc
|
[tx-robot] updated from transifex
|
2013-06-13 02:20:23 +02:00 |
Frank Karlitschek
|
06808eddf3
|
Merge pull request #3676 from owncloud/move-storage-bar
move storage bar below clients showcase to make it more visible
|
2013-06-12 09:02:16 -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 |
Morris Jobke
|
a39ecd5ea9
|
Merge pull request #3681 from owncloud/fix_ajax_removeuser.php
Init language object before using it
|
2013-06-12 04:23:52 -07:00 |
Georg Ehrke
|
a2fa91fdd5
|
init language object before using it
|
2013-06-12 09:40:13 +02:00 |
Jenkins for ownCloud
|
aab3b7d8ea
|
[tx-robot] updated from transifex
|
2013-06-12 03:05:58 +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
|
20ddd6e1c7
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/tests/crypt.php
|
2013-06-11 15:19:02 +02:00 |
Jenkins for ownCloud
|
4f0f537b42
|
[tx-robot] updated from transifex
|
2013-06-11 02:02:44 +02:00 |
Björn Schießle
|
13017ce9e1
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
settings/ajax/changepassword.php
|
2013-06-10 12:12:07 +02:00 |
Björn Schießle
|
db06b906e5
|
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
recover encryption keys if ownCloud can't change the log-in password
|
2013-06-10 02:03:56 -07:00 |
Jenkins for ownCloud
|
3c79d89492
|
[tx-robot] updated from transifex
|
2013-06-08 02:13:41 +02:00 |
Björn Schießle
|
b25ab94a08
|
only check for recovery key if someone else than the user wants to change the password
|
2013-06-07 20:17:48 +02:00 |
Jenkins for ownCloud
|
67c085417c
|
[tx-robot] updated from transifex
|
2013-06-07 02:17:50 +02:00 |
Björn Schießle
|
d7a9852f7b
|
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened
|
2013-06-06 13:32: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 |
Jenkins for ownCloud
|
81b6cab94f
|
[tx-robot] updated from transifex
|
2013-06-06 02:21:31 +02:00 |
Jenkins for ownCloud
|
666a5c1cc7
|
[tx-robot] updated from transifex
|
2013-06-05 02:01:42 +02:00 |
Florin Peter
|
563f343291
|
fix password change when files_encryption app is disabled
|
2013-06-03 19:06:20 +02:00 |
Thomas Müller
|
1b3c9fe5ae
|
Merge pull request #3454 from owncloud/fix_hasInternetConnection
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
|
2013-05-31 17:05:45 -07:00 |
Thomas Mueller
|
dd4a07321a
|
fix method naming
|
2013-05-31 23:24:09 +02:00 |
Jenkins for ownCloud
|
8e1d9261aa
|
[tx-robot] updated from transifex
|
2013-05-30 02:34:14 +02:00 |
Jenkins for ownCloud
|
7c0c6bd779
|
[tx-robot] updated from transifex
|
2013-05-29 02:10:54 +02:00 |
Jörn Friedrich Dreyer
|
da55c76168
|
Merge pull request #2778 from Kondou-ger/optimize_pictures
Optimize pictures with optipng.
|
2013-05-28 04:48:38 -07:00 |
blizzz
|
3beff3fdc2
|
Merge pull request #3488 from zafi/master
The "lost password" field in the personal setting depends on OC_USER_BACKEND_SET_PASSWORD
|
2013-05-28 02:39:02 -07:00 |
Jenkins for ownCloud
|
3420d853ab
|
[tx-robot] updated from transifex
|
2013-05-28 02:07:51 +02:00 |
Georg Ehrke
|
183f8c90af
|
use false instead of 0
|
2013-05-27 19:26:53 +02:00 |
Georg Ehrke
|
557cc4c1ab
|
make method names camelCase
|
2013-05-27 19:24:31 +02:00 |
Georg Ehrke
|
3f52393866
|
don't show a warning if internet connection is disabled on purpose
|
2013-05-27 19:19:47 +02:00 |
Jenkins for ownCloud
|
73e0b4c10a
|
[tx-robot] updated from transifex
|
2013-05-27 02:07:24 +02:00 |
Jenkins for ownCloud
|
0c621ff6a9
|
[tx-robot] updated from transifex
|
2013-05-26 02:03:54 +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 |
Thomas Müller
|
4911305887
|
Merge pull request #3416 from owncloud/files_encryption
New files encryption app
|
2013-05-24 02:21:19 -07:00 |
Jenkins for ownCloud
|
b47729c5fc
|
[tx-robot] updated from transifex
|
2013-05-24 02:02:43 +02:00 |
Björn Schießle
|
5cd14425f9
|
Merge branch 'master' into files_encryption
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
|
2013-05-21 15:30:19 +02:00 |
Florin Peter
|
31037241e1
|
Merge branch 'master' into files_encryption
|
2013-05-20 02:25:56 +02:00 |
Jenkins for ownCloud
|
6609de28d8
|
[tx-robot] updated from transifex
|
2013-05-20 02:10:11 +02:00 |
Björn Schießle
|
f70240f430
|
display a warning if the user has enabled file recovery but the admin tries to change the users password without a recovery password
|
2013-05-18 10:33:33 +02:00 |
Jenkins for ownCloud
|
9428d813ba
|
[tx-robot] updated from transifex
|
2013-05-18 02:03:28 +02:00 |
Jenkins for ownCloud
|
6a6079176b
|
[tx-robot] updated from transifex
|
2013-05-17 02:07:36 +02:00 |
Björn Schießle
|
f1a5b8b524
|
show nicer warning if the admin recovery password was wrong
|
2013-05-16 16:01:40 +02:00 |
Björn Schießle
|
8ae30891b3
|
some error handling in case the recovery password is wrong
|
2013-05-16 15:19:53 +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 |
Jenkins for ownCloud
|
966c2231e3
|
[tx-robot] updated from transifex
|
2013-05-16 02:01:37 +02:00 |
Pellaeon Lin
|
935675ab49
|
Merge remote-tracking branch 'upstream/master' into pr-langcode
|
2013-05-12 22:32:22 +08:00 |
Jenkins for ownCloud
|
74f92d0c7f
|
[tx-robot] updated from transifex
|
2013-05-12 02:05:29 +02:00 |
Jan-Christoph Borchardt
|
f3f74f826a
|
Merge pull request #3257 from owncloud/fix_3251
Fix 3251
|
2013-05-10 08:41:27 -07:00 |
kondou
|
ee1ce055fc
|
Fix #3251
Using ksort now, instead of prefilling the commonlanguages array.
|
2013-05-09 23:19:37 +02:00 |
Björn Schießle
|
135991474b
|
fix inconsistent post parameters in change password operation
|
2013-05-08 12:38:09 +02:00 |
Björn Schießle
|
9b258929c6
|
allow to set quota to zero, issue #2696
|
2013-05-07 10:40:25 +02:00 |
Pellaeon Lin
|
3409403893
|
Modify zh_* language codes
|
2013-05-04 20:27:40 +08:00 |
Jenkins for ownCloud
|
a876240b32
|
[tx-robot] updated from transifex
|
2013-05-04 02:00:54 +02:00 |
Bart Visscher
|
cc3f7ba7e1
|
Merge pull request #3201 from owncloud/own_sorting_for_priorized_languages
Sort priorized languages as defined in the array
|
2013-05-03 05:56:56 -07:00 |
Arthur Schiwon
|
9c3b83e28c
|
Fix retrieval of users with multiple backends
|
2013-05-03 13:50:14 +02:00 |
Jenkins for ownCloud
|
ee53e7b3d2
|
[tx-robot] updated from transifex
|
2013-05-02 02:19:04 +02:00 |
Jenkins for ownCloud
|
6163a85668
|
[tx-robot] updated from transifex
|
2013-05-01 02:02:59 +02:00 |
kondou
|
d8e6db5608
|
Sort priorized languages as defined in the array
Also add russian and arabic to the common languages.
|
2013-05-01 00:34:13 +02:00 |
Jenkins for ownCloud
|
5764bf088e
|
[tx-robot] updated from transifex
|
2013-04-30 01:59:18 +02:00 |
Jenkins for ownCloud
|
2b36ad292d
|
[tx-robot] updated from transifex
|
2013-04-29 02:00:26 +02:00 |
Jenkins for ownCloud
|
901e0c598d
|
[tx-robot] updated from transifex
|
2013-04-28 02:01:38 +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 |
Jenkins for ownCloud
|
7b2c64236c
|
[tx-robot] updated from transifex
|
2013-04-27 02:24:29 +02:00 |
Bart Visscher
|
d825669265
|
Merge pull request #3002 from owncloud/priorize_common_languages
Priorize common languages.
|
2013-04-26 06:30:59 -07:00 |
Jenkins for ownCloud
|
7ea2f785f4
|
[tx-robot] updated from transifex
|
2013-04-26 01:58:21 +02: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 |
Bart Visscher
|
63b2699720
|
Merge pull request #3094 from owncloud/log-ajax
fix logical issue while retrieving log via ajax
|
2013-04-25 01:21:59 -07:00 |
Lukas Reschke
|
d41b600725
|
Add an update notification on every page for admin users
|
2013-04-24 18:47:38 +02:00 |
Raghu Nayyar
|
063e1238bf
|
Merge pull request #3096 from owncloud/add_missing_space_for_new_groups
Fixing #3095
|
2013-04-24 09:33:37 -07:00 |
kondou
|
e8bb998ecc
|
Fix #3095.
|
2013-04-24 11:13:12 +02:00 |
Jenkins for ownCloud
|
a7b4469b2e
|
[tx-robot] updated from transifex
|
2013-04-24 02:01:20 +02:00 |
David Reagan
|
4bee02f75c
|
Fixed comment in personal.js. Changed message text in changedisplayname.php.
|
2013-04-23 14:31:35 -07: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 |
Morris Jobke
|
8fab7d5afb
|
fix syntax layout
|
2013-04-23 18:15:34 +02:00 |
Morris Jobke
|
e78a464002
|
remove log sort in admin section
doesn't work anymore, because now the datetime is saved as string (ref #2975)
|
2013-04-23 14:56:33 +02:00 |
Morris Jobke
|
b9b2e0269a
|
fix logical issue while retrieving log via ajax
|
2013-04-23 14:40:21 +02:00 |
Jenkins for ownCloud
|
f6808617b3
|
[tx-robot] updated from transifex
|
2013-04-22 02:00:20 +02: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 |
Jenkins for ownCloud
|
cbd8b792d9
|
[tx-robot] updated from transifex
|
2013-04-18 02:09:28 +02:00 |
Morris Jobke
|
867a527148
|
Merge pull request #2975 from owncloud/log-date
use date and time instead of timestamp in log
|
2013-04-17 06:49:46 -07:00 |
Bernhard Posselt
|
4679e789e1
|
also adjust template properly for log date fix
|
2013-04-17 15:31:05 +02:00 |
Bernhard Posselt
|
f7e29eabf2
|
fix admin log display and use a more readable format
|
2013-04-17 14:05:51 +02:00 |
Jenkins for ownCloud
|
37868818ff
|
[tx-robot] updated from transifex
|
2013-04-17 02:29:17 +02:00 |
David Reagan
|
0dd6f16e0b
|
Removed extra id from jquery selectors. Remove console.log call. Removed commented code.
|
2013-04-16 13:22:04 -07:00 |
David Reagan
|
6d812ada05
|
Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event.
|
2013-04-16 13:03:41 -07:00 |
Jenkins for ownCloud
|
d0b3e8aceb
|
[tx-robot] updated from transifex
|
2013-04-16 02:17:30 +02:00 |
Jenkins for ownCloud
|
e13e4c412f
|
[tx-robot] updated from transifex
|
2013-04-15 02:12:43 +02:00 |
Thomas Tanghus
|
f480596b94
|
Merge pull request #2896 from owncloud/app-enable-fix
Add span tag while enabling or disbling apps as well.
|
2013-04-13 06:57:42 -07:00 |
Jenkins for ownCloud
|
19afc216cf
|
[tx-robot] updated from transifex
|
2013-04-13 02:15:54 +02:00 |
kondou
|
448a390486
|
Optimize svgs with scour.
|
2013-04-12 19:06:29 +02:00 |
raghunayyar
|
5228eb8a18
|
Add span tag while enabling or disbling apps as well.
|
2013-04-12 18:15:59 +05:30 |
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 |
Jenkins for ownCloud
|
b02db643d0
|
[tx-robot] updated from transifex
|
2013-04-11 02:10:41 +02:00 |
Robin Appelman
|
1abc264873
|
Add the quota change listeners to newly added user entries in the user list
|
2013-04-10 14:12:54 +02:00 |
Jenkins for ownCloud
|
c06bc81c79
|
[tx-robot] updated from transifex
|
2013-04-10 02:09:39 +02:00 |
Robin Appelman
|
27f710d860
|
Users: fix "Other.." quota option for the default quota
|
2013-04-09 12:47:08 +02:00 |
Bernhard Posselt
|
bfe48ba99e
|
Merge pull request #2800 from owncloud/fixing-2743-master
fixes #2743 - use public OC_User::getDisplayName instead of OC_User::det...
|
2013-04-09 00:17:01 -07:00 |
Jenkins for ownCloud
|
5ef389610f
|
[tx-robot] updated from transifex
|
2013-04-09 02:14:02 +02:00 |