cda0780d4b
Remove superfluous append
2013-02-05 14:15:17 +01:00
2ec0c491d4
remove superfluous enabled-app class again
2013-02-05 11:30:18 +01:00
4059959c5f
Merge branch 'master' into fix_addNavigation
2013-02-05 11:09:38 +01:00
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
88ad1e5fbd
Make app icon linkable when enabling app.
2013-02-03 16:02:25 +01:00
88f4aced38
Merge pull request #1404 from owncloud/fixing-1276-master
...
fix #1276 - use registerLoadedCallback()
2013-02-01 03:13:23 -08:00
cc73568d68
Updateing -> Updating
2013-02-01 00:51:00 +01:00
402263bd5c
fix #1276 - use registerLoadedCallback()
2013-02-01 00:33:14 +01:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
85a12970c7
update on translation string
2013-01-31 14:11:31 +01:00
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
3af09f2acf
l10n support for the error dialog added
2013-01-31 10:43:59 +01:00
b978cc8b28
Shorter, Cleaner JS in apps.js
2013-01-31 11:52:56 +05:30
de00111c1f
use on instead of live in users.js
2013-01-30 17:49:02 +01:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
0dfbd53a6e
Reduced Styling and Image loads as from src and not backgorund.
2013-01-30 19:12:51 +05:30
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
Thomas Tanghus
Jan-Christoph Borchardt
Thomas Müller
blizzz
raghunayyar
Jörn Friedrich Dreyer
Frank Karlitschek
Lukas Reschke
Björn Schießle
Bart Visscher
Georg Ehrke
Brice Maron