Commit graph

39 commits

Author SHA1 Message Date
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
Frank Karlitschek
389c4e8415 mark recommended apps. server part not yet fully implemented 2013-01-30 13:39:53 +01:00
Lukas Reschke
48949ba04a Move appid to external file 2013-01-23 11:21:34 +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
Frank Karlitschek
a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Diederik de Haas
eff13a28c1 Fixed new checkstyle issues in apps.php from build #1341. 2012-11-10 01:03:54 +01:00
Frank Karlitschek
f799e48f7e fix the broken image path on the apps page 2012-11-08 13:34:00 +01:00
Felix Moeller
a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Bart Visscher
d0bd2bbf27 Convert menu entries of settings pages to use router 2012-09-28 23:20:17 +02:00
Sam Tuke
9df403f051 Added failsafes for retrieving remote apps on settings->apps page, in case categories or app data are not found 2012-09-18 16:55:03 +01:00
Sam Tuke
b765e883f3 Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
Added method getAppstoreApps to OC_App
Added minor documentation
2012-09-18 14:35:27 +01:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Thomas Müller
1063034e93 Update settings/apps.php
respect coding style
2012-09-04 12:28:49 +03:00
Thomas Müller
cfd62d422b Update settings/apps.php
respect coding style
2012-09-04 12:14:09 +03:00
Bart Visscher
38116c7efa Add check for missing appinfo in apps settings page 2012-09-03 21:51:32 +02:00
Jörn Friedrich Dreyer
84a5faff36 remove files_imageviewer and files_texteditor from blacklist so they can be activated in a multi apps environment 2012-08-27 20:35:05 +02:00
Thomas Tanghus
f17876d093 Remove unused code. 2012-08-04 21:25:41 +02:00
Thomas Tanghus
24af2e8078 Load OCS apps in an ajax call to avoid blocking the WUI. 2012-08-04 20:16:32 +02:00
Alessandro Cosentino
627ea9efe4 fixes bug oc-1433 2012-08-04 12:39:23 -04:00
Jörn Friedrich Dreyer
e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Thomas Tanghus
c3130919c2 Allow direct link to app. 2012-06-25 05:02:01 +02:00
Lukas Reschke
2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Lukas Reschke
c009bc4b87 Revert 2012-06-11 13:27:32 +02:00
Lukas Reschke
ec4c373eaa Settings... 2012-06-11 12:48:47 +02:00
Frank Karlitschek
3947aa3ef7 apps paging is not yet implemented. increase pagesize to 100 as a quickfix 2012-06-09 22:00:28 +02:00
Frank Karlitschek
a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Frank Karlitschek
fdbe0c9734 don´t claim that already downloaded 3rd party apps are internal apps 2012-05-18 21:14:07 +02:00
Frank Karlitschek
b5db852438 add files to blacklist. Should be always on 2012-04-29 21:16:41 +02:00
Frank Karlitschek
6bfe2289be improve the app installer.
show a label if an app is an internal app or a third party app from the app store.
show a preview image of the app if available
2012-04-21 15:30:58 +02:00
Frank Karlitschek
05f1fffddc fix appstore download. 2012-01-27 17:34:47 +01:00
Frank Karlitschek
d485a70e7d finish the application store feature so that users can download and install ownCloud apps from our website. there is still a small problem with write permissions. will look into this later 2012-01-06 19:08:35 +01:00
Bart Visscher
9ba59aee36 Sort apps on name and enabled status 2011-12-07 20:41:00 +01:00
Robin Appelman
3ebf1a5a3b dissable app instalation from apps.owncloud.org interface 2011-09-28 22:39:41 +02:00
Bart Visscher
e990ef3542 Move some common code to OC_Util
Created the following function:
 - checkLoggedIn
 - checkAdminUser
 - redirectToDefaultPage
2011-09-18 21:31:56 +02:00
Michael Gapczynski
74c7890fbb Fix undefined index license in Apps 2011-08-27 17:56:22 -04:00
Robin Appelman
391e064e67 allow apps to register form for the settings and admin pages 2011-08-23 01:41:18 +02:00
Robin Appelman
c08e85bf70 dont throw errors if we cant connect to the apps repository 2011-08-15 16:01:41 +02:00
Jan-Christoph Borchardt
4a5ee765cf merged admin, help and settings to settings 2011-08-13 05:13:34 +02:00
Renamed from admin/apps.php (Browse further)