kondou
c533b80682
Use OC_Cache and finish cropper functionality
2013-08-29 16:56:32 +02:00
kondou
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
Thomas Müller
1d04843ef0
no duplicate declaration of appLicense + camelCase
2013-08-28 22:42:43 +02:00
kondou
6c7efd5dac
Work around #4630 to fix license showing
2013-08-28 22:12:01 +02:00
kondou
bdf48a6daa
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
2013-08-28 21:20:28 +02:00
kondou
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
kondou
31736a1df3
Have a controller instead ofo avatar.php and fix some cropper-design
2013-08-26 16:46:55 +02:00
kondou
9a8908b643
Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
2013-08-25 21:06:44 +02:00
kondou
81cadd5ea3
Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
2013-08-25 21:06:02 +02:00
kondou
0a4febf1eb
Integrate newavatar.php into avatar.php by using GET, POST & DELETE
2013-08-25 21:06:01 +02:00
kondou
9c12da6a94
Several improvements
...
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
2013-08-25 21:05:40 +02:00
kondou
d7e6c77e20
Have a fancy uploadavatar button
2013-08-25 21:05:40 +02:00
kondou
9500109349
Refactor newavatar.php and show (for now) an alert on problems when setting new avatars
2013-08-25 21:05:40 +02:00
kondou
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
kondou
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
kondou
fac671b14e
Modularize get(), async getAvatar, avatars @ usermgmt
...
And other small improvements
2013-08-25 21:04:04 +02:00
kondou
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
kondou
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
Christopher
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
Morris Jobke
de949b1caa
Merge pull request #4447 from owncloud/fix_4351_master
...
Use JSON to send/receive group data.
2013-08-20 02:49:48 -07:00
Björn Schießle
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
kondou
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +02:00
kondou
db424cc86b
Use appitem instead of always recreating a jquery object
...
Also fix some wrong data storages
2013-08-18 14:49:11 +02:00
kondou
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
kondou
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
Owen Winkler
9840363488
Break long lines into smaller ones.
2013-08-18 05:03:20 -04:00
kondou
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
Bjoern Schiessle
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Owen Winkler
cd7e57e8ec
Use JSON to send/receive group data.
...
Squashed commits from PR #4364 for master.
2013-08-15 06:19:40 -04:00
Jan-Christoph Borchardt
31d50288a5
draw attention to the newly added app entry by flashing it twice
2013-08-07 21:54:28 +02:00
Jan-Christoph Borchardt
7a9daa99d1
scroll the app navigation down so the newly added app is seen
2013-08-07 21:53:53 +02:00
Jan-Christoph Borchardt
775f33cc1b
prepend the new app before the 'More apps' function
2013-08-07 21:53:25 +02:00
kondou
1a4465f41d
Improve app-management
...
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00
kondou
1348330c7d
Fix a syntax error & have if-conds in an own line
2013-08-01 18:44:01 +02:00
kondou
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
Bjoern Schiessle
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
Björn Schießle
e15e394fcc
add ajax call to decrypt all files
...
Conflicts:
apps/files_encryption/lib/crypt.php
2013-07-29 13:39:05 +02:00
kondou
05084e03a0
Use !== and === in settings.
2013-07-21 13:55:25 +02:00
kondou
efb707a431
Use OC instead of oc to show alert at an error.
...
Related to #4001
2013-07-10 04:28:54 +02:00
Victor Dubiniuk
a20f7f1d67
Do not add groups if user has no groups
2013-07-03 22:06:09 +03:00
Victor Dubiniuk
13bfa3be27
Use svg to png fallback on demand only
2013-06-28 23:18:11 +03:00
Victor Dubiniuk
6ecbae7da9
Add fallback for svg app icons
2013-06-28 23:10:40 +03:00
Victor Dubiniuk
d110e60316
Hide a ghost image on the apps management page
2013-06-28 21:53:56 +03:00
Victor Dubiniuk
b2cb81f857
Replace display name only
2013-06-18 00:17:08 +03:00
Björn Schießle
f1a5b8b524
show nicer warning if the admin recovery password was wrong
2013-05-16 16:01:40 +02:00
Björn Schießle
8ae30891b3
some error handling in case the recovery password is wrong
2013-05-16 15:19:53 +02:00
Björn Schießle
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
Arthur Schiwon
9c3b83e28c
Fix retrieval of users with multiple backends
2013-05-03 13:50:14 +02:00
Bart Visscher
d825669265
Merge pull request #3002 from owncloud/priorize_common_languages
...
Priorize common languages.
2013-04-26 06:30:59 -07:00
David Reagan
4bee02f75c
Fixed comment in personal.js. Changed message text in changedisplayname.php.
2013-04-23 14:31:35 -07:00
David Reagan
7312cbec91
Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages.
2013-04-23 12:45:12 -07:00
kondou
7a2be0c5dc
Make divider not selectable
...
Very hacky
2013-04-19 00:39:42 +02:00
kondou
79218be1d2
Priorize common languages.
2013-04-18 15:14:42 +02:00
Morris Jobke
867a527148
Merge pull request #2975 from owncloud/log-date
...
use date and time instead of timestamp in log
2013-04-17 06:49:46 -07:00
Bernhard Posselt
f7e29eabf2
fix admin log display and use a more readable format
2013-04-17 14:05:51 +02:00
David Reagan
0dd6f16e0b
Removed extra id from jquery selectors. Remove console.log call. Removed commented code.
2013-04-16 13:22:04 -07:00
David Reagan
6d812ada05
Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event.
2013-04-16 13:03:41 -07:00
raghunayyar
5228eb8a18
Add span tag while enabling or disbling apps as well.
2013-04-12 18:15:59 +05:30
Robin Appelman
1abc264873
Add the quota change listeners to newly added user entries in the user list
2013-04-10 14:12:54 +02:00
Bart Visscher
46a552fd56
Merge pull request #2738 from Kondou-ger/fix_alert_issues
...
Fixed things in alert-messages
2013-04-06 08:24:43 -07:00
kondou
de2e546617
Translate 'Error' in core
2013-04-06 16:52:55 +02:00
kondou
32f96e19e5
Fix Typo
2013-04-05 19:06:58 +02:00
kondou
8d63b7d9bf
Fix #2693
...
When removing a group response.data.action becomes 'remove', thus the if
shows an empty notification.
2013-04-05 18:52:14 +02:00
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