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 |