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
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
Morris Jobke
4a00b26029
add visualize
2013-08-28 16:29:27 +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
Christopher
90da518e3e
Merge pull request #4262 from owncloud/fix_jslint_kondou
...
Fix some JSLint warnings
2013-08-20 12:45:10 -07: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
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
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
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
Jan-Christoph Borchardt
d2767faf61
Merge pull request #4113 from owncloud/delete-fix
...
Delete icon fix
2013-08-15 15:31:42 -07: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
Morris Jobke
5fb7aab7a0
remove jPlayer css rules from core css file
2013-08-15 16:08:49 +02:00
Thomas Tanghus
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +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
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
kondou
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
Owen Winkler
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -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
Thomas Müller
d97e3c3571
adding proper evaluation of plural form - uses LGPL licensed code of jsgettext
2013-08-03 23:31:49 +02: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
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
kondou
aaf0fec9f5
Fix some JSLint warnings
2013-07-31 21:21:02 +02:00
Thomas Müller
17c36b5074
fixes #4026
2013-07-30 10:26:42 +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
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
ab997bdc68
Create an array entry before filling it
2013-07-23 14:57:58 +03: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
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
Jakob Sack
bb0c5bff5f
Add multiple plural forms to the php part
2013-07-16 22:16:53 +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
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
Jörn Friedrich Dreyer
5513e30752
Merge pull request #3920 from owncloud/Fixing_search_ie8
...
[ie8] Fix lazy CSS loading and missing borders in search dropdown
2013-07-09 05:29:18 -07:00
Jakob Sack
4e214883d6
Partly integrate plural translations into js
2013-07-07 20:26:09 +02:00
Thomas Müller
18b11f76b1
fixing === and ident
2013-07-05 15:27:14 +02:00
Thomas Müller
59b700a550
Merge branch 'master' into fixing-3934-master
...
Conflicts:
core/js/share.js
2013-07-05 13:52:33 +02:00
Thomas Müller
27c0cc7fda
no anonymous upload on read-only folders
2013-07-05 11:23:08 +02:00