Commit Graph

1045 Commits

Author SHA1 Message Date
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