Commit Graph

598 Commits

Author SHA1 Message Date
Georg Ehrke 15c215cd03 Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
Bjoern Schiessle c1ef536896 show explenation only if the setting is activated 2014-06-16 15:33:46 +02:00
Lukas Reschke 01de7b8b9e Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
migrate table layout to paragraph layout for HTTPS setting
2014-06-14 13:08:58 +02:00
Morris Jobke fd5fad194d remove double space 2014-06-14 01:03:03 +02:00
Morris Jobke dc2212cd46 migrate table layout to paragraph layout for HTTPS setting 2014-06-13 16:54:47 +02:00
Morris Jobke f5da0052cf fix mail settings save function - ref #8854 2014-06-13 15:31:35 +02:00
Jan-Christoph Borchardt 23c83c076c unify controls bar, remove duplicate from user management 2014-06-06 12:22:09 +02:00
Georg Ehrke 0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore
Conflicts:
	lib/private/app.php
	settings/templates/apps.php
2014-06-05 22:54:27 +02:00
Bjoern Schiessle 6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Bjoern Schiessle cf9099c788 This settings doesn't belong together
Revert "make reshare settings foldable"

This reverts commit c01f196f72.

Conflicts:
	settings/templates/admin.php
2014-06-05 15:44:56 +02:00
Bjoern Schiessle c991e148a6 improve share settings working 2014-06-05 15:44:55 +02:00
Jan-Christoph Borchardt bc47e56f9f fix related layout issues in user management 2014-06-04 16:24:39 +02:00
icewind1991 cdf8a123e7 Merge pull request #8264 from owncloud/app-enable-by-group
Add the option to enable apps only for specific groups
2014-06-03 19:01:12 +02:00
Thomas Müller cfc1d5623e Merge pull request #8840 from owncloud/share_settings
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
Thomas Müller a5dd8e84f1 Merge pull request #8827 from owncloud/add-sqlite-info
add info about sqlite on setup page
2014-06-03 15:07:59 +02:00
Thomas Müller 79b3558c6d Merge pull request #7151 from owncloud/user-jquery
Continuing the New User management
2014-06-03 15:04:30 +02:00
Thomas Müller a3202f1f03 bring back the line breaks 2014-06-03 12:48:36 +02:00
Jan-Christoph Borchardt de012667c7 Apps: fix wording and layout for 'enable only for specific groups' 2014-06-03 12:42:36 +02:00
Thomas Müller 402a31f196 adding some line breaks 2014-06-03 12:42:36 +02:00
Robin Appelman 53dc30af4f Add option to enable app for specific groups 2014-06-03 12:42:35 +02:00
Morris Jobke 25c676f203 simplify SQLite warning 2014-06-03 12:02:23 +02:00
Bjoern Schiessle 5097bcc16d improve settings name 2014-06-03 11:29:51 +02:00
Morris Jobke 68a4fd44e6 add notification on admin page 2014-06-03 08:01:39 +02:00
Jan-Christoph Borchardt c84b226cb5 add arrow icon for external links 2014-06-02 23:18:25 +02:00
Jan-Christoph Borchardt 2e6a27614e move Help section from controls bar to sidebar 2014-06-02 22:59:16 +02:00
Arthur Schiwon 39982c2aea fix grouplist behaviour (blank after filtering) 2014-06-02 17:32:59 +02:00
Morris Jobke 6f4bdbdb94 Merge pull request #8784 from owncloud/fold-reshare-settings
make reshare settings foldable
2014-06-02 14:37:10 +02:00
Arthur Schiwon ec572607e1 remove group rename stuff, there is not support in the backends yet. to do for oc8. 2014-06-02 12:53:59 +02:00
Jan-Christoph Borchardt 29ef2f7a2f user mgmt: hide group rename function because it’s not supported in the backend yet 2014-06-02 12:53:59 +02:00
ringmaster 4de14fe6da Javascript cleanup for groups. 2014-06-02 12:53:58 +02:00
ringmaster c38548a1aa Rebase cleanup.
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
2014-06-02 12:53:58 +02:00
ringmaster 1115d68f25 Fix broken span. 2014-06-02 12:53:58 +02:00
ringmaster 097887a659 Add the admin group to the group list data.
Fixes the admin group disappearing from the list when updating the display as the result of a search.

This group data should probably be managed on the page entirely by the javascript GroupList object, but this seems like the interim method.
2014-06-02 12:53:58 +02:00
ringmaster 747c011615 More specific selectors, javascript cleanup.
* Assigned jQuery selector results to variables for speed.
* Moved all .attr('data') calls to .data() calls.
* Added :data(uid) selector.
* Split the multiselect checkhandlers into separate functions.
* De-duped click event on password change/img.
* Used fluent interface on jQuery object for event binding.
* Removed redundant tag names in class selectors.
* Fixed incorrect date display for last login.
* Added Userlist.has() to search for uid.
* General code convention compliance fixes.

to-do: Group dropdowns currently don't add the admin group after the search result, not sure why yet.
2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt 57cc51d21d user management: remove autocompletion of user/password fields, fix #8464 2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt 66d00cf782 user management: remove unneeded and erroneous user filter reset function 2014-06-02 12:53:57 +02:00
Lukas Reschke b56d14260d Rename $isadmin to $isAdmin 2014-06-02 12:53:57 +02:00
Arthur Schiwon a9bd416643 add reset button for the filter field 2014-06-02 12:53:57 +02:00
Arthur Schiwon 3ff123f247 more appropriate label 2014-06-02 12:53:57 +02:00
Arthur Schiwon 3e411c82a5 unify and consolidate group fetching method for initial template fill and ajax request 2014-06-02 12:53:56 +02:00
Arthur Schiwon 08ad073cf5 make string translatable 2014-06-02 12:53:56 +02:00
Arthur Schiwon 249e42c4cd enable group filtering 2014-06-02 12:53:55 +02:00
raghunayyar d3cee79b5a Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist. 2014-06-02 12:53:55 +02:00
Arthur Schiwon a4cfa95545 restructure group.js and put functions to object, also add group list sorting after adding. 2014-06-02 12:53:54 +02:00
Arthur Schiwon faab6c095c move group-click initialization to groups.js and only react on elements with a data-gid attribute given 2014-06-02 12:53:54 +02:00
raghunayyar 65aa20433c Enhancement : Toggle Add Group on Click, @blizzz have a look here. 2014-06-02 12:53:53 +02:00
Arthur Schiwon 17e640af22 set admin gid to Admins filter. I.e. hard-coding the admin group, but this is OC reality atm - other admin groups are not possible. 2014-06-02 12:53:53 +02:00
Arthur Schiwon b3221f0e4e LDAP: adjust main template according to PR 7291 2014-06-02 12:53:53 +02:00
raghunayyar eed108ec1b Enhancement : The edit icon looks like files app rename fileaction. 2014-06-02 12:53:53 +02:00
raghunayyar ceb6c4df04 Enhancement: Makes Edit and Delete Icons Tapable, 44px by 44px dimensions. 2014-06-02 12:53:53 +02:00
Arthur Schiwon f7903e92be do not forget to pass parameters to subtemplate 2014-06-02 12:53:52 +02:00
raghunayyar 63645461f0 Fixes Markup in templates. 2014-06-02 12:53:52 +02:00
raghunayyar 9ba4a76214 resolving conflict when picking 8b81a0b 2014-06-02 12:53:52 +02:00
Arthur Schiwon bf88bd108e do not show 0 when administered group has no users 2014-06-02 12:53:52 +02:00
Arthur Schiwon 7d3ac194e3 do not show 0 when group has no users 2014-06-02 12:53:52 +02:00
raghunayyar e681e1eec0 Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group 2014-06-02 12:53:51 +02:00
Arthur Schiwon 3a92d48104 reduce template function calls 2014-06-02 12:53:51 +02:00
Arthur Schiwon 57ffaddf26 add Last Login column 2014-06-02 12:53:51 +02:00
raghunayyar 970f899726 Initial Commit : Changes Storage to Quota, Implements GroupName editing. 2014-06-02 12:52:53 +02:00
Arthur Schiwon dc28f58951 add Storage Location col 2014-06-02 12:52:53 +02:00
raghunayyar dc1523355b Adds Admin to Grouplist Everywhere 2014-06-02 12:52:53 +02:00
raghunayyar 4a30665ec3 Removes Delete Icon from Admin Group. 2014-06-02 12:52:53 +02:00
raghunayyar 8e4bbe8297 Adds class button to fix font sizes. 2014-06-02 12:52:53 +02:00
raghunayyar 8e34316e04 Fixes User Search by username. 2014-06-02 12:52:53 +02:00
raghunayyar c7af9cd6dd Initial Commit : User Search, Fixes Typos 2014-06-02 12:52:53 +02:00
raghunayyar 71160ff853 Deletes Group Clientside Effectively. 2014-06-02 12:52:52 +02:00
raghunayyar ce46cd3680 Implements Group Creation from Sidebar 2014-06-02 12:52:52 +02:00
raghunayyar b506388b75 Reverts last commit, implements user in group count. 2014-06-02 12:52:52 +02:00
raghunayyar 43ced8c6c7 Splits Controls overlap in files and users. 2014-06-02 12:52:52 +02:00
raghunayyar 0663d954e6 resolve conflicts while picking c0fb623 2014-06-02 12:52:52 +02:00
Georg Ehrke 020255b4e5 add button for properly uninstalling apps 2014-05-31 17:50:39 +02:00
Thomas Müller 555b9cc245 Merge pull request #7614 from owncloud/test_annotations_working
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
Lukas Reschke 5cd0fd2559 Merge pull request #8700 from owncloud/design-smallfixes
Design detail fixes
2014-05-29 21:54:15 +02:00
Volkan Gezer c01f196f72 make reshare settings foldable 2014-05-29 21:14:20 +02:00
Volkan Gezer 1a22478446 reverts 188c543 and translates only mail 2014-05-27 12:58:46 +02:00
Volkan Gezer 188c5435d8 unwrapped strings fix 2014-05-27 03:48:24 +02:00
Jan-Christoph Borchardt c6c4bb62e1 move saved notification for mail server, so it's smaller 2014-05-23 18:09:45 +02:00
Bjoern Schiessle 12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Thomas Müller 30f1ec2521 Merge branch 'master' into test_annotations_working
Conflicts:
	lib/private/util.php
2014-05-19 21:42:30 +02:00
Björn Schießle b52cb8f557 Merge pull request #8604 from owncloud/sharing_encforce_password
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
Bjoern Schiessle b6e14af861 allow admin to enforce passwords for public link shares 2014-05-16 17:41:09 +02:00
Vincent Petry 9ccb3279dd Added app navigation for files app
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
2014-05-15 17:51:04 +02:00
Björn Schießle dab3cb65cf Merge pull request #8522 from owncloud/sharing_ux_improvements
Sharing ux improvements
2014-05-14 12:54:27 -04:00
Bjoern Schiessle a9ac11718e backup the encryption key after the encryption was disabled so that the user
can restore them if needed
2014-05-13 12:35:25 +02:00
Bjoern Schiessle ec045b251c hide input field if default expire date isn't activated 2014-05-13 11:28:25 +02:00
Thomas Müller b7981910f7 adopt new settings style 2014-05-09 22:53:01 +02:00
Thomas Tanghus 287c8981bc Check if ReflectionMethod::getDocComment is working 2014-05-09 22:44:55 +02:00
Volkan Gezer ad1265da13 typo fix, by translators on transifex 2014-04-25 16:26:30 +02:00
Bjoern Schiessle 6650be9913 add setting to set default expire date 2014-04-24 13:34:31 +02:00
Thomas Müller 54476c468c fix spelling 'Allow user ...' -> 'Allow users ...' 2014-04-22 09:34:08 +02:00
Lukas Reschke b2f8e34388 Remove uneeded file
This file seems not to be actually used anywhere.
2014-04-04 22:14:51 +02:00
Morris Jobke bd2cf6ee29 Merge pull request #7817 from owncloud/app-navigation-for-apps
Makes #app-navigation a part of app management.
2014-04-01 21:38:43 +02:00
Jan-Christoph Borchardt 69be5bdbd8 replace personalblock fieldset with section div in admin and personal settings 2014-03-27 17:00:47 +01:00
kondou dda7129a24 Merge branch 'master' of https://github.com/owncloud/core into last_cron_log 2014-03-21 20:23:31 +01:00
raghunayyar 59d1ee565e Makes #app-navigation a part of app management. 2014-03-20 13:34:50 +05:30
Vincent Petry b75ca9fb50 Display admin option for public upload with encryption enabled
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
2014-03-18 11:28:56 +01:00
Vincent Petry 5fcfb2ef84 Merge pull request #7564 from owncloud/issue/7559
Hide QMail when not selected and hide SendMail when not available on the server
2014-03-12 18:32:38 +01:00
kondou 556c6eca23 Use OC_Util::formatDate() 2014-03-12 17:53:39 +01:00
kondou c5440fa133 Move cron status to the right of the heading 2014-03-12 17:29:26 +01:00
kondou 547b563464 Log last cron execution
Fixes #2012
2014-03-12 15:20:51 +01:00
Thomas Müller 5713b0dedb Authentification -> Authentication 2014-03-11 16:24:50 +01:00
Joas Schilling 0285d5b6e2 Hide QMail when not selected and hide sendmail when not available on the server
Fix #7559
2014-03-05 14:53:20 +01:00
Joas Schilling d583d61b69 Merge pull request #7412 from owncloud/issue/7175
Add button to send a test mail after changing the email settings
2014-03-05 13:18:41 +01:00
Joas Schilling 5b8cde48dc Add button to send a test mail after changing the email settings
Fix #7175
2014-03-05 10:01:34 +01:00
Morris Jobke af2c2b3a16 update wording of email field 2014-03-04 10:22:54 +01:00
Jan-Christoph Borchardt e78da036c1 profile image: relabel technical 'Abort' to more widely used 'Cancel' 2014-02-28 10:09:34 +01:00
Jan-Christoph Borchardt d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
Joas Schilling 9847912257 Remove unused variables, add doc blocks and break lines
Fix #7166
2014-02-26 13:10:46 +01:00
Joas Schilling 331bd527a7 Hide SMTP options based on selected send mode
Fix #7166
2014-02-26 10:30:22 +01:00
Lukas Reschke 16262e3fd2 Move isadmin to template and rename it to oc_isadmin 2014-02-19 17:56:12 +01:00
Joas Schilling 8387cd8ae3 Add option to change email settings in admin section
Fix issue #7166
2014-02-18 14:26:03 +01:00
Jan-Christoph Borchardt dafa8fc37e do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete 2014-02-18 10:58:00 +01:00
Jan-Christoph Borchardt 61aa6ead83 Merge pull request #6490 from owncloud/theming-for-appstemplate
do not show 'Add app' and 'More apps' for themed ownCloud
2014-02-05 16:49:07 +01:00
Morris Jobke d182b4f59f Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt
remove the form, it isn't needed here
2014-01-27 04:30:06 -08:00
Jan-Christoph Borchardt 150d3856a0 prevent autofill for password change settings, prevent leak of existing password, fix #6552 2014-01-24 18:58:56 +01:00
Bjoern Schiessle 2a3cb7ac5b remove the form, it isn't needed here 2014-01-24 11:41:24 +01:00
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