wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
25445 commits 157 branches 562 tags 714 MiB
Commit graph

2505 commits

Author SHA1 Message Date
Thomas Müller
d90b83725f Merge pull request #16085 from owncloud/encryption-module-rename 
rename to 'Default encryption module'
 2015-05-19 11:13:33 +02:00
Joas Schilling
d683752b37 Sort user groups by group name and hide the user count 2015-05-18 12:55:19 +02:00
Bjoern Schiessle
887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Jenkins for ownCloud
73a3086945 [tx-robot] updated from transifex 2015-05-18 01:54:58 -04:00
Thomas Müller
257ee205bb Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips 
[enc2]fixing recovery tooltip
 2015-05-15 22:39:17 +02:00
Jenkins for ownCloud
49c4ee98b4 [tx-robot] updated from transifex 2015-05-15 01:54:49 -04:00
Jenkins for ownCloud
1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Jenkins for ownCloud
504586aec6 [tx-robot] updated from transifex 2015-05-13 01:55:14 -04:00
Lukas Reschke
a7a2579c89 Subadmin permissions are also not required 2015-05-12 18:08:10 +02:00
Lukas Reschke
cdeb2052bb Add NoAdminRequired annotation 
Stupid mistake in master, fixes https://github.com/owncloud/core/issues/16288
 2015-05-12 17:49:34 +02:00
Jan-Christoph Borchardt
76f6f6b6bc fix user mgmt search box position, fix #15928 2015-05-12 15:48:45 +02:00
Lukas Reschke
0a3bf3f963 Use active instead of non existing pressed 
Fixes https://github.com/owncloud/core/issues/16083
 2015-05-12 12:20:28 +02:00
Jenkins for ownCloud
deeeca69fe [tx-robot] updated from transifex 2015-05-12 01:55:10 -04:00
Jenkins for ownCloud
a331f6b83e [tx-robot] updated from transifex 2015-05-11 01:54:43 -04:00
Jenkins for ownCloud
52fc45e6e3 [tx-robot] updated from transifex 2015-05-10 01:56:13 -04:00
Jenkins for ownCloud
6f5854a8de [tx-robot] updated from transifex 2015-05-09 01:55:35 -04:00
Lukas Reschke
ebf3953908 Merge pull request #16168 from owncloud/cron-errors 
fix cron errors to only appear in one line instead of introducing another list
 2015-05-08 11:23:19 +02:00
Joas Schilling
0577691631 Merge pull request #16175 from owncloud/fix-enc-typo 
Fix typo in encryption module message
 2015-05-08 09:41:27 +02:00
Jenkins for ownCloud
ff0faacf0b [tx-robot] updated from transifex 2015-05-08 01:54:52 -04:00
Morris Jobke
5b7e4b3341 Fix typo in encryption module message 
* finishes #16021
 2015-05-07 18:04:32 +02:00
Jan-Christoph Borchardt
3abaf34709 fix cron errors to only appear in one line instead of introducing another list 2015-05-07 16:19:14 +02:00
Morris Jobke
12b24ee567 Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page 
Display the module settings in the list of the encryption modules
 2015-05-07 10:44:03 +02:00
Jenkins for ownCloud
3dee907b70 [tx-robot] updated from transifex 2015-05-07 01:56:44 -04:00
Jan-Christoph Borchardt
35292eb66c rename to 'Default encryption module' 2015-05-06 15:31:05 +02:00
Morris Jobke
5a46dad4e0 kill new lines in l10n strings 2015-05-06 14:30:22 +02:00
Morris Jobke
5ef4a7606c Add l10n support to encryption settings 
* fixes #16111
 2015-05-06 12:39:02 +02:00
Jenkins for ownCloud
910146824e [tx-robot] updated from transifex 2015-05-06 01:55:19 -04:00
Jan-Christoph Borchardt
952a90f2e3 Merge pull request #16037 from owncloud/enc_dont_disable_encryption 
don't let the the user disable encryption once it was activated
 2015-05-05 18:53:01 +02:00
Clark Tomlinson
10d7eb56af adding username as param for isrecoveryenabled 2015-05-05 09:42:53 -04:00
Morris Jobke
5fd849f545 Allow user to set an empty email address 
* fixes #16057
 2015-05-05 11:58:19 +02:00
Morris Jobke
624c25313e fix label reference 2015-05-05 11:12:56 +02:00
Bjoern Schiessle
8f1e504d79 adjust wording and add button to confirm encryption 2015-05-05 10:38:09 +02:00
Jan-Christoph Borchardt
a7deba74a7 Merge pull request #16031 from owncloud/fix-15953-master 
No clickable app for local apps
 2015-05-05 09:27:47 +02:00
Jenkins for ownCloud
b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Roeland Jago Douma
a9a9adc217 Only show SSL table header if there are certificates 2015-05-04 19:08:43 +02:00
Joas Schilling
eadc2c330c Display the module settings in the list of the encryption modules 2015-05-04 15:04:03 +02:00
Bjoern Schiessle
6dc3682cc2 don't let the the user disable encryption once it was activated 2015-05-04 13:13:31 +02:00
Thomas Müller
7112824229 fix l10n strings 2015-05-04 11:37:30 +02:00
Thomas Müller
c2fd7b1d12 no link if there is no detailpage property set - fixes #15953 2015-05-04 11:35:30 +02:00
Clark Tomlinson
3ef2e668ac fixing recovery tooltip 2015-05-04 09:40:59 +02:00
Jenkins for ownCloud
7fa308977b [tx-robot] updated from transifex 2015-05-04 01:54:47 -04:00
Jenkins for ownCloud
9f76b8b356 [tx-robot] updated from transifex 2015-05-03 01:55:17 -04:00
Lukas Reschke
6528a17ea3 Merge pull request #16005 from owncloud/remove-more-apps 
remove 'More apps' link from apps mgmt now that we have support for experimental apps
 2015-05-02 19:54:42 +02:00
Jenkins for ownCloud
aa0d439ed9 [tx-robot] updated from transifex 2015-05-02 01:54:49 -04:00
Jan-Christoph Borchardt
4c070b3e12 remove 'More apps' link from apps mgmt now that we have support for experimental apps 2015-05-01 18:07:55 -04:00
Jenkins for ownCloud
eda4d45836 [tx-robot] updated from transifex 2015-05-01 01:54:43 -04:00
Jan-Christoph Borchardt
9ec80377e6 fix layout for documentation link hints 2015-04-30 17:12:34 -04:00
Jan-Christoph Borchardt
8b37e25ec2 add admin documentation links for Sharing, Encryption and Email server 2015-04-30 17:10:24 -04:00
Jenkins for ownCloud
ae853445ef [tx-robot] updated from transifex 2015-04-30 03:27:57 -04:00
Jenkins for ownCloud
9db338df29 [tx-robot] updated from transifex 2015-04-29 01:54:45 -04:00
Jenkins for ownCloud
6679ef287a [tx-robot] updated from transifex 2015-04-28 01:54:44 -04:00
Joas Schilling
1341d03455 Can't use function return value in write context 2015-04-27 14:28:31 +02:00
Joas Schilling
d600955a51 Make getDefaultModuleId public and get module protected 2015-04-27 11:03:51 +02:00
Jenkins for ownCloud
e58029f8ad [tx-robot] updated from transifex 2015-04-27 01:54:46 -04:00
Jenkins for ownCloud
37adf6df01 [tx-robot] updated from transifex 2015-04-26 01:54:49 -04:00
Jenkins for ownCloud
7855174879 [tx-robot] updated from transifex 2015-04-25 01:55:13 -04:00
Morris Jobke
62bac7de91 Add missing loading indicator for enabled apps 
* happened when an app gets activated, because the
  new appended HTML doesn't contain the loading
  image
* fixes #15806
 2015-04-23 21:40:51 +02:00
Thomas Müller
6d3f120d23 Merge pull request #15617 from mmattel/getenv_system_check_and_warning 
Checks if getenv returns proper system environment variable results
 2015-04-23 14:42:58 +02:00
root
35dbef55b5 Checks if getenv returns proper system variable results 
Updated texts and changed the variable name to match the query

Updated text + info which path for php config is used

removed the term ownCloud and squashed the commits

Updated text
 2015-04-23 10:58:13 +02:00
Jenkins for ownCloud
f8f354b351 [tx-robot] updated from transifex 2015-04-23 01:54:51 -04:00
Thomas Müller
fc4127dd62 add $encryptionModuleId to methods of Keys/IStorage 2015-04-22 11:53:05 +02:00
Jenkins for ownCloud
d7bdf60559 [tx-robot] updated from transifex 2015-04-22 01:55:38 -04:00
Morris Jobke
4b968da9e6 Merge pull request #15713 from owncloud/fix-15707-master 
[enc2] Fixing JS errors
 2015-04-21 12:47:43 +02:00
Thomas Müller
4a2f8f81ca Don't pollute the global namespace 2015-04-21 12:01:56 +02:00
Jenkins for ownCloud
c548066d2c [tx-robot] updated from transifex 2015-04-21 01:55:37 -04:00
Lukas Reschke
9bc48451b9 Adjust tests and statuscode 2015-04-20 13:00:02 +02:00
Morris Jobke
8935369564 fix date variable 2015-04-20 13:00:02 +02:00
Lukas Reschke
20a6073a9f Migrate personal certificate handling into AppFramework controllers 
Also added unit-tests and better error-handling
 2015-04-20 12:58:58 +02:00
Jenkins for ownCloud
75bf03a605 [tx-robot] updated from transifex 2015-04-20 01:54:44 -04:00
Jenkins for ownCloud
fd3c1484ad [tx-robot] updated from transifex 2015-04-19 01:54:41 -04:00
Joas Schilling
b5c5775626 Fix potential undefined variable 2015-04-18 10:20:13 +02:00
Jenkins for ownCloud
37a871127b [tx-robot] updated from transifex 2015-04-18 01:55:19 -04:00
Jan-Christoph Borchardt
b083b65894 fix capitalization for server-side encryption and email server, fix #15642 2015-04-17 17:57:30 +02:00
Bjoern Schiessle
7d4b1b52d0 always create a new instance of the encryption module 2015-04-17 10:31:33 +02:00
Jenkins for ownCloud
da44df2cfa [tx-robot] updated from transifex 2015-04-17 01:55:37 -04:00
Clark Tomlinson
1174ad0681 Merge pull request #15445 from owncloud/enc2_migration 
add migration script from old encryption to new one
 2015-04-16 09:34:47 -04:00
Bjoern Schiessle
d2ef73367c allow user to start migration in admin settings if no external user back-ends are enabled 2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e3d77c4b01 add migration script from old encryption to new one 2015-04-16 14:15:04 +02:00
Jenkins for ownCloud
8606b7ca66 [tx-robot] updated from transifex 2015-04-16 01:54:43 -04:00
Jan-Christoph Borchardt
14b92c3ce6 Merge pull request #15632 from owncloud/remove-tooltip-fade 
remove slow fade animation for remaining tipsy tooltips
 2015-04-15 14:42:45 +02:00
Jan-Christoph Borchardt
04ca5b8160 remove slow fade animation for remaining tipsy tooltips 2015-04-15 12:25:10 +02:00
Vincent Petry
75268860fc Merge pull request #15626 from owncloud/remove-tooltip-fade 
remove slow fade animation for tipsy tooltip
 2015-04-15 12:14:54 +02:00
Jan-Christoph Borchardt
9332c8c266 remove slow fade animation for tipsy tooltip 2015-04-15 09:10:21 +02:00
Jenkins for ownCloud
7f3f191ee9 [tx-robot] updated from transifex 2015-04-14 18:19:31 -04:00
Morris Jobke
74732cc0d8 Fix user list 
* the name cell was changed from td to th because of accessibility
  issues - this adjusts the CSS and JS to behave like before
 2015-04-13 21:43:36 +02:00
Roeland Jago Douma
2b8fc774d0 Initial fix for #15494 2015-04-12 16:29:05 +02:00
Jan-Christoph Borchardt
bbb2567918 Merge pull request #15398 from Volker-E/master 
fixing #15396 & #15397
 2015-04-10 10:43:39 +02:00
Jan-Christoph Borchardt
95890804f1 help section: code style and wording fixes 2015-04-09 12:33:18 +02:00
Jan-Christoph Borchardt
83a0d1b3ba link to proper subsite for Commercial support 2015-04-09 12:29:44 +02:00
Jan-Christoph Borchardt
65dc958418 add admin documentation hints to Federated Cloud Sharing and cron 2015-04-09 12:07:05 +02:00
Lukas Reschke
ba52f6f8fc Merge pull request #15314 from owncloud/app-categories-15274 
Add different trust levels to AppStore interface
 2015-04-09 10:07:32 +02:00
Lukas Reschke
98698e05e8 Add JS unit test for sorting 2015-04-08 22:08:37 +02:00
Lukas Reschke
eb1cf58d11 Reference $(this) instead 2015-04-08 21:26:12 +02:00
Lukas Reschke
0cd29e00d1 Fix wording 2015-04-08 21:24:03 +02:00
Thomas Müller
1fbf5d86df Merge pull request #14472 from owncloud/feature/wipencryptionapp 
encryption 2.0 app
 2015-04-07 16:46:45 +02:00
Morris Jobke
2182ae0d27 Merge pull request #15431 from owncloud/displayname-width 
widen displayName input field
 2015-04-07 14:24:01 +02:00
Bjoern Schiessle
a057108c0c make recovery key work 2015-04-07 13:30:30 +02:00
Thomas Müller
bd933b1c85 Adding app icon and fixing admin setting 2015-04-07 13:30:29 +02:00
Thomas Müller
bf809ac85a Removing left overs from old encryption app 2015-04-07 13:30:29 +02:00
Jan-Christoph Borchardt
44a8160b58 widen displayName input field 2015-04-07 13:28:26 +02:00