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 |
|
Georg Ehrke
|
6f0c1e8d45
|
Merge master into oc_preview
|
2013-08-26 12:24:33 +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 |
|
Georg Ehrke
|
6ffa2a28d0
|
Merge branch 'master' into oc_preview
|
2013-08-23 23:10:37 +02:00 |
|
dampfklon
|
87c3f34a93
|
Make group suffix in share dialog translatable
|
2013-08-22 19:52:08 +02: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 |
|
kondou
|
f1518a54df
|
Merge branch 'master' into clean_up_util
Conflicts:
lib/util.php
|
2013-08-20 17:20:30 +02: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 |
|
Georg Ehrke
|
d9e8ebabdc
|
outsource sharing and deleted files previews to apps
|
2013-08-19 13:24:07 +02:00 |
|
Georg Ehrke
|
48f0c54261
|
style fixes for preview lib
|
2013-08-19 12:16:55 +02:00 |
|
Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +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 |
|
kondou
|
65d802329f
|
Fix some naming and spacing in lib/util.php
|
2013-08-18 10:33:09 +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 |
|
Thomas Müller
|
15c9a0f405
|
fixing undefined js error
|
2013-08-17 19:24:06 +02:00 |
|
Thomas Müller
|
12f4494de0
|
Merge pull request #4339 from owncloud/mimetype-defaults
Add the option to provide templates for newly created files
|
2013-08-17 08:42:49 -07:00 |
|
Kondou
|
a1128aadd0
|
Merge pull request #4482 from owncloud/remove_cancel_button_filepicker
Remove cancel button from filepicker
|
2013-08-17 06:58:34 -07:00 |
|
Morris Jobke
|
3e88430840
|
Merge pull request #4475 from owncloud/brighter-font-color
change font on login/install page from black to white
|
2013-08-17 04:37:49 -07:00 |
|
Thomas Müller
|
69350c4e0d
|
Merge pull request #4471 from owncloud/password-icon
use proper password icon, three dots are 'more'
|
2013-08-17 03:16:11 -07:00 |
|
Thomas Müller
|
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 |
|
kondou
|
2ee8425295
|
Remove cancel button from filepicker
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
|
2013-08-17 12:07:58 +02:00 |
|
Morris Jobke
|
60efd93d5d
|
fixes for IE8
|
2013-08-17 11:56:52 +02:00 |
|
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +02:00 |
|
Morris Jobke
|
746d32eb05
|
fix difference between packaged version and master
|
2013-08-17 10:33:11 +02:00 |
|
Morris Jobke
|
18769e1348
|
change font on login/install page from black to white
|
2013-08-17 10:26:30 +02:00 |
|
Jan-Christoph Borchardt
|
b8b24bbae7
|
use proper password icon, three dots are 'more'
|
2013-08-16 17:59:48 +02:00 |
|
Jörn Friedrich Dreyer
|
5b8d30c6b6
|
refactor OC.Breadcrumbs, allow injection of container to allow rendering crumbs into full screen editor
|
2013-08-16 17:20:49 +02:00 |
|
Jan-Christoph Borchardt
|
1e8849b04e
|
Merge pull request #4314 from owncloud/css-fixes
Design fixes
|
2013-08-16 01:05:29 -07:00 |
|
Morris Jobke
|
c196985ea3
|
Merge pull request #4032 from owncloud/more-whitespace
More whitespace
|
2013-08-16 01:02:03 -07:00 |
|
Jenkins for ownCloud
|
6bd0ba79df
|
[tx-robot] updated from transifex
|
2013-08-16 01:32:30 -04:00 |
|
Thomas Müller
|
0aa7dc9b89
|
tixing width and position of wider error messages
|
2013-08-16 00:56:09 +02:00 |
|
Jan-Christoph Borchardt
|
d2767faf61
|
Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
|
2013-08-15 15:31:42 -07:00 |
|
Jan-Christoph Borchardt
|
399adf67b0
|
merge master into css-fixes
|
2013-08-16 00:29:43 +02:00 |
|
Thomas Müller
|
7279a07ca2
|
Merge branch 'master' into mimetype-defaults
Conflicts:
apps/files/ajax/newfile.php
|
2013-08-16 00:13:10 +02:00 |
|
Jan-Christoph Borchardt
|
b632b8f4e4
|
force show loading icon also for IE
|
2013-08-16 00:02:11 +02:00 |
|
Jan-Christoph Borchardt
|
3563eecfff
|
merge master into more-whitespace
|
2013-08-15 23:25:20 +02:00 |
|
Thomas Müller
|
bd1895bdf8
|
Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-15 14:08:01 -07:00 |
|
Jan-Christoph Borchardt
|
61370a7655
|
add folder icons for shared, public and external
|
2013-08-15 18:58:55 +02:00 |
|
Morris Jobke
|
5fb7aab7a0
|
remove jPlayer css rules from core css file
|
2013-08-15 16:08:49 +02:00 |
|
kondou
|
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 |
|
Thomas Müller
|
ada13a4d40
|
fixing all broken translation files
|
2013-08-15 15:41:45 +02:00 |
|
Jan-Christoph Borchardt
|
2fd5178a00
|
adjust New file dialog for new styles
|
2013-08-15 12:50:26 +02:00 |
|
Jenkins for ownCloud
|
680ac48856
|
[tx-robot] updated from transifex
|
2013-08-15 04:53:54 -04:00 |
|
Thomas Tanghus
|
ca495758bd
|
Fix octemplate string escaping.
|
2013-08-14 23:06:43 +02:00 |
|
Thomas Müller
|
06670cef8a
|
Merge pull request #4304 from tripflex/lostpw-themed
use theme name and title for password reset
|
2013-08-14 12:04:40 -07:00 |
|
Georg Ehrke
|
4b5fb08c2c
|
Merge master into oc_preview
|
2013-08-14 20:56:44 +02:00 |
|
Jan-Christoph Borchardt
|
cba0f69622
|
increase row height to 50px, properly position everything, checkboxes, actions etc
|
2013-08-14 20:41:20 +02:00 |
|
Jörn Friedrich Dreyer
|
8f3f47e868
|
Merge pull request #4376 from owncloud/use_plurals
Use plural translations
|
2013-08-14 10:23:19 -07:00 |
|
Jan-Christoph Borchardt
|
79a5e2a4cc
|
adjustments of video and web icon
|
2013-08-14 13:51:55 +02:00 |
|
Jan-Christoph Borchardt
|
4845ef5ac6
|
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
|
2013-08-14 13:01:52 +02:00 |
|
Jan-Christoph Borchardt
|
14003b6d96
|
replace different icons for code with proper ones
|
2013-08-14 13:00:13 +02:00 |
|
Jan-Christoph Borchardt
|
fc23649fa1
|
replace different icons for documents, spreadsheets and presentations with proper ones
|
2013-08-14 12:43:42 +02:00 |
|
Jan-Christoph Borchardt
|
5abf6ddea4
|
replace same but differently named package graphics with one proper one
|
2013-08-14 12:36:31 +02:00 |
|
Jan-Christoph Borchardt
|
20855add94
|
add more file type icons, replace old ones
|
2013-08-14 12:33:41 +02:00 |
|
Georg Ehrke
|
f9b2815767
|
remove \OC\Preview::showErrorPreview
|
2013-08-14 12:21:27 +02:00 |
|
Jörn Friedrich Dreyer
|
435e63b5ee
|
Merge pull request #4410 from owncloud/fix_sharing_defaults
Fix sharing defaults
|
2013-08-13 15:27:24 -07:00 |
|
Jörn Friedrich Dreyer
|
11a404b90b
|
comment clarification
|
2013-08-14 00:25:07 +02:00 |
|
Jörn Friedrich Dreyer
|
ca95a475d5
|
use edit & reshare permission as default
|
2013-08-13 22:58:47 +02:00 |
|
Jörn Friedrich Dreyer
|
5660f99592
|
add PERMISSIONS_ALL summary
|
2013-08-13 22:58:27 +02:00 |
|
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04:00 |
|
Jenkins for ownCloud
|
5ebff8cfc4
|
[tx-robot] updated from transifex
|
2013-08-11 08:11:03 -04:00 |
|
kondou
|
9549bd3e68
|
Use plural translations
|
2013-08-09 20:37:18 +02:00 |
|
Jan-Christoph Borchardt
|
4c0ec974b9
|
Merge pull request #4344 from owncloud/appmgmt-in-navigation
show 'More apps' link to app administration directly in app navigation
|
2013-08-09 08:49:41 -07:00 |
|
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 -04:00 |
|
Myles McNamara
|
f5d23c469d
|
use getName instead of getTitle
|
2013-08-08 16:21:47 -04:00 |
|
Owen Winkler
|
a2ac5e0163
|
Merge pull request #4271 from owncloud/plural_translations
Plural translations
|
2013-08-08 10:34:28 -07:00 |
|
Jan-Christoph Borchardt
|
8652137ad6
|
Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
|
2013-08-08 07:31:01 -07:00 |
|
Jörn Friedrich Dreyer
|
ff67f115d4
|
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-08 13:50:04 +02:00 |
|
Jan-Christoph Borchardt
|
367b248bc0
|
show 'More apps' link to app administration directly in app navigation
|
2013-08-07 18:18:09 +02:00 |
|
Robin Appelman
|
1c1ede5703
|
add template for html files
|
2013-08-07 16:53:33 +02:00 |
|
Jenkins for ownCloud
|
0deae7b86f
|
[tx-robot] updated from transifex
|
2013-08-07 09:04:32 -04:00 |
|
Georg Ehrke
|
af983b843d
|
fix merge conflicts
|
2013-08-05 14:27:38 +02:00 |
|
Jenkins for ownCloud
|
9923fe655b
|
[tx-robot] updated from transifex
|
2013-08-04 02:01:28 -04:00 |
|
Myles McNamara
|
74a264e82e
|
fix syntax error
accidentally had ; included, and changed concatenating
|
2013-08-03 18:47:27 -04:00 |
|
Thomas Müller
|
d97e3c3571
|
adding proper evaluation of plural form - uses LGPL licensed code of jsgettext
|
2013-08-03 23:31:49 +02:00 |
|
Thomas Müller
|
2e5f1142be
|
return plural form in ajax translations
|
2013-08-03 23:27:18 +02:00 |
|
Jenkins for ownCloud
|
17fe748abc
|
[tx-robot] updated from transifex
|
2013-08-03 01:56:46 -04:00 |
|
Myles McNamara
|
8edc0f210b
|
use theme name and title for password reset
password reset email uses owncloud, updated to use theme settings
|
2013-08-03 00:00:32 -04:00 |
|
Jörn Friedrich Dreyer
|
f8bb4e10ae
|
use fixed OC.Breadcrumb.push()
|
2013-08-02 11:46:44 +02:00 |
|
Jörn Friedrich Dreyer
|
b12c1cb325
|
add OC.Breadcrumb.show(dir, filename, link)
|
2013-08-02 11:46:44 +02:00 |
|
Jörn Friedrich Dreyer
|
41739ff83f
|
Merge pull request #4278 from owncloud/breadcrumb-first
make sure the first breadcrumb item is inserted before any other elements in the topbar
|
2013-08-02 02:46:12 -07:00 |
|
Jenkins for ownCloud
|
16726ab793
|
[tx-robot] updated from transifex
|
2013-08-02 02:00:45 -04:00 |
|
Victor Dubiniuk
|
85f1de884f
|
Better ie8 multiselect
|
2013-08-01 19:59:32 +03:00 |
|
kondou
|
1348330c7d
|
Fix a syntax error & have if-conds in an own line
|
2013-08-01 18:44:01 +02:00 |
|
Robin Appelman
|
44594fb41c
|
make sure the first breadcrumb item is inserted before any other elements in the topbar
|
2013-08-01 16:46:01 +02:00 |
|
Jenkins for ownCloud
|
b037f2dc6e
|
[tx-robot] updated from transifex
|
2013-08-01 01:57:04 -04:00 |
|
kondou
|
aaf0fec9f5
|
Fix some JSLint warnings
|
2013-07-31 21:21:02 +02:00 |
|
Jan-Christoph Borchardt
|
ded02e771e
|
wrap code output in error messages, fix #4231
|
2013-07-31 18:08:29 +02:00 |
|
Jan-Christoph Borchardt
|
0a5be39446
|
remove unused and never to be used pagination
|
2013-07-31 09:58:57 +02:00 |
|
Jenkins for ownCloud
|
761f40328c
|
[tx-robot] updated from transifex
|
2013-07-31 02:01:45 -04:00 |
|
Thomas Müller
|
d3e610f589
|
Merge pull request #4225 from owncloud/better-404
More verbose 404, closes #3225
|
2013-07-30 13:20:28 -07:00 |
|
Jan-Christoph Borchardt
|
31afbb3434
|
remove ugly inset shadow from header
|
2013-07-30 14:47:05 +02:00 |
|
Jan-Christoph Borchardt
|
f9d1d79929
|
reduce z-index of settings popup, fix #4212
|
2013-07-30 14:43:48 +02:00 |
|
Georg Ehrke
|
93cdfc3e8a
|
Merge branch 'master' into oc_preview
|
2013-07-30 13:52:53 +02:00 |
|
Georg Ehrke
|
640253fa31
|
fix code style of try catch blocks
|
2013-07-30 13:43:15 +02:00 |
|
Georg Ehrke
|
ac6a3133ec
|
style fixes
|
2013-07-30 12:33:54 +02:00 |
|
Jan-Christoph Borchardt
|
1a1c100719
|
fix loading.gif size for both upload and deletion, force visiblity
|
2013-07-30 10:44:01 +02:00 |
|
Thomas Müller
|
17c36b5074
|
fixes #4026
|
2013-07-30 10:26:42 +02:00 |
|
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 -04:00 |
|
Thomas Müller
|
7425efade7
|
Merge branch 'master' into oc_preview
Conflicts:
3rdparty
lib/template.php
|
2013-07-30 00:34:36 +02:00 |
|
Victor Dubiniuk
|
33fe24dc3d
|
Replace delete icon with spinner
|
2013-07-29 19:27:11 +03:00 |
|
Victor Dubiniuk
|
dec7b2fa40
|
Move styles from core to app
|
2013-07-29 17:36:59 +03:00 |
|
Victor Dubiniuk
|
97f2c393c1
|
Allow apps to have own 404 content, closes #3225
|
2013-07-29 16:54:19 +03:00 |
|
Georg Ehrke
|
e01bc7de98
|
Revert "OC\Preview - outsource static methods"
This reverts commit 14a35267c1.
|
2013-07-29 14:51:06 +02:00 |
|
Jenkins for ownCloud
|
0fde473cb7
|
[tx-robot] updated from transifex
|
2013-07-29 01:57:04 -04:00 |
|
Jenkins for ownCloud
|
48621115c1
|
[tx-robot] updated from transifex
|
2013-07-28 01:58:28 -04:00 |
|
Jenkins for ownCloud
|
fa35650e0a
|
[tx-robot] updated from transifex
|
2013-07-27 02:03:03 -04:00 |
|
Jörn Friedrich Dreyer
|
98e76b8978
|
Merge pull request #4199 from owncloud/login-cleanup
Login cleanup IE8 fixes
|
2013-07-26 05:15:02 -07:00 |
|
Jörn Friedrich Dreyer
|
a0f574ccd7
|
IE8 login/install screen cleartype fixes and input box borders
|
2013-07-26 10:00:07 +02:00 |
|
kondou
|
92af840a51
|
Merge branch 'master' into css_cleanup_kondou
Conflicts:
core/css/styles.css
settings/templates/personal.php
|
2013-07-24 20:35:00 +02:00 |
|
Jörn Friedrich Dreyer
|
284fb86258
|
show tablespace only for oracle, hide dbhost for sqlite, remove unnecessary js & html ids
|
2013-07-24 19:56:57 +02:00 |
|
Jörn Friedrich Dreyer
|
18c565666e
|
force dbs to stay in one line
|
2013-07-24 19:56:57 +02:00 |
|
Jörn Friedrich Dreyer
|
5c00804c61
|
force dbs to stay in one line
|
2013-07-24 17:06:52 +02:00 |
|