fce198874f
Merge pull request #5272 from mrflix/master
...
fix label to checkbox binding in admin -> force-https
2013-10-12 01:41:30 -07:00
1a05ed2f38
Fixed table grid styles for IE8
...
The selector :not() isn't supported in IE8, replaced it with the "grid"
class.
- Fixes the log table style in IE8 (#5057 )
- Fixes the users table layout bug in IE8
2013-10-11 15:58:15 +02:00
02c7f95687
Includes <optgroup> tag
2013-10-11 18:52:27 +05:30
7c2f1fd580
Puts the language divider in place. thanks @Kondou-ger ;)
2013-10-11 18:46:59 +05:30
4b2bb11716
Removes the Bogus Label
2013-10-11 18:42:02 +05:30
e27bb660bd
Uniform Styles and Indentation Fixes for Personal Block
2013-10-11 18:03:53 +05:30
6970774776
Fixed display name change for IE8
...
After saving the display name, the oldDisplayName field's value was
wrongly set with text(), which would append the text inside the input
element which is considered as an invalid operation in IE8.
This fix for #5054 correctly puts the old value into the field with a val() call.
2013-10-11 10:48:30 +02:00
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
01d3536a76
fix checkbox <-> label binding
...
clicking the label will trigger the checkbox
2013-10-10 23:10:06 +02:00
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
a240e63981
Fix new user avatar. Ref#5166
2013-10-07 18:00:15 +03:00
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
2b521327c0
more elegant style for Personal and Admin settings
2013-10-05 11:23:49 +02:00
041837de2c
merge master into input-simplify
2013-10-04 17:08:34 +03:00
51295e9a6b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
ecd2bf2a55
Merge pull request #5109 from owncloud/controls-bar-height
...
Controls bar height
2013-10-04 01:01:54 -07:00
c335169f6d
increase height of controls bar and elements to more clickable 44px
2013-10-04 08:41:16 +03:00
b0ff10a536
Hide defaultavatar in #header and don't darken proper avatars in #header
2013-10-04 02:27:53 +02:00
3c13afee98
better style and color for warning and success feedback on inputs
2013-10-03 16:58:48 +03:00
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
59e4ff7d24
[tx-robot] updated from transifex
2013-09-29 00:03:26 -04:00
24d092c4ba
Have uniform (wrong) indention
2013-09-28 17:49:07 +02:00
4907685405
Base defaultavatar text on displayname
...
Fix #4876
2013-09-28 16:46:53 +02:00
f31d31844e
[tx-robot] updated from transifex
2013-09-27 00:02:30 -04:00
2d12e52769
[tx-robot] updated from transifex
2013-09-24 12:59:48 -04:00
40871bab88
Merge pull request #4930 from owncloud/fix-apps-settings
...
Fix the apps enabling/disabling in settings
2013-09-24 01:02:50 -07:00
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
45a7b0dbac
Fix the apps enabling/disabling in settings
2013-09-20 20:29:15 +02:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
de8d0783ed
fixing syntax error - it it that hard to test own code?
2013-09-18 23:46:58 +02:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
817b8d151b
Merge pull request #4745 from owncloud/split_personal-user_passwordchange
...
Split personal and user-mgmt password change logic
2013-09-18 07:53:11 -07:00
18a2c48ceb
Translate errormsgs in settings/changepassword/controller
2013-09-18 16:47:27 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
a58e176852
Merge pull request #4506 from owncloud/oc_avatars
...
OC Avatars
2013-09-14 16:00:36 -07:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
18da2f9cf7
Improve changepassword route naming
2013-09-13 17:07:23 +02:00
306a8681c5
Move ajax/changepassword to changepassword/controller to use autoloading
2013-09-13 17:03:13 +02:00
3790cbb493
Allow numeric group names
2013-09-13 09:06:20 -04:00
c9c5e1b97f
Merge branch 'master' into oc_avatars
2013-09-12 07:41:44 +02:00
2ae3ab98d8
Merge branch 'master' into split_personal-user_passwordchange
2013-09-11 16:35:55 +02:00
f6faec0e0b
Use a controller instead of two files for changepassword.php
2013-09-11 16:35:13 +02:00
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
1832eb8872
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
2013-09-09 16:57:46 +02:00
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
4963a5b30f
Fix language selection; Fix #4756
2013-09-07 16:28:51 +02:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
4aa84047fe
Remove $recoveryPassword from changepersonalpassword & fix indent
2013-09-06 17:05:10 +02:00
d18a070a03
Have the "notsquare" error as data, not as message
2013-09-06 13:46:50 +02:00
a21376480d
Split personal and user-mgmt password change logic
2013-09-06 08:05:07 +02:00
3774632ecc
Clean up avatars and preliminary use JSON->rawlist.php
2013-09-05 23:12:52 +02:00
15ab798353
Fix an IE8 bug with the avatarcropper.
...
1. Crop an avatar
2. Crop another avatar without reloading
-> Second cropper is 28px x 30px big
2013-09-05 19:26:02 +02:00
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
6db96603a0
Have login-checks and CSRF checks
2013-09-05 00:04:31 +02:00
fca5db748b
Remove backgroundcolor on updating avatar, and add a missing parameter
2013-09-04 13:16:21 +02:00
820fd42161
Merge branch 'master' into oc_avatars
2013-09-04 12:56:40 +02:00
a1e7614d73
Clean up oc_avatars
2013-09-04 12:56:14 +02:00
09187f3b3b
Merge pull request #4449 from owncloud/clean_up_util
...
Clean up \OC\Util
2013-09-03 22:53:03 -07:00
32a7ba9823
Don't update avatar on displayNameChange anymore
2013-09-04 07:13:09 +02:00
6d42f51d0c
Fix unwanted caching in IE8
2013-09-03 18:34:40 +02:00
4724d60ecd
Partly fix cropper in IE8 and don't use a dialog for it
2013-09-03 17:40:41 +02:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
65413a95dc
Merge branch 'master' into oc_avatars
...
Conflicts:
config/config.sample.php
2013-09-03 04:43:11 +02:00
3ce4bf5ec7
use css class hidden to hide setting elements
2013-09-02 17:14:11 +02:00
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
91c0923cce
Merge pull request #4663 from owncloud/fix-sticky-apps
...
fix issues caused by introduction of sticky Apps management footer
2013-09-02 01:11:09 -07:00
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
c95d4cafa9
Fix @tanghus's complains in avatars and clean up cropper after closing with "x"
2013-09-01 19:12:54 +02:00
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
aa88eea9cf
Sanitize displayname, respect data @ $element, fix routename, clean after cropping, updateAvatar with displayname
2013-08-31 18:27:28 +02:00
5d653753bd
Merge branch 'master' into oc_avatars
2013-08-31 12:56:36 +02:00
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
1e834c57a4
fix issues caused by introduction of sticky Apps management footer
2013-08-30 13:46:10 +02:00
80e10f01c4
Clean up
2013-08-30 13:16:13 +02:00
ecf187393b
Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests
2013-08-30 09:00:37 +02:00
c533b80682
Use OC_Cache and finish cropper functionality
2013-08-29 16:56:32 +02:00
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
e66113f50d
Include placeholder.js
2013-08-28 23:23:17 +02:00
1d04843ef0
no duplicate declaration of appLicense + camelCase
2013-08-28 22:42:43 +02:00
6c7efd5dac
Work around #4630 to fix license showing
2013-08-28 22:12:01 +02:00
bdf48a6daa
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
2013-08-28 21:20:28 +02:00
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
8d8a57de7f
Continue work on cropper
2013-08-28 16:39:00 +02:00
0c02e1efef
Merge pull request #4563 from owncloud/use_personal-password
...
Use personal-password for the password name in personal.php
2013-08-28 06:23:13 -07:00
3e7ddbc9d9
[tx-robot] updated from transifex
2013-08-28 06:24:14 -04:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
ea446544ef
Merge pull request #4586 from owncloud/fixing-3431-master
...
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
8cf9336bcb
storage information is path specific
2013-08-27 00:59:58 +02:00
e6473e6d49
Clean up some cruft
2013-08-26 17:41:19 +02:00
31736a1df3
Have a controller instead ofo avatar.php and fix some cropper-design
2013-08-26 16:46:55 +02:00
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
9a8908b643
Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
2013-08-25 21:06:44 +02:00
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
0a4febf1eb
Integrate newavatar.php into avatar.php by using GET, POST & DELETE
2013-08-25 21:06:01 +02:00
cd2f7bdaef
Deny access for non-users and add a (not-working) override button
2013-08-25 21:06:01 +02:00
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
d7e6c77e20
Have a fancy uploadavatar button
2013-08-25 21:05:40 +02:00
9500109349
Refactor newavatar.php and show (for now) an alert on problems when setting new avatars
2013-08-25 21:05:40 +02:00
33827d690e
Use avatar.php in user-management
2013-08-25 21:05:38 +02:00
131d0edab6
Show avatar on personal.php always (except if avatars are disabled)
2013-08-25 21:04:49 +02:00
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
a58d270684
Load avatar from path, if one's provided
2013-08-25 21:04:09 +02:00
2bfe662235
Add unittests & check filetype in setLocalAvatar()
...
TODO: Fix OC_Image->mimetype(), it always returns "image/png"
2013-08-25 21:04:09 +02:00
fac671b14e
Modularize get(), async getAvatar, avatars @ usermgmt
...
And other small improvements
2013-08-25 21:04:04 +02:00
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
b8965c6107
Merge pull request #4331 from owncloud/improve_app-management
...
Improve app-management
2013-08-25 11:56:56 -07:00
fbe7a68ce8
Use personal-password for the password name in personal.php
...
Fix #4491
2013-08-24 14:31:32 +02:00
596ac40b7f
[tx-robot] updated from transifex
2013-08-23 20:17:08 -04:00
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07:00
f1518a54df
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/util.php
2013-08-20 17:20:30 +02:00
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
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
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
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +02:00
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
db424cc86b
Use appitem instead of always recreating a jquery object
...
Also fix some wrong data storages
2013-08-18 14:49:11 +02:00
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
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
9840363488
Break long lines into smaller ones.
2013-08-18 05:03:20 -04:00
65d802329f
Fix some naming and spacing in lib/util.php
2013-08-18 10:33:09 +02:00
edd92e4c09
Merge branch 'master' into fix_jslint_kondou
...
Conflicts:
apps/files/js/file-upload.js
2013-08-18 00:38:52 +02:00
4f462e9b6f
Add trailing comma for all touched array lines.
2013-08-17 23:39:26 +02:00
d38929fb10
Fix spacing of all touched lines.
2013-08-17 23:38:26 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
29b6dd53a0
Compare result are already true/false
2013-08-17 12:58:10 +02:00
264ee9df9a
Merge pull request #4476 from owncloud/doc-on-master
...
fix difference between packaged version and master
2013-08-17 03:13:17 -07:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
746d32eb05
fix difference between packaged version and master
2013-08-17 10:33:11 +02:00
1e8849b04e
Merge pull request #4314 from owncloud/css-fixes
...
Design fixes
2013-08-16 01:05:29 -07:00
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
cd7e57e8ec
Use JSON to send/receive group data.
...
Squashed commits from PR #4364 for master.
2013-08-15 06:19:40 -04:00
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
80e9744da0
Merge branch 'master' into improve_app-management
2013-08-09 18:02:40 +02:00
605050df9b
Log exception at the catching code
2013-08-09 18:01:49 +02:00
Thomas Müller
Vincent Petry
raghunayyar
Felix Niklas
Victor Dubiniuk
Jan-Christoph Borchardt
Bjoern Schiessle
Morris Jobke
kondou
Bart Visscher
Bernhard Posselt
ringmaster
Björn Schießle
Andreas Fischer