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