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
Jan-Christoph Borchardt
9b1866f1ac
merge master
2013-07-24 16:31:01 +02:00
Jan-Christoph Borchardt
876309a215
Merge pull request #4175 from owncloud/remember-checked
...
check remember log in by default, ref #3918
2013-07-24 07:05:41 -07:00
Jan-Christoph Borchardt
aae26ef5e5
slight dark inset text shadow for warnings to increase legibility
2013-07-24 12:41:09 +02:00
Björn Schießle
003ae7b916
use OC_Defaults directly from the template
2013-07-24 12:04:18 +02:00
Björn Schießle
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
Jan-Christoph Borchardt
6a5e2ea7d5
check remember log in by default, ref #3918
2013-07-24 10:01:56 +02:00
Thomas Müller
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
Jenkins for ownCloud
7bb6aab8ee
[tx-robot] updated from transifex
2013-07-24 01:57:21 -04:00
Jan-Christoph Borchardt
315613a8f3
Bring the Noise
2013-07-23 21:33:15 +02:00
Jan-Christoph Borchardt
c92e0eab97
remove superfluous important
2013-07-23 21:25:07 +02:00
Jan-Christoph Borchardt
84fa84d182
fix browser rendering issues
2013-07-23 18:42:35 +02:00
Jan-Christoph Borchardt
d1a5dfc397
larger log in and installation buttons
2013-07-23 18:41:02 +02:00
Jan-Christoph Borchardt
12990543bc
better whitespace for footer
2013-07-23 18:41:02 +02:00
Jan-Christoph Borchardt
837b158914
cleaner look and code for primary button
2013-07-23 18:41:01 +02:00
Jan-Christoph Borchardt
6dfbe21446
input fields work on any background now
2013-07-23 18:41:01 +02:00
Jan-Christoph Borchardt
c524c04808
add some padding to footer
2013-07-23 18:41:01 +02:00
Jan-Christoph Borchardt
dc82e29949
adjust labels and input field groups
2013-07-23 18:41:00 +02:00
Jan-Christoph Borchardt
31bf24a116
more beautiful warnings
2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt
74edfd79f5
fix and checkstyle for show password toggle
2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt
acb26c3a52
increase button size, adjust remember checkbox
2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt
9568fefb80
move log in button CSS to appropriate place
2013-07-23 18:36:46 +02:00
Jan-Christoph Borchardt
89d0d7f58b
adjust text colors for remember and footer
2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt
622c567c1f
larger clickable area for remember log in
2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt
38bfae57fe
sticky footer
2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt
fd4638c229
primary button adjustments
2013-07-23 18:36:45 +02:00
Jan-Christoph Borchardt
14edfa52ea
input field adjustments for new full-color background on log in
2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt
c478234f6a
fix general reset CSS issue which caused gradient background to cut off
2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt
107ace42b8
rip out unneeded #login div, replace with existing body-login
2013-07-23 18:36:44 +02:00
Jan-Christoph Borchardt
9982f47ab5
initial WIP for cleaner log in page
2013-07-23 18:36:44 +02:00
Jörn Friedrich Dreyer
ab77af7b4d
Merge pull request #4159 from owncloud/Fixing-share-sj-error
...
Fixing share JS error
2013-07-23 08:23:15 -07:00
Thomas Müller
2a42021815
Merge branch 'master' into delete-fix
...
Conflicts:
core/css/styles.css
2013-07-23 16:24:34 +02:00
Victor Dubiniuk
cdb993ad69
Explicit ie8 fallback
2013-07-23 17:13:12 +03:00
Victor Dubiniuk
ab997bdc68
Create an array entry before filling it
2013-07-23 14:57:58 +03:00
Jenkins for ownCloud
a94c55be98
[tx-robot] updated from transifex
2013-07-23 02:03:19 -04:00
Victor Dubiniuk
5160ea6063
Show generic error when there is no error
2013-07-22 21:02:18 +03:00
Thomas Müller
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
Morris Jobke
647e0a0cba
Merge pull request #4118 from owncloud/remove-size-experiment
...
finally remove the file size obfuscation as it had more disadvantages.
2013-07-21 01:25:39 -07:00
Jenkins for ownCloud
9a13b687cc
[tx-robot] updated from transifex
2013-07-21 02:02:41 -04:00
Jan-Christoph Borchardt
35fc149ef0
deactivate show password toggle for IE
2013-07-19 15:17:28 +02:00
Jenkins for ownCloud
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
Jan-Christoph Borchardt
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
Jan-Christoph Borchardt
8a25d1ad06
remove unnecessary tipsy for Files delete
2013-07-18 18:41:01 +02:00
Jan-Christoph Borchardt
197c979d26
use background image instead of img for Files delete icon
2013-07-18 18:40:09 +02:00
Jan-Christoph Borchardt
cab792323d
make delete icon less intrusive again, only on hover
2013-07-18 18:31:56 +02:00
Jenkins for ownCloud
279a71acb3
[tx-robot] updated from transifex
2013-07-18 02:02:51 -04:00
Jenkins for ownCloud
210006c4a6
[tx-robot] updated from transifex
2013-07-17 02:28:02 -04:00
Jakob Sack
bb0c5bff5f
Add multiple plural forms to the php part
2013-07-16 22:16:53 +02:00
Jenkins for ownCloud
a8acbfdf7b
[tx-robot] updated from transifex
2013-07-16 02:06:21 -04:00
Jenkins for ownCloud
583addaea1
[tx-robot] updated from transifex
2013-07-13 02:07:35 +02:00
Thomas Müller
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
Jenkins for ownCloud
3fbf7ab189
[tx-robot] updated from transifex
2013-07-12 02:12:25 +02:00
kondou
10cc0511af
Optimize images with optipng and scour
2013-07-12 01:36:10 +02:00
Georg Ehrke
14a35267c1
OC\Preview - outsource static methods
2013-07-11 20:35:55 +02:00
Jan-Christoph Borchardt
20791e0ad1
use themable strings for installation
2013-07-11 17:39:44 +02:00
Jan-Christoph Borchardt
aacca494c5
introduce shortname themable string and split from title, use for image alt text
2013-07-11 16:38:07 +02:00
Jörn Friedrich Dreyer
c5f2ea9a95
Merge pull request #4015 from owncloud/fixing-4005-master
...
EventSource and update fixes [master]
2013-07-11 03:33:47 -07:00
Jenkins for ownCloud
f74659f3f6
[tx-robot] updated from transifex
2013-07-11 02:26:22 +02:00
Thomas Müller
d18bd17eb7
- eventsource.php: in case of potential CSRF attack we send an error message from the EventSource to the browser
...
- eventsource.js: handle undefined data on event
- update.js: in case of error we close the event source - advise the user to reload the page
- update.php: EventSource initialization is now done before we enter the maintenance mode in order to allow browser reload in case of possible CSRF attack
2013-07-11 00:27:21 +02:00
Georg Ehrke
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
Georg Ehrke
832779804d
add two new icons - for copyright see filetypes/readme-2.txt
2013-07-10 12:30:20 +02:00
kondou
4cd87549e1
Close.png instead of delete.png for close dialogs
2013-07-10 04:39:22 +02:00
Jenkins for ownCloud
7ec6f3bde9
[tx-robot] updated from transifex
2013-07-10 02:20:59 +02:00
Jan-Christoph Borchardt
b44cab5acc
prevent ugly selection effect on accidental selection, fix #3713
2013-07-09 22:04:22 +02:00
Jan-Christoph Borchardt
bbad1ad21e
more whitespace for user menu
2013-07-09 22:04:21 +02:00
Jan-Christoph Borchardt
583d068590
more small whitespace fixes for the app list
2013-07-09 22:04:21 +02:00
Jan-Christoph Borchardt
a5c84768f1
more whitespace WIP 2
2013-07-09 22:04:21 +02:00