Commit Graph

1365 Commits

Author SHA1 Message Date
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
Thomas Mueller ce54d00b5c fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName 2013-04-08 23:11:33 +02:00
Jenkins for ownCloud ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
kondou f59aedff4f Optimize pictures with optipng. 2013-04-07 20:09:25 +02:00
Bart Visscher 46a552fd56 Merge pull request #2738 from Kondou-ger/fix_alert_issues
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
kondou de2e546617 Translate 'Error' in core 2013-04-06 16:52:55 +02:00
Jenkins for ownCloud 6798b6dc34 [tx-robot] updated from transifex 2013-04-06 00:05:32 +02:00
kondou 32f96e19e5 Fix Typo 2013-04-05 19:06:58 +02:00
kondou 8d63b7d9bf Fix #2693
When removing a group response.data.action becomes 'remove', thus the if
shows an empty notification.
2013-04-05 18:52:14 +02:00
root 74b02db337 Fixed things in alert-messages
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
2013-04-05 01:56:32 +02:00
Jenkins for ownCloud c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Jenkins for ownCloud cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Jenkins for ownCloud 10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Lukas Reschke 8000f9db74 Unescape the update hint
Fixes #2647
2013-04-02 16:39:21 +03:00
Jenkins for ownCloud cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
Bernhard Posselt 8ed9be5408 Merge pull request #2597 from kabum/lesslog
Make it possible to show less log entries again
2013-03-29 07:22:43 -07:00
Bernhard Posselt 7c0999bd27 Merge pull request #2448 from owncloud/userlist_available_groups
User list: Keep array of available groups. Should fix #873
2013-03-29 07:19:09 -07:00
Morris Jobke 866ca51d83 fix typo and remove animation 2013-03-28 16:11:46 +01:00
Morris Jobke f19fd30278 convert js call to css rule 2013-03-28 15:43:14 +01:00
Morris Jobke df74c0e43a apply code review hints 2013-03-28 15:02:31 +01:00
Arthur Schiwon 942cdff240 Users: use DisplayName in the Display Name col when appending users 2013-03-27 18:52:15 +01:00
Morris Jobke 7c8a0a486b add copyright note 2013-03-27 16:53:51 +01:00
Morris Jobke 97d73d41a8 remove animation 2013-03-27 15:19:28 +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
Jenkins for ownCloud 0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Brice Maron 24d471af29 Improve detection of installations errors 2013-03-23 13:47:42 +01:00
Jenkins for ownCloud 4f6e13e673 [tx-robot] updated from transifex 2013-03-23 00:06:16 +01:00
Jenkins for ownCloud a035ed0c19 [tx-robot] updated from transifex 2013-03-22 00:04:46 +01:00
Jenkins for ownCloud 3b1c7de459 [tx-robot] updated from transifex 2013-03-21 00:04:36 +01:00
Jenkins for ownCloud 63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
Thomas Tanghus 06a7d39024 User list: Keep array of available groups. Should fix #873 2013-03-19 14:49:02 +01:00
Thomas Tanghus c13487332a User list: Avoid dupes and better sorting. Fix #2420 2013-03-19 02:48:08 +01:00
Jenkins for ownCloud 63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Jenkins for ownCloud 2a48aa322d [tx-robot] updated from transifex 2013-03-18 00:06:55 +01:00
Jenkins for ownCloud 1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
Jenkins for ownCloud 0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Jenkins for ownCloud 9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Jenkins for ownCloud 569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Jenkins for ownCloud 6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Jenkins for ownCloud 308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Jenkins for ownCloud 97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Jenkins for ownCloud c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Jenkins for ownCloud 6c96b93fd4 [tx-robot] updated from transifex 2013-03-05 00:19:07 +01:00
Frank Karlitschek 36a1bcb732 Merge pull request #2061 from owncloud/app-text
Add the description as text and not as html
2013-03-04 00:01:26 -08:00
Frank Karlitschek d70912e72b Merge pull request #2060 from owncloud/escapeGroupname
Sanitize uid, group and quota
2013-03-04 00:00:47 -08:00
Frank Karlitschek 17f7bd4c14 Merge pull request #2059 from owncloud/getlog
Add log as text and not as HTML
2013-03-04 00:00:04 -08:00
Lukas Reschke 0252479e3e Add the description as text and not as html 2013-03-04 00:19:07 +01:00
Lukas Reschke 86a7202cda Sanitize uid, group and quota 2013-03-04 00:11:46 +01:00
Jenkins for ownCloud b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Lukas Reschke 962b7a7c80 Add log as text and not as HTML 2013-03-03 23:46:08 +01:00
Bart Visscher 376f350af2 Fix encoding settings ajax getlog 2013-03-03 23:14:36 +01:00
Jenkins for ownCloud 844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Thomas Müller 4c8c974740 Merge pull request #2020 from owncloud/fixing-bugtracker-link-master
change bug tracker links to https://github.com/owncloud/core/blob/master...
2013-03-02 02:16:45 -08:00
Jenkins for ownCloud c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Bart Visscher f21ecef0b4 Merge pull request #2019 from owncloud/fixing-languages-again-master
some more new languages recently introduced to ownCloud
2013-03-01 14:55:27 -08:00
Lukas Reschke fadb11253b Merge branch 'master' into fixing-bugtracker-link-master
Conflicts:
	core/templates/exception.php
	settings/templates/help.php
2013-03-01 23:41:23 +01:00
Thomas Mueller f9b454dab1 change bug tracker links to https://github.com/owncloud/core/blob/master/CONTRIBUTING.md 2013-03-01 23:32:43 +01:00
Thomas Mueller 6708dd80cd some more new languages recently introduced to ownCloud 2013-03-01 23:28:54 +01:00
Lukas Reschke 5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Jenkins for ownCloud d20fd7e9a6 [tx-robot] updated from transifex 2013-03-01 00:07:02 +01:00
Lukas Reschke dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Jenkins for ownCloud a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke 7311c2bb5d Remove uneeded OAuth files 2013-02-27 23:26:00 +01:00
Lukas Reschke 229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Jenkins for ownCloud fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Björn Schießle f69fa2726c Merge pull request #1958 from owncloud/fixing-1933-master
the locale name is no longer part of the translation string
2013-02-27 03:15:03 -08:00
Thomas Mueller c71fdf04d7 fixes 1933 - the locale name is no longer part of the translation string 2013-02-27 11:41:50 +01:00
Bernhard Posselt a54be4acc4 Merge pull request #1948 from owncloud/improve_user_sorting
Sort after display name + LDAP server side sorting
2013-02-27 02:39:22 -08:00
Jenkins for ownCloud 348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Arthur Schiwon 60d4fdda57 sort users according to display name 2013-02-26 22:56:55 +01:00
Frank Karlitschek 072daf8850 Merge pull request #1885 from houqp/issue_1776
when user changes displayName, also update it on expand button
2013-02-26 00:19:42 -08:00
Jenkins for ownCloud 63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00
Qingping Hou 195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
	core/templates/layout.user.php
2013-02-25 17:16:03 -05:00
Qingping Hou c111a3aa24 add span tag to displayname on expand button 2013-02-25 15:40:57 -05:00
Qingping Hou 278a6f5b41 update oldDisplayName value on displayName change
This patch fixes a bug that can be reproduced in following way:

1. change displayName
2. clear text in displayName input click change again

Then you will get an error and previous displayName will be restored.

Expected behavior should restore the new updated displayName.
2013-02-24 18:13:25 -05:00
Qingping Hou 2f3c5d8afc when user changes displayName, also update it on expand button 2013-02-24 18:07:35 -05:00
Jenkins for ownCloud 21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Thomas Müller a417028ccd Merge pull request #1862 from owncloud/whitespace-cleanup
Whitespace cleanup
2013-02-23 11:39:13 -08:00
Jenkins for ownCloud 6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Bart Visscher bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Bernhard Posselt 78fce83405 Merge pull request #1855 from owncloud/userlist_load_displaynames
Fetch displayname in userlist ajax requests. Refs #1681
2013-02-22 07:44:24 -08:00
Jörn Friedrich Dreyer e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup
Codestyle cleanup
2013-02-22 07:02:51 -08:00
Thomas Tanghus 2268596e1a Fetch displayname in userlist ajax requests. Refs #1681 2013-02-22 14:51:21 +01:00
Thomas Müller 31d2b9bc07 Merge pull request #1838 from owncloud/fix-changedisplayname-call
Fix error path in changedisplayname call
2013-02-22 02:14:00 -08:00
Bart Visscher 83e613b45a Fix error path in changedisplayname call 2013-02-22 00:49:44 +01:00
Jenkins for ownCloud 734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher 19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher 83f161d3f9 Style cleanup settings 2013-02-21 23:47:56 +01:00
Jenkins for ownCloud dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Jenkins for ownCloud 99758dce2b [tx-robot] updated from transifex 2013-02-20 00:03:28 +01:00
Jenkins for ownCloud 76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Victor Dubiniuk 06dbcec5a1 Do not set password if it has't provided 2013-02-18 21:20:48 +03:00
Victor Dubiniuk c5f6a77dbd Correct new password input name 2013-02-18 21:15:32 +03:00
Lukas Reschke a984a27fa0 Sanitize user input 2013-02-18 08:04:35 +01:00
Jenkins for ownCloud 3b9796bfcc [tx-robot] updated from transifex 2013-02-18 00:06:45 +01:00
Jenkins for ownCloud c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Jenkins for ownCloud 83f0c8ce61 [tx-robot] updated from transifex 2013-02-16 00:05:50 +01:00
blizzz cd310add23 Merge pull request #1694 from owncloud/users-header
Users header
2013-02-15 05:36:21 -08:00
Jan-Christoph Borchardt ac32ae79af Merge pull request #1683 from owncloud/ie-fixes
IE fixes
2013-02-15 03:32:31 -08:00
Jan-Christoph Borchardt 8b09fbc150 Merge pull request #1700 from owncloud/fixing-1680-master
Fixing 1680 master
2013-02-15 03:21:49 -08:00
Jenkins for ownCloud b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Bart Visscher 9058d398a7 Merge pull request #1662 from owncloud/style-cleanup
Style cleanup
2013-02-14 12:54:36 -08:00
Thomas Mueller d2f34183a6 sort languages based on display name not the iso code 2013-02-14 21:34:15 +01:00
Thomas Mueller a63f5ffa75 some more missing language code fallbacks 2013-02-14 20:59:14 +01:00
Lukas Reschke 5624f1b838 Merge pull request #1701 from owncloud/XSS-fixes
Sanitize HTML
2013-02-14 10:50:46 -08:00
Lukas Reschke c7094197bf Sanitize HTML 2013-02-14 18:15:14 +01:00
Thomas Mueller 2e280167b8 adding language code oc 2013-02-14 17:51:27 +01:00
Thomas Mueller 61e3c158b2 add some missing fallback language mappings 2013-02-14 17:46:53 +01:00
Jan-Christoph Borchardt f29a0ec67d also fix header alignment for multiselect columns 2013-02-14 16:38:34 +01:00
Jan-Christoph Borchardt 0f405d9895 fix Users settings header bar element positioning, close #1686 2013-02-14 16:38:10 +01:00
Thomas Mueller c5d716effe fixing javascript errors IE8 in apps management 2013-02-14 15:47:48 +01:00
Jan-Christoph Borchardt e8190c6511 fix user delete button not showing in IE, another SVG replacement issue 2013-02-14 13:01:51 +01:00
Thomas Mueller 022993c098 fixing javascript errors IE8 in user management 2013-02-14 12:59:59 +01:00
Bart Visscher 5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00
Jenkins for ownCloud bfe6334cd9 [tx-robot] updated from transifex 2013-02-14 00:06:51 +01:00
Thomas Mueller 9d6f74c65e missing piece after merge 2013-02-13 10:59:41 +01:00
Thomas Mueller bc43dd704f Merge branch 'master' into fixing-1424-master
Conflicts:
	settings/js/users.js
2013-02-13 01:18:01 +01:00
Jenkins for ownCloud 68fa0b7dcc [tx-robot] updated from transifex 2013-02-13 00:05:40 +01:00
Frank Karlitschek 316807e0d3 Merge pull request #1624 from owncloud/singleselect
Split editable select code used for quota selection into a jquery plugin
2013-02-12 11:05:07 -08:00
Jenkins for ownCloud 8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
Jenkins for ownCloud fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Thomas Mueller 037fcde133 Merge branch 'master' into fixing-1424-master 2013-02-11 21:42:27 +01:00
Jenkins for ownCloud 39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
Robin Appelman e68e5cc849 Split editable select code used for quota selection into a jquery plugin 2013-02-11 15:18:14 +01:00
Jan-Christoph Borchardt efc70e27bc Merge pull request #1610 from owncloud/improved_personal_page
add the buttons for the clients to the personal page.
2013-02-11 03:51:11 -08:00
Jan-Christoph Borchardt 40d8a2531d move CSS to correct location, move and format php 2013-02-11 12:49:52 +01:00
Jan-Christoph Borchardt 47341eb4bd spaces to tabs 2013-02-11 12:41:14 +01:00
Jan-Christoph Borchardt 2b586eb91c correct target blank from image to link 2013-02-11 12:40:17 +01:00
Thomas Müller b9089fe8d9 Merge branch 'master' into fixing-1424-master 2013-02-09 19:15:23 +01:00
Thomas Müller 0222c589ac Merge pull request #1546 from owncloud/fix-loading-hooks
Fix loading hooks when going though the routing system
2013-02-09 09:59:41 -08:00
Thomas Müller e68cf72458 Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-09 09:58:05 -08:00
Thomas Müller 460faf3f97 Merge pull request #1569 from owncloud/clean-app-id
Remove invalid characters from app id to prevent loading of invalid reso...
2013-02-09 09:56:26 -08:00
Jörn Friedrich Dreyer bb656ca2fb Merge pull request #1561 from Raydiation/master
Moved the iframe height and width fix from js to css
2013-02-09 08:56:12 -08:00
Bernhard Posselt 62122148bf Revert "moved iframe height and width fix from js to css"
This reverts commit 842fc85b9a.
2013-02-09 17:46:23 +01:00
Bernhard Posselt 842fc85b9a moved iframe height and width fix from js to css 2013-02-09 17:41:17 +01:00
Thomas Müller d67d9566ce Merge branch 'master' into clean-app-id 2013-02-09 17:28:30 +01:00
Bart Visscher 9dddcae9ca Remove invalid characters from app id to prevent loading of invalid resources 2013-02-09 15:10:40 +01:00
Lukas Reschke 18fa8e2753 json_encode the appid 2013-02-09 15:06:35 +01:00
Thomas Müller 279cbeb001 Merge pull request #1481 from owncloud/fixing-1354-master
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
Bernhard Posselt f8335c4815 moved iframe height and width fix from js to css 2013-02-09 11:34:25 +01:00
Frank Karlitschek 4a130d106c I'm an evil bastard and I commit this 3 letter text fix without a pull request. 2013-02-09 10:09:37 +01:00
Jenkins for ownCloud 04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +01:00
Björn Schießle 45a4016878 Merge pull request #1552 from raghunayyar/personalpage-style-fix
Personal Page Password Toggle Loads Fine.
2013-02-10 07:31:05 -08:00
Björn Schießle d8fee28b3b add switch to enable/disable the possibility to change the display name by the user 2013-02-10 14:43:31 +01:00
Lukas Reschke 01fabd6c65 Merge pull request #1577 from owncloud/typo_catagory
Typo
2013-02-10 02:31:34 -08:00
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Lukas Reschke 2dde418e99 Remove uneeded lines 2013-02-09 23:43:48 +01:00
Lukas Reschke bd2f8980cd Typo 2013-02-09 23:37:42 +01:00
Frank Karlitschek c14f0b5637 add in new window 2013-02-09 09:30:59 +01:00
Frank Karlitschek 9bd45b26a5 add the buttons for the clients to the personal page.
Useful and prettier
2013-02-09 09:13:11 +01:00
raghunayyar e8d17e4e8e Personal Page Password Toggle Also Loads Well. 2013-02-09 11:40:07 +05:30
Jenkins for ownCloud e5c05e9674 [tx-robot] updated from transifex 2013-02-09 00:14:08 +01:00
Bart Visscher 340d6fce11 Better way of getting the navigation entries for an app 2013-02-08 18:53:43 +01:00
Thomas Müller 232a98524c some systems use en_US.UTF8 instead of en_US.UTF-8 2013-02-08 17:49:54 +01:00
Thomas Müller 05b46f7828 on creation only test for existing users if the backend supports user creation
this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
2013-02-08 17:16:18 +01:00
Jenkins for ownCloud 59249ebc0c [tx-robot] updated from transifex 2013-02-08 00:13:16 +01:00
Thomas Mueller 5788d36c8d Merge branch 'master' into fixing-1354-master
Conflicts:
	settings/admin.php
	settings/templates/admin.php
2013-02-07 10:44:28 +01:00
Thomas Mueller 84f3c8b6cc show webdav test results in admin section as well 2013-02-07 00:49:39 +01:00
Jenkins for ownCloud 35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01:00
Lukas Reschke e969a78cf9 Merge pull request #1443 from owncloud/use-module-file-info-master
we get best results regarding mime type detection if we use fileinfo - l...
2013-02-06 11:53:13 -08:00
Lukas Reschke 93b1597395 Merge pull request #1506 from owncloud/files_encryption
Files encryption
2013-02-06 11:47:55 -08:00
Lukas Reschke ad644b4e08 Merge pull request #1363 from owncloud/FixPasswordChange
Fix password change
2013-02-06 11:14:59 -08:00
Sam Tuke 2c22619a18 Reverted fix temporarily; another fix by LukasReschke is awaiting merge 2013-02-06 19:06:55 +00:00
Sam Tuke faf6cb0868 Merge branch 'master' into files_encryption 2013-02-06 18:26:44 +00:00
Sam Tuke 954a627483 Added comment 2013-02-06 18:24:35 +00:00
Sam Tuke 81de09711b Fixed bug causing password change related hooks to not be called due to ajax 2013-02-06 17:42:29 +00:00
Thomas Tanghus 3879e5d9c5 Merge pull request #1428 from owncloud/content_positioning
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
Sam Tuke d9631aebfc Merge branch 'master' into files_encryption 2013-02-06 16:05:14 +00:00
Sam Tuke a8c0e3612c Removed call to depreciated isUserVerified() 2013-02-06 16:01:43 +00:00
Georg Ehrke 0a16d25724 make it possible to modify the links to the clients 2013-02-06 15:20:43 +01:00
Björn Schießle e68d0c7398 make strings translatable 2013-02-06 11:55:19 +01:00
Björn Schießle 9d73e7eb1e let the user change his display name, if supported by the back-end 2013-02-06 11:38:03 +01:00
Jenkins for ownCloud 335b6cd060 [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
Arthur Schiwon 5221ee0c5a offer change password only when the action is supported by the user backend 2013-02-05 19:26:00 +01:00
Thomas Tanghus cda0780d4b Remove superfluous append 2013-02-05 14:15:17 +01:00
Jan-Christoph Borchardt 2ec0c491d4 remove superfluous enabled-app class again 2013-02-05 11:30:18 +01:00
Jan-Christoph Borchardt 4059959c5f Merge branch 'master' into fix_addNavigation 2013-02-05 11:09:38 +01:00
Jenkins for ownCloud 98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Thomas Tanghus b06ac67e07 Add 'hascontrols' class for content with fixed topbar. 2013-02-04 18:30:49 +01:00
Thomas Mueller 6058c2f734 we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that 2013-02-04 15:04:26 +01:00
Thomas Tanghus 46e10407f7 Remove padding hack to position users list. 2013-02-04 14:09:32 +01:00
Thomas Müller 04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Jenkins for ownCloud da6e79a381 [tx-robot] updated from transifex 2013-02-04 00:05:52 +01:00
Thomas Tanghus 88ad1e5fbd Make app icon linkable when enabling app. 2013-02-03 16:02:25 +01:00
Jenkins for ownCloud 2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
Jenkins for ownCloud b29b55a332 [tx-robot] updated from transifex 2013-02-02 00:08:15 +01:00
blizzz 88f4aced38 Merge pull request #1404 from owncloud/fixing-1276-master
fix #1276 - use registerLoadedCallback()
2013-02-01 03:13:23 -08:00
Thomas Mueller cc73568d68 Updateing -> Updating 2013-02-01 00:51:00 +01:00
Thomas Mueller 402263bd5c fix #1276 - use registerLoadedCallback() 2013-02-01 00:33:14 +01:00
Jenkins for ownCloud 94f7446724 [tx-robot] updated from transifex 2013-02-01 00:19:28 +01:00
Michael Gapczynski a9e1c9bf6d Merge pull request #1351 from owncloud/navigation
New navigation design
2013-01-31 14:37:39 -08:00
Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on
Conflicts:
	apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Jan-Christoph Borchardt 943c0334c1 remove z-index from app labels which caused overlap with top bar 2013-01-31 20:27:39 +01:00
Jan-Christoph Borchardt 3d5c7ca245 Merge branch 'master' into navigation 2013-01-31 19:28:25 +01:00
Robin Appelman a224d80f4d Sort internal apps above 3rdparty apps 2013-01-31 17:49:58 +01:00
Lukas Reschke b471177439 Merge pull request #1379 from owncloud/improved_appsmanagement
Improved appsmanagement
2013-01-31 08:30:55 -08:00
Thomas Müller 0dd9e6cb12 Merge pull request #1387 from schiesbn/visual_improvements
small visual improvements
2013-01-31 08:30:25 -08:00
Jenkins for ownCloud 209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Jan-Christoph Borchardt ad044eb888 Merge branch 'master' into navigation 2013-01-31 15:35:20 +01:00
Thomas Mueller 85a12970c7 update on translation string 2013-01-31 14:11:31 +01:00
Jan-Christoph Borchardt c801b86bc2 Merge pull request #1359 from raghunayyar/navigation
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-31 05:01:20 -08:00
Thomas Mueller 3af09f2acf l10n support for the error dialog added 2013-01-31 10:43:59 +01:00
Thomas Mueller 8a662a6c74 Cleanup string - easier for translators 2013-01-31 10:34:54 +01:00
Björn Schießle 170cf20298 addapt the css to adjust the change display name filed to the set password field 2013-01-31 09:57:16 +01:00
raghunayyar b978cc8b28 Shorter, Cleaner JS in apps.js 2013-01-31 11:52:56 +05:30
Jenkins for ownCloud 00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +01:00
Jörn Friedrich Dreyer de00111c1f use on instead of live in users.js 2013-01-30 17:49:02 +01:00
Jörn Friedrich Dreyer 22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
Björn Schießle 92921ceefd make strings translatable 2013-01-30 16:28:41 +01:00
Frank Karlitschek ea5861ed8c remove leftover code 2013-01-30 15:27:20 +01:00
Frank Karlitschek 5e422dea61 fix typo 2013-01-30 14:52:35 +01:00
raghunayyar 0dfbd53a6e Reduced Styling and Image loads as from src and not backgorund. 2013-01-30 19:12:51 +05:30
Frank Karlitschek 66cab77b6d merge master
Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php
2013-01-30 14:36:17 +01:00
Jan-Christoph Borchardt 284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Frank Karlitschek 389c4e8415 mark recommended apps. server part not yet fully implemented 2013-01-30 13:39:53 +01:00
Jenkins for ownCloud 68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Lukas Reschke a7aff48658 Fix indentation 2013-01-30 00:17:41 +01:00
Lukas Reschke 0067ac6ca6 Remove the no longer existing function "isUserVerified"
Thx @eMerzh
2013-01-30 00:16:37 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle 6659798197 only change display name if the display name from the current user was changed; add correct display name to new user 2013-01-29 22:33:46 +01:00
Björn Schießle 56c6e6a334 remove debug output 2013-01-29 22:20:47 +01:00
Björn Schießle afad6e95db check permissions before changing the display name 2013-01-29 22:20:15 +01:00
Björn Schießle 27edbfdf56 added missing changedisplayname.php 2013-01-29 21:52:03 +01:00
Björn Schießle e613a68274 remove dubug output 2013-01-29 21:30:04 +01:00
Björn Schießle 8d0b67e17a fix typo in variable name 2013-01-29 21:04:11 +01:00
raghunayyar d620495e92 No Image Repetition on Enabling Apps in Navigation Bar 2013-01-30 00:54:23 +05:30
Jan-Christoph Borchardt 3bafa87a12 merge styles 2013-01-28 19:36:21 +01:00
Björn Schießle 4b7b092008 rename Name to Login Name 2013-01-28 17:05:20 +01:00
Björn Schießle f3a99f4869 show display name in input field 2013-01-28 17:01:37 +01:00
Björn Schießle e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +01:00
Björn Schießle 022a7b13b8 prepare user table to show and edit display names 2013-01-28 13:12:44 +01:00
Jan-Christoph Borchardt 329d965441 merge changes in navigation 2013-01-28 10:52:15 +01:00
Jenkins for ownCloud b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Jenkins for ownCloud 00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Thomas Müller 276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
2013-01-26 04:15:40 -08:00
Jenkins for ownCloud af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
Björn Schießle 19024de988 typo fixed 2013-01-25 17:44:40 +01:00
Lukas Reschke 047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
raghunayyar aed204d420 Defined height for #leftcontent 2013-01-25 20:39:07 +05:30
Björn Schießle 64e853394c compare the correct uids 2013-01-25 12:46:32 +01:00
Björn Schießle 4271430e60 get all display names from users in a given group 2013-01-25 11:48:03 +01:00
Björn Schießle 9bb8e05839 get all display names 2013-01-25 11:05:00 +01:00
Jenkins for ownCloud 6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Lukas Reschke c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Lukas Reschke 48949ba04a Move appid to external file 2013-01-23 11:21:34 +01:00
Jenkins for ownCloud c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Lukas Reschke 8907bdaf7f Remove uneeded JS 2013-01-22 12:15:46 +01:00
Lukas Reschke bd5ff29716 Merge branch 'master' into no-inline-js 2013-01-22 11:50:33 +01:00
Lukas Reschke d2383338de External JSON for the Apps 2013-01-21 22:18:42 +01:00
Lukas Reschke 30274ee33e Move to OC_App 2013-01-21 22:18:11 +01:00
Lukas Reschke 3ed7d5d521 Move isadmin to external file 2013-01-21 21:25:38 +01:00
Frank Karlitschek a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Jenkins for ownCloud aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00
Jenkins for ownCloud ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +01:00
Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Jan-Christoph Borchardt b81a7aa078 fix up content and content-wrapper merge ... 2013-01-18 19:58:50 +07:00
Jenkins for ownCloud 824fcf6624 [tx-robot] updated from transifex 2013-01-18 00:04:36 +01:00
Jan-Christoph Borchardt 09d3db5eb7 new settings menu for new design 2013-01-17 12:45:33 +07:00
Bart Visscher a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Daniel Molkentin 65ef780ed6 Fix regression caused by 31b1a73e1f 2013-01-15 22:44:40 +01:00
Bart Visscher 0da06187f6 Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Jenkins for ownCloud fdd667a83c [tx-robot] updated from transifex 2013-01-15 00:05:10 +01:00
Thomas Mueller 388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Lukas Reschke eab6d7eb23 Enhanced auth is totally unmaintained and broken
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
Lukas Reschke 0810d80f8a Add a closing )
Thanks Jenkins!
2013-01-14 20:10:10 +01:00
Lukas Reschke fef73d96d1 CP fail 2013-01-14 19:51:16 +01:00
Lukas Reschke 31b1a73e1f Check if user is admin - bool
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)

Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
Jenkins for ownCloud 981fd5e424 [tx-robot] updated from transifex 2013-01-13 00:08:40 +01:00
Jenkins for ownCloud ad64ce189d [tx-robot] updated from transifex 2013-01-12 00:10:58 +01:00
Bart Visscher b608675938 Merge pull request #1157 owncloud/move-OpenID
Move openid.php to apps repo

Conflicts:
	settings/routes.php
2013-01-11 22:57:40 +01:00
Lukas Reschke 954b559d48 Merge pull request #994 from owncloud/enhanced_multiSelect
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Lukas Reschke 1f6eb68ef9 Merge pull request #1150 from owncloud/EnableSSL-AdminMenu
Add security section to admin settings to enable the HTTPS enforcement
2013-01-11 09:21:08 -08:00
Lukas Reschke e11b650d2e Remove OpenID from the router 2013-01-11 17:24:10 +01:00
Lukas Reschke 1631ee4d60 Move to apps repo
This belongs to the apps repo.
2013-01-11 17:22:15 +01:00
Lukas Reschke 9b9f5b1a8a Remove setContentTypeHeader()
`OC_JSON::success` and `OC_JSON::error` are calling
`OC_JSON::encodedPrint`, which already sets these headers. So this two
calls are uneeded duplicates.
2013-01-11 17:09:36 +01:00
Lukas Reschke ffbf273c9a Removed uneeded HTML tag 2013-01-11 14:43:56 +01:00
Lukas Reschke 466cdab680 Add security section to admin menu
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.

The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
2013-01-11 14:18:51 +01:00
Thomas Mueller 508b6a9fc7 displaying notification now centered
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
Thomas Mueller 364b1cd391 Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Jenkins for ownCloud d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Jenkins for ownCloud 912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Jenkins for ownCloud 533f0e8e25 [tx-robot] updated from transifex 2013-01-09 00:05:49 +01:00
Jenkins for ownCloud b69328e1d1 [tx-robot] updated from transifex 2013-01-08 00:31:36 +01:00
Thomas Mueller e475c26f1a fixing <input> tag 2013-01-07 21:23:14 +01:00
Thomas Mueller 7ebfcab49b Merge branch 'master' into fixing-998-master
Conflicts:
	lib/helper.php
2013-01-06 12:18:21 +01:00
Thomas Mueller 6806484c16 Merge branch 'master' into fixing-998-master 2013-01-06 10:36:14 +01:00
Michael Gapczynski 0b13b41189 Merge pull request #1053 from owncloud/ocs_api
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
Thomas Mueller b5d1dfcdc9 javascript syntax error fixed on the way 2013-01-04 23:38:07 +01:00
Thomas Mueller 594d388ad9 new javascript notification functions used within users.js 2013-01-04 23:37:21 +01:00
Jenkins for ownCloud 90f39cd703 [tx-robot] updated from transifex 2013-01-04 13:23:31 +01:00
Jenkins for ownCloud 3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Thomas Mueller 2d36a20a1d moving storage calculation code to OC_Helper::getStorageInfo() 2013-01-02 14:35:45 +01:00
Jörn Friedrich Dreyer ed06070741 omit type attribute in script tag to use fallback (text/javascript) 2013-01-02 12:13:07 +01:00
Jenkins for ownCloud 516464ba94 [tx-robot] updated from transifex 2013-01-02 00:05:14 +01:00
Jenkins for ownCloud c6064a542c [tx-robot] updated from transifex 2013-01-01 00:04:42 +01:00
Tom Needham 6eb194b702 Merge branch 'master' into ocs_api
Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
Jenkins for ownCloud 329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Jenkins for ownCloud 66e57f5fb1 [tx-robot] updated from transifex 2012-12-30 00:05:52 +01:00
Thomas Müller 36da34e5f6 Merge pull request #902 from owncloud/storage-wording
Storage wording
2012-12-28 23:19:52 -08:00
Michael Gapczynski f922f836ce Change old variable name $default_quota to $defaultQuota 2012-12-28 19:14:33 -05:00
Jenkins for ownCloud e9c51b319e [tx-robot] updated from transifex 2012-12-28 00:20:34 +01:00
Jenkins for ownCloud 27f9ea2abb [tx-robot] updated from transifex 2012-12-27 00:05:17 +01:00
Jenkins for ownCloud b7257b2524 [tx-robot] updated from transifex 2012-12-26 00:12:10 +01:00