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
Bart Visscher
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
Frank Karlitschek
c701bed2e3
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
2012-10-08 15:49:48 +02:00
Frank Karlitschek
306bfb44d3
no garbage on the screen please
2012-10-08 13:33:52 +02:00
Bart Visscher
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
Bart Visscher
bb136b9adf
Make the settings ajax calls use the router
2012-10-02 18:00:23 +02:00
Sam Tuke
b765e883f3
Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
...
Added method getAppstoreApps to OC_App
Added minor documentation
2012-09-18 14:35:27 +01:00
Bart Visscher
a8de0af273
Add 'var' before some global js vars
2012-09-05 22:26:09 +02:00
Bart Visscher
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
Thomas Mueller
10bd64debd
translation support enhanced
2012-09-01 13:23:37 +02:00
Robin Appelman
b5234a4f34
allow html inside app descriptions
2012-08-30 22:17:54 +02:00
Michael Gapczynski
42a291286b
Fix incorrect Javascript for changing Share API settings
2012-08-27 20:45:36 -04:00
Michael Gapczynski
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
Michael Gapczynski
59cf1d19e5
setbackgroundjobsmode.php got lost somewhere - switched call to use the perferred OC.AppConfig.setValue() instead
2012-08-26 22:05:34 -04:00
Georg Ehrke
80374c7cb2
fix UI bug with subadmins
2012-08-25 14:35:24 +02:00
Georg Ehrke
ced234a81a
rename subadmin to group admin
2012-08-17 16:00:24 +02:00
Michael Gapczynski
9d2ae5fa1f
Add infinite scrolling to Settings -> Users, still a little buggy
2012-08-11 16:25:27 -04:00
Michael Gapczynski
baa0b4d530
Cast subadmin groups as strings
2012-08-11 16:25:27 -04:00
Jakob Sack
1ce2cd73ff
Add first version of backgroundjobs settings
2012-08-09 10:41:10 +02:00
Thomas Tanghus
97853a1ae5
Restructure JS code and small fixes.
2012-08-04 23:48:36 +02:00
Michael Gapczynski
f95ca36b49
Listen to correct undo click for undoing deleting users
2012-08-04 17:03:36 -04:00
Michael Gapczynski
1ec27399a7
Show delete tipsy for users
2012-08-04 17:00:16 -04:00
Michael Gapczynski
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
Thomas Tanghus
24af2e8078
Load OCS apps in an ajax call to avoid blocking the WUI.
2012-08-04 20:16:32 +02:00
Alessandro Cosentino
226af11f33
reset version number when not specified - again bug oc-1433
2012-08-04 13:08:55 -04:00
Georg Ehrke
1bccc80996
hide morelog button if there are no more log entries - bugfix for oc-1398
2012-08-04 17:38:31 +02:00
Georg Ehrke
47e4793c30
little fix for previous commit
2012-08-01 18:04:06 +02:00
Georg Ehrke
8766b3286b
fix a subadmin UI bug
2012-08-01 18:03:08 +02:00
Michael Gapczynski
7050f0fa67
Cast groups as string, fixes bug oc-1309. Thanks to nderambure.
2012-07-26 23:54:25 -04:00
Georg Ehrke
88f66460a3
some js improvements for subadmins
2012-07-21 13:10:51 +02:00
Georg Ehrke
bf9b6e9ccc
don't show label 'add group' for subadmins and remove some debug code
2012-07-20 17:18:40 +02:00
Georg Ehrke
4700222ea9
Merge branch 'master' into subadmin
2012-07-15 16:33:17 +02:00
Georg Ehrke
e707e94857
subadmins can now add users
2012-07-15 16:31:28 +02:00
Michael Gapczynski
b455149bae
Fix undo delete user
2012-07-14 16:57:16 -04:00
Michael Gapczynski
8890a41280
Fix setting custom quota size for users, bug fix for oc-1128
2012-07-11 18:25:08 -04:00
Sam Tuke
825d92d59c
Added undo functionality to delete user procedure on user settings page
2012-07-04 14:30:42 +01:00
Michael Gapczynski
7ceba61413
Revert "bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)"
...
This reverts commit 265d7e50f5
.
2012-07-01 11:29:02 -04:00
Michael Gapczynski
c992482e92
Prevent duplicate group showing in multiselect that added the group
2012-06-29 17:52:44 -04:00
Michael Gapczynski
05cb94801a
Add new group to other user's group select forms
2012-06-29 16:29:58 -04:00
Bjoern Schiessle
72b365842f
bugfix for #1098 (assigning a group to a user, the group appears incrementally many times the more you assign it)
2012-06-26 12:51:32 +02:00
Thomas Tanghus
c3130919c2
Allow direct link to app.
2012-06-25 05:02:01 +02:00
Bjoern Schiessle
036530b2fd
log messages are looking nicer if html code gets interpreted. (xss prevention happens on another place)
2012-06-22 17:00:56 +02:00
Bjoern Schiessle
1b6dd6628a
applied patch provided by bug #966 to fix broken user specific quota settings
2012-06-12 11:18:34 +02:00
Michael Gapczynski
adc200c1f3
Hide app page link for internal apps, fixes bug oc-913
2012-06-04 14:26:30 -04:00
Frank Karlitschek
f3c1d1eded
link to apps.owncloud.com
...
thanks to guillaume for the patch
2012-06-03 23:48:59 +02:00
Frank Karlitschek
982cde0bb1
check during ownCloud upgrade if all the installed apps are compatible with the new ownCloud version. Disable them if not
2012-05-26 20:37:10 +02:00
Brice Maron
97e8ff6801
Switch enable button only when app is really installed or uninstalled
2012-05-14 21:52:40 +00:00
Robin Appelman
1a2ab2ef68
prevent user creation with empty password
2012-05-13 20:53:56 +02:00
Brice Maron
5962a0d4ac
Enhance user creation (avoid create+delete row), clear create user form after action
2012-05-07 21:27:03 +00:00
Brice Maron
da4688d804
Reorder code to avoid race condition in user creation
2012-05-07 16:08:35 +00:00
Michael Gapczynski
e0db22cc07
Provide feedback when user creation fails
2012-05-06 18:04:48 -04:00
Thomas Tanghus
d9592ddcb0
Tried to make settings/apps more keyboard/screenreader friendly.
2012-05-04 17:56:00 +02:00
Michael Gapczynski
31d623f426
Fix log viewing bug
2012-05-02 15:26:42 -04:00
Frank Karlitschek
6bfe2289be
improve the app installer.
...
show a label if an app is an internal app or a third party app from the app store.
show a preview image of the app if available
2012-04-21 15:30:58 +02:00
Robin Appelman
e59c87ee36
reload log after changing log level
2012-04-16 12:27:21 +02:00
Robin Appelman
5720bd296d
merge log into admin
2012-04-16 12:21:48 +02:00
Bart Visscher
74ba09f95c
Fix password is being saved even if not changed
...
Fixes: http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-303
2012-04-15 17:11:03 +02:00
Robin Appelman
8113a43252
typo
2012-04-14 18:09:42 +02:00
Robin Appelman
386663ddb6
swap enable and dissable error messages
2012-04-14 13:16:37 +02:00
Robin Appelman
d8864d4f4b
show error when installing an app has failed
2012-04-14 12:57:10 +02:00
Robin Appelman
128d446f39
fix timestamps when viewing logs
2012-03-27 00:21:31 +02:00
Robin Appelman
797e921b9a
improve log browsing
2012-02-26 03:10:29 +01:00
Robin Appelman
11cb45bd43
slight change to select style
2012-02-24 23:54:38 +01:00
Robin Appelman
9dcf29ff51
fix bug in group mangement
2012-02-24 23:54:38 +01:00
Robin Appelman
4230e217af
new config widget for user quota
2012-02-24 23:54:38 +01:00