Thomas Mueller
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
Thomas Mueller
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Jenkins for ownCloud
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
Bernhard Posselt
b659072686
dont show horizontal scrollbar
2013-01-16 19:55:16 +01:00
Bernhard Posselt
b7f507b925
dont resize content div with javascript but use css box-sizing to do it
2013-01-16 19:38:19 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Jenkins for ownCloud
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
Bart Visscher
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Jenkins for ownCloud
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Lukas Reschke
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
Jenkins for ownCloud
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
Jenkins for ownCloud
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
Lukas Reschke
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
Lukas Reschke
216a5af396
Remove uneeded file
...
logout.php is a legacy file, which isn't used anymore in the ownCloud
code.
2013-01-11 16:49:55 +01:00
Lukas Reschke
1eb3c8ecf6
Correct link to the bugtracker in exception.php
2013-01-11 16:42:06 +01:00
Thomas Mueller
7fe8fb4248
pin notification to the top
2013-01-11 15:21:39 +01:00
Thomas Mueller
c2b3c7ed3e
fixing text-align on navigation menu - closing div was missing - THX Lukas
2013-01-11 15:19:53 +01:00
Thomas Mueller
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Jenkins for ownCloud
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
Jenkins for ownCloud
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
Jenkins for ownCloud
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
Thomas Mueller
bfc55fef89
bring back L250 as spotted by @tanghus - THX
2013-01-08 00:24:35 +01:00
Thomas Mueller
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
Jörn Friedrich Dreyer
0dda8f5d1c
ie8 ignores rgba, show button border in ie8 by adding second border css row
2013-01-07 13:09:52 +01:00
Jörn Friedrich Dreyer
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
Jörn Friedrich Dreyer
3dbb148567
Merge pull request #1061 from owncloud/remove_css_not_selector_to_fix_ie8_input_fields
...
remove css not selector - incompatible with ie8
2013-01-07 01:17:19 -08:00
Thomas Müller
7ca740fa3d
Merge pull request #632 from owncloud/fix_629
...
fix pattern for database names - #629
2013-01-06 14:03:02 -08:00
Thomas Mueller
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Thomas Mueller
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
Thomas Mueller
a867b36e7f
js optimisations and style fixes
2013-01-06 10:41:07 +01:00
Thomas Mueller
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
Michael Gapczynski
035d0aa9d5
Merge branch 'master' into update-progress
2013-01-05 12:24:21 -05:00
Michael Gapczynski
5ea8adc7c7
Reformat long line
2013-01-05 12:21:57 -05:00
Michael Gapczynski
f6426cee04
Tweak failure message and throw exceptions from updateDbFromStructure()
2013-01-05 12:13:36 -05:00
Michael Gapczynski
6b2216f0d6
Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache
2013-01-05 11:09:48 -05:00
Michael Gapczynski
a94405b4e4
Only show the version updating to instead of worrying about converting internal to a formatted version
2013-01-04 20:13:00 -05:00
Jenkins for ownCloud
934d9dcc42
[tx-robot] updated from transifex
2013-01-05 00:03:58 +01:00
Thomas Mueller
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
Thomas Müller
913c96ddc5
Merge pull request #1081 from owncloud/fix-issue-1075
...
Remove echo from lost password page
2013-01-04 10:17:25 -08:00
Michael Gapczynski
394cebc90f
Remove echo from lost password page
2013-01-04 11:12:28 -05:00
Michael Gapczynski
e7eea3dd2e
Use hooks to send updates from apps
2013-01-04 10:21:33 -05:00
Jenkins for ownCloud
90f39cd703
[tx-robot] updated from transifex
2013-01-04 13:23:31 +01:00
Michael Gapczynski
7505837079
Basic update progress of database update only
2013-01-03 21:32:33 -05:00
Jenkins for ownCloud
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
Jörn Friedrich Dreyer
e2f549f6d7
remove css not selector - incompatible with ie8
2013-01-02 18:01:33 +01:00