66e426c990
Sort apps by level, then by name
...
Also properly initialize the level to 0 when no level was returned
2015-05-20 13:43:20 +02:00
d683752b37
Sort user groups by group name and hide the user count
2015-05-18 12:55:19 +02:00
952a90f2e3
Merge pull request #16037 from owncloud/enc_dont_disable_encryption
...
don't let the the user disable encryption once it was activated
2015-05-05 18:53:01 +02:00
5fd849f545
Allow user to set an empty email address
...
* fixes #16057
2015-05-05 11:58:19 +02:00
8f1e504d79
adjust wording and add button to confirm encryption
2015-05-05 10:38:09 +02:00
a9a9adc217
Only show SSL table header if there are certificates
2015-05-04 19:08:43 +02:00
6dc3682cc2
don't let the the user disable encryption once it was activated
2015-05-04 13:13:31 +02:00
62bac7de91
Add missing loading indicator for enabled apps
...
* happened when an app gets activated, because the
new appended HTML doesn't contain the loading
image
* fixes #15806
2015-04-23 21:40:51 +02:00
4a2f8f81ca
Don't pollute the global namespace
2015-04-21 12:01:56 +02:00
8935369564
fix date variable
2015-04-20 13:00:02 +02:00
20a6073a9f
Migrate personal certificate handling into AppFramework controllers
...
Also added unit-tests and better error-handling
2015-04-20 12:58:58 +02:00
1174ad0681
Merge pull request #15445 from owncloud/enc2_migration
...
add migration script from old encryption to new one
2015-04-16 09:34:47 -04:00
d2ef73367c
allow user to start migration in admin settings if no external user back-ends are enabled
2015-04-16 14:15:04 +02:00
04ca5b8160
remove slow fade animation for remaining tipsy tooltips
2015-04-15 12:25:10 +02:00
9332c8c266
remove slow fade animation for tipsy tooltip
2015-04-15 09:10:21 +02:00
74732cc0d8
Fix user list
...
* the name cell was changed from td to th because of accessibility
issues - this adjusts the CSS and JS to behave like before
2015-04-13 21:43:36 +02:00
2b8fc774d0
Initial fix for #15494
2015-04-12 16:29:05 +02:00
ba52f6f8fc
Merge pull request #15314 from owncloud/app-categories-15274
...
Add different trust levels to AppStore interface
2015-04-09 10:07:32 +02:00
eb1cf58d11
Reference `$(this)` instead
2015-04-08 21:26:12 +02:00
0cd29e00d1
Fix wording
2015-04-08 21:24:03 +02:00
1fbf5d86df
Merge pull request #14472 from owncloud/feature/wipencryptionapp
...
encryption 2.0 app
2015-04-07 16:46:45 +02:00
bf809ac85a
Removing left overs from old encryption app
2015-04-07 13:30:29 +02:00
4334cdc973
Revert "[WIP] Only show SSL table header if there are certificates"
2015-04-07 13:30:08 +02:00
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
6250365bf4
app mgmt app level design enhancements
2015-04-07 11:55:10 +02:00
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
4e50f2b72d
Fix the initial list of groups
2015-04-02 15:47:48 +02:00
68b4ce568e
Fix JS reference error for personal password changing
2015-03-31 12:41:10 +01:00
d61f688126
Only show SSL table header if there are certificates
2015-03-31 13:00:24 +02:00
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
495562f40c
Move federated cloud sharing, files externals and updater to special positions
2015-03-27 09:38:09 +01:00
ea93356598
Don't append user in a filtered list if groups don't match
2015-03-27 00:09:35 +01:00
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
232518ac54
Merge pull request #15234 from owncloud/encryption2_core
...
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
ff9c85ce60
implement basic encryption functionallity in core to enable multiple encryption modules
2015-03-26 20:56:51 +01:00
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
7c66e17237
force log messages to break to alleviate horizontal scroll on Admin page
2015-03-26 12:34:57 +01:00
04a4df5065
only show connection checks results if there are errors, fix #11476
2015-03-25 09:34:13 +01:00
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
b262c30fa9
Correctly get array of groups and send OCP\IGroup objects to enable method
2015-03-24 12:56:42 +01:00
c3c2517131
Display a message when no apps can be found for this oc version
2015-03-24 11:29:28 +01:00
bdb4089139
collapse app descriptions by default, make expandable, fix #13112
2015-03-19 16:30:47 +01:00
cb4367b6d5
disable submit button while groupname is empty
2015-03-18 14:19:26 +01:00
ffe06ac5c7
display app update error messages - fixes #14611
2015-03-11 09:59:56 +01:00
db02edd7c8
adjust list of errors, more compact and readable
2015-03-06 15:27:21 +01:00
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
0efed5c216
Add absolute time of last cronjob as hover tip
2015-02-28 21:48:19 +01:00
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
66e3211fd8
Merge pull request #13439 from owncloud/app-filter
...
Make the search box filter apps
2015-02-23 21:51:53 +01:00
e144d3aa49
Added unit test for app filter
2015-02-23 15:29:25 +01:00
3632962000
Make the search box filter apps
2015-02-19 00:01:03 +01:00
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
95cfe292f4
Make the password changed msg inline to fix #10242
2015-02-11 14:27:05 +01:00
30b24696c8
fix user loading
2015-02-04 17:19:11 +01:00
9beb033a9f
fix trusted domain localization
2015-02-01 16:06:12 +01:00
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
2244e0eba7
do not clear fields until request return success
2015-01-20 23:14:41 +03:00
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
6e20a408b4
Cancel app list load when switching categories
2015-01-16 12:23:02 +01:00
22ab56a592
Fix js error in personal settings if there is no password field
2015-01-09 15:38:39 +01:00
6a5f12beca
Merge pull request #12988 from owncloud/logfile_download
...
Logfile download
2015-01-09 00:33:22 +01:00
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
5ce295907f
Merge pull request #12687 from owncloud/auto-escape-t-placeholders
...
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
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
b2124d8d4f
Fix group select autocomplete
2015-01-06 15:48:15 +01:00
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
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
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
5327b80430
Merge pull request #12870 from owncloud/send-mail-new-user
...
Send mail for new users
2014-12-18 22:32:37 +01:00
51a22431ee
load showpassord.js conditionally in the template only if needed
2014-12-16 18:45:37 +01:00
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
d3fe780805
fix initial loading limit of user management on large screens
2014-12-12 17:58:01 +01:00
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
3ab18f1f54
add comments to user list JS for better understanding
2014-12-12 09:59:42 +01:00
af1f34e813
remove PHP generated user list and move all to the existing JS part
2014-12-12 09:12:30 +01:00
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
c23957811d
React on other statuscodes than 200
2014-12-08 16:35:13 +01:00
3a49411051
Fix url
2014-12-08 15:32:53 +01:00
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
23e09be65f
fix placeholder fake in IE8 & 9 that brokes group listing in user management - fixes #12525
2014-12-05 12:16:22 +01:00
4c1244f50c
Merge pull request #11917 from owncloud/fix-11909
...
Add checkbox to enforce SSL for subdomains
2014-11-11 20:37:50 +01:00
cc19d05ae7
changed default dropdown content
...
to fix issue #11959
2014-11-07 21:56:48 +01:00
f816f3df03
bower zxcvbn
2014-11-06 11:55:57 +01:00
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
1076a77840
fix loading of more log entries
2014-10-30 14:59:13 +01:00
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
f48c973876
Merge pull request #11570 from owncloud/backport-11408-master
...
Backport 11408 master
2014-10-15 21:21:45 +02:00
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
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
0039099f51
restrict $div to local scope
2014-10-07 11:09:07 +02:00
f4a2ddbe31
variable for found avatar div
2014-10-07 10:44:36 +02:00
2849c75646
fix for issue #10483
2014-10-06 08:53:12 +02:00
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
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
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
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
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
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
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
d23621536c
Now using select2 for the groups excluded from sharing
2014-09-09 18:03:05 +02:00
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
6a56e03d48
Using countUsers method to return true count of users
2014-09-05 11:23:59 -04:00
4efe6f6240
Add unit tests and fix rootcerts creation bug
2014-08-31 10:47:50 +02:00
1361bbb1e6
Cleanup routes
2014-08-31 10:47:50 +02:00
c1b11571ea
Move certificate management interface from files_external to core
2014-08-31 10:47:50 +02:00
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
92685acf60
Implementing moment.js
...
Updating Usages
Removing unused method
Adding JS Doc
2014-08-28 09:28:45 -04:00
dd871098c5
Redirect user after clicking on link
...
Use DI
2014-08-22 16:01:03 +02:00
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
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
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
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
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
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
fa9659ae69
use correct app-icon class for new apps as well, fix icon size
2014-08-05 14:23:25 +02:00
087e68b11a
Fix undefined variable when uninstalling an app
2014-08-04 17:42:02 +02:00
7c39c02ee5
Set group usercount to 0, not '', fixes #9782
2014-08-04 13:55:33 +00:00
84ea393393
Fixed wrong brackets in apps settings
2014-07-30 17:23:19 +02:00
1d39282360
$.unique works only for DOM elements
2014-07-18 21:10:19 +02:00
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
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
cd97847cd6
Strinct comparsion fix
2014-07-15 13:44:41 +02:00
26d9993b3e
Userlist: async load doesnt fill checked group/subadmin array
2014-07-15 07:52:04 +02:00
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
db07c33ecd
use .filterAttr()
2014-07-09 16:52:52 +02:00
56f029d524
use .filterAttr()
2014-07-09 16:48:26 +02:00
899d6eab00
some more cleanup
2014-07-09 16:36:51 +02:00
506a3400e5
remove the group in case the last user has removed from that group
2014-07-09 15:29:38 +02:00
f76deb9f87
fixing JS synatx errors
2014-07-09 14:32:10 +02:00
bdc36461a7
avoid global selector
2014-07-09 14:32:10 +02:00
e2c935d6fb
increase/decrease everyone count on user creation/deletion
2014-07-09 14:32:10 +02:00
5e5a02cc2f
decrease user count in affected groups after user delete
2014-07-09 14:30:39 +02:00
a584022ecc
increment group counters when a user is created
2014-07-09 14:30:39 +02:00
ec4cb56bd7
Merge pull request #9505 from stephane84/fix-9497
...
Refocus input field after user creation
2014-07-07 23:11:23 +02:00
179a707e29
Fixes #9497
2014-07-07 18:32:51 +02:00
a26370e585
Merge pull request #9479 from stephane84/fix-9147
...
Log table design glitch in date field
2014-07-07 11:27:56 +02:00
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
485be909ff
improvements for uninstall button
2014-07-05 13:39:25 +02:00
bbea031090
Revert "hides table header while users load."
...
This reverts commit 0dc12a3737
2014-07-02 22:56:26 +02:00
0dc12a3737
hides table header while users load.
2014-07-01 17:05:44 +05:30
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
85894654ae
Make sure last seen tooltip always appears even after searching and filtering
2014-06-19 14:30:22 +02:00
9e74787c8a
Migrate table layout to p layout for share settings
...
ref #8906
2014-06-17 14:33:14 +02:00
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
f12c4f6d11
style
2014-06-16 13:46:31 +02:00
3ebb1565a7
escape before output, fixes #9041
2014-06-16 13:44:41 +02:00
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
f56b86e857
fix split translations
2014-06-06 15:31:51 +02:00
6f3b95052f
app manager forgets the documentation links
2014-06-06 15:22:02 +02:00
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
cf9099c788
This settings doesn't belong together
...
Revert "make reshare settings foldable"
This reverts commit c01f196f72
2014-06-05 15:44:56 +02:00
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
218131d30d
fix leading decimal Scrutinizer coding style issue
2014-06-05 10:52:06 +02:00
e26936e94f
remove obsolete placeholder call, fix #8881
2014-06-04 18:44:12 +02:00
210a1ef7e6
add to app navigation after enabling
2014-06-04 18:22:40 +02:00
56a8010c9f
remove console.log in apps.js
2014-06-04 09:51:43 +02:00
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
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
9396b22fe3
add missing placeholder shim for change password fields in IE8/9
2014-06-03 15:30:10 +02:00
79b3558c6d
Merge pull request #7151 from owncloud/user-jquery
...
Continuing the New User management
2014-06-03 15:04:30 +02:00
49f1e4a811
Fix syntax error
2014-06-03 12:42:36 +02:00
0f82b8efb3
Preserve changed groups when switching between apps
2014-06-03 12:42:36 +02:00
953e194245
Dont show group settings for login, filesystem, etc apps after enabling them
2014-06-03 12:42:36 +02:00
e3567242b2
Remove debug statements
2014-06-03 12:42:36 +02:00
7e07ff6f4f
Disable enabling apps by groups for filesystem, authentication and loggin apps
2014-06-03 12:42:36 +02:00
7272779456
Prevent js error
2014-06-03 12:42:35 +02:00
53dc30af4f
Add option to enable app for specific groups
2014-06-03 12:42:35 +02:00
39982c2aea
fix grouplist behaviour (blank after filtering)
2014-06-02 17:32:59 +02:00
6f4bdbdb94
Merge pull request #8784 from owncloud/fold-reshare-settings
...
make reshare settings foldable
2014-06-02 14:37:10 +02:00
75cc16f2bd
remove debug output
2014-06-02 12:53:59 +02:00
28a012410a
polish JSDoc
2014-06-02 12:53:59 +02:00
92b8344489
replace setTimeout and clearTimeout handling by _.debounce
2014-06-02 12:53:59 +02:00
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
7b63c2c036
cleanup
2014-06-02 12:53:59 +02:00
d030c28d69
bind undo to current deleteHandler
2014-06-02 12:53:59 +02:00
fc7438b221
Fix UserList.empty(), use _.defer() instead of setTimeout()
2014-06-02 12:53:58 +02:00
4de14fe6da
Javascript cleanup for groups.
2014-06-02 12:53:58 +02:00
c38548a1aa
Rebase cleanup.
...
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
2014-06-02 12:53:58 +02:00
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
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
f324aa7b24
fix some jshint errors
2014-06-02 12:53:58 +02:00
66d00cf782
user management: remove unneeded and erroneous user filter reset function
2014-06-02 12:53:57 +02:00
0067306fd6
Remove uneeded last comma
2014-06-02 12:53:57 +02:00
a9bd416643
add reset button for the filter field
2014-06-02 12:53:57 +02:00
dea7f45782
stick with current group when the filter is used
2014-06-02 12:53:57 +02:00
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
d87347e64e
update GroupList when a users is added or removed to a group
2014-06-02 12:53:56 +02:00
3c9788d40c
js cleanup + typos
2014-06-02 12:53:56 +02:00
d779db5aba
js cleanup
2014-06-02 12:53:56 +02:00
249e42c4cd
enable group filtering
2014-06-02 12:53:55 +02:00
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
8df50acce7
some documentation
2014-06-02 12:53:55 +02:00
68dc665c65
dynamically decide whether to load 10 or 30 users
2014-06-02 12:53:55 +02:00
5b8ba79356
make filter work on server-side
2014-06-02 12:53:55 +02:00
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
5f57d72b93
kick out deprecated and dislodged OC.Router
2014-06-02 12:53:55 +02:00
fe4b1f8b10
Enhancement: Adds Group to grouplist when added via multiselect
2014-06-02 12:53:55 +02:00
d3cee79b5a
Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist.
2014-06-02 12:53:55 +02:00
e159f7e4a9
Enhancement: Implements Grouplist Toggle, Courtesy Calendar App Settings.
2014-06-02 12:53:55 +02:00
7aca126086
Adds @blizzz to authors
2014-06-02 12:53:54 +02:00
b3d68fc175
refactor delete handling and apply it to users and groups
2014-06-02 12:53:54 +02:00
b6b133237a
Initial Commit with Group Toggle.
2014-06-02 12:53:54 +02:00
cfba7e20cf
don't hide add group when text is entered (except for ESC press)
2014-06-02 12:53:54 +02:00
853ced644d
hide Add Group when clicking away or pressing ESC
2014-06-02 12:53:54 +02:00
a4cfa95545
restructure group.js and put functions to object, also add group list sorting after adding.
2014-06-02 12:53:54 +02:00
480173569f
put Add Group elements hiding and showing into its own function
2014-06-02 12:53:54 +02:00
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
749afe74df
when clicking on Add Group also put the focus into the group name field
2014-06-02 12:53:54 +02:00
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
65aa20433c
Enhancement : Toggle Add Group on Click, @blizzz have a look here.
2014-06-02 12:53:53 +02:00
506e065f23
stricter test for 0
2014-06-02 12:53:53 +02:00
eed108ec1b
Enhancement : The edit icon looks like files app rename fileaction.
2014-06-02 12:53:53 +02:00
d650cd66dc
mark selected group active
2014-06-02 12:53:53 +02:00
1f4bc7cb10
port scroll improvements
2014-06-02 12:53:52 +02:00
478393e15a
load groups when clicking on them
2014-06-02 12:53:52 +02:00
e681e1eec0
Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group
2014-06-02 12:53:51 +02:00
f751e0bc48
Splits Code for Users and Groups.
2014-06-02 12:53:51 +02:00
57ffaddf26
add Last Login column
2014-06-02 12:53:51 +02:00
970f899726
Initial Commit : Changes Storage to Quota, Implements GroupName editing.
2014-06-02 12:52:53 +02:00
dc28f58951
add Storage Location col
2014-06-02 12:52:53 +02:00
8e34316e04
Fixes User Search by username.
2014-06-02 12:52:53 +02:00
c7af9cd6dd
Initial Commit : User Search, Fixes Typos
2014-06-02 12:52:53 +02:00
71160ff853
Deletes Group Clientside Effectively.
2014-06-02 12:52:52 +02:00
ce46cd3680
Implements Group Creation from Sidebar
2014-06-02 12:52:52 +02:00
020255b4e5
add button for properly uninstalling apps
2014-05-31 17:50:39 +02:00
4843d13056
prevent pageload if pressed enter on name email change
2014-05-30 15:12:39 +02:00
c01f196f72
make reshare settings foldable
2014-05-29 21:14:20 +02:00
dc83b17f49
Fix double "saved" message when changing email settings
2014-05-28 11:50:55 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
5291f47c66
fix typo encryption
2014-05-15 01:29:14 +02:00
dab3cb65cf
Merge pull request #8522 from owncloud/sharing_ux_improvements
...
Sharing ux improvements
2014-05-14 12:54:27 -04:00
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
ec045b251c
hide input field if default expire date isn't activated
2014-05-13 11:28:25 +02:00
eecd4bd18e
Use JS as content-type due to mimesniffing
2014-04-17 10:40:19 +02:00
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
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
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
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
82f98fb3d3
Fixed user list offset call
2014-03-28 18:12:34 +01:00
3d8ce8104f
Adds Style changes to app-navigation in core/css/apps.css
2014-03-24 17:59:53 +05:30
59d1ee565e
Makes #app-navigation a part of app management.
2014-03-20 13:34:50 +05:30
8fafee31ef
Use $.hide() instead of .hidden for now
...
.inlineblock ranks higher than .hidden
2014-03-12 15:42:29 +01:00
dd97d532be
Remove OC.Router usage
2014-03-12 15:31:48 +01:00
1c82b4751e
Merge branch 'master' into hide_remove_image_avatar
2014-03-12 15:29:26 +01:00
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
5b8cde48dc
Add button to send a test mail after changing the email settings
...
Fix #7175
2014-03-05 10:01:34 +01:00
5f711912a1
remove OC.Router.registerLoadedCallback()
2014-03-02 23:45:23 +01:00
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
3c11dc0006
Merge branch 'master' into hide_remove_image_avatar
2014-02-28 19:28:29 +01:00
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
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
9847912257
Remove unused variables, add doc blocks and break lines
...
Fix #7166
2014-02-26 13:10:46 +01:00
593adab258
Fix scrutinizer issue in settings/js/apps.js
2014-02-26 11:41:32 +01:00
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
bc1c136cd6
coding style fixes: cut long lines, whitespace
2014-02-26 10:34:38 +01:00
331bd527a7
Hide SMTP options based on selected send mode
...
Fix #7166
2014-02-26 10:30:22 +01:00
e32acf933d
Highlight the selected app in app-settings
2014-02-26 04:03:41 +01:00
80481a1e41
Merge branch 'master' into mobile-header
2014-02-21 12:46:09 +01:00
88882e3fa7
Use addClass('hidden') and removeClass('hidden')
2014-02-21 12:42:07 +01:00
0e0b4d5575
Hide remove image, if there's no custom avatar
...
Fix #7308
2014-02-20 21:53:59 +01:00
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
bfe6dfe5da
Merge pull request #7056 from owncloud/users-scrollperformance
...
Improve users list scrolling performance
2014-02-20 16:45:36 +01:00
20b740f8e4
do not show display name on mobile when profile picture is present
2014-02-20 13:37:23 +01:00
16262e3fd2
Move isadmin to template and rename it to oc_isadmin
2014-02-19 17:56:12 +01:00
c196e59e88
Add event parameter to keyup event
...
Fix issue #7277
2014-02-19 10:25:52 +01:00
fdb0d2067f
Remove duplicated definition and move OC.msg to js/js.js
...
Fix issue #7166
2014-02-19 10:20:52 +01:00
8387cd8ae3
Add option to change email settings in admin section
...
Fix issue #7166
2014-02-18 14:26:03 +01:00
58b1dc5e76
Added loading spinner to users list on scroll
2014-02-18 10:52:05 +01:00
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
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
6bb27ea76b
disable button and input field during decryption
2014-01-24 12:15:06 +01:00
2a3cb7ac5b
remove the form, it isn't needed here
2014-01-24 11:41:24 +01:00
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
80dead5a9f
fix double call of changeEmailAddress()
2014-01-18 22:59:49 +01:00
80d871ab1e
added website field
2014-01-17 16:35:48 +01:00
e2de3b8337
distinguish app links from doc links
2014-01-17 16:08:32 +01:00
bf0471a92e
show link to app documentation
2014-01-17 14:56:25 +01:00
45709937af
Merge pull request #6786 from wakeup/master
...
Fix untranslated text when deleting user
2014-01-16 03:22:55 -08:00
97b0840bbe
Fix untranslated text when deleting user
...
This should fix issue #6728
2014-01-15 18:40:04 +01:00
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
bc23f46198
fix typo
2013-12-09 16:05:10 +01:00
44a55056e7
change mail address by pressing enter - fixes #6179
2013-12-07 17:33:27 +01:00
ac77218d57
parent().parent() -> closest()
2013-12-06 13:53:01 +01:00
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
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
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
5aeafab9ab
Fixed wrong id when reading checkbox value for force SSL setting
...
Fixes #5488
2013-10-23 15:21:18 +02:00
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
7c2f1fd580
Puts the language divider in place. thanks @Kondou-ger ;)
2013-10-11 18:46:59 +05:30
e27bb660bd
Uniform Styles and Indentation Fixes for Personal Block
2013-10-11 18:03:53 +05:30
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
a240e63981
Fix new user avatar. Ref#5166
2013-10-07 18:00:15 +03:00
b0ff10a536
Hide defaultavatar in #header and don't darken proper avatars in #header
2013-10-04 02:27:53 +02:00
24d092c4ba
Have uniform (wrong) indention
2013-09-28 17:49:07 +02:00
4907685405
Base defaultavatar text on displayname
...
Fix #4876
2013-09-28 16:46:53 +02:00
45a7b0dbac
Fix the apps enabling/disabling in settings
2013-09-20 20:29:15 +02:00
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
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
18da2f9cf7
Improve changepassword route naming
2013-09-13 17:07:23 +02:00
3790cbb493
Allow numeric group names
2013-09-13 09:06:20 -04:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
2ae3ab98d8
Merge branch 'master' into split_personal-user_passwordchange
2013-09-11 16:35:55 +02:00
4963a5b30f
Fix language selection; Fix #4756
2013-09-07 16:28:51 +02:00
d18a070a03
Have the "notsquare" error as data, not as message
2013-09-06 13:46:50 +02:00
a21376480d
Split personal and user-mgmt password change logic
2013-09-06 08:05:07 +02:00
3774632ecc
Clean up avatars and preliminary use JSON->rawlist.php
2013-09-05 23:12:52 +02:00
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
6db96603a0
Have login-checks and CSRF checks
2013-09-05 00:04:31 +02:00
fca5db748b
Remove backgroundcolor on updating avatar, and add a missing parameter
2013-09-04 13:16:21 +02:00
a1e7614d73
Clean up oc_avatars
2013-09-04 12:56:14 +02:00
32a7ba9823
Don't update avatar on displayNameChange anymore
2013-09-04 07:13:09 +02:00
6d42f51d0c
Fix unwanted caching in IE8
2013-09-03 18:34:40 +02:00
4724d60ecd
Partly fix cropper in IE8 and don't use a dialog for it
2013-09-03 17:40:41 +02:00
65413a95dc
Merge branch 'master' into oc_avatars
...
Conflicts:
config/config.sample.php
2013-09-03 04:43:11 +02:00
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
c95d4cafa9
Fix @tanghus's complains in avatars and clean up cropper after closing with "x"
2013-09-01 19:12:54 +02:00
aa88eea9cf
Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname
2013-08-31 18:27:28 +02:00
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
1e834c57a4
fix issues caused by introduction of sticky Apps management footer
2013-08-30 13:46:10 +02:00
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
c533b80682
Use OC_Cache and finish cropper functionality
2013-08-29 16:56:32 +02:00
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
1d04843ef0
no duplicate declaration of appLicense + camelCase
2013-08-28 22:42:43 +02:00
6c7efd5dac
Work around #4630 to fix license showing
2013-08-28 22:12:01 +02:00
bdf48a6daa
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
2013-08-28 21:20:28 +02:00
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
31736a1df3
Have a controller instead ofo avatar.php and fix some cropper-design
2013-08-26 16:46:55 +02:00
9a8908b643
Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
2013-08-25 21:06:44 +02:00
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
0a4febf1eb
Integrate newavatar.php into avatar.php by using GET, POST & DELETE
2013-08-25 21:06:01 +02:00
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
d7e6c77e20
Have a fancy uploadavatar button
2013-08-25 21:05:40 +02:00
9500109349
Refactor newavatar.php and show (for now) an alert on problems when setting new avatars
2013-08-25 21:05:40 +02:00
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
fac671b14e
Modularize get(), async getAvatar, avatars @ usermgmt
...
And other small improvements
2013-08-25 21:04:04 +02:00
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
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
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
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +02:00
db424cc86b
Use appitem instead of always recreating a jquery object
...
Also fix some wrong data storages
2013-08-18 14:49:11 +02:00
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
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
9840363488
Break long lines into smaller ones.
2013-08-18 05:03:20 -04:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
cd7e57e8ec
Use JSON to send/receive group data.
...
Squashed commits from PR #4364 for master.
2013-08-15 06:19:40 -04:00
Vincent Petry
Joas Schilling
Jan-Christoph Borchardt
Morris Jobke
Bjoern Schiessle
Roeland Jago Douma
Thomas Müller
Lukas Reschke
Clark Tomlinson
Robin McCorkell
Joas Schilling
Robin Appelman
Jakob Sack
kondou
Arthur Schiwon
Volkan Gezer
Sugaroverdose
Georg Ehrke
Jörn Friedrich Dreyer
Sebastian Bolt
michag86
Stephane V
tomneedham
Der-Jan
DeLtAfOx
raghunayyar
Volkan Gezer
Morris Jobke
icewind1991
Bart Visscher
ringmaster
Lukas Reschke
Victor Dubiniuk
Bernhard Posselt
Björn Schießle