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

582 commits

Author SHA1 Message Date
Bjoern Schiessle
80d871ab1e added website field 2014-01-17 16:35:48 +01:00
Bjoern Schiessle
e2de3b8337 distinguish app links from doc links 2014-01-17 16:08:32 +01:00
Bjoern Schiessle
bf0471a92e show link to app documentation 2014-01-17 14:56:25 +01:00
Bjoern Schiessle
d36da7e43a use appstoreenabled config switch 2014-01-16 12:58:17 +01:00
Morris Jobke
5c1a9f35f1 Indicate password strength using strengthify 
* uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29
 2014-01-15 11:10:12 +01:00
Jan-Christoph Borchardt
3c21fd5bfc do not show 'Add app' and 'More apps' for themed ownCloud 2013-12-18 14:59:57 +01:00
Frank Karlitschek
61296ed7bb lower required php version to 5.3.3 2013-12-04 10:25:22 +01:00
Morris Jobke
8506d2bf42 fix wording 2013-11-27 00:38:56 +01:00
Morris Jobke
2d822e3b95 add warning for HTTP connection 2013-11-27 00:05:48 +01:00
blizzz
4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar 
Set Avatar for LDAP users automatically (if a picture is available)
 2013-11-26 12:05:32 -08:00
Bjoern Schiessle
f1f172e16e fix typo 2013-11-25 11:09:31 +01:00
Thomas Mueller
f6df4b349f remove logic from template and fix syntax error 2013-11-24 21:27:32 +01:00
Frank Karlitschek
77bb168007 replace echo with p 2013-11-24 17:17:10 +01:00
Frank Karlitschek
22e39baf77 show the build number if on the daily build update channel 2013-11-24 16:46:07 +01:00
Arthur Schiwon
8ccac86c98 Enable user backends to provide avatar images 2013-11-22 13:25:20 +01:00
Thomas Müller
cd1cf58875 Fixing the warning notifications 2013-11-21 14:44:25 +01:00
Bart Visscher
368342a085 Update error messages 2013-11-15 14:46:00 +01:00
Jan-Christoph Borchardt
d62b683c6a change 'Display Name' to more understandable 'Full Name', fix #5612 2013-11-06 14:20:43 +01:00
Morris Jobke
ea4dfa7e38 Merge pull request #5638 from owncloud/admin-quotafield 
Improve quota input field
 2013-10-31 04:25:42 -07:00
Morris Jobke
680f4963dc fix translation strings 2013-10-31 12:21:42 +01:00
Vincent Petry
9d230bcc75 Improve quota input field 
- Added tooltip with examples
- The quota value returned by the server is now displayed after update
- Fixes #5346
 2013-10-30 20:46:53 +01:00
Vincent Petry
aba7335d3f Changed wording in log level dropdown 2013-10-30 18:39:21 +01:00
Vincent Petry
e3b13b13c9 Changed log level labels in log level dropdown 2013-10-30 18:23:48 +01:00
Thomas Müller
148d2616e5 introduce link_to_docs() and migrate links 2013-10-21 21:29:45 +02:00
Frank Karlitschek
44d15d497e change the language 2013-10-20 15:22:50 +02:00
Frank Karlitschek
37b89b11b6 harmonize this with the documentation. Once every minute is way to often. Every 15min should be fine just as the documentation suggests: http://doc.owncloud.org/server/5.0/admin_manual/configuration/background_jobs.html 2013-10-19 01:42:59 +02:00
Frank Karlitschek
7cf81f2d12 show the channel. Also mark git as git channel so that someone can see where this build comes from 2013-10-13 21:51:47 +02:00
Thomas Müller
3f54e3c783 Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles 
Fixed table grid styles for IE8
 2013-10-12 03:51:01 -07:00
Thomas Müller
fce198874f Merge pull request #5272 from mrflix/master 
fix label to checkbox binding in admin -> force-https
 2013-10-12 01:41:30 -07:00
Vincent Petry
1a05ed2f38 Fixed table grid styles for IE8 
The selector :not() isn't supported in IE8, replaced it with the "grid"
class.

- Fixes the log table style in IE8 (#5057)
- Fixes the users table layout bug in IE8
 2013-10-11 15:58:15 +02:00
raghunayyar
02c7f95687 Includes <optgroup> tag 2013-10-11 18:52:27 +05:30
raghunayyar
7c2f1fd580 Puts the language divider in place. thanks @Kondou-ger ;) 2013-10-11 18:46:59 +05:30
raghunayyar
4b2bb11716 Removes the Bogus Label 2013-10-11 18:42:02 +05:30
raghunayyar
e27bb660bd Uniform Styles and Indentation Fixes for Personal Block 2013-10-11 18:03:53 +05:30
Felix Niklas
01d3536a76 fix checkbox <-> label binding 
clicking the label will trigger the checkbox
 2013-10-10 23:10:06 +02:00
Jan-Christoph Borchardt
2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
Bjoern Schiessle
534d93d2d3 Merge branch 'master' into sharing_mail_notification_master 
Conflicts:
	apps/files/index.php
 2013-09-16 10:40:06 +02:00
kondou
1832eb8872 Pass view in \OC_Avatar to constructor and use $_ for enable_avatars 2013-09-09 16:57:46 +02:00
kondou
15ab798353 Fix an IE8 bug with the avatarcropper. 
1. Crop an avatar
2. Crop another avatar without reloading
-> Second cropper is 28px x 30px big
 2013-09-05 19:26:02 +02:00
kondou
4724d60ecd Partly fix cropper in IE8 and don't use a dialog for it 2013-09-03 17:40:41 +02:00
Bjoern Schiessle
3ce4bf5ec7 use css class hidden to hide setting elements 2013-09-02 17:14:11 +02:00
kondou
e7e3f1b81a Fix some of @jancborchardt's complaints in oc_avatars 2013-09-02 17:07:38 +02:00
kondou
76b1b5b6a3 Provide 'enable_avatars' in config.php, to disable avatars 2013-09-01 18:17:14 +02:00
Bjoern Schiessle
77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
kondou
0c708be76b Use defaultavatars 2013-08-29 14:26:11 +02:00
kondou
67c5be9f19 Merge branch 'master' into oc_avatars 
Conflicts:
	3rdparty
 2013-08-28 16:44:11 +02:00
Jan-Christoph Borchardt
0c02e1efef Merge pull request #4563 from owncloud/use_personal-password 
Use personal-password for the password name in personal.php
 2013-08-28 06:23:13 -07:00
kondou
e6473e6d49 Clean up some cruft 2013-08-26 17:41:19 +02:00
kondou
31736a1df3 Have a controller instead ofo avatar.php and fix some cropper-design 2013-08-26 16:46:55 +02:00
kondou
9a8908b643 Use Jcrop, have inline errormsg, work on cropping, clean up, WIP 2013-08-25 21:06:44 +02:00
kondou
81cadd5ea3 Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff 2013-08-25 21:06:02 +02:00
kondou
0a4febf1eb Integrate newavatar.php into avatar.php by using GET, POST & DELETE 2013-08-25 21:06:01 +02:00
kondou
cd2f7bdaef Deny access for non-users and add a (not-working) override button 2013-08-25 21:06:01 +02:00
kondou
9c12da6a94 Several improvements 
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
 2013-08-25 21:05:40 +02:00
kondou
d7e6c77e20 Have a fancy uploadavatar button 2013-08-25 21:05:40 +02:00
kondou
33827d690e Use avatar.php in user-management 2013-08-25 21:05:38 +02:00
kondou
131d0edab6 Show avatar on personal.php always (except if avatars are disabled) 2013-08-25 21:04:49 +02:00
kondou
4521b54c67 Have /avatar.php as a central avatar-point 2013-08-25 21:04:49 +02:00
kondou
252548c62c Improve styling & enable avatar-upload at personal page 2013-08-25 21:04:45 +02:00
kondou
fac671b14e Modularize get(), async getAvatar, avatars @ usermgmt 
And other small improvements
 2013-08-25 21:04:04 +02:00
kondou
4a08f7d710 Add basic avatars and gravatar 2013-08-25 21:02:43 +02:00
kondou
fbe7a68ce8 Use personal-password for the password name in personal.php 
Fix #4491
 2013-08-24 14:31:32 +02:00
kondou
0ce35af02a Merge branch 'master' into improve_app-management 
Conflicts:
	settings/js/apps.js
 2013-08-21 19:20:25 +02:00
Morris Jobke
de949b1caa Merge pull request #4447 from owncloud/fix_4351_master 
Use JSON to send/receive group data.
 2013-08-20 02:49:48 -07:00
kondou
7c296a6cf9 Move .errormsg from settings-css to .warning in core. Reusable! 2013-08-18 17:37:22 +02:00
kondou
9f4bd7cb47 Don't use an alert for displaying app-mgmt-errors 
Rather display a dominant div and mark the problematic app in the applist.

Fix #305
 2013-08-18 13:49:34 +02:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Jan-Christoph Borchardt
399adf67b0 merge master into css-fixes 2013-08-16 00:29:43 +02:00
Owen Winkler
cd7e57e8ec Use JSON to send/receive group data. 
Squashed commits from PR #4364 for master.
 2013-08-15 06:19:40 -04:00
Jan-Christoph Borchardt
8eaa0e7336 remove table layout for background jobs 2013-07-31 10:04:02 +02:00
Bjoern Schiessle
b6fa0e4eef working decrypt files method 2013-07-29 17:06:05 +02:00
Björn Schießle
2c8e5ec84f user interface to allow user to decrypt all his files once the encryption app was disabled 
Conflicts:
	settings/templates/personal.php
 2013-07-29 13:36:06 +02:00
kondou
92af840a51 Merge branch 'master' into css_cleanup_kondou 
Conflicts:
	core/css/styles.css
	settings/templates/personal.php
 2013-07-24 20:35:00 +02:00
Björn Schießle
75fd6d4fde initialize OC_Defaults in template constructorX 2013-07-24 11:51:21 +02:00
Thomas Müller
1a73e607bd Merge branch 'master' into more-themable-strings 
Conflicts:
	lib/template.php
 2013-07-24 09:35:33 +02:00
Thomas Müller
840e96cda3 Merge branch 'master' into disable-anon-upload-master 
Conflicts:
	settings/templates/admin.php
 2013-07-22 11:55:20 +02:00
Thomas Müller
934f2e94a3 Merge branch 'master' into disable-anon-upload-master 2013-07-22 11:36:52 +02:00
kondou
05084e03a0 Use !== and === in settings. 2013-07-21 13:55:25 +02:00
Thomas Müller
2964027cad Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master 2013-07-14 22:00:42 +02:00
Thomas Müller
79d23463f8 No admin option to enable public upload in case encryption is enabled 
No upload on pubic page if public upload is disabled
 2013-07-14 21:58:08 +02:00
rolandgeider
995feea42a Use transifex.com on link to translations 2013-07-14 11:54:39 +02:00
Thomas Mueller
7a44d45714 change anonymous to public 2013-07-12 21:34:38 +02:00
Thomas Müller
fc2d538311 new admin setting added which allows to turn off anonymous uploads 2013-07-12 17:03:51 +02:00
Jan-Christoph Borchardt
7741ca0bcc use themable strings for admin page, simplify admin export, fix rest of #3791 2013-07-11 17:41:36 +02:00
kondou
4818e0062e General CSS cleanup 2013-07-09 16:08:32 +02:00
Björn Schießle
9b9ea7cd8e Merge https://github.com/owncloud/core/pull/3827 
Squashed commit of the following:

commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:03:23 2013 +0200

    initialize OC_Defaults only once

commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 8 10:02:48 2013 +0200

    link to doc in error messages

commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:56 2013 +0200

    Merge branch 'master' into better-messages

commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jul 4 11:10:41 2013 +0200

    move to non-static defaults.php

commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Tue Jul 2 10:32:13 2013 +0200

    no sprintf here, lets t() handle it

commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:13:38 2013 +0200

    Merge branch 'master' into better-messages

commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:10:57 2013 +0200

    use document base url from defaults.php

commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Mon Jul 1 11:00:15 2013 +0200

    Merge branch 'master' into better-messages

commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:21:12 2013 +0200

    link to docs in WebDAV message, ref #3791

commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date:   Mon Jun 24 16:10:21 2013 +0200

    link to docs in error messages, fix #3819
 2013-07-08 10:07:57 +02:00
Björn Schießle
5f2378be5b revert changes which where introduced by accident during merge 23cc69b816 2013-07-04 12:06:36 +02:00
Björn Schießle
3c691c9ec9 move to non-static OC_Defaults 
Conflicts:

	lib/mail.php
 2013-07-04 10:11:16 +02:00
Björn Schießle
d46e62886a Add init funtion to OC_Defaults to be able to wrap translatable strings 2013-07-04 10:09:28 +02:00
Thomas Müller
a20e9dee89 Merge pull request #3894 from owncloud/ie8_compatibility_fixes 
Ie8 compatibility fixes
 2013-07-01 11:57:29 -07:00
Björn Schießle
87bbdc1ed9 check for updates only in the community edition 2013-07-01 10:46:16 +02:00
Björn Schießle
23cc69b816 construct the foother in defaults.php so that we use always the same footer 
Conflicts:

	settings/templates/admin.php
 2013-07-01 10:46:00 +02:00
Victor Dubiniuk
d110e60316 Hide a ghost image on the apps management page 2013-06-28 21:53:56 +03:00
Arthur Schiwon
4dd0076e7c Users page: username instead of login name as col header to avoid confusion with other backends 2013-06-18 14:32:28 +02:00
Björn Schießle
7889f2ef5c Merge pull request #3687 from owncloud/template_updates 
Make templates aware of different owncloud editions
 2013-06-13 07:32:41 -07:00
Jan-Christoph Borchardt
a178de8501 Merge pull request #3677 from owncloud/apps-buttons 
remove App management top bar and move buttons more contextually in the interface
 2013-06-13 01:44:48 -07:00
Björn Schießle
63472aed3f Merge branch 'template_updates' of github.com:owncloud/core into template_updates 2013-06-12 17:26:38 +02:00
Björn Schießle
2e1836c1da don't show translation hints in enterprise edition 2013-06-12 17:07:43 +02:00
Jan-Christoph Borchardt
f565e4c25b move common settings footer fieldset out of conditional 2013-06-12 16:59:23 +02:00
Björn Schießle
e1e798c623 make footer and urls aware of ownCloud editions 2013-06-12 15:44:11 +02:00
Jan-Christoph Borchardt
4cafe21aa4 apps management: change misleading + to ... 2013-06-12 14:49:23 +02:00
Jan-Christoph Borchardt
c0568e0443 remove App management top bar and move buttons more contextually in the interface 2013-06-12 13:36:17 +02:00
Jan-Christoph Borchardt
b014509f41 move storage bar below clients showcase to make it more visible 2013-06-11 16:05:02 +02:00
Björn Schießle
97e05b71f8 add hint about what the recovery password field is for 2013-06-06 12:26:05 +02: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 +02:00
Björn Schießle
9d1e60325c allow admin to recover users files in case of password lost 2013-05-16 14:53:04 +02:00
Björn Schießle
135991474b fix inconsistent post parameters in change password operation 2013-05-08 12:38:09 +02:00
Raghu Nayyar
2bcb64e781 Merge pull request #3114 from owncloud/update-notification 
Add an update notification
 2013-04-26 21:12:38 -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
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
Lukas Reschke
d41b600725 Add an update notification on every page for admin users 2013-04-24 18:47:38 +02:00
kondou
e8bb998ecc Fix #3095. 2013-04-24 11:13:12 +02: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
kondou
7a2be0c5dc Make divider not selectable 
Very hacky
 2013-04-19 00:39:42 +02:00
kondou
79218be1d2 Priorize common languages. 2013-04-18 15:14:42 +02:00
Bernhard Posselt
4679e789e1 also adjust template properly for log date fix 2013-04-17 15:31:05 +02: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 +05:30
Robin Appelman
27f710d860 Users: fix "Other.." quota option for the default quota 2013-04-09 12:47:08 +02:00
Lukas Reschke
8000f9db74 Unescape the update hint 
Fixes #2647
 2013-04-02 16:39:21 +03:00
Morris Jobke
df74c0e43a apply code review hints 2013-03-28 15:02:31 +01: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 +01:00
Lukas Reschke
fadb11253b Merge branch 'master' into fixing-bugtracker-link-master 
Conflicts:
	core/templates/exception.php
	settings/templates/help.php
 2013-03-01 23:41:23 +01:00
Thomas Mueller
f9b454dab1 change bug tracker links to https://github.com/owncloud/core/blob/master/CONTRIBUTING.md 2013-03-01 23:32:43 +01:00
Lukas Reschke
7311c2bb5d Remove uneeded OAuth files 2013-02-27 23:26:00 +01:00
Lukas Reschke
229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Thomas Mueller
c71fdf04d7 fixes 1933 - the locale name is no longer part of the translation string 2013-02-27 11:41:50 +01:00
Bart Visscher
19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher
83f161d3f9 Style cleanup settings 2013-02-21 23:47:56 +01:00
Victor Dubiniuk
c5f6a77dbd Correct new password input name 2013-02-18 21:15:32 +03:00
Jan-Christoph Borchardt
e8190c6511 fix user delete button not showing in IE, another SVG replacement issue 2013-02-14 13:01:51 +01:00
Frank Karlitschek
316807e0d3 Merge pull request #1624 from owncloud/singleselect 
Split editable select code used for quota selection into a jquery plugin
 2013-02-12 11:05:07 -08:00
Robin Appelman
e68e5cc849 Split editable select code used for quota selection into a jquery plugin 2013-02-11 15:18:14 +01:00
Jan-Christoph Borchardt
40d8a2531d move CSS to correct location, move and format php 2013-02-11 12:49:52 +01:00
Jan-Christoph Borchardt
47341eb4bd spaces to tabs 2013-02-11 12:41:14 +01:00
Jan-Christoph Borchardt
2b586eb91c correct target blank from image to link 2013-02-11 12:40:17 +01:00
Björn Schießle
45a4016878 Merge pull request #1552 from raghunayyar/personalpage-style-fix 
Personal Page Password Toggle Loads Fine.
 2013-02-10 07:31:05 -08:00
Thomas Müller
e68cf72458 Merge pull request #1543 from owncloud/utf8-locale-master 
some systems use en_US.UTF8 instead of en_US.UTF-8
 2013-02-09 09:58:05 -08:00
Jörn Friedrich Dreyer
bb656ca2fb Merge pull request #1561 from Raydiation/master 
Moved the iframe height and width fix from js to css
 2013-02-09 08:56:12 -08:00
Bernhard Posselt
62122148bf Revert "moved iframe height and width fix from js to css" 
This reverts commit 842fc85b9a.
 2013-02-09 17:46:23 +01:00
Bernhard Posselt
842fc85b9a moved iframe height and width fix from js to css 2013-02-09 17:41:17 +01:00
Bernhard Posselt
f8335c4815 moved iframe height and width fix from js to css 2013-02-09 11:34:25 +01:00
Frank Karlitschek
c14f0b5637 add in new window 2013-02-09 09:30:59 +01:00
Frank Karlitschek
9bd45b26a5 add the buttons for the clients to the personal page. 
Useful and prettier
 2013-02-09 09:13:11 +01:00
raghunayyar
e8d17e4e8e Personal Page Password Toggle Also Loads Well. 2013-02-09 11:40:07 +05:30
Thomas Müller
232a98524c some systems use en_US.UTF8 instead of en_US.UTF-8 2013-02-08 17:49:54 +01:00
Thomas Mueller
5788d36c8d Merge branch 'master' into fixing-1354-master 
Conflicts:
	settings/admin.php
	settings/templates/admin.php
 2013-02-07 10:44:28 +01:00
Thomas Mueller
84f3c8b6cc show webdav test results in admin section as well 2013-02-07 00:49:39 +01:00
Lukas Reschke
e969a78cf9 Merge pull request #1443 from owncloud/use-module-file-info-master 
we get best results regarding mime type detection if we use fileinfo - l...
 2013-02-06 11:53:13 -08:00
Thomas Tanghus
3879e5d9c5 Merge pull request #1428 from owncloud/content_positioning 
Fix leftcontent positioning. Ref #1255
 2013-02-06 08:13:45 -08:00
Georg Ehrke
0a16d25724 make it possible to modify the links to the clients 2013-02-06 15:20:43 +01:00
Björn Schießle
9d73e7eb1e let the user change his display name, if supported by the back-end 2013-02-06 11:38:03 +01:00
Arthur Schiwon
5221ee0c5a offer change password only when the action is supported by the user backend 2013-02-05 19:26:00 +01:00
Thomas Tanghus
b06ac67e07 Add 'hascontrols' class for content with fixed topbar. 2013-02-04 18:30:49 +01:00
Thomas Mueller
6058c2f734 we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that 2013-02-04 15:04:26 +01:00
Lukas Reschke
b471177439 Merge pull request #1379 from owncloud/improved_appsmanagement 
Improved appsmanagement
 2013-01-31 08:30:55 -08:00
Björn Schießle
92921ceefd make strings translatable 2013-01-30 16:28:41 +01:00
Frank Karlitschek
ea5861ed8c remove leftover code 2013-01-30 15:27:20 +01:00
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
250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 -08:00
Björn Schießle
4b7b092008 rename Name to Login Name 2013-01-28 17:05:20 +01:00
Björn Schießle
f3a99f4869 show display name in input field 2013-01-28 17:01:37 +01:00
Björn Schießle
e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +01:00
Björn Schießle
022a7b13b8 prepare user table to show and edit display names 2013-01-28 13:12:44 +01:00
Thomas Müller
276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master 
Fixing 998 master
 2013-01-26 04:15:40 -08:00
Björn Schießle
64e853394c compare the correct uids 2013-01-25 12:46:32 +01:00
Lukas Reschke
48949ba04a Move appid to external file 2013-01-23 11:21:34 +01:00
Lukas Reschke
8907bdaf7f Remove uneeded JS 2013-01-22 12:15:46 +01:00
Lukas Reschke
d2383338de External JSON for the Apps 2013-01-21 22:18:42 +01:00
Lukas Reschke
3ed7d5d521 Move isadmin to external file 2013-01-21 21:25:38 +01:00
Frank Karlitschek
a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Thomas Mueller
afb5de955e Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
 2013-01-18 23:22:34 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Lukas Reschke
ffbf273c9a Removed uneeded HTML tag 2013-01-11 14:43:56 +01:00
Lukas Reschke
466cdab680 Add security section to admin menu 
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.

The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
 2013-01-11 14:18:51 +01:00
Thomas Mueller
508b6a9fc7 displaying notification now centered 
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
 2013-01-11 11:52:07 +01:00
Thomas Mueller
e475c26f1a fixing <input> tag 2013-01-07 21:23:14 +01:00
Michael Gapczynski
0b13b41189 Merge pull request #1053 from owncloud/ocs_api 
External API for ownCloud based on OCS
 2013-01-04 17:18:58 -08:00
Jörn Friedrich Dreyer
ed06070741 omit type attribute in script tag to use fallback (text/javascript) 2013-01-02 12:13:07 +01:00
Tom Needham
6eb194b702 Merge branch 'master' into ocs_api 
Conflicts:
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/files_encryption.pot
	l10n/templates/files_external.pot
	l10n/templates/files_sharing.pot
	l10n/templates/files_versions.pot
	l10n/templates/lib.pot
	l10n/templates/settings.pot
	l10n/templates/user_ldap.pot
	l10n/templates/user_webdavauth.pot
 2012-12-31 15:47:15 +00:00
Thomas Müller
36da34e5f6 Merge pull request #902 from owncloud/storage-wording 
Storage wording
 2012-12-28 23:19:52 -08:00
Thomas Müller
7e78f8e15a moving logic from template to the 'controller' 
THX @VicDeo
 2012-12-21 00:48:12 +01:00
Thomas Müller
436df6b67d enable translations for quota sizes 'none' and 'default' 2012-12-20 15:35:36 +01:00
Thomas Müller
bca02f4b40 [l18n] fixing typos in source text 2012-12-19 23:43:07 +01:00
Frank Karlitschek
b162e72f94 Merge pull request #961 from owncloud/check_locale 
add a check and a warning if setlocale is working
 2012-12-19 08:53:43 -08:00
Frank Karlitschek
d7fbe47583 Merge pull request #868 from owncloud/new_doc_system 
New doc system
 2012-12-19 06:40:37 -08:00
Frank Karlitschek
196f1c3786 add a check and a warning if setlocale is working 2012-12-19 15:10:33 +01:00
Tom Needham
3c98f36121 Merge branch 'master' into ocs_api 2012-12-16 22:29:00 +00:00
Frank Karlitschek
30b0e8b70c cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-) 2012-12-15 20:02:16 +01:00
Bart Visscher
df7d6cb26c More style fixes 2012-12-15 00:43:46 +01:00
Jan-Christoph Borchardt
4acb2f70e1 change technical expression 'Quota' to simpler 'Storage' 2012-12-14 23:02:22 +01:00
Tom Needham
5fe6129698 Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
Frank Karlitschek
cde74fe248 make it more readable 2012-12-14 14:41:09 +01:00
Frank Karlitschek
2330d6bcc7 show the link to the issue tracker only for Admins as discussed with Björn and Jan. 2012-12-13 11:08:12 +01:00
Frank Karlitschek
89bbabd77b a bit more polish. We are getting there. 2012-12-13 09:26:25 +01:00
Frank Karlitschek
f85106b6b5 first version of the new documentation system integration. 2012-12-12 22:41:12 +01:00
Victor Dubiniuk
6a211f3fa1 Check if we have an array with data. Fix #487 2012-12-02 23:54:54 +03:00
Thomas Müller
c053863644 Merge pull request #330 from owncloud/check_connection 
add a check and a warning if the ownCloud server is not able to establis...
 2012-11-09 02:11:24 -08:00
Frank Karlitschek
55f75c6d8e add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why. 2012-11-08 18:08:44 +01:00
Frank Karlitschek
fef2d07873 add credits to personal page too so that non admins can see what they run. 2012-11-08 14:12:49 +01:00
Felix Moeller
a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Felix Moeller
27ab0357ae Checkstyle: Fix last six NewlineBeforeOpenBrace 2012-11-04 18:36:16 +01:00
Felix Moeller
30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Tom Needham
bcdf3a23db Merge master into ocs_api 2012-10-28 11:16:04 +00:00
Lukas Reschke
f475ed5cc1 Revert "Remove old password check from changepassword and use verifyUser instead" 
This reverts commit e6b8153865.
 2012-10-15 23:49:49 +02:00
Lukas Reschke
e6b8153865 Remove old password check from changepassword and use verifyUser instead 2012-10-15 17:44:44 +02:00
Frank Karlitschek
c701bed2e3 fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally 2012-10-08 15:49:48 +02:00
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