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