sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,880 Commits
627 Branches
1167 Tags
9.1 GiB
Commit Graph

1117 Commits (d544a371bfb84f36a3b789d19d44d6694de21c48)

Author SHA1 Message Date
Björn Schießle e1e798c623 make footer and urls aware of ownCloud editions 2013-06-12 15:44:11 +07:00
Jan-Christoph Borchardt 4cafe21aa4 apps management: change misleading + to ... 2013-06-12 14:49:23 +07:00
Jan-Christoph Borchardt c0568e0443 remove App management top bar and move buttons more contextually in the interface 2013-06-12 13:36:17 +07: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 +07:00
Jenkins for ownCloud aab3b7d8ea [tx-robot] updated from transifex 2013-06-12 03:05:58 +07:00
Jan-Christoph Borchardt b014509f41 move storage bar below clients showcase to make it more visible 2013-06-11 16:05:02 +07: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 +07:00
Jenkins for ownCloud 4f0f537b42 [tx-robot] updated from transifex 2013-06-11 02:02:44 +07: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 +07: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 +07: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 +07:00
Jenkins for ownCloud 67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +07: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 +07:00
Björn Schießle 97e05b71f8 add hint about what the recovery password field is for 2013-06-06 12:26:05 +07:00
Jenkins for ownCloud 81b6cab94f [tx-robot] updated from transifex 2013-06-06 02:21:31 +07:00
Jenkins for ownCloud 666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +07:00
Florin Peter 563f343291 fix password change when files_encryption app is disabled 2013-06-03 19:06:20 +07: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 +07:00
Jenkins for ownCloud 8e1d9261aa [tx-robot] updated from transifex 2013-05-30 02:34:14 +07:00
Jenkins for ownCloud 7c0c6bd779 [tx-robot] updated from transifex 2013-05-29 02:10:54 +07: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 +07:00
Georg Ehrke 183f8c90af use false instead of 0 2013-05-27 19:26:53 +07:00
Georg Ehrke 557cc4c1ab make method names camelCase 2013-05-27 19:24:31 +07:00
Georg Ehrke 3f52393866 don't show a warning if internet connection is disabled on purpose 2013-05-27 19:19:47 +07:00
Jenkins for ownCloud 73e0b4c10a [tx-robot] updated from transifex 2013-05-27 02:07:24 +07:00
Jenkins for ownCloud 0c621ff6a9 [tx-robot] updated from transifex 2013-05-26 02:03:54 +07: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 +07: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 +07: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 +07:00
Florin Peter 31037241e1 Merge branch 'master' into files_encryption 2013-05-20 02:25:56 +07:00
Jenkins for ownCloud 6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +07: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 +07:00
Jenkins for ownCloud 9428d813ba [tx-robot] updated from transifex 2013-05-18 02:03:28 +07:00
Jenkins for ownCloud 6a6079176b [tx-robot] updated from transifex 2013-05-17 02:07:36 +07:00
Björn Schießle f1a5b8b524 show nicer warning if the admin recovery password was wrong 2013-05-16 16:01:40 +07:00
Björn Schießle 8ae30891b3 some error handling in case the recovery password is wrong 2013-05-16 15:19:53 +07:00
Björn Schießle 9d1e60325c allow admin to recover users files in case of password lost 2013-05-16 14:53:04 +07:00
Jenkins for ownCloud 966c2231e3 [tx-robot] updated from transifex 2013-05-16 02:01:37 +07:00
Pellaeon Lin 935675ab49 Merge remote-tracking branch 'upstream/master' into pr-langcode 2013-05-12 22:32:22 +07:00
Jenkins for ownCloud 74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +07: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 +07:00
Björn Schießle 135991474b fix inconsistent post parameters in change password operation 2013-05-08 12:38:09 +07:00
Björn Schießle 9b258929c6 allow to set quota to zero, issue #2696 2013-05-07 10:40:25 +07:00
Pellaeon Lin 3409403893 Modify zh_* language codes 2013-05-04 20:27:40 +07:00
Jenkins for ownCloud a876240b32 [tx-robot] updated from transifex 2013-05-04 02:00:54 +07: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 +07:00
Jenkins for ownCloud ee53e7b3d2 [tx-robot] updated from transifex 2013-05-02 02:19:04 +07:00
Jenkins for ownCloud 6163a85668 [tx-robot] updated from transifex 2013-05-01 02:02:59 +07: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 +07:00
Jenkins for ownCloud 5764bf088e [tx-robot] updated from transifex 2013-04-30 01:59:18 +07:00
Jenkins for ownCloud 2b36ad292d [tx-robot] updated from transifex 2013-04-29 02:00:26 +07:00
Jenkins for ownCloud 901e0c598d [tx-robot] updated from transifex 2013-04-28 02:01:38 +07: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 +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
Jenkins for ownCloud 7ea2f785f4 [tx-robot] updated from transifex 2013-04-26 01:58:21 +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
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 +07: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 +07:00
Jenkins for ownCloud a7b4469b2e [tx-robot] updated from transifex 2013-04-24 02:01:20 +07: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 +07: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 +07:00
Morris Jobke b9b2e0269a fix logical issue while retrieving log via ajax 2013-04-23 14:40:21 +07:00
Jenkins for ownCloud f6808617b3 [tx-robot] updated from transifex 2013-04-22 02:00:20 +07:00
kondou 7a2be0c5dc Make divider not selectable 
Very hacky
 2013-04-19 00:39:42 +07:00
kondou 79218be1d2 Priorize common languages. 2013-04-18 15:14:42 +07:00
Jenkins for ownCloud cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +07: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 +07:00
Bernhard Posselt f7e29eabf2 fix admin log display and use a more readable format 2013-04-17 14:05:51 +07:00
Jenkins for ownCloud 37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +07: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 +07:00
Jenkins for ownCloud e13e4c412f [tx-robot] updated from transifex 2013-04-15 02:12:43 +07: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 +07:00
kondou 448a390486 Optimize svgs with scour. 2013-04-12 19:06:29 +07:00
raghunayyar 5228eb8a18 Add span tag while enabling or disbling apps as well. 2013-04-12 18:15:59 +07: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 +07:00
Jenkins for ownCloud b02db643d0 [tx-robot] updated from transifex 2013-04-11 02:10:41 +07:00
Robin Appelman 1abc264873 Add the quota change listeners to newly added user entries in the user list 2013-04-10 14:12:54 +07:00
Jenkins for ownCloud c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +07:00
Robin Appelman 27f710d860 Users: fix "Other.." quota option for the default quota 2013-04-09 12:47:08 +07: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 +07:00
Thomas Mueller ce54d00b5c fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName 2013-04-08 23:11:33 +07:00
Jenkins for ownCloud ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +07:00
kondou f59aedff4f Optimize pictures with optipng. 2013-04-07 20:09:25 +07: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 +07:00
Jenkins for ownCloud 6798b6dc34 [tx-robot] updated from transifex 2013-04-06 00:05:32 +07:00
kondou 32f96e19e5 Fix Typo 2013-04-05 19:06:58 +07: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 +07: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 +07:00
Jenkins for ownCloud c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +07:00
Jenkins for ownCloud cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +07:00
Jenkins for ownCloud 10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +07:00
Lukas Reschke 8000f9db74 Unescape the update hint 
Fixes #2647
 2013-04-02 16:39:21 +07:00
Jenkins for ownCloud cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +07: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 +07:00
Morris Jobke f19fd30278 convert js call to css rule 2013-03-28 15:43:14 +07:00
Morris Jobke df74c0e43a apply code review hints 2013-03-28 15:02:31 +07:00
Arthur Schiwon 942cdff240 Users: use DisplayName in the Display Name col when appending users 2013-03-27 18:52:15 +07:00
Morris Jobke 7c8a0a486b add copyright note 2013-03-27 16:53:51 +07:00
Morris Jobke 97d73d41a8 remove animation 2013-03-27 15:19:28 +07: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 +07:00
Jenkins for ownCloud 0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +07:00
Brice Maron 24d471af29 Improve detection of installations errors 2013-03-23 13:47:42 +07:00
Jenkins for ownCloud 4f6e13e673 [tx-robot] updated from transifex 2013-03-23 00:06:16 +07:00
Jenkins for ownCloud a035ed0c19 [tx-robot] updated from transifex 2013-03-22 00:04:46 +07:00
Jenkins for ownCloud 3b1c7de459 [tx-robot] updated from transifex 2013-03-21 00:04:36 +07:00
Jenkins for ownCloud 63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +07:00
Thomas Tanghus 06a7d39024 User list: Keep array of available groups. Should fix #873 2013-03-19 14:49:02 +07:00
Thomas Tanghus c13487332a User list: Avoid dupes and better sorting. Fix #2420 2013-03-19 02:48:08 +07:00
Jenkins for ownCloud 63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +07:00
Jenkins for ownCloud 2a48aa322d [tx-robot] updated from transifex 2013-03-18 00:06:55 +07:00
Jenkins for ownCloud 1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +07:00
Jenkins for ownCloud 0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +07:00
Jenkins for ownCloud 9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +07:00
Jenkins for ownCloud 569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +07:00
Jenkins for ownCloud 6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +07:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +07:00
Jenkins for ownCloud 308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +07:00
Jenkins for ownCloud 97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +07:00
Jenkins for ownCloud c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +07:00
Jenkins for ownCloud 6c96b93fd4 [tx-robot] updated from transifex 2013-03-05 00:19:07 +07: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 +07:00
Frank Karlitschek d70912e72b Merge pull request #2060 from owncloud/escapeGroupname 
Sanitize uid, group and quota
 2013-03-04 00:00:47 +07: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 +07:00
Lukas Reschke 0252479e3e Add the description as text and not as html 2013-03-04 00:19:07 +07:00
Lukas Reschke 86a7202cda Sanitize uid, group and quota 2013-03-04 00:11:46 +07:00
Jenkins for ownCloud b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +07:00
Lukas Reschke 962b7a7c80 Add log as text and not as HTML 2013-03-03 23:46:08 +07:00
Bart Visscher 376f350af2 Fix encoding settings ajax getlog 2013-03-03 23:14:36 +07:00