Thomas Müller
1fbf5d86df
Merge pull request #14472 from owncloud/feature/wipencryptionapp
...
encryption 2.0 app
2015-04-07 16:46:45 +02:00
Thomas Müller
bf809ac85a
Removing left overs from old encryption app
2015-04-07 13:30:29 +02:00
Morris Jobke
4334cdc973
Revert "[WIP] Only show SSL table header if there are certificates"
2015-04-07 13:30:08 +02:00
Jan-Christoph Borchardt
2b6e13d088
Merge pull request #15345 from rullzer/fix_15263
...
[WIP] Only show SSL table header if there are certificates
2015-04-07 13:19:36 +02:00
Jan-Christoph Borchardt
6250365bf4
app mgmt app level design enhancements
2015-04-07 11:55:10 +02:00
Lukas Reschke
0816cf9142
Add experimental applications switch
...
Allows administrators to disable or enabled experimental applications as well as show the trust level.
2015-04-03 13:21:24 +02:00
Joas Schilling
4e50f2b72d
Fix the initial list of groups
2015-04-02 15:47:48 +02:00
Robin McCorkell
68b4ce568e
Fix JS reference error for personal password changing
2015-03-31 12:41:10 +01:00
Roeland Jago Douma
d61f688126
Only show SSL table header if there are certificates
2015-03-31 13:00:24 +02:00
Morris Jobke
00b2be11dd
Merge pull request #15239 from owncloud/see-no-evil
...
Move federated cloud sharing, files externals and updater to special pos...
2015-03-30 09:05:31 +02:00
Joas Schilling
495562f40c
Move federated cloud sharing, files externals and updater to special positions
2015-03-27 09:38:09 +01:00
Vincent Petry
ea93356598
Don't append user in a filtered list if groups don't match
2015-03-27 00:09:35 +01:00
Jan-Christoph Borchardt
fc59a37ae7
Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9
...
Don't use placeholder for password in IE8 & 9
2015-03-26 22:06:22 +01:00
Thomas Müller
232518ac54
Merge pull request #15234 from owncloud/encryption2_core
...
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
Bjoern Schiessle
ff9c85ce60
implement basic encryption functionallity in core to enable multiple encryption modules
2015-03-26 20:56:51 +01:00
Morris Jobke
55e1226dfe
Don't use placeholder for password in IE8 & 9
...
* the placeholder is in IE 8 and 9 just set as text and
styled a bit grey. If the form is then serialized without
typing something in the placeholder is sent as value
* this fixes that behaviour for the password field and
properly detects empyt passwords
* fixes #14912
2015-03-26 20:03:27 +01:00
Jan-Christoph Borchardt
7c66e17237
force log messages to break to alleviate horizontal scroll on Admin page
2015-03-26 12:34:57 +01:00
Jan-Christoph Borchardt
04a4df5065
only show connection checks results if there are errors, fix #11476
2015-03-25 09:34:13 +01:00
Joas Schilling
5e71d1558a
Merge pull request #15149 from owncloud/fix-enable-for-group
...
Correctly get array of groups and send OCP\IGroup objects to enable meth...
2015-03-24 13:50:56 +01:00
Joas Schilling
b262c30fa9
Correctly get array of groups and send OCP\IGroup objects to enable method
2015-03-24 12:56:42 +01:00
Joas Schilling
c3c2517131
Display a message when no apps can be found for this oc version
2015-03-24 11:29:28 +01:00
Jan-Christoph Borchardt
bdb4089139
collapse app descriptions by default, make expandable, fix #13112
2015-03-19 16:30:47 +01:00
Robin Appelman
cb4367b6d5
disable submit button while groupname is empty
2015-03-18 14:19:26 +01:00
Thomas Müller
ffe06ac5c7
display app update error messages - fixes #14611
2015-03-11 09:59:56 +01:00
Jan-Christoph Borchardt
db02edd7c8
adjust list of errors, more compact and readable
2015-03-06 15:27:21 +01:00
Lukas Reschke
bbd5f28415
Let users configure security headers in their Webserver
...
Doing this in the PHP code is not the right approach for multiple reasons:
1. A bug in the PHP code prevents them from being added to the response.
2. They are only added when something is served via PHP and not in other cases (that makes for example the newest IE UXSS which is not yet patched by Microsoft exploitable on ownCloud)
3. Some headers such as the Strict-Transport-Security might require custom modifications by administrators. This was not possible before and lead to buggy situations.
This pull request moves those headers out of the PHP code and adds a security check to the admin settings performed via JS.
2015-03-02 19:07:46 +01:00
Jakob Sack
0efed5c216
Add absolute time of last cronjob as hover tip
2015-02-28 21:48:19 +01:00
Lukas Reschke
e5c6af5102
Merge pull request #10599 from owncloud/move_passwordchange_text
...
Make the password changed msg inline to fix #10242
2015-02-24 11:54:17 +01:00
Thomas Müller
66e3211fd8
Merge pull request #13439 from owncloud/app-filter
...
Make the search box filter apps
2015-02-23 21:51:53 +01:00
Vincent Petry
e144d3aa49
Added unit test for app filter
2015-02-23 15:29:25 +01:00
Robin Appelman
3632962000
Make the search box filter apps
2015-02-19 00:01:03 +01:00
Lukas Reschke
0ea6de2f8c
Encode Requesttoken for avatars
...
Fixes new avatar selection in master half, other half will work when https://github.com/owncloud/core/pull/14266 has get merged.
Shocking to see how much places in our code do it wrong 🔫
2015-02-17 15:25:38 +01:00
kondou
95cfe292f4
Make the password changed msg inline to fix #10242
2015-02-11 14:27:05 +01:00
Arthur Schiwon
30b24696c8
fix user loading
2015-02-04 17:19:11 +01:00
Volkan Gezer
9beb033a9f
fix trusted domain localization
2015-02-01 16:06:12 +01:00
Morris Jobke
9fbeaf0fd9
Add value if restore of data is possible for a user
...
* reason: nice to know before password change in user management
* restore is possible:
* encryption is disabled
* encryption is enabled, admin and user has checked the
restore option
* if not possible:
* highlight users row in red once the admin wants to change the password
* show also a little tipsy
2015-01-27 13:23:19 +01:00
Sugaroverdose
2244e0eba7
do not clear fields until request return success
2015-01-20 23:14:41 +03:00
Morris Jobke
1b81339dfd
Drop the hide and show of new users in user list
...
* causes the first load after the initial load to hide some users in the viewport
and showing them again, but with a scrolled up viewport
* causes higher load for nearly never visible effects
* fixes #12962
2015-01-16 18:11:31 +01:00
Vincent Petry
6e20a408b4
Cancel app list load when switching categories
2015-01-16 12:23:02 +01:00
Robin Appelman
22ab56a592
Fix js error in personal settings if there is no password field
2015-01-09 15:38:39 +01:00
Morris Jobke
6a5f12beca
Merge pull request #12988 from owncloud/logfile_download
...
Logfile download
2015-01-09 00:33:22 +01:00
Georg Ehrke
f579f2bd94
add Download logfile button to admin settings
...
add logSettingsController
add download logfile button
move getEntries to LogSettingsController
move set log level to logsettingscontroller.php
add warning if logfile is bigger than 100MB
add unit test for set log level
fix typecasting, add new line at EoF
show log and logfile download only if log_type is set to owncloud
add unit test for getFilenameForDownload
2015-01-07 14:55:53 +01:00
Morris Jobke
5ce295907f
Merge pull request #12687 from owncloud/auto-escape-t-placeholders
...
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
Morris Jobke
bfdf0db7c0
Autoescape of placeholders in t() and p() - for JS
...
* add disableEscape parameter to disable this functionality
* drop usage of escapeHTML() that is now done inside t()
* add unit test for escaped and not escaped placeholder
* proper JSDoc
2015-01-07 12:56:32 +01:00
Robin Appelman
b2124d8d4f
Fix group select autocomplete
2015-01-06 15:48:15 +01:00
Thomas Müller
995f01fa2a
Merge pull request #12921 from owncloud/user-mail-user-management
...
Mail address of users is now changable in the user management
2014-12-19 09:51:18 +01:00
Jörn Friedrich Dreyer
891474b0d6
Merge pull request #12759 from owncloud/core-reduce-js-and-css
...
make sure styles and scripts are only loaded once
2014-12-18 23:18:37 +01:00
Morris Jobke
5913af8a72
Mail address of users is now changable in the user management
...
* introduced new route settings/users/{id}/mailAddress
* kept old responses
* better error messages
* dropped lostpassword.php from settings/ajax
* cleaned up the UserList.add() and hand in user object instead of
each attribute as another parameter
* check for change permission of mail address
* proper response messages
2014-12-18 22:43:09 +01:00
Thomas Müller
5327b80430
Merge pull request #12870 from owncloud/send-mail-new-user
...
Send mail for new users
2014-12-18 22:32:37 +01:00
Thomas Müller
51a22431ee
load showpassord.js conditionally in the template only if needed
2014-12-16 18:45:37 +01:00
Morris Jobke
3b61f76ca0
Send mail for new users
...
* supply mail address
* send mail with username and URL to that mail address
* option to temporary enable this feature
2014-12-16 09:10:22 +01:00
Morris Jobke
d3fe780805
fix initial loading limit of user management on large screens
2014-12-12 17:58:01 +01:00
Morris Jobke
04aaa72810
Show user backend in user management
...
* add switch to settings to show user backend
* user classes for headers and rows to unify the show/hide statement
* add user backend to response of user create request
* proper markup in settings area
2014-12-12 14:19:29 +01:00
Morris Jobke
3ab18f1f54
add comments to user list JS for better understanding
2014-12-12 09:59:42 +01:00
Morris Jobke
af1f34e813
remove PHP generated user list and move all to the existing JS part
2014-12-12 09:12:30 +01:00
Lukas Reschke
4c13918bd8
Expose backend type via REST API
...
This change will expose the user backend via the REST API which is a pre-requisite for https://github.com/owncloud/core/issues/12620 .
For example:
````json
[{"name":"9707A09E-CA9A-4ABE-A66A-3F632F16C409","displayname":"Document Conversion User Account","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/9707A09E-CA9A-4ABE-A66A-3F632F16C409","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"ED86733E-745C-4E4D-90CB-278A9737DB3C","displayname":"Hacker","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/ED86733E-745C-4E4D-90CB-278A9737DB3C","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"71CDF45B-E125-450D-983C-D9192F36EC88","displayname":"admin","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/71CDF45B-E125-450D-983C-D9192F36EC88","lastLogin":0,"backend":"OCA\\user_ldap\\USER_LDAP"},{"name":"admin","displayname":"admin","groups":["admin"],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/admin","lastLogin":"1418057287","backend":"OC_User_Database"},{"name":"test","displayname":"test","groups":[],"subadmin":[],"quota":"default","storageLocation":"\/Users\/lreschke\/Programming\/core\/data\/test","lastLogin":0,"backend":"OC_User_Database"}]
```
2014-12-09 12:04:19 +01:00
Lukas Reschke
c23957811d
React on other statuscodes than 200
2014-12-08 16:35:13 +01:00
Lukas Reschke
3a49411051
Fix url
2014-12-08 15:32:53 +01:00
Lukas Reschke
fe7d9a7ca0
Add REST route for user & group management
...
First step of a somewhat testable user management. - I know, the JSON returns are in an ugly format but the JS expects it that way. So let's keep it that way until we have time to fix the JS in the future.
2014-12-08 12:11:01 +01:00
Morris Jobke
23e09be65f
fix placeholder fake in IE8 & 9 that brokes group listing in user management - fixes #12525
2014-12-05 12:16:22 +01:00
Thomas Müller
4c1244f50c
Merge pull request #11917 from owncloud/fix-11909
...
Add checkbox to enforce SSL for subdomains
2014-11-11 20:37:50 +01:00
Sebastian Bolt
cc19d05ae7
changed default dropdown content
...
to fix issue #11959
2014-11-07 21:56:48 +01:00
Morris Jobke
f816f3df03
bower zxcvbn
2014-11-06 11:55:57 +01:00
Lukas Reschke
e73ccbd4ca
Migrate "setsecurity.php" to the AppFramework
...
Add switch to enforce SSL for subdomains
Add unit tests
Add test for boolean values
Camel-case
Fix ugly JS
2014-11-03 16:53:03 +01:00
Thomas Müller
1076a77840
fix loading of more log entries
2014-10-30 14:59:13 +01:00
Sebastian Bolt
52684c86e5
"Group admin" default label (issue #7706 )
...
Changed the column header to "Group Admin for" and the default value of
the multiselect box to "no group" if user is not a groupadmin for any
group.
2014-10-22 22:08:55 +02:00
Lukas Reschke
f48c973876
Merge pull request #11570 from owncloud/backport-11408-master
...
Backport 11408 master
2014-10-15 21:21:45 +02:00
Thomas Müller
b091394a90
introduce new app page layout
...
filter installed and not-installed apps properly
kill unneeded file
load category 'Installed' on page load
adding documentation links
new apps mgmt: first style adjustment
apps mgmt: only show license and preview if they exist
adding buttons
new apps mgmt: fix for mobile
use app icon if available
new apps mgmt: position enable/disable toggle to the right
new apps mgmt: proper display of icons or previews
new apps mgmt: fix loading spinner
reenable group selection for apps
new apps mgmt: position enable button normally again
new apps mgmt: clarify wording from 'Installed' to 'Enabled'
reintroduce enable/disable
Move rating image path generation to client-side
Move expression outside of l10n
fix group handling
add buttons for 'More apps' and 'Add your app' again
disable changed date of app for now
adding recommended label
style 'Recommended' app tag
fixing php warning
sort by rating
adding meta-category 'Recommended'
Only show existing documentation links
lacy loading of screenshots
making group based app activation work again
adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'
adding app.svg for all core apps
query string '?installed' is not longer needed
update and uninstall is back + error feedback
remove unneeded parameter
fix alignment of 'recommended' label
2014-10-15 15:21:40 +02:00
Lukas Reschke
13b1b45ee4
Refactor MailSettings controller
...
- Do not store the password (fixes https://github.com/owncloud/core/issues/11385 )
- Refactor to AppFramework
- Add unit tests
Conflicts:
settings/admin/controller.php
2014-10-14 15:38:34 +02:00
michag86
0039099f51
restrict $div to local scope
2014-10-07 11:09:07 +02:00
michag86
f4a2ddbe31
variable for found avatar div
2014-10-07 10:44:36 +02:00
michag86
2849c75646
fix for issue #10483
2014-10-06 08:53:12 +02:00
Vincent Petry
e65ceb08fc
Moved WebDAV and internet checks to client side JS
...
- Added setup checks in JavaScript
- Moved isWebDAVWorking to JS using SetupChecks
- Moved internet connection checks to an ajax call that goes through the
server
2014-09-23 11:16:14 +02:00
Lukas Reschke
fed8100177
Merge pull request #10968 from owncloud/admin-groupsselect2
...
Use select2 for the groups excluded from sharing in admin page
2014-09-19 16:50:56 +02:00
Lukas Reschke
d2743e6ad6
Merge pull request #7254 from owncloud/core-sortalgo
...
Fixed JS sort comparator to be consistent between JS and PHP
2014-09-16 17:29:03 +02:00
Vincent Petry
0d9f24a0ef
Add timeout to user and group deletion notification
...
Added timeout in DeleteHandler to auto-delete after a delay.
Fixed issue where OC.Notification.hide() was called twice in a row when
deleting multiple entries, causing the second notification to disappear.
Fixed issue where "undo" click event handler was registered multiple
times when calling setNotifications() twice.
Added JS unit tests for the DeleteHandler class.
Refix undo users, groups feature
Timeout is now cleared in cancel().
Fixed click handler name for "undo" to be able to work with multiple
DeleteHandler instances (in our case one for users and one for groups)
so that there is no conflict.
2014-09-15 14:04:44 +02:00
Vincent Petry
71776e307f
Add select2 cache for complete group list
...
To avoid making a server request every time the dropdown opens, the
whole list of groups are cached (from the last request):
Whenever the user types in a search term it will still send server
requests.
2014-09-11 11:12:44 +02:00
Vincent Petry
a064536ec1
Fixed select2 for admin and apps page
...
Added explicit escaping.
Now internally using a pipe symbol as separator for select2, to make it
possible to use group names containing commas.
2014-09-10 14:30:02 +02:00
Vincent Petry
0d28ba0662
Added select2 on the apps page
...
Moved setupGroupsSelect() from admin.js to a common settings.js
as OC.Settings.setupGoupsSelect().
Now using select2 as well on the apps page.
2014-09-09 18:04:00 +02:00
Vincent Petry
d23621536c
Now using select2 for the groups excluded from sharing
2014-09-09 18:03:05 +02:00
Lukas Reschke
ffee4da397
Merge pull request #10740 from owncloud/fix-everyone-group-count
...
Using countUsers method to return true count of users
2014-09-08 18:29:11 +02:00
Clark Tomlinson
6a56e03d48
Using countUsers method to return true count of users
2014-09-05 11:23:59 -04:00
Lukas Reschke
4efe6f6240
Add unit tests and fix rootcerts creation bug
2014-08-31 10:47:50 +02:00
Robin Appelman
1361bbb1e6
Cleanup routes
2014-08-31 10:47:50 +02:00
Robin Appelman
c1b11571ea
Move certificate management interface from files_external to core
2014-08-31 10:47:50 +02:00
Stephane V
c7c54d9361
Adds 2 checkboxes at the top of userlist in the settings, to display/hide optional columns
...
This fixes #9367 .
2014-08-28 23:45:21 +02:00
Clark Tomlinson
92685acf60
Implementing moment.js
...
Updating Usages
Removing unused method
Adding JS Doc
2014-08-28 09:28:45 -04:00
Lukas Reschke
dd871098c5
Redirect user after clicking on link
...
Use DI
2014-08-22 16:01:03 +02:00
Lukas Reschke
97b536e3df
Add a trusted domain wizard
...
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.
By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
2014-08-21 22:22:35 +02:00
Vincent Petry
25a8588f7b
Fix default quota settings field
...
The default quota settings field is initially hidden which makes it
impossible for singleSelect() to make its width measurements.
This fix uses the app navigation slide "show" event to defer the
singleSelect() initialization on the default quota field.
Refactored setQuota() into UserList._updateQuota().
Refactored duplicate event handler code into UserList.onQuotaSelect().
2014-08-12 12:00:34 +02:00
Vincent Petry
c208796c47
Use global apps slide toggle logic
...
Remove local app settings slide logic and make it use the global one
triggered by the "data-apps-slide-toggle" attribute.
2014-08-12 12:00:34 +02:00
Vincent Petry
173059f6d0
Fixed file list sorting
...
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)
- added OC.Util.naturalSortComparator that uses the same algo that was
used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
2014-08-11 13:28:53 +02:00
Morris Jobke
54030f4eef
Merge pull request #10176 from owncloud/fix-install-icon-size
...
use correct app-icon class for new apps as well, fix icon size
2014-08-05 16:04:30 +02:00
Morris Jobke
892d824804
Merge pull request #10154 from owncloud/uninstall-undefined-appitem
...
Fix undefined variable when uninstalling an app
2014-08-05 15:13:15 +02:00
Jan-Christoph Borchardt
fa9659ae69
use correct app-icon class for new apps as well, fix icon size
2014-08-05 14:23:25 +02:00
Robin Appelman
087e68b11a
Fix undefined variable when uninstalling an app
2014-08-04 17:42:02 +02:00
tomneedham
7c39c02ee5
Set group usercount to 0, not '', fixes #9782
2014-08-04 13:55:33 +00:00
Der-Jan
84ea393393
Fixed wrong brackets in apps settings
2014-07-30 17:23:19 +02:00
Arthur Schiwon
1d39282360
$.unique works only for DOM elements
2014-07-18 21:10:19 +02:00
Vincent Petry
4d5ebe61c4
Fixed JS and CSS issues in users page
...
- Renamed "delete" to "deleteEntry" to make IE8 happy.
- Added missing "svg" class for the "+" button
- Added height to "+" button but was unable to properly align it
2014-07-17 13:13:03 +02:00
blizzz
d22904612b
Merge pull request #9628 from edozzo/master
...
Userlist: async load doesnt fill checked group/subadmin array
2014-07-15 19:10:01 +02:00
DeLtAfOx
cd97847cd6
Strinct comparsion fix
2014-07-15 13:44:41 +02:00
DeLtAfOx
26d9993b3e
Userlist: async load doesnt fill checked group/subadmin array
2014-07-15 07:52:04 +02:00
Arthur Schiwon
ab2c7e06a4
remove dead code
...
do not filter groups. but update the user count according to the filter
improve phpdoc
improve metadata runtime cache
add metadata tests
2014-07-14 21:26:37 +02:00
Thomas Müller
db07c33ecd
use .filterAttr()
2014-07-09 16:52:52 +02:00
Thomas Müller
56f029d524
use .filterAttr()
2014-07-09 16:48:26 +02:00
Thomas Müller
899d6eab00
some more cleanup
2014-07-09 16:36:51 +02:00
Thomas Müller
506a3400e5
remove the group in case the last user has removed from that group
2014-07-09 15:29:38 +02:00
Thomas Müller
f76deb9f87
fixing JS synatx errors
2014-07-09 14:32:10 +02:00
Arthur Schiwon
bdc36461a7
avoid global selector
2014-07-09 14:32:10 +02:00
Arthur Schiwon
e2c935d6fb
increase/decrease everyone count on user creation/deletion
2014-07-09 14:32:10 +02:00
Arthur Schiwon
5e5a02cc2f
decrease user count in affected groups after user delete
2014-07-09 14:30:39 +02:00
Arthur Schiwon
a584022ecc
increment group counters when a user is created
2014-07-09 14:30:39 +02:00
Vincent Petry
ec4cb56bd7
Merge pull request #9505 from stephane84/fix-9497
...
Refocus input field after user creation
2014-07-07 23:11:23 +02:00
Stephane V
179a707e29
Fixes #9497
2014-07-07 18:32:51 +02:00
Morris Jobke
a26370e585
Merge pull request #9479 from stephane84/fix-9147
...
Log table design glitch in date field
2014-07-07 11:27:56 +02:00
Stephane V
e6cea04a30
Bug 9147 owncloud/core
...
Added class="date" in the latest column of the log table to get everything on one line (in the ajax request).
2014-07-06 16:15:33 +02:00
Georg Ehrke
485be909ff
improvements for uninstall button
2014-07-05 13:39:25 +02:00
Arthur Schiwon
bbea031090
Revert "hides table header while users load."
...
This reverts commit 0dc12a3737
.
2014-07-02 22:56:26 +02:00
raghunayyar
0dc12a3737
hides table header while users load.
2014-07-01 17:05:44 +05:30
Morris Jobke
6e2aaaaa31
Fix test mail behaviour
...
* ref #8854
* prevent default of "send test mail" button
* drop unused form serialization
* use display name of user for test mail
2014-06-25 15:32:40 +02:00
Arthur Schiwon
85894654ae
Make sure last seen tooltip always appears even after searching and filtering
2014-06-19 14:30:22 +02:00
Morris Jobke
9e74787c8a
Migrate table layout to p layout for share settings
...
ref #8906
2014-06-17 14:33:14 +02:00
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
Arthur Schiwon
f12c4f6d11
style
2014-06-16 13:46:31 +02:00
Arthur Schiwon
3ebb1565a7
escape before output, fixes #9041
2014-06-16 13:44:41 +02:00
Volkan Gezer
83b45926ee
Merge pull request #8716 from owncloud/forget-documentation
...
app manager forgets the documentation links workaround for #8081
2014-06-16 12:24:39 +02:00
Volkan Gezer
f56b86e857
fix split translations
2014-06-06 15:31:51 +02:00
Volkan Gezer
6f3b95052f
app manager forgets the documentation links
2014-06-06 15:22:02 +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
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
Thomas Müller
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
Jan-Christoph Borchardt
218131d30d
fix leading decimal Scrutinizer coding style issue
2014-06-05 10:52:06 +02:00
Jan-Christoph Borchardt
e26936e94f
remove obsolete placeholder call, fix #8881
2014-06-04 18:44:12 +02:00
Morris Jobke
210a1ef7e6
add to app navigation after enabling
2014-06-04 18:22:40 +02:00
Georg Ehrke
56a8010c9f
remove console.log in apps.js
2014-06-04 09:51:43 +02:00
Jan-Christoph Borchardt
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +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
Jan-Christoph Borchardt
9396b22fe3
add missing placeholder shim for change password fields in IE8/9
2014-06-03 15:30:10 +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
Bart Visscher
49f1e4a811
Fix syntax error
2014-06-03 12:42:36 +02:00
Robin Appelman
0f82b8efb3
Preserve changed groups when switching between apps
2014-06-03 12:42:36 +02:00
Robin Appelman
953e194245
Dont show group settings for login, filesystem, etc apps after enabling them
2014-06-03 12:42:36 +02:00
Robin Appelman
e3567242b2
Remove debug statements
2014-06-03 12:42:36 +02:00
Robin Appelman
7e07ff6f4f
Disable enabling apps by groups for filesystem, authentication and loggin apps
2014-06-03 12:42:36 +02:00
Robin Appelman
7272779456
Prevent js error
2014-06-03 12:42:35 +02:00
Robin Appelman
53dc30af4f
Add option to enable app for specific groups
2014-06-03 12:42:35 +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
75cc16f2bd
remove debug output
2014-06-02 12:53:59 +02:00
Arthur Schiwon
28a012410a
polish JSDoc
2014-06-02 12:53:59 +02:00
Arthur Schiwon
92b8344489
replace setTimeout and clearTimeout handling by _.debounce
2014-06-02 12:53:59 +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
Arthur Schiwon
7b63c2c036
cleanup
2014-06-02 12:53:59 +02:00
Arthur Schiwon
d030c28d69
bind undo to current deleteHandler
2014-06-02 12:53:59 +02:00
ringmaster
fc7438b221
Fix UserList.empty(), use _.defer() instead of setTimeout()
2014-06-02 12:53:58 +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
ad1c34db45
Revisions from review.
...
* Explicit toString()-based getters for uid and displayname data.
* Restored user check for group multiselect in new user creation form.
* Removed jQuery colon expr for uid.
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
Thomas Müller
f324aa7b24
fix some jshint errors
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
0067306fd6
Remove uneeded last comma
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
dea7f45782
stick with current group when the filter is used
2014-06-02 12:53:57 +02:00
Arthur Schiwon
7b8935abda
show users whose username starts with the search pattern first
...
We may want to switch or extend it to display name. I leave it like this for now, continued work on this needs to have sortable columns in mind
2014-06-02 12:53:56 +02:00
Arthur Schiwon
d87347e64e
update GroupList when a users is added or removed to a group
2014-06-02 12:53:56 +02:00
Thomas Müller
3c9788d40c
js cleanup + typos
2014-06-02 12:53:56 +02:00
Thomas Müller
d779db5aba
js cleanup
2014-06-02 12:53:56 +02:00
Arthur Schiwon
249e42c4cd
enable group filtering
2014-06-02 12:53:55 +02:00
Arthur Schiwon
dbc854d8b8
Fire up server request only on typing printed or modifying characters and when the string actually changed
2014-06-02 12:53:55 +02:00
Arthur Schiwon
8df50acce7
some documentation
2014-06-02 12:53:55 +02:00
Arthur Schiwon
68dc665c65
dynamically decide whether to load 10 or 30 users
2014-06-02 12:53:55 +02:00
Arthur Schiwon
5b8ba79356
make filter work on server-side
2014-06-02 12:53:55 +02:00
Arthur Schiwon
19fd7cd9c7
When emptying a list, a hidden entry remains. If the user uid is the same as of a user being to be loaded, it will not be appended but removed. Thus, add a random user name to avoid such happenings.
2014-06-02 12:53:55 +02:00
Arthur Schiwon
5f57d72b93
kick out deprecated and dislodged OC.Router
2014-06-02 12:53:55 +02:00
raghunayyar
fe4b1f8b10
Enhancement: Adds Group to grouplist when added via multiselect
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
raghunayyar
e159f7e4a9
Enhancement: Implements Grouplist Toggle, Courtesy Calendar App Settings.
2014-06-02 12:53:55 +02:00
raghunayyar
7aca126086
Adds @blizzz to authors
2014-06-02 12:53:54 +02:00
Arthur Schiwon
b3d68fc175
refactor delete handling and apply it to users and groups
2014-06-02 12:53:54 +02:00
raghunayyar
b6b133237a
Initial Commit with Group Toggle.
2014-06-02 12:53:54 +02:00
Arthur Schiwon
cfba7e20cf
don't hide add group when text is entered (except for ESC press)
2014-06-02 12:53:54 +02:00
Arthur Schiwon
853ced644d
hide Add Group when clicking away or pressing ESC
2014-06-02 12:53:54 +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
480173569f
put Add Group elements hiding and showing into its own function
2014-06-02 12:53:54 +02:00
Arthur Schiwon
330dfeb46b
group name input shall not vanish upon click, plus cleanup (groups do not have home folders)
2014-06-02 12:53:54 +02:00
Arthur Schiwon
749afe74df
when clicking on Add Group also put the focus into the group name field
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
506e065f23
stricter test for 0
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
Arthur Schiwon
d650cd66dc
mark selected group active
2014-06-02 12:53:53 +02:00
Arthur Schiwon
1f4bc7cb10
port scroll improvements
2014-06-02 12:53:52 +02:00
Arthur Schiwon
478393e15a
load groups when clicking on them
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
raghunayyar
f751e0bc48
Splits Code for Users and Groups.
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
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
Georg Ehrke
020255b4e5
add button for properly uninstalling apps
2014-05-31 17:50:39 +02:00
Volkan Gezer
4843d13056
prevent pageload if pressed enter on name email change
2014-05-30 15:12:39 +02:00
Volkan Gezer
c01f196f72
make reshare settings foldable
2014-05-29 21:14:20 +02:00
Joas Schilling
dc83b17f49
Fix double "saved" message when changing email settings
2014-05-28 11:50:55 +02:00
Bjoern Schiessle
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
Volkan Gezer
5291f47c66
fix typo encryption
2014-05-15 01:29:14 +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
Lukas Reschke
eecd4bd18e
Use JS as content-type due to mimesniffing
2014-04-17 10:40:19 +02:00
Björn Schießle
10dc1de644
Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
...
Fix some localization issues with file encryption/decryption strings
2014-04-11 17:22:13 +02:00
Thomas Müller
647abe512b
reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
2014-04-07 14:04:16 +02:00
Volkan Gezer
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +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
Vincent Petry
82f98fb3d3
Fixed user list offset call
2014-03-28 18:12:34 +01:00
raghunayyar
3d8ce8104f
Adds Style changes to app-navigation in core/css/apps.css
2014-03-24 17:59:53 +05:30
raghunayyar
59d1ee565e
Makes #app-navigation a part of app management.
2014-03-20 13:34:50 +05:30
kondou
8fafee31ef
Use $.hide() instead of .hidden for now
...
.inlineblock ranks higher than .hidden
2014-03-12 15:42:29 +01:00
kondou
dd97d532be
Remove OC.Router usage
2014-03-12 15:31:48 +01:00
kondou
1c82b4751e
Merge branch 'master' into hide_remove_image_avatar
2014-03-12 15:29:26 +01:00
Thomas Müller
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +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
Thomas Müller
5f711912a1
remove OC.Router.registerLoadedCallback()
2014-03-02 23:45:23 +01:00
Thomas Müller
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
kondou
3c11dc0006
Merge branch 'master' into hide_remove_image_avatar
2014-02-28 19:28:29 +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
Jan-Christoph Borchardt
84eea47991
Merge pull request #7406 from owncloud/settings-apps.js-style
...
coding style fixes: cut long lines, whitespace
2014-02-26 14:24:34 +01:00
Joas Schilling
9847912257
Remove unused variables, add doc blocks and break lines
...
Fix #7166
2014-02-26 13:10:46 +01:00
kondou
593adab258
Fix scrutinizer issue in settings/js/apps.js
2014-02-26 11:41:32 +01:00
Vincent Petry
a1600a289c
Merge pull request #7401 from owncloud/highlight_selected_app_settings
...
Highlight the selected app in app-settings
2014-02-26 11:07:43 +01:00
Jan-Christoph Borchardt
bc1c136cd6
coding style fixes: cut long lines, whitespace
2014-02-26 10:34:38 +01:00
Joas Schilling
331bd527a7
Hide SMTP options based on selected send mode
...
Fix #7166
2014-02-26 10:30:22 +01:00
kondou
e32acf933d
Highlight the selected app in app-settings
2014-02-26 04:03:41 +01:00
Robin Appelman
80481a1e41
Merge branch 'master' into mobile-header
2014-02-21 12:46:09 +01:00
kondou
88882e3fa7
Use addClass('hidden') and removeClass('hidden')
2014-02-21 12:42:07 +01:00
kondou
0e0b4d5575
Hide remove image, if there's no custom avatar
...
Fix #7308
2014-02-20 21:53:59 +01:00
Lukas Reschke
917a505af4
Merge pull request #7291 from owncloud/adminess-raghu
...
Move isadmin to template and rename it to oc_isadmin
2014-02-20 19:01:28 +01:00
Jan-Christoph Borchardt
bfe6dfe5da
Merge pull request #7056 from owncloud/users-scrollperformance
...
Improve users list scrolling performance
2014-02-20 16:45:36 +01:00
Jan-Christoph Borchardt
20b740f8e4
do not show display name on mobile when profile picture is present
2014-02-20 13:37:23 +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
c196e59e88
Add event parameter to keyup event
...
Fix issue #7277
2014-02-19 10:25:52 +01:00
Joas Schilling
fdb0d2067f
Remove duplicated definition and move OC.msg to js/js.js
...
Fix issue #7166
2014-02-19 10:20:52 +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
Vincent Petry
58b1dc5e76
Added loading spinner to users list on scroll
2014-02-18 10:52:05 +01:00
Vincent Petry
c732764eb5
Improve users list scrolling performance
...
- fixed JS error when avatar mode is disabled
- added spinner at the bottom of the table
- scroll detection now happens earlier
- single/multiselect init is deferred so that the new rows are first appended
into the list (more responsive) and initialized afterwards
- disabled users sorting after add (assuming they are always sorted on
the server side)
2014-02-17 19:32:45 +01:00
Morris Jobke
13fa0e2a9d
Fix implied evals and doubled definition of variable
...
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
Bjoern Schiessle
6bb27ea76b
disable button and input field during decryption
2014-01-24 12:15:06 +01:00
Bjoern Schiessle
2a3cb7ac5b
remove the form, it isn't needed here
2014-01-24 11:41:24 +01:00
Jan-Christoph Borchardt
5956277ed4
Merge pull request #6234 from owncloud/change-email-by-enter
...
change mail address by pressing enter - fixes #6179
2014-01-23 08:03:22 -08:00
Morris Jobke
80dead5a9f
fix double call of changeEmailAddress()
2014-01-18 22:59:49 +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
Björn Schießle
45709937af
Merge pull request #6786 from wakeup/master
...
Fix untranslated text when deleting user
2014-01-16 03:22:55 -08:00
Volkan Gezer
97b0840bbe
Fix untranslated text when deleting user
...
This should fix issue #6728
2014-01-15 18:40:04 +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
Morris Jobke
bc23f46198
fix typo
2013-12-09 16:05:10 +01:00
Morris Jobke
44a55056e7
change mail address by pressing enter - fixes #6179
2013-12-07 17:33:27 +01:00
Morris Jobke
ac77218d57
parent().parent() -> closest()
2013-12-06 13:53:01 +01:00
Morris Jobke
008bfc6793
Fix full name edit for repetive edit
...
fixes #6212
fixes the data attributes after edit
fixes markup to successfully re-edit display name
2013-12-05 23:44:59 +01:00
Bjoern Schiessle
caf486d6e7
- show a spinner while decrypting files if the encryption app was disabled
...
- don't fade-out the decryption result
2013-11-20 12:23:10 +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
5aeafab9ab
Fixed wrong id when reading checkbox value for force SSL setting
...
Fixes #5488
2013-10-23 15:21:18 +02:00
Vincent Petry
00f4928866
Added warning notification when user home already exists
...
When creating a user and the home already exists in the data dir, a
warning notification will be displayed.
Fixes #5161
2013-10-22 18:10:29 +02:00
raghunayyar
7c2f1fd580
Puts the language divider in place. thanks @Kondou-ger ;)
2013-10-11 18:46:59 +05:30
raghunayyar
e27bb660bd
Uniform Styles and Indentation Fixes for Personal Block
2013-10-11 18:03:53 +05:30
Vincent Petry
6970774776
Fixed display name change for IE8
...
After saving the display name, the oldDisplayName field's value was
wrongly set with text(), which would append the text inside the input
element which is considered as an invalid operation in IE8.
This fix for #5054 correctly puts the old value into the field with a val() call.
2013-10-11 10:48:30 +02:00
Victor Dubiniuk
a240e63981
Fix new user avatar. Ref#5166
2013-10-07 18:00:15 +03:00
kondou
b0ff10a536
Hide defaultavatar in #header and don't darken proper avatars in #header
2013-10-04 02:27:53 +02:00
kondou
24d092c4ba
Have uniform (wrong) indention
2013-09-28 17:49:07 +02:00
kondou
4907685405
Base defaultavatar text on displayname
...
Fix #4876
2013-09-28 16:46:53 +02:00
Bart Visscher
45a7b0dbac
Fix the apps enabling/disabling in settings
2013-09-20 20:29:15 +02:00
Bart Visscher
817b8d151b
Merge pull request #4745 from owncloud/split_personal-user_passwordchange
...
Split personal and user-mgmt password change logic
2013-09-18 07:53:11 -07:00
Bernhard Posselt
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
kondou
18da2f9cf7
Improve changepassword route naming
2013-09-13 17:07:23 +02:00
ringmaster
3790cbb493
Allow numeric group names
2013-09-13 09:06:20 -04:00
kondou
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
kondou
2ae3ab98d8
Merge branch 'master' into split_personal-user_passwordchange
2013-09-11 16:35:55 +02:00
kondou
4963a5b30f
Fix language selection; Fix #4756
2013-09-07 16:28:51 +02:00
kondou
d18a070a03
Have the "notsquare" error as data, not as message
2013-09-06 13:46:50 +02:00
kondou
a21376480d
Split personal and user-mgmt password change logic
2013-09-06 08:05:07 +02:00
kondou
3774632ecc
Clean up avatars and preliminary use JSON->rawlist.php
2013-09-05 23:12:52 +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
6db96603a0
Have login-checks and CSRF checks
2013-09-05 00:04:31 +02:00
kondou
fca5db748b
Remove backgroundcolor on updating avatar, and add a missing parameter
2013-09-04 13:16:21 +02:00
kondou
a1e7614d73
Clean up oc_avatars
2013-09-04 12:56:14 +02:00
kondou
32a7ba9823
Don't update avatar on displayNameChange anymore
2013-09-04 07:13:09 +02:00
kondou
6d42f51d0c
Fix unwanted caching in IE8
2013-09-03 18:34:40 +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
kondou
65413a95dc
Merge branch 'master' into oc_avatars
...
Conflicts:
config/config.sample.php
2013-09-03 04:43:11 +02:00
kondou
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
kondou
c95d4cafa9
Fix @tanghus's complains in avatars and clean up cropper after closing with "x"
2013-09-01 19:12:54 +02:00
kondou
aa88eea9cf
Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname
2013-08-31 18:27:28 +02:00
kondou
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
Jan-Christoph Borchardt
1e834c57a4
fix issues caused by introduction of sticky Apps management footer
2013-08-30 13:46:10 +02:00
kondou
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
kondou
c533b80682
Use OC_Cache and finish cropper functionality
2013-08-29 16:56:32 +02:00
kondou
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
Thomas Müller
1d04843ef0
no duplicate declaration of appLicense + camelCase
2013-08-28 22:42:43 +02:00
kondou
6c7efd5dac
Work around #4630 to fix license showing
2013-08-28 22:12:01 +02:00
kondou
bdf48a6daa
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
2013-08-28 21:20:28 +02:00
kondou
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +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
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
9500109349
Refactor newavatar.php and show (for now) an alert on problems when setting new avatars
2013-08-25 21:05:40 +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
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
Christopher
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07: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
Björn Schießle
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
kondou
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +02:00
kondou
db424cc86b
Use appitem instead of always recreating a jquery object
...
Also fix some wrong data storages
2013-08-18 14:49:11 +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
kondou
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
Owen Winkler
9840363488
Break long lines into smaller ones.
2013-08-18 05:03:20 -04:00
kondou
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +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
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
31d50288a5
draw attention to the newly added app entry by flashing it twice
2013-08-07 21:54:28 +02:00
Jan-Christoph Borchardt
7a9daa99d1
scroll the app navigation down so the newly added app is seen
2013-08-07 21:53:53 +02:00
Jan-Christoph Borchardt
775f33cc1b
prepend the new app before the 'More apps' function
2013-08-07 21:53:25 +02:00
kondou
1a4465f41d
Improve app-management
...
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00
kondou
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
kondou
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
Bjoern Schiessle
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
Björn Schießle
e15e394fcc
add ajax call to decrypt all files
...
Conflicts:
apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
kondou
05084e03a0
Use !== and === in settings.
2013-07-21 13:55:25 +02:00
kondou
efb707a431
Use OC instead of oc to show alert at an error.
...
Related to #4001
2013-07-10 04:28:54 +02:00
Victor Dubiniuk
a20f7f1d67
Do not add groups if user has no groups
2013-07-03 22:06:09 +03:00
Victor Dubiniuk
13bfa3be27
Use svg to png fallback on demand only
2013-06-28 23:18:11 +03:00
Victor Dubiniuk
6ecbae7da9
Add fallback for svg app icons
2013-06-28 23:10:40 +03:00
Victor Dubiniuk
d110e60316
Hide a ghost image on the apps management page
2013-06-28 21:53:56 +03:00
Victor Dubiniuk
b2cb81f857
Replace display name only
2013-06-18 00:17:08 +03:00
Björn Schießle
f1a5b8b524
show nicer warning if the admin recovery password was wrong
2013-05-16 16:01:40 +02:00
Björn Schießle
8ae30891b3
some error handling in case the recovery password is wrong
2013-05-16 15:19:53 +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
Arthur Schiwon
9c3b83e28c
Fix retrieval of users with multiple backends
2013-05-03 13:50:14 +02:00
Bart Visscher
d825669265
Merge pull request #3002 from owncloud/priorize_common_languages
...
Priorize common languages.
2013-04-26 06:30:59 -07:00
David Reagan
4bee02f75c
Fixed comment in personal.js. Changed message text in changedisplayname.php.
2013-04-23 14:31:35 -07: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
Morris Jobke
867a527148
Merge pull request #2975 from owncloud/log-date
...
use date and time instead of timestamp in log
2013-04-17 06:49:46 -07:00
Bernhard Posselt
f7e29eabf2
fix admin log display and use a more readable format
2013-04-17 14:05:51 +02:00
David Reagan
0dd6f16e0b
Removed extra id from jquery selectors. Remove console.log call. Removed commented code.
2013-04-16 13:22:04 -07:00
David Reagan
6d812ada05
Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event.
2013-04-16 13:03:41 -07:00
raghunayyar
5228eb8a18
Add span tag while enabling or disbling apps as well.
2013-04-12 18:15:59 +05:30
Robin Appelman
1abc264873
Add the quota change listeners to newly added user entries in the user list
2013-04-10 14:12:54 +02:00
Bart Visscher
46a552fd56
Merge pull request #2738 from Kondou-ger/fix_alert_issues
...
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
kondou
de2e546617
Translate 'Error' in core
2013-04-06 16:52:55 +02:00
kondou
32f96e19e5
Fix Typo
2013-04-05 19:06:58 +02:00
kondou
8d63b7d9bf
Fix #2693
...
When removing a group response.data.action becomes 'remove', thus the if
shows an empty notification.
2013-04-05 18:52:14 +02:00
root
74b02db337
Fixed things in alert-messages
...
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".
Also fixed missing translation.
2013-04-05 01:56:32 +02:00
Bernhard Posselt
8ed9be5408
Merge pull request #2597 from kabum/lesslog
...
Make it possible to show less log entries again
2013-03-29 07:22:43 -07:00
Bernhard Posselt
7c0999bd27
Merge pull request #2448 from owncloud/userlist_available_groups
...
User list: Keep array of available groups. Should fix #873
2013-03-29 07:19:09 -07:00
Morris Jobke
866ca51d83
fix typo and remove animation
2013-03-28 16:11:46 +01:00
Morris Jobke
f19fd30278
convert js call to css rule
2013-03-28 15:43:14 +01:00
Morris Jobke
df74c0e43a
apply code review hints
2013-03-28 15:02:31 +01:00
Arthur Schiwon
942cdff240
Users: use DisplayName in the Display Name col when appending users
2013-03-27 18:52:15 +01:00
Morris Jobke
7c8a0a486b
add copyright note
2013-03-27 16:53:51 +01:00
Morris Jobke
97d73d41a8
remove animation
2013-03-27 15:19:28 +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
Brice Maron
24d471af29
Improve detection of installations errors
2013-03-23 13:47:42 +01:00
Thomas Tanghus
06a7d39024
User list: Keep array of available groups. Should fix #873
2013-03-19 14:49:02 +01:00
Thomas Tanghus
c13487332a
User list: Avoid dupes and better sorting. Fix #2420
2013-03-19 02:48:08 +01:00
Frank Karlitschek
36a1bcb732
Merge pull request #2061 from owncloud/app-text
...
Add the description as text and not as html
2013-03-04 00:01:26 -08:00
Frank Karlitschek
d70912e72b
Merge pull request #2060 from owncloud/escapeGroupname
...
Sanitize uid, group and quota
2013-03-04 00:00:47 -08:00
Lukas Reschke
0252479e3e
Add the description as text and not as html
2013-03-04 00:19:07 +01:00
Lukas Reschke
86a7202cda
Sanitize uid, group and quota
2013-03-04 00:11:46 +01:00
Lukas Reschke
962b7a7c80
Add log as text and not as HTML
2013-03-03 23:46:08 +01:00
Arthur Schiwon
60d4fdda57
sort users according to display name
2013-02-26 22:56:55 +01:00
Qingping Hou
195b52cb63
Merge branch 'master' of github.com:owncloud/core into issue_1776
...
Conflicts:
core/templates/layout.user.php
2013-02-25 17:16:03 -05:00
Qingping Hou
c111a3aa24
add span tag to displayname on expand button
2013-02-25 15:40:57 -05:00
Qingping Hou
278a6f5b41
update oldDisplayName value on displayName change
...
This patch fixes a bug that can be reproduced in following way:
1. change displayName
2. clear text in displayName input click change again
Then you will get an error and previous displayName will be restored.
Expected behavior should restore the new updated displayName.
2013-02-24 18:13:25 -05:00
Qingping Hou
2f3c5d8afc
when user changes displayName, also update it on expand button
2013-02-24 18:07:35 -05:00
Thomas Tanghus
2268596e1a
Fetch displayname in userlist ajax requests. Refs #1681
2013-02-22 14:51:21 +01:00
Lukas Reschke
a984a27fa0
Sanitize user input
2013-02-18 08:04:35 +01:00
Lukas Reschke
5624f1b838
Merge pull request #1701 from owncloud/XSS-fixes
...
Sanitize HTML
2013-02-14 10:50:46 -08:00
Lukas Reschke
c7094197bf
Sanitize HTML
2013-02-14 18:15:14 +01:00
Thomas Mueller
c5d716effe
fixing javascript errors IE8 in apps management
2013-02-14 15:47:48 +01:00
Thomas Mueller
022993c098
fixing javascript errors IE8 in user management
2013-02-14 12:59:59 +01:00
Thomas Mueller
9d6f74c65e
missing piece after merge
2013-02-13 10:59:41 +01:00
Robin Appelman
e68e5cc849
Split editable select code used for quota selection into a jquery plugin
2013-02-11 15:18:14 +01:00
Lukas Reschke
18fa8e2753
json_encode the appid
2013-02-09 15:06:35 +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
Thomas Tanghus
cda0780d4b
Remove superfluous append
2013-02-05 14:15:17 +01:00
Jan-Christoph Borchardt
2ec0c491d4
remove superfluous enabled-app class again
2013-02-05 11:30:18 +01:00
Jan-Christoph Borchardt
4059959c5f
Merge branch 'master' into fix_addNavigation
2013-02-05 11:09:38 +01:00
Thomas Müller
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Thomas Tanghus
88ad1e5fbd
Make app icon linkable when enabling app.
2013-02-03 16:02:25 +01:00
blizzz
88f4aced38
Merge pull request #1404 from owncloud/fixing-1276-master
...
fix #1276 - use registerLoadedCallback()
2013-02-01 03:13:23 -08:00
Thomas Mueller
cc73568d68
Updateing -> Updating
2013-02-01 00:51:00 +01:00
Thomas Mueller
402263bd5c
fix #1276 - use registerLoadedCallback()
2013-02-01 00:33:14 +01:00
Thomas Mueller
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Jan-Christoph Borchardt
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
Thomas Mueller
85a12970c7
update on translation string
2013-01-31 14:11:31 +01:00
Jan-Christoph Borchardt
c801b86bc2
Merge pull request #1359 from raghunayyar/navigation
...
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-31 05:01:20 -08:00
Thomas Mueller
3af09f2acf
l10n support for the error dialog added
2013-01-31 10:43:59 +01:00
raghunayyar
b978cc8b28
Shorter, Cleaner JS in apps.js
2013-01-31 11:52:56 +05:30
Jörn Friedrich Dreyer
de00111c1f
use on instead of live in users.js
2013-01-30 17:49:02 +01:00
Jörn Friedrich Dreyer
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
raghunayyar
0dfbd53a6e
Reduced Styling and Image loads as from src and not backgorund.
2013-01-30 19:12:51 +05:30
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
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
6659798197
only change display name if the display name from the current user was changed; add correct display name to new user
2013-01-29 22:33:46 +01:00
Björn Schießle
56c6e6a334
remove debug output
2013-01-29 22:20:47 +01:00
Björn Schießle
e613a68274
remove dubug output
2013-01-29 21:30:04 +01:00
raghunayyar
d620495e92
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-30 00:54:23 +05:30
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
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08: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
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
Lukas Reschke
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08: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
b5d1dfcdc9
javascript syntax error fixed on the way
2013-01-04 23:38:07 +01:00
Thomas Mueller
594d388ad9
new javascript notification functions used within users.js
2013-01-04 23:37:21 +01:00
Thomas Tanghus
5f795d3aac
Users: Show selected groups first in list.
2012-12-21 06:18:45 +01:00
Thomas Tanghus
1d55829ba6
multiSelect: Modified users.js to only update other multiSelects.
2012-12-21 00:54:31 +01:00
Thomas Müller
cc9061d20d
adding missing translations for various strings + fixing tool tip on delete
2012-12-20 09:59:09 +01:00
Bart Visscher
68562dafb4
More whitespace fixes
2012-12-15 00:43:46 +01:00
Georg Ehrke
e5af24d084
use attr instead of data
2012-11-29 13:56:07 +01:00
Georg Ehrke
1d1ab2a911
Revert "fix group and subadmin managing for 'ajax-loaded' users"
...
This reverts commit a5774229a1
.
2012-11-29 13:37:37 +01:00
Georg Ehrke
4c83a4c918
add a client side check
2012-11-28 18:40:58 +01:00
Georg Ehrke
a5774229a1
fix group and subadmin managing for 'ajax-loaded' users
2012-11-28 18:40:00 +01:00
Georg Ehrke
ab13702770
make some checks server-side
2012-11-28 18:15:40 +01:00
Bart Visscher
343e9d8621
Better check and handing of user deletion
2012-11-14 21:52:28 +01:00
Bart Visscher
4eff27ed42
Always have the username as string in user admin
2012-11-14 21:52:28 +01:00
Bart Visscher
85209a0a00
Cleanup user settings js
2012-11-14 21:52:28 +01:00
Brice Maron
910a25adbd
Fix deleting multiple user w-o reloading V2
2012-11-12 20:29:06 +00:00
Brice Maron
4c06c25c6c
Fix delete link when new user is added
2012-11-08 20:17:16 +00:00
Brice Maron
fbc3123d8e
Correct more data vs attr to fix #189
2012-11-07 23:51:00 +00:00
Bart Visscher
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Robin Appelman
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00