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

2641 commits

Author SHA1 Message Date
michag86
3841bb1c07 assign error message to correct object 
fix for  #17817
 2015-07-22 18:42:46 +02:00
Jan-Christoph Borchardt
780a2ed093 use arrow to indicate external link, use correct quotes and capitalization 2015-07-22 14:20:55 +02:00
Bjoern Schiessle
50cbb57065 make sure that there is a space between user- and admin-documentation 2015-07-22 14:02:43 +02:00
Bjoern Schiessle
3000f0125f don't move keys if the key where already moved in a previous migration run 2015-07-17 15:19:10 +02:00
Jenkins for ownCloud
8723410319 [tx-robot] updated from transifex 2015-07-17 01:54:52 -04:00
Thomas Müller
d6f02eb703 Merge pull request #17500 from owncloud/encryption_migration_improvements 
Only clean up if migration finished succesfully
 2015-07-16 14:03:21 +02:00
Morris Jobke
533a23611a Handle returned null value in app level code 
* getApplication on OCSClient can also return null
  this is now handled properly
* fixes #17587
 2015-07-13 15:34:00 +02:00
Jenkins for ownCloud
bfd7194cf9 [tx-robot] updated from transifex 2015-07-11 01:54:51 -04:00
Jenkins for ownCloud
176dabd976 [tx-robot] updated from transifex 2015-07-10 01:54:55 -04:00
Jenkins for ownCloud
6d9bb17360 [tx-robot] updated from transifex 2015-07-09 01:54:53 -04:00
Bjoern Schiessle
85c3b9d5cf only cleanUp the remaining keys if the migration really finished succesfully 2015-07-08 18:23:18 +02:00
Jenkins for ownCloud
2fd84607ee [tx-robot] updated from transifex 2015-07-08 01:55:28 -04:00
Jenkins for ownCloud
ee5dd25290 [tx-robot] updated from transifex 2015-07-07 01:55:18 -04:00
Jenkins for ownCloud
55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00
Roeland Jago Douma
15a0f8e433 Do not allow invalid default expire days 
Currently it is possible to set a negative number of days in which a
public share expires. This results in public sharing not working and it
undesired.

Weird thing is that the API still lets you create shares and gives back
an URL. However the id is "unkown" and the URL invalid.
 2015-07-04 06:57:00 +02:00
Thomas Müller
1385b1ec48 Remove OC_Appconfig 2015-07-03 18:00:16 +02:00
Thomas Müller
d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Jenkins for ownCloud
b8f5b2c47a [tx-robot] updated from transifex 2015-07-03 01:54:57 -04:00
Vincent Petry
d5b7e40c19 Unit test for app list 2015-07-02 17:22:56 +02:00
Vincent Petry
2f6dc8743e Fix global app list state 2015-07-02 17:15:14 +02:00
Jenkins for ownCloud
d2e1cae331 [tx-robot] updated from transifex 2015-07-02 01:59:26 -04:00
Lukas Reschke
1db047a336 Add missing version field 2015-06-29 15:09:57 +02:00
Lukas Reschke
b56af26199 Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store 
Send OC version to appstore so it can reply with the right links
 2015-06-29 15:07:00 +02:00
Lukas Reschke
5810e7ab87 Merge pull request #17050 from owncloud/request-status-from-ocs 
Request approved state for disabled apps with ocsid
 2015-06-29 13:41:11 +02:00
Joas Schilling
ae3d402dbc Send OC version to appstore so it can reply with the right links 2015-06-29 12:14:07 +02:00
Lukas Reschke
30145c0b52 Also load enabled apps 2015-06-29 11:38:28 +02:00
Jenkins for ownCloud
733d59ed44 [tx-robot] updated from transifex 2015-06-29 01:54:44 -04:00
Jenkins for ownCloud
4d565a8447 [tx-robot] updated from transifex 2015-06-28 01:55:19 -04:00
Lukas Reschke
d1f0ff372e Merge pull request #17163 from owncloud/update-licenses 
Update license headers
 2015-06-27 20:22:23 +02:00
Jenkins for ownCloud
28c223edc6 [tx-robot] updated from transifex 2015-06-27 01:55:58 -04:00
Thomas Müller
8cc88fa64f Merge pull request #17190 from owncloud/lock-changelabel 
Rename experimental to transactional file locking
 2015-06-26 12:27:16 +02:00
Vincent Petry
eadf789519 Rename experimental to transactional file locking 2015-06-26 11:10:10 +02:00
Jenkins for ownCloud
b1e29c7dde [tx-robot] updated from transifex 2015-06-26 01:55:35 -04:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Jenkins for ownCloud
dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Jenkins for ownCloud
ceb80ac123 [tx-robot] updated from transifex 2015-06-24 01:55:55 -04:00
Joas Schilling
e0fb5f4b5e Accept this language change at your own risk 2015-06-23 10:59:15 +02:00
Jenkins for ownCloud
3cad0d4ed2 [tx-robot] updated from transifex 2015-06-23 01:56:15 -04:00
Jenkins for ownCloud
c77e44117d [tx-robot] updated from transifex 2015-06-22 01:55:00 -04:00
Jenkins for ownCloud
59513ac377 [tx-robot] updated from transifex 2015-06-21 01:55:06 -04:00
Jenkins for ownCloud
183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00
Lukas Reschke
00a65e30ce Request approved state for disabled apps with ocsid 
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.

With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.

Fixes https://github.com/owncloud/core/issues/17003
 2015-06-19 19:04:54 +02:00
Joas Schilling
6adddb3095 Merge pull request #16889 from owncloud/group-sorting-fixes 
Only sort by group name when LDAP is involved
 2015-06-19 08:29:25 +02:00
Jenkins for ownCloud
c4cb34da9d [tx-robot] updated from transifex 2015-06-18 01:55:14 -04:00
Jenkins for ownCloud
3898b8c9b8 [tx-robot] updated from transifex 2015-06-17 01:55:34 -04:00
Lukas Reschke
829f6474ff Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-completion 
Load the update information asyncroniously to fix the page load speed
 2015-06-16 11:41:44 +02:00
Joas Schilling
497fe93b6c Do not return backends but add a method to check for one 2015-06-16 11:31:04 +02:00
Joas Schilling
171f86ca2e Only sort by group name when LDAP is involved 2015-06-16 11:10:00 +02:00
Joas Schilling
fee62ac61c Always keep "Everyone" and "admin" at the top of the list 2015-06-16 11:10:00 +02:00
Joas Schilling
5ca6ec7ead Make "include update info" part of the cache key 2015-06-15 10:04:13 +02:00
Jenkins for ownCloud
2806c9476c [tx-robot] updated from transifex 2015-06-15 01:54:58 -04:00
Jenkins for ownCloud
fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00
Jenkins for ownCloud
51d181f331 [tx-robot] updated from transifex 2015-06-13 01:55:04 -04:00
Jenkins for ownCloud
abd70932c6 [tx-robot] updated from transifex 2015-06-12 01:55:11 -04:00
Jenkins for ownCloud
88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Joas Schilling
580155abe7 Load the update information asyncroniously to fix the page load speed 2015-06-10 12:11:05 +02:00
Jenkins for ownCloud
4d88302b3a [tx-robot] updated from transifex 2015-06-10 01:54:55 -04:00
Jenkins for ownCloud
75bd040f1c [tx-robot] updated from transifex 2015-06-09 01:55:06 -04:00
Thomas Müller
f051b7381b Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount 
Sort user groups by group name and hide the user count
 2015-06-08 12:11:22 +02:00
Jenkins for ownCloud
2fb1b0864a [tx-robot] updated from transifex 2015-06-08 01:55:01 -04:00
Jenkins for ownCloud
3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Jenkins for ownCloud
16708ae187 [tx-robot] updated from transifex 2015-06-06 01:55:26 -04:00
Jenkins for ownCloud
e544d5b2c6 [tx-robot] updated from transifex 2015-06-05 01:55:04 -04:00
Jenkins for ownCloud
66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Thomas Müller
69d1e7aaf4 Merge pull request #16687 from owncloud/issue-16113-redis-minimum-version 
Check for redis to be 2.2.5+
 2015-06-03 13:55:26 +02:00
Jenkins for ownCloud
410a836702 [tx-robot] updated from transifex 2015-06-03 01:55:29 -04:00
Joas Schilling
bdc82dcfb9 Check for redis to be 2.2.5+ 2015-06-02 15:42:48 +02:00
Jenkins for ownCloud
baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Thomas Müller
43772e2a9a Adding information on file locking status to admin section 2015-06-01 13:24:02 +02:00
Morris Jobke
197378d1fd Fix L10n in apps management 
* fixes #16632
 2015-05-30 13:39:12 +02:00
Lukas Reschke
173b147305 Merge pull request #16467 from owncloud/apps-fixsort 
Sort apps by level, then by name
 2015-05-28 16:10:27 +02:00
Vincent Petry
474c99e19a Merge pull request #16577 from owncloud/enc_improve_migration 
only request encryption module for files which are not excluded
 2015-05-28 11:31:33 +02:00
Jenkins for ownCloud
1726d84e73 [tx-robot] updated from transifex 2015-05-28 01:55:22 -04:00
Bjoern Schiessle
0de59acb49 only request encryption module for files which are not excluded 2015-05-27 15:47:40 +02:00
Thomas Müller
07c6e523b1 Merge pull request #16565 from owncloud/add-urandom-check 
Add check for availability of /dev/urandom
 2015-05-26 16:53:11 +02:00
Lukas Reschke
bc6d17ed74 Add check for availability of /dev/urandom 
Without /dev/urandom being available to read the medium RNG will rely only on the following components on a Linux system:

1. MicroTime: microtime() . memory_get_usage() as seed and then a garbage collected microtime for loop
2. MTRand: chr((mt_rand() ^ mt_rand()) % 256)
3. Rand: chr((rand() ^ rand()) % 256)
4. UniqId: Plain uniqid()

An adversary with the possibility to predict the seed used by the PHP process may thus be able to predict future tokens which is an unwanted behaviour.

One should note that this behaviour is documented in our documentation to ensure that users get aware of this even without reading our documentation this will add a post setup check to the administrative interface.

Thanks to David Black from d1b.org for bringing this again to our attention.
 2015-05-26 14:16:07 +02:00
Vincent Petry
23bbf287ff Merge pull request #16518 from owncloud/external-link-arrow 
use arrow icon for external link to Apps dev docs, like in Help section
 2015-05-26 12:17:50 +02:00
Jenkins for ownCloud
6198fb20cb [tx-robot] updated from transifex 2015-05-26 01:54:57 -04:00
Jenkins for ownCloud
fe610a65d3 [tx-robot] updated from transifex 2015-05-25 01:55:06 -04:00
Jenkins for ownCloud
06934e7c00 [tx-robot] updated from transifex 2015-05-24 01:55:03 -04:00
Jenkins for ownCloud
e189435499 [tx-robot] updated from transifex 2015-05-23 01:55:05 -04:00
Jenkins for ownCloud
156881efce [tx-robot] updated from transifex 2015-05-22 01:55:04 -04:00
Jan-Christoph Borchardt
94e4f448ee use arrow icon for external link to Apps dev docs, like in Help section 2015-05-22 01:17:22 +02:00
Jenkins for ownCloud
42dd40ad80 [tx-robot] updated from transifex 2015-05-21 01:55:57 -04:00
Vincent Petry
66e426c990 Sort apps by level, then by name 
Also properly initialize the level to 0 when no level was returned
 2015-05-20 13:43:20 +02:00
Jenkins for ownCloud
c49a06a684 [tx-robot] updated from transifex 2015-05-20 01:56:19 -04:00
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