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 |
|
kondou
|
0ba498119c
|
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
|
2013-08-28 23:21:26 +02:00 |
Morris Jobke
|
f0ea23891a
|
Merge pull request #4618 from owncloud/visualize-js
visualize
|
2013-08-28 14:17:50 -07:00 |
Thomas Müller
|
6502a148ec
|
fixing typo
|
2013-08-28 23:04:55 +02:00 |
|
Morris Jobke
|
067815099f
|
calculate fontsize and line-height
|
2013-08-28 21:54:20 +02:00 |
|
kondou
|
bdf48a6daa
|
Use OC.Router.generate, TODO use cache, prepare for defaultavatars
|
2013-08-28 21:20:28 +02:00 |
|
Morris Jobke
|
584857de69
|
Merge pull request #4627 from owncloud/trashbin-tipsy
change orientation for delete tooltip to left, fix #4589
|
2013-08-28 09:09:40 -07:00 |
Jan-Christoph Borchardt
|
e7b40983e4
|
change orientation for delete tooltip to left, fix #4589
|
2013-08-28 17:58:23 +02:00 |
|
Morris Jobke
|
ed2fa06a26
|
reviewers comments
|
2013-08-28 16:52:12 +02:00 |
|
kondou
|
67c5be9f19
|
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
|
2013-08-28 16:44:11 +02:00 |
|
kondou
|
8d8a57de7f
|
Continue work on cropper
|
2013-08-28 16:39:00 +02:00 |
|
Morris Jobke
|
4a00b26029
|
add visualize
|
2013-08-28 16:29:27 +02:00 |
|
Jan-Christoph Borchardt
|
0c8ac241df
|
fix shadow style of username input box
|
2013-08-28 13:59:23 +02:00 |
|
Jan-Christoph Borchardt
|
c6eda25d50
|
remove show password toggle from log in page, ref #4577 #4580
|
2013-08-28 13:58:49 +02:00 |
Thomas Tanghus
|
9843c8e838
|
Merge pull request #4434 from owncloud/fix_octemplate_escaping
Fix octemplate string escaping.
|
2013-08-28 03:59:43 -07:00 |
|
Thomas Tanghus
|
776d64f804
|
Cache Object.keys(this.vars)
|
2013-08-28 12:50:05 +02:00 |
|
Jenkins for ownCloud
|
3e7ddbc9d9
|
[tx-robot] updated from transifex
|
2013-08-28 06:24:14 -04:00 |
|
Jenkins for ownCloud
|
d5062b9e0e
|
[tx-robot] updated from transifex
|
2013-08-27 11:23:18 -04:00 |
|
kondou
|
1b45683168
|
Translate "Permission denied" & use class-autoloader
|
2013-08-27 12:50:21 +02:00 |
|
Morris Jobke
|
ea446544ef
|
Merge pull request #4586 from owncloud/fixing-3431-master
kill zh_CN.GB2312
|
2013-08-27 02:00:48 -07:00 |
|
Thomas Müller
|
c9123263ab
|
kill zh_CN.GB2312
|
2013-08-27 01:27:05 +02:00 |
|
Thomas Müller
|
9909b8b726
|
adding translations to update events
|
2013-08-27 00:26:44 +02:00 |
|
kondou
|
e6473e6d49
|
Clean up some cruft
|
2013-08-26 17:41:19 +02:00 |
|
kondou
|
31736a1df3
|
Have a controller instead ofo avatar.php and fix some cropper-design
|
2013-08-26 16:46:55 +02:00 |
|
Morris Jobke
|
653bc9a477
|
Merge pull request #4281 from owncloud/ie8-multiselect
Better ie8 multiselect
|
2013-08-26 02:59:31 -07:00 |
|
Morris Jobke
|
438e816941
|
Merge pull request #4519 from owncloud/style-fixes
fix minor style issue in the app navigation
|
2013-08-26 00:47:34 -07:00 |
|
Morris Jobke
|
ec0808ce75
|
fix reviewers concerns
|
2013-08-26 09:44:21 +02:00 |
|
Jenkins for ownCloud
|
d587146a5a
|
[tx-robot] updated from transifex
|
2013-08-25 19:21:52 -04: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
|
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 |
|
Christopher
|
b8965c6107
|
Merge pull request #4331 from owncloud/improve_app-management
Improve app-management
|
2013-08-25 11:56:56 -07:00 |
|
Jenkins for ownCloud
|
596ac40b7f
|
[tx-robot] updated from transifex
|
2013-08-23 20:17:08 -04:00 |
|
Jenkins for ownCloud
|
02b2b5a808
|
[tx-robot] updated from transifex
|
2013-08-22 10:37:23 -04:00 |
|
kondou
|
0ce35af02a
|
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
|
2013-08-21 19:20:25 +02:00 |
|
Jenkins for ownCloud
|
a89199cc7b
|
[tx-robot] updated from transifex
|
2013-08-21 08:14:27 -04:00 |
|
Christopher
|
90da518e3e
|
Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
|
2013-08-20 12:45:10 -07:00 |
|
Jenkins for ownCloud
|
e9644c2f52
|
[tx-robot] updated from transifex
|
2013-08-19 15:14:38 -04:00 |
|
Morris Jobke
|
9e5b721a0d
|
fix minor style issue in the app navigation
|
2013-08-19 15:42:51 +02:00 |
|
Thomas Müller
|
0890a915b3
|
adding file templates for ods, odt and odp
|
2013-08-18 21:11:11 +02:00 |
|
kondou
|
7c296a6cf9
|
Move .errormsg from settings-css to .warning in core. Reusable!
|
2013-08-18 17:37:22 +02:00 |
|
Kondou
|
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 |
|
Kondou
|
141d2f67aa
|
Merge pull request #4496 from owncloud/fixing-error-page-layout-master
fixing error page layout
|
2013-08-18 06:46:48 -07:00 |
Owen Winkler
|
1793ec1d5d
|
Fixed inconsistent spacing.
|
2013-08-18 05:17:28 -04:00 |
|
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
|
Thomas Müller
|
3d760222d4
|
fixing error page layout
|
2013-08-18 10:30:21 +02: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 |