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
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
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
56c6e6a334
remove debug output
2013-01-29 22:20:47 +01:00
e613a68274
remove dubug output
2013-01-29 21:30:04 +01:00
d620495e92
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-30 00:54:23 +05:30
f3a99f4869
show display name in input field
2013-01-28 17:01:37 +01:00
e0f2ed2757
interface and API to change display names
2013-01-28 14:09:11 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
48949ba04a
Move appid to external file
2013-01-23 11:21:34 +01:00
d2383338de
External JSON for the Apps
2013-01-21 22:18:42 +01:00
3ed7d5d521
Move isadmin to external file
2013-01-21 21:25:38 +01:00
a27f92a17a
we are getting closer. updating is not working yet.
2013-01-21 20:40:23 +01:00
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
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
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
b5d1dfcdc9
javascript syntax error fixed on the way
2013-01-04 23:38:07 +01:00
594d388ad9
new javascript notification functions used within users.js
2013-01-04 23:37:21 +01:00
5f795d3aac
Users: Show selected groups first in list.
2012-12-21 06:18:45 +01:00
1d55829ba6
multiSelect: Modified users.js to only update other multiSelects.
2012-12-21 00:54:31 +01:00
cc9061d20d
adding missing translations for various strings + fixing tool tip on delete
2012-12-20 09:59:09 +01:00
68562dafb4
More whitespace fixes
2012-12-15 00:43:46 +01:00
e5af24d084
use attr instead of data
2012-11-29 13:56:07 +01:00
1d1ab2a911
Revert "fix group and subadmin managing for 'ajax-loaded' users"
...
This reverts commit a5774229a1
2012-11-29 13:37:37 +01:00
4c83a4c918
add a client side check
2012-11-28 18:40:58 +01:00
a5774229a1
fix group and subadmin managing for 'ajax-loaded' users
2012-11-28 18:40:00 +01:00
ab13702770
make some checks server-side
2012-11-28 18:15:40 +01:00
343e9d8621
Better check and handing of user deletion
2012-11-14 21:52:28 +01:00
4eff27ed42
Always have the username as string in user admin
2012-11-14 21:52:28 +01:00
85209a0a00
Cleanup user settings js
2012-11-14 21:52:28 +01:00
910a25adbd
Fix deleting multiple user w-o reloading V2
2012-11-12 20:29:06 +00:00
4c06c25c6c
Fix delete link when new user is added
2012-11-08 20:17:16 +00:00
fbc3123d8e
Correct more data vs attr to fix #189
2012-11-07 23:51:00 +00:00
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00
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
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
306bfb44d3
no garbage on the screen please
2012-10-08 13:33:52 +02:00
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
bb136b9adf
Make the settings ajax calls use the router
2012-10-02 18:00:23 +02:00
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
a8de0af273
Add 'var' before some global js vars
2012-09-05 22:26:09 +02:00
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
10bd64debd
translation support enhanced
2012-09-01 13:23:37 +02:00
b5234a4f34
allow html inside app descriptions
2012-08-30 22:17:54 +02:00
42a291286b
Fix incorrect Javascript for changing Share API settings
2012-08-27 20:45:36 -04:00
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
59cf1d19e5
setbackgroundjobsmode.php got lost somewhere - switched call to use the perferred OC.AppConfig.setValue() instead
2012-08-26 22:05:34 -04:00
80374c7cb2
fix UI bug with subadmins
2012-08-25 14:35:24 +02:00
ced234a81a
rename subadmin to group admin
2012-08-17 16:00:24 +02:00
9d2ae5fa1f
Add infinite scrolling to Settings -> Users, still a little buggy
2012-08-11 16:25:27 -04:00
baa0b4d530
Cast subadmin groups as strings
2012-08-11 16:25:27 -04:00
1ce2cd73ff
Add first version of backgroundjobs settings
2012-08-09 10:41:10 +02:00
97853a1ae5
Restructure JS code and small fixes.
2012-08-04 23:48:36 +02:00
f95ca36b49
Listen to correct undo click for undoing deleting users
2012-08-04 17:03:36 -04:00
1ec27399a7
Show delete tipsy for users
2012-08-04 17:00:16 -04:00
002ad4ba16
Tweak users delete notification
2012-08-04 16:44:26 -04:00
24af2e8078
Load OCS apps in an ajax call to avoid blocking the WUI.
2012-08-04 20:16:32 +02:00
226af11f33
reset version number when not specified - again bug oc-1433
2012-08-04 13:08:55 -04:00
1bccc80996
hide morelog button if there are no more log entries - bugfix for oc-1398
2012-08-04 17:38:31 +02:00
47e4793c30
little fix for previous commit
2012-08-01 18:04:06 +02:00
8766b3286b
fix a subadmin UI bug
2012-08-01 18:03:08 +02:00
7050f0fa67
Cast groups as string, fixes bug oc-1309. Thanks to nderambure.
2012-07-26 23:54:25 -04:00
88f66460a3
some js improvements for subadmins
2012-07-21 13:10:51 +02:00
bf9b6e9ccc
don't show label 'add group' for subadmins and remove some debug code
2012-07-20 17:18:40 +02:00
4700222ea9
Merge branch 'master' into subadmin
2012-07-15 16:33:17 +02:00
e707e94857
subadmins can now add users
2012-07-15 16:31:28 +02:00
b455149bae
Fix undo delete user
2012-07-14 16:57:16 -04:00
8890a41280
Fix setting custom quota size for users, bug fix for oc-1128
2012-07-11 18:25:08 -04:00
825d92d59c
Added undo functionality to delete user procedure on user settings page
2012-07-04 14:30:42 +01:00
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
c992482e92
Prevent duplicate group showing in multiselect that added the group
2012-06-29 17:52:44 -04:00
05cb94801a
Add new group to other user's group select forms
2012-06-29 16:29:58 -04:00
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
c3130919c2
Allow direct link to app.
2012-06-25 05:02:01 +02:00
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
1b6dd6628a
applied patch provided by bug #966 to fix broken user specific quota settings
2012-06-12 11:18:34 +02:00
adc200c1f3
Hide app page link for internal apps, fixes bug oc-913
2012-06-04 14:26:30 -04:00
f3c1d1eded
link to apps.owncloud.com
...
thanks to guillaume for the patch
2012-06-03 23:48:59 +02:00
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
97e8ff6801
Switch enable button only when app is really installed or uninstalled
2012-05-14 21:52:40 +00:00
1a2ab2ef68
prevent user creation with empty password
2012-05-13 20:53:56 +02:00
5962a0d4ac
Enhance user creation (avoid create+delete row), clear create user form after action
2012-05-07 21:27:03 +00:00
da4688d804
Reorder code to avoid race condition in user creation
2012-05-07 16:08:35 +00:00
e0db22cc07
Provide feedback when user creation fails
2012-05-06 18:04:48 -04:00
d9592ddcb0
Tried to make settings/apps more keyboard/screenreader friendly.
2012-05-04 17:56:00 +02:00
31d623f426
Fix log viewing bug
2012-05-02 15:26:42 -04:00
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
e59c87ee36
reload log after changing log level
2012-04-16 12:27:21 +02:00
5720bd296d
merge log into admin
2012-04-16 12:21:48 +02:00
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
8113a43252
typo
2012-04-14 18:09:42 +02:00
386663ddb6
swap enable and dissable error messages
2012-04-14 13:16:37 +02:00
d8864d4f4b
show error when installing an app has failed
2012-04-14 12:57:10 +02:00
128d446f39
fix timestamps when viewing logs
2012-03-27 00:21:31 +02:00
797e921b9a
improve log browsing
2012-02-26 03:10:29 +01:00
11cb45bd43
slight change to select style
2012-02-24 23:54:38 +01:00
9dcf29ff51
fix bug in group mangement
2012-02-24 23:54:38 +01:00
4230e217af
new config widget for user quota
2012-02-24 23:54:38 +01:00
c2183427c3
dont try to create a user with an already existing username
2012-01-23 17:34:23 +01:00
76ce8c6c6a
dont show new user when an error occured
2012-01-23 17:33:12 +01:00
2d25bb3b01
add min width to multiselect in user management
2012-01-14 23:10:38 +01:00
534b6f3a09
Fix whitespace username
2012-01-02 11:49:53 +01:00
9c6d3a83fd
also update the data attribute holding the quota
2011-12-11 23:34:20 +01:00
ccd9b56609
after editing a user quota, set the value of the quota field to how the server parsed the input, not the user input
...
this way the user can see when an invalid input is given
2011-12-11 23:34:13 +01:00
7358d9ebb4
Fix quota onBlur In Settings, Take from right attribute
2011-10-17 20:50:41 +02:00
d9372ac766
make log level configurable
2011-10-16 21:11:03 +02:00
590ff0ced9
moved bookmarklet to personal. username must be provided when adding a new user.
2011-10-08 13:10:49 +02:00
daee88fd26
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
2011-10-02 15:51:24 +02:00
f149303895
Add email field to personal preferences
2011-09-26 21:17:26 +02:00
cd44dff5af
Better feedback for saving calendar and openid settings
2011-09-11 20:38:52 +02:00
1b6a77ce5e
Use Chosen for language select form
2011-08-27 19:46:20 -04:00
fba066341d
Add locale for password change error
2011-08-27 19:12:10 -04:00
98ca6c4a16
Fix changing password in personal page (not complete)
2011-08-27 17:40:41 -04:00
eee7d8da50
Reload the personal page when a new language is set
2011-08-27 17:06:15 -04:00
391e064e67
allow apps to register form for the settings and admin pages
2011-08-23 01:41:18 +02:00
d9aae20003
more valid HTML, alt attributes, refactored pagenavi etc.
2011-08-20 05:07:58 +02:00
af55526164
fix enableing apps
2011-08-15 23:31:59 +02:00
523b0966d2
add option to set user quota
2011-08-15 21:09:13 +02:00
7bb261f810
more fixes for Personal and Tipsy
2011-08-14 16:12:31 +02:00
6e30ade0b3
updated tipsy, tooltips finally work everywhere, thanks icewind
2011-08-14 14:55:43 +02:00
4f43b0a729
fix creating users
2011-08-13 23:56:53 +02:00
7ece8ed314
added global action class for icons
2011-08-13 05:27:50 +02:00
4a5ee765cf
merged admin, help and settings to settings
2011-08-13 05:13:34 +02:00
7b38e5d7c7
apps can now add their own forms to the Personal page
2011-08-08 23:46:52 +02:00
f039320a0b
move openid settings to Personal
2011-08-06 10:08:26 +02:00
76b12c4ae0
add settings option for language
2011-06-20 14:33:31 +02:00
b57823baa5
Made the "change password" thingie in settings working
2011-04-18 15:07:14 +02:00
Frank Karlitschek
Lukas Reschke
Björn Schießle
raghunayyar
Thomas Müller
Thomas Tanghus
Bart Visscher
Georg Ehrke
Brice Maron
Robin Appelman
Sam Tuke
Michael Gapczynski
Jakob Sack
Alessandro Cosentino
Bjoern Schiessle
Michael Gapczynski
Frank Karlitschek
Georg Ehrke
Robin Appelman
Marvin Thomas Rabe
Jan-Christoph Borchardt
Jakob Sack