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

272 commits

Author SHA1 Message Date
Tom Needham
729b36e495 Fix grammer and dont split translatable string 2012-09-18 21:31:03 +00:00
Sam Tuke
dc0dc56d48 Merge branch 'master' of https://github.com/owncloud/core 2012-09-18 14:36:08 +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
Tom Needham
88b786e8dd Merge branch 'master' into ocs_api 2012-09-17 12:09:34 +00:00
Alessandro Cosentino
158af74b3e makes cron config layout similar to the sharing one 2012-09-16 12:40:08 -04:00
Frank Karlitschek
442f26ea80 structure the settings options a bit better. 2012-09-16 17:23:21 +02:00
Tom Needham
227ada3257 Fix merge conflicts 2012-09-13 10:23:41 +00:00
Frank Karlitschek
c0a3bdb757 improve the documentation for the cron config a bit 2012-09-12 12:09:46 +02:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Thomas Tanghus
a2b6a92107 Disable asking to save password when adding users. 2012-09-05 17:22:03 +02:00
Thomas Mueller
685f03edf6 fixing translation - thx eMerzh 2012-09-04 23:49:43 +02:00
Thomas Müller
409ede0975 Update settings/templates/users.php 
respect coding style
 2012-09-04 13:05:09 +03:00
Thomas Müller
f3e330ce64 Update settings/templates/help.php 
respect coding style
 2012-09-04 13:03:51 +03:00
Robin Appelman
0fa254508d dont use shorthand php tags 2012-09-01 16:38:23 +02:00
Thomas Mueller
10bd64debd translation support enhanced 2012-09-01 13:23:37 +02:00
Robin Appelman
b5234a4f34 allow html inside app descriptions 2012-08-30 22:17:54 +02:00
Michael Gapczynski
aad7dc8390 Remove sharing notice in users settings - The default is now share with anyone, groups only sharing is now a setting in the admin page 2012-08-27 20:55:11 -04:00
Michael Gapczynski
9cd55508c3 Add Share API settings to admin page 2012-08-27 20:39:31 -04:00
Michael Gapczynski
617449b230 Change URL from gitorious to github 2012-08-26 21:38:53 -04:00
Georg Ehrke
ced234a81a rename subadmin to group admin 2012-08-17 16:00:24 +02:00
Jakob Sack
0c69e64b86 Backgroundjobs: Fix template 2012-08-12 00:44:25 +02:00
Jakob Sack
2bc8d3e5d6 Backgroundjobs: interface improvements 2012-08-12 00:37:14 +02:00
Michael Gapczynski
a5a5ab2318 Add type text to new user, fixes display issue 2012-08-11 16:29:41 -04:00
Jakob Sack
9ad31e5f81 Backgroundjobs: use correct var name in template 2012-08-10 01:44:38 +02:00
Jakob Sack
7c766cdfe0 Backgroundjobs: fix bugs in template 2012-08-10 01:42:30 +02:00
Jakob Sack
7055d2aa2b Backgroundjobs: improve admin form 2012-08-10 01:36:33 +02:00
Jakob Sack
1ce2cd73ff Add first version of backgroundjobs settings 2012-08-09 10:41:10 +02:00
Thomas Tanghus
ce866a5bdb CSS tweaks for app settings. 2012-08-05 01:42:17 +02:00
Michael Gapczynski
1ec27399a7 Show delete tipsy for users 2012-08-04 17:00:16 -04:00
Alessandro Cosentino
84aa7c7b54 link of Add your app was broken 2012-08-04 14:34:57 -04:00
Thomas Tanghus
24af2e8078 Load OCS apps in an ajax call to avoid blocking the WUI. 2012-08-04 20:16:32 +02:00
Georg Ehrke
1bccc80996 hide morelog button if there are no more log entries - bugfix for oc-1398 2012-08-04 17:38:31 +02:00
Georg Ehrke
8766b3286b fix a subadmin UI bug 2012-08-01 18:03:08 +02:00
Tom Needham
91daf54d7c Check if required apps are installed 2012-07-30 16:41:07 +00:00
Tom Needham
138c66a2ba Improve styling of permission request page 2012-07-30 10:51:00 +00:00
Tom Needham
5933d43901 Basic template for authorising exernal apps with OAuth 2012-07-30 10:25:41 +00:00
Georg Ehrke
c3bd30cc6b improve default qouta for subadmins 2012-07-20 15:20:48 +02:00
Georg Ehrke
6cf418f2fa fix copy&paste fail and deny subadmins to set the default qouta 2012-07-19 18:00:33 +02:00
Georg Ehrke
e707e94857 subadmins can now add users 2012-07-15 16:31:28 +02:00
Georg Ehrke
d0b625352c some work on subadmins 2012-07-09 21:51:19 +02:00
Sam Tuke
825d92d59c Added undo functionality to delete user procedure on user settings page 2012-07-04 14:30:42 +01:00
Frank Karlitschek
6917d74193 move the ownCloud version to admin which makes more sense. A normal user can´t update ownCloud anyways. 2012-06-29 11:07:41 +02:00
Sam Tuke
f374dae233 Added text ACS warning to admin's user settings page, and corresponding CSS styles 2012-06-25 18:04:10 +01:00
Thomas Tanghus
5ac4830e75 XSS fix. 2012-06-25 05:03:30 +02:00
Thomas Tanghus
c3130919c2 Allow direct link to app. 2012-06-25 05:02:01 +02:00
Frank Karlitschek
e95055b2bd check if the data directory is accessible via http. Show a big security warning if yes 2012-06-21 14:07:04 +02:00
Michael Gapczynski
b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127 
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
 2012-06-13 15:17:46 -04:00
Bjoern Schiessle
1b6dd6628a applied patch provided by bug #966 to fix broken user specific quota settings 2012-06-12 11:18:34 +02:00
Lukas Reschke
2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Bjoern Schiessle
f91ad08613 fixed broken lines in user table 2012-06-08 11:37:04 +02:00
Tom Needham
1f409ec524 Protect the help page 2012-06-07 17:43:26 +00:00
Frank Karlitschek
f3c1d1eded link to apps.owncloud.com 
thanks to guillaume for the patch
 2012-06-03 23:48:59 +02:00
Frank Karlitschek
a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Bart Visscher
a9d7c67bf2 The log message is not always shown in html 
The log message can also be logged with syslog, here we don't want to have html-entities. Also the log messages through json are displayed as text not html.
 2012-05-10 09:13:09 +02:00
Bart Visscher
4dbc2093c6 Create a function for linking to remote.php 2012-05-07 21:47:14 +02:00
Georg Ehrke
e33b12a375 fix path of webdav 2012-05-07 12:07:39 +02:00
Georg Ehrke
6330fdad08 fix path of webdav 2012-05-05 19:02:13 +02:00
Thomas Tanghus
d9592ddcb0 Tried to make settings/apps more keyboard/screenreader friendly. 2012-05-04 17:56:00 +02:00
Frank Karlitschek
1277962183 a lot of users have problems with big files. So add an explicit button to the documentation 2012-04-26 16:53:18 +02:00
Thomas Tanghus
f08cfcecec Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet. 2012-04-22 03:59:28 +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
ef80ad1d48 add a link to the desktop and mobile clients download. 2012-04-21 00:33:24 +02:00
Frank Karlitschek
d1fe3c2314 add a button to open the online documentation 2012-04-21 00:18:47 +02:00
Robin Appelman
5720bd296d merge log into admin 2012-04-16 12:21:48 +02:00
Jan-Christoph Borchardt
85cb171cb8 improved updater wording 2012-04-14 18:41:09 +02:00
Tom Needham
42e110b49c Update url 2012-04-07 13:07:44 +00:00
Frank Karlitschek
6545e48787 Show the different editions to the user. Used in the status call, on the personal settings page and in the updater to update to the next available version from the same edition. 2012-04-01 11:20:12 +02:00
Robin Appelman
797e921b9a improve log browsing 2012-02-26 03:10:29 +01:00
Robin Appelman
0d3181b6d1 add configure option for default quota 2012-02-24 23:54:38 +01:00
Robin Appelman
4230e217af new config widget for user quota 2012-02-24 23:54:38 +01:00
Marvin Thomas Rabe
3988ec2813 Updated bookmark form 2012-02-22 23:22:17 +01:00
Bart Visscher
f47444e1f7 Use separate function to make absolute urls 2012-02-17 22:07:14 +01:00
Frank Karlitschek
927bf56940 add a link to the credits page. fame for all our awesome contributors 2012-01-29 14:45:38 +01:00
Tom Needham
dd7a411f9a Disable save button while saving. Streamlined code. 2011-11-29 22:11:42 +00:00
Brice Maron
3940ca3df1 Display correctly the error message when nothing is retrieved from OCS servers 2011-11-06 16:48:26 +01:00
Jan-Christoph Borchardt
8d203531fb corrected link for app dev instructions 2011-10-23 12:38:36 +02:00
Michael Gapczynski
da4a1e6118 Change 'Help translating' to 'Help translate' 2011-10-22 18:03:57 -04:00
Robin Appelman
d9372ac766 make log level configurable 2011-10-16 21:11:03 +02:00
Robin Appelman
820cd0fb75 provide a logging mechanism 2011-10-16 21:11:03 +02:00
Jan-Christoph Borchardt
71caa4a20c added code and license links next to version number 2011-10-08 10:10:29 +02:00
Bart Visscher
21a88613a1 Merge branch 'lostpassword' 
Conflicts:
	core/templates/login.php
	index.php
	lib/util.php
 2011-09-30 23:48:20 +02:00
Marvin Thomas Rabe
5775421f78 user list has descriptions now 2011-09-30 19:35:25 +02:00
Frank Karlitschek
f2a7f230f1 add status file. useful for external administration. show the ownClopud version at least in the config dialog. 2011-09-28 13:52:26 +02:00
Bart Visscher
f149303895 Add email field to personal preferences 2011-09-26 21:17:26 +02:00
Robin Appelman
bcf92badd1 dont set content type to json for Apps 2011-09-26 00:19:34 +02:00
Bart Visscher
17e631bc5e Use OC_JSON for json responses 
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
 2011-09-25 22:19:28 +02:00
Florian Pritz
e0d013b25e settings/personal: remove padding from quota bar 
The text will stay in it's place, but 0% usage will lead to an empty
bar.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
 2011-09-24 18:42:02 +02:00
Bart Visscher
760b47a62f Use OC_Helper::linkTo also for absolute urls. 
One central place to check for https.
 2011-09-09 22:19:15 +02:00
Jan-Christoph Borchardt
f4b9895cbf having non-editable stuff as input fields is really confusing. You were right Robin ;) 2011-09-04 10:34:57 +02:00
Michael Gapczynski
1b6a77ce5e Use Chosen for language select form 2011-08-27 19:46:20 -04:00
Michael Gapczynski
fba066341d Add locale for password change error 2011-08-27 19:12:10 -04:00
Robin Appelman
391e064e67 allow apps to register form for the settings and admin pages 2011-08-23 01:41:18 +02:00
Jan-Christoph Borchardt
3f8e4e2a30 added controls bar for Apps and Help 2011-08-21 11:14:57 +02:00
Jan-Christoph Borchardt
d9aae20003 more valid HTML, alt attributes, refactored pagenavi etc. 2011-08-20 05:07:58 +02:00
Jan-Christoph Borchardt
bb127a367d made translation link language-specific 2011-08-19 13:29:07 +02:00
Jan-Christoph Borchardt
4c49a81c8e language updates, optimization of Help HTML 2011-08-18 19:22:44 +02:00
Frank Karlitschek
cb9fc6d901 make the help section working and pretty. knowledge base entries are fetched via OCS from a different server. cool stuff 2011-08-17 00:24:50 +02:00
Robin Appelman
523b0966d2 add option to set user quota 2011-08-15 21:09:13 +02:00
Jan-Christoph Borchardt
7bb261f810 more fixes for Personal and Tipsy 2011-08-14 16:12:31 +02:00
Robin Appelman
df532e3f82 Show language names in Personal 2011-08-14 15:30:30 +02:00
Robin Appelman
970888b92d fix some details in Personal 2011-08-14 15:06:16 +02:00
Jan-Christoph Borchardt
6e30ade0b3 updated tipsy, tooltips finally work everywhere, thanks icewind 2011-08-14 14:55:43 +02:00
Jan-Christoph Borchardt
f2a21398d7 more info in personal, WebDAV, OpenID 2011-08-14 11:09:51 +02:00
Robin Appelman
4f43b0a729 fix creating users 2011-08-13 23:56:53 +02:00
Jan-Christoph Borchardt
6b2862fcfe various CSS fixes 2011-08-13 16:00:10 +02:00
Jan-Christoph Borchardt
7474c907dc CSS update, Personal looks better now 2011-08-13 15:32:00 +02:00
Jan-Christoph Borchardt
7ece8ed314 added global action class for icons 2011-08-13 05:27:50 +02:00
Jan-Christoph Borchardt
4a5ee765cf merged admin, help and settings to settings 2011-08-13 05:13:34 +02:00
Robin Appelman
9059b55979 make more strings translatable 2011-08-10 14:03:54 +02:00
Robin Appelman
7b38e5d7c7 apps can now add their own forms to the Personal page 2011-08-08 23:46:52 +02:00
Jan-Christoph Borchardt
70a4cfd112 removed paragraphs in forms, added show password function 2011-08-08 11:07:44 +02:00
Robin Appelman
f039320a0b move openid settings to Personal 2011-08-06 10:08:26 +02:00
Robin Appelman
4c1d3155a3 make personal settings translatable 2011-06-20 14:51:33 +02:00
Robin Appelman
76b12c4ae0 add settings option for language 2011-06-20 14:33:31 +02:00
Jakob Sack
b57823baa5 Made the "change password" thingie in settings working 2011-04-18 15:07:14 +02:00
Frank Karlitschek
f02884e294 user the prettybutton 2011-04-17 18:37:38 +02:00
Robin Appelman
542a0a2518 show real data in account information 2011-04-17 13:47:45 +02:00
Jan-Christoph Borchardt
7de3ecfe5f away with the h1, in with the good stuff 2011-04-17 00:45:22 +02:00
Jakob Sack
af1e48df80 Changes in the user experience 2011-04-16 17:49:57 +02:00
Jakob Sack
66ac355f78 Getting rid of Smarty, using our own template system 2011-03-02 11:56:48 +01:00
Jakob Sack
015ab0eb64 Say Smarty to only use one compile directory. Makes setup somewhat easier. 2011-03-02 00:16:43 +01:00
Jakob Sack
132695ceb1 Start of the refactoring. Commit is quite big because I forgot to use git right from the beginning. Sorry. 2011-03-01 23:20:16 +01:00