Bjoern Schiessle
48ee265170
urlencode link fort password reset (bug #970 )
2012-06-13 17:26:30 +02:00
Bjoern Schiessle
b9d5f510c3
urlencode link fort password reset (bug #970 )
2012-06-13 17:22:28 +02:00
Lukas Reschke
6defbc7f4d
Removed some unessecary sanitizations
2012-06-11 19:20:48 +02:00
Lukas Reschke
2b22c538c8
Make some apps compatible
2012-06-11 19:07:51 +02:00
Georg Ehrke
82abbed883
Merge branch 'master' into oc_error
2012-06-10 18:38:38 +02:00
Robin Appelman
8f616ecf76
fix potential xss in multiselect
2012-06-09 15:08:05 +02:00
Robin Appelman
cfe219fbb9
fix potential xss in multiselect
2012-06-09 15:07:16 +02:00
Georg Ehrke
f43fd1765e
fix merge conflicts
2012-06-08 11:23:58 +02:00
Bart Visscher
4260dce826
Better handling of core.css and core.js
...
Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
2012-06-07 21:35:40 +02:00
Brice Maron
cf02f3c107
Merge branch 'master' into multi_app_dir
2012-06-07 19:11:55 +00:00
Michael Gapczynski
d28e0f4d5b
Remove old internal mail call for password reset, fixes bug oc-934
...
Conflicts:
core/lostpassword/index.php
2012-06-07 09:36:23 -04:00
Michael Gapczynski
3c3a2b9b27
Remove old internal mail call for password reset, fixes bug oc-934
2012-06-07 09:25:50 -04:00
Brice Maron
5c2b2fc842
Change app path logic in templates
2012-06-06 20:24:16 +00:00
Brice Maron
cc494259d3
Unit path and webpath, correct some more
2012-06-06 20:24:15 +00:00
Georg Ehrke
fa0c45b005
Merge branch 'master' into oc_error
2012-06-06 10:12:54 +02:00
Robin Appelman
f1b10fcc93
update translations
2012-06-06 00:29:44 +02:00
Robin Appelman
f7d221f5f0
update translations
2012-06-06 00:29:28 +02:00
Bart Visscher
eed0450351
Fix remap dir for CSS minimizer
2012-06-05 18:09:32 +02:00
Bart Visscher
7e017253f5
Load apps before minimizing the core css and js
2012-06-04 23:17:50 +02:00
Bart Visscher
4a5973662c
Merge branch 'unstable'
...
Conflicts:
apps/files_external/tests/config.php
apps/files_versions/ajax/getVersions.php
apps/files_versions/appinfo/app.php
apps/files_versions/history.php
apps/files_versions/js/versions.js
apps/files_versions/templates/history.php
apps/files_versions/versions.php
lib/base.php
2012-06-04 23:02:05 +02:00
Georg Ehrke
b8275691e7
Merge branch 'master' into oc_error
2012-06-04 10:35:50 +02:00
Frank Karlitschek
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
Frank Karlitschek
5d425a9f79
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:16:44 +02:00
Georg Ehrke
94c633b6b7
Merge branch 'master' into oc_error
2012-05-26 22:54:49 +02:00
Frank Karlitschek
a945fa10a6
update copyright
2012-05-26 19:14:24 +02:00
Georg Ehrke
79bf933319
Merge branch 'master' into oc_error
2012-05-25 10:30:44 +02:00
Thomas Mueller
ede89ee405
oc-657: icons for M$ office file types
2012-05-21 09:35:31 +02:00
Michiel de Jong
fc536c3491
add htmlentities() call into login form
2012-05-18 16:12:49 +02:00
Georg Ehrke
3d713e711b
Merge branch 'master' into oc_error
2012-05-17 22:17:31 +02:00
Michael Gapczynski
cbfbbe672c
Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
...
Conflicts:
apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
Robin Appelman
58adeaa80a
only check our own input fields when determining to show the login button
...
fixes a problem with browser plugins adding hidden inputs
2012-05-17 01:17:44 +02:00
Robin Appelman
ac8bfc218e
update translations
2012-05-17 00:36:21 +02:00
Bart Visscher
ce1e4425c2
Combine and minimize core and default app js files
2012-05-16 18:53:46 +02:00
Bart Visscher
f71fec8cdc
Combine and minimize core and default app css files
2012-05-16 18:53:46 +02:00
Michiel de Jong
4c6d11e223
move auth.css and remoteStorage-big.png to assets folders From where they can be included
2012-05-14 17:05:35 +02:00
Michael Gapczynski
198b73ddd1
Sanitize search queries, thanks to Lukas Reschke
2012-05-13 15:57:46 -04:00
Robin Appelman
ee0294bbb1
update translations
2012-05-13 20:00:34 +02:00
Georg Ehrke
a5f0ac811f
Merge branch 'master' into oc_error
2012-05-13 19:13:31 +02:00
Robin Appelman
9eb91a111d
update to jquery 1.7.2
2012-05-12 00:37:19 +02:00
Bart Visscher
20499e336b
Remove duplicate line
2012-05-11 22:13:05 +02:00
Jan-Christoph Borchardt
00e1d174a9
fixed settings text not being clickable
2012-05-11 12:24:49 +00:00
Michael Gapczynski
59a2616105
Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links
2012-05-10 23:04:27 -04:00
Jan-Christoph Borchardt
d1e5a56bc6
fixing upload icon color
2012-05-10 21:40:22 +02:00
Tom Needham
bf93b9e98a
Make select_all checkbox more central
2012-05-10 18:08:46 +00:00
Jan-Christoph Borchardt
20f8137ca0
upload button goes MJ
2012-05-10 20:05:30 +02:00
Vitaly Kuznetsov
6f981738bb
Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example)
2012-05-10 09:10:53 +00:00
Robin Appelman
588b51d88a
update translations
2012-05-09 12:41:01 +02:00
Michael Gapczynski
52d113b9e1
Prevent extra '/' from being added to url if app is not defined
2012-05-07 12:35:02 -04:00
Simon Birnbach
df6b15445d
Fix bug on browsers like rekonq which stopped execution of javascript
2012-05-07 17:35:23 +02:00
Georg Ehrke
936c8ba1cc
improve remote.php and create public.php
2012-05-07 15:39:17 +02:00
Bart Visscher
2facf509cc
Merge branch 'tasks' for Tasks app
2012-05-05 18:26:13 +02:00
Florian Hülsmann
4a7591d0ab
Custom icons for contacts app
2012-05-05 16:31:58 +02:00
Thomas Tanghus
2580d8540d
Dialogs: Clean indentation. Add some missing brackets.
2012-05-05 13:49:47 +02:00
Bart Visscher
a004759230
Tasks: Really correct icon
2012-05-04 20:44:11 +02:00
Thomas Tanghus
d9592ddcb0
Tried to make settings/apps more keyboard/screenreader friendly.
2012-05-04 17:56:00 +02:00
Bart Visscher
1e47156226
Merge branch 'master' into tasks
2012-05-04 17:04:11 +02:00
Thomas Tanghus
27da29525a
Made the global settings icon accessable via keyboard.
...
Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
2012-05-04 09:53:36 +02:00
Thomas Tanghus
8d1754041e
VCategories: Check if any categories are selected before json call. Add Close button. Remove log calls.
2012-05-04 01:33:47 +02:00
Thomas Tanghus
a4a3d62a55
Check for callback in OC.dialogs.alert.
2012-05-04 00:13:35 +02:00
Bartek Przybylski
5611e6c9d3
fix incorrect dialog computing in ff
2012-05-03 12:32:37 +02:00
Bartek Przybylski
8feb7dd9d9
fix filepicker in webkit
2012-05-03 12:09:59 +02:00
Bart Visscher
71f9b1968e
Tasks: Make it possible to close the details area
2012-05-02 17:28:19 +02:00
Georg Ehrke
c536e930f4
add appswebroot to the guest template
2012-05-02 16:41:23 +02:00
unknown
98e0db15a2
correction of bug oc-393 in using owncloud V2, V3, V4 with android browser :
...
JSON.parse(null) results in 'Uncaught illegal access' and not 'null' (see google for details)
solved
Signed-off-by: bourgeoa
2012-05-01 23:46:51 +02:00
Frank Karlitschek
051cb7d96b
show the username in the title. good idea.
2012-04-30 13:08:32 +02:00
Thomas Mueller
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
Thomas Tanghus
9c520c70a8
Various file path fixes.
2012-04-30 01:48:01 +02:00
Georg Ehrke
993d655aad
Merge branch 'master' into movable_apps_2
2012-04-27 10:30:50 +02:00
Frank Karlitschek
74b5e22a68
some more csrf fixes
2012-04-26 23:17:46 +02:00
Georg Ehrke
6930af4c0f
Merge branch 'master' into movable_apps_2
2012-04-26 21:27:22 +02:00
Frank Karlitschek
6bdefef31e
csrf protection
2012-04-26 19:35:33 +02:00
Georg Ehrke
2b10371bde
fix merge conflicts
2012-04-26 18:08:49 +02:00
Georg Ehrke
40f95ffdf3
fix security check for the path of the requested file
2012-04-26 17:55:00 +02:00
Georg Ehrke
0249a72cab
fix downloading of files in files app
2012-04-26 17:35:12 +02:00
Georg Ehrke
ebcaa46482
fix loading of css files that are core related
2012-04-26 15:19:27 +02:00
Georg Ehrke
3f64eb25ab
some fixes fore movable apps
2012-04-26 14:52:55 +02:00
Sam Tuke
02a65f30ec
added history buttons
2012-04-25 14:01:03 +01:00
Georg Ehrke
d6346b5b0b
fix OC.filePath in main js
2012-04-24 21:54:09 +02:00
Georg Ehrke
a85d49833b
fix position of Semicolon
2012-04-24 21:52:44 +02:00
Georg Ehrke
684007bbae
fix pathes in contacts
2012-04-24 21:33:34 +02:00
Georg Ehrke
42a570788b
Merge branch 'master' into movable_apps
2012-04-23 19:56:07 +02:00
Georg Ehrke
6d92ebca45
use native functions of php to parse the string into the Var
2012-04-23 17:09:28 +02:00
Georg Ehrke
9226cb7a6a
rename var file to getfile to prevent fails in files app
2012-04-23 16:36:24 +02:00
Jan-Christoph Borchardt
1b29fc3fb2
fixing multiselect overflow, issue 341
2012-04-23 14:29:11 +02:00
Jan-Christoph Borchardt
3ba9a9e6a8
adding proper copyright and license notice to the style files
2012-04-23 14:19:03 +02:00
Georg Ehrke
6b9072de58
fix merge conflicts
2012-04-22 13:20:25 +02:00
Georg Ehrke
4c2cf35050
fix merge conflicts
2012-04-22 13:19:12 +02:00
Thomas Tanghus
f08cfcecec
Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet.
2012-04-22 03:59:28 +02:00
Georg Ehrke
e29ae46609
fix merge conflicts
2012-04-21 22:12:31 +02:00
Georg Ehrke
711aa229b8
Merge branch 'master' into movable_apps
2012-04-20 22:41:39 +02:00
Georg Ehrke
12ef2f5054
modify OC.filepath for movable apps
2012-04-20 22:35:12 +02:00
Frank Karlitschek
2fbc92bd4b
new OC_Mail class to handle all mail sending. The benefit is that is way mor flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code
2012-04-20 20:49:35 +02:00
Georg Ehrke
3fb91a7411
restore require once command for non app files
2012-04-18 17:49:50 +02:00
Georg Ehrke
eb29c577c2
Merge branch 'master' into movable_apps
2012-04-18 12:20:09 +02:00
Georg Ehrke
cf492a9649
Merge branch 'master' into calendar_sharing
2012-04-18 11:51:59 +02:00
Georg Ehrke
69ee0efc0b
remove the require_once lib base from all (or nearly all) files
2012-04-17 19:31:29 +02:00
Robin Appelman
cfd0140e2f
fix 2 potential xss problems
2012-04-16 12:59:38 +02:00
Jan-Christoph Borchardt
3c182bdb35
adding sticker logo jpg
2012-04-16 12:57:17 +02:00
Jan-Christoph Borchardt
961c239ee4
improving leftcontent display, increasing item height
2012-04-16 12:52:48 +02:00
Jan-Christoph Borchardt
70d0103a67
updated logos and icons
2012-04-16 11:34:16 +02:00
Georg Ehrke
c8cb870a27
Merge branch 'master' into oc_error
2012-04-15 22:27:47 +02:00
Georg Ehrke
dc18e65b46
fix merge conflicts
2012-04-15 22:26:55 +02:00
Jan-Christoph Borchardt
e5cda3abcd
tooltip for delete shows up to the left
2012-04-15 17:49:54 +02:00
Jan-Christoph Borchardt
1f91224f9e
fixing opacity and fading, also for IE
2012-04-15 14:37:42 +02:00
Georg Ehrke
8ddea7e95c
Merge branch 'master' into calendar_sharing
2012-04-15 14:28:31 +02:00
Jan-Christoph Borchardt
7ddd043427
renamed extention to extension, also now only showing lowercase
2012-04-15 13:34:30 +02:00
Jan-Christoph Borchardt
5868199e85
fixed settings hover, now whole row sensitive and fading not jerky
2012-04-15 13:34:30 +02:00
Georg Ehrke
e292b1fcdb
fix merge conflicts
2012-04-15 12:43:07 +02:00
Jan-Christoph Borchardt
fbb314ef4b
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-04-14 18:56:55 +02:00
Bart Visscher
30498fd6f8
Use offset function to position block elements
2012-04-14 18:31:41 +02:00
Jan-Christoph Borchardt
a0a5668d1e
increase opacity of search field and logout icon
2012-04-14 17:20:50 +02:00
Robin Appelman
b1bcc60d83
reuse OC_L10N objects
2012-04-14 16:44:15 +02:00
Georg Ehrke
e5e7d4a73a
fix merge conflicts
2012-04-13 16:44:31 -04:00
Georg Ehrke
afcb0aee40
fix merge conflicts
2012-04-13 16:40:10 -04:00
Bart Visscher
b8466d362e
Fix rescan "File not Found" error handling in oc-vcategories.js
2012-04-13 21:13:58 +02:00
Jan-Christoph Borchardt
eea0d2e096
fixing delete tooltip
2012-04-13 18:28:17 +02:00
Jan-Christoph Borchardt
add9673ad6
merging tanghus category CSS
2012-04-13 17:23:56 +02:00
Jan-Christoph Borchardt
31df4c00ec
adding tipsy tooltips for file actions
2012-04-13 17:22:23 +02:00
Bart Visscher
bc81179163
Fix categories delete fallback when there is no app specific ajax categories delete function
2012-04-12 23:10:49 +02:00
Frank Karlitschek
56bc2c4591
add a title attribute to the logout button
2012-04-12 20:34:56 +02:00
unknown
2f3c0a6d80
wrong defaultValue definition in OC.AppConfig.getValue
...
done
2012-04-12 19:14:25 +02:00
Georg Ehrke
ac2d14101c
Merge branch 'master' into calendar_sharing
2012-04-10 20:10:07 -04:00
Bart Visscher
9f547a1b39
VCategories: fix function names to coding standard
2012-04-10 21:53:51 +02:00
Thomas Tanghus
d1ae6512cc
Contacts: Misc. cleanup tweaks.
2012-04-07 16:03:43 +02:00
Bartek Przybylski
96c99125da
mimetype filter for filepicker
2012-04-05 23:18:44 +02:00
Bartek Przybylski
fe3d3be399
filepicker loading style fixup
2012-04-05 22:25:58 +02:00
Bartek Przybylski
5b4a303672
loading screen for filepicker
2012-04-05 21:29:54 +02:00
Florian Hülsmann
8a2c5dda6d
Merge commit 'refs/merge-requests/102' of git://gitorious.org/owncloud/owncloud into merge-requests/102
2012-04-04 21:36:50 +02:00
Tom Needham
85f9869f69
Make the token really random
2012-04-04 13:18:02 +00:00
Tom Needham
95c2ac5d58
Dont typecast variables as integers
2012-04-03 21:14:55 +00:00
Bartek Przybylski
cd05dfb943
adding icons to filepicker
2012-04-03 22:18:03 +02:00
Bartek Przybylski
ff5dbc52b8
multiselect handle for filepicker
2012-04-02 21:32:35 +02:00
Bartek Przybylski
f21d6d4f9f
dialogs filepicker first draft
2012-04-02 19:39:24 +02:00
Robin Appelman
d01b78a4b4
prevent an possible xss exploit
2012-04-01 00:55:49 +02:00
Bartek Przybylski
4e327295c6
adding callback when ok click on alert dialog
2012-04-01 00:30:52 +02:00
Robin Appelman
2f68b08491
fix eventsource for ie
2012-03-31 16:40:42 +02:00
Robin Appelman
ad495a9218
fix potential problem when using multiply eventsource's
2012-03-31 16:10:29 +02:00
Bartek Przybylski
6b704a780d
select field added to oc.dialogs.form, gallery ported to use it
2012-03-30 22:50:57 +02:00
Georg Ehrke
d15959d573
Merge branch 'master' into calendar_sharing
2012-03-29 23:19:31 +02:00
Georg Ehrke
e45e48ff3d
Merge branch 'master' into oc_error
2012-03-29 23:18:47 +02:00
Georg Ehrke
d049d9bd0c
initial commit for OC_Exception
2012-03-29 23:16:19 +02:00
Arthur Schiwon
e2fd0bbf02
IE 8: fix appeareance of checkboxes on login and files pages
2012-03-29 18:32:25 +02:00
Georg Ehrke
ede0a675bc
Merge branch 'master' into calendar_sharing
2012-03-27 20:53:40 +02:00
Thomas Tanghus
0a07e5fdaa
Added some documentation.
2012-03-27 12:30:20 +02:00
Georg Ehrke
96dd008f5e
Merge branch 'master' into calendar_sharing
2012-03-26 09:50:39 +02:00
Georg Ehrke
ec40f69c9e
add error 403 site
2012-03-25 14:16:39 +02:00
Georg Ehrke
19c101a660
fix merge conflicts
2012-03-25 14:02:02 +02:00
Bartek Przybylski
cbdcb68c2b
gallery sharing, experimental version
2012-03-24 18:35:42 +01:00
Nils Jansen
7ed8f39744
as preperation for the sgf viewer app i added a file icon for .sgf files (saved go games), and an according mimetype.
2012-03-23 13:34:07 +01:00
Georg Ehrke
61166c1002
Merge branch 'master' into calendar_sharing
2012-03-21 09:43:29 +01:00
Georg Ehrke
03120959e9
add a proper email address for lostpassword service - bugfix for oc-178
2012-03-19 09:09:18 +01:00
Georg Ehrke
27218f85cb
Merge branch 'master' into calendar_sharing
2012-03-16 12:17:58 +01:00
Thomas Tanghus
03eb5197b6
Added category editor for apps using OC_VObjects.
2012-03-12 14:13:03 +01:00
Bart Visscher
ab760578f8
Allow overflow of rightcontent area
2012-03-07 21:46:42 +01:00
Georg Ehrke
c40668e3a9
Merge branch 'master' into calendar_sharing
2012-03-04 10:10:19 +01:00
Bartek Przybylski
c411826fe5
moving gallery op to one file, migrate gallery dialogs to oc dialogs
2012-03-04 00:35:37 +01:00
Georg Ehrke
f2dcab50b5
fix merge conflicts
2012-03-03 15:06:51 +01:00
Bartek Przybylski
2754cac21f
dialogs library for apps
2012-02-28 23:02:30 +01:00
Alessandro Cosentino
630cee0ef2
bookmarklets should not look like buttons
2012-02-27 18:20:40 -05:00
Roland van Laar
2a351f4456
Fixed off by one bug. List length is 1 larger than the index of the last
...
element.
2012-02-26 22:09:21 +01:00
Robin Appelman
3d0d47957e
improved humanFileSize for js
2012-02-26 14:12:50 +01:00
Robin Appelman
a5e892505e
more robust png fallback
2012-02-26 03:10:29 +01:00
Robin Appelman
797e921b9a
improve log browsing
2012-02-26 03:10:29 +01:00
Georg Ehrke
bfb67286c8
fix merge conflicts
2012-02-25 16:54:27 +01:00
Robin Appelman
8b93a9a237
add javascript bindings for OC_AppConfig
2012-02-25 16:35:40 +01:00
Robin Appelman
862f824d64
some multiselect improvements
2012-02-25 16:35:40 +01:00
Robin Appelman
11cb45bd43
slight change to select style
2012-02-24 23:54:38 +01:00
Marvin Thomas Rabe
b3f3b8c23f
UI problems solved. Bookmarks app updated.
2012-02-22 16:04:31 +01:00
Thomas Mueller
6540bda238
some icons for filetypes have been added.
...
for licensing information please have look at core/img/filetypes/readme-2.txt
2012-02-20 22:33:38 +01:00
Bart Visscher
f47444e1f7
Use separate function to make absolute urls
2012-02-17 22:07:14 +01:00
Georg Ehrke
01827e9340
Merge branch 'master' into calendar_sharing
2012-02-13 17:08:52 +01:00
Bart Visscher
a25bda8e41
Add application name to title
2012-02-12 21:56:01 +01:00
Georg Ehrke
a8b7ae515c
Merge branch 'master' into calendar_sharing
2012-02-10 19:36:00 +01:00
Thomas Tanghus
c95e8a1fc5
Added custom combobox widget.
2012-02-10 16:40:40 +01:00
Thomas Tanghus
90a830baba
Added files for new contact editor/viewer.
2012-02-08 07:59:39 +01:00
Georg Ehrke
f91702d7b5
Merge branch 'master' into calendar
2012-01-31 17:03:48 +01:00
Robin Appelman
fdf3df3de5
add option to send get data along with an eventsource request
2012-01-31 16:35:47 +01:00
Georg Ehrke
538618df62
Merge branch 'master' into calendar
2012-01-31 11:58:40 +01:00
Georg Ehrke
217151eb9c
add textfield style declaration
2012-01-31 11:50:45 +01:00
Robin Appelman
6a1121ab2e
provide server side close option for EventStream
2012-01-30 23:19:58 +01:00
Robin Appelman
45038af948
provide small wrapper around server side events and provide a fallback for IE
2012-01-30 20:21:16 +01:00
Robin Appelman
039bbfde2d
automatically show advanced options when no sqlite is available
2012-01-29 18:00:55 +01:00
Robin Appelman
ad4e305c96
update translations
2012-01-27 00:59:24 +01:00
Robin Appelman
6fccf12299
update translations
2012-01-24 00:42:08 +01:00
Robin Appelman
7ea2923fa8
translation updates
2012-01-20 18:53:45 +01:00
Robin Appelman
965ea96439
update translations
2012-01-16 17:34:53 +01:00
Robin Appelman
b366b0eb52
quick fix for javascript translations
2012-01-16 00:09:43 +01:00
Robin Appelman
a883fcca3c
add user and instance awere localstorage to prevent collisions when using localstorage
2012-01-15 19:22:32 +01:00
Robin Appelman
7cd809b286
update translations
2012-01-15 15:12:58 +01:00
Georg Ehrke
9c04858631
added vcards to the mimetype fix list and renamed the icon for vcards
2012-01-15 11:02:08 +01:00
Robin Appelman
872d301af3
fix inconsitent behaviour when trying to remove yourself from the admin group
2012-01-15 00:50:01 +01:00
Robin Appelman
5cd6e0f4d9
remove some of the flickering in opera
2012-01-15 00:14:42 +01:00
Robin Appelman
56af6ee752
fix some of the styling issues on opera
2012-01-14 23:47:31 +01:00
Robin Appelman
0ac9e56da9
small fix for server svg mimetype detection
2012-01-14 23:41:48 +01:00
Robin Appelman
5eb6071b04
make the minimum width of the multiselect configurable
2012-01-14 23:10:14 +01:00
Tom Needham
ffd47ef4d7
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-13 16:55:55 +00:00
Robin Appelman
f67e5d18e7
update translations
2012-01-11 01:06:59 +01:00
Tom Needham
3f67918522
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2012-01-09 21:17:41 +00:00
Tom Needham
6c78cd2765
Moved .separator to core css
2012-01-09 18:39:09 +00:00
Tom Needham
6dcabdc61c
Fixed merge conflict in /files/ajax/move.php
2012-01-04 16:31:06 +00:00
Georg Ehrke
a1af757ef6
Fix whitespace username in the installation form
2012-01-02 14:21:46 +01:00
Robin Appelman
1415cb8d19
add infieldlabel source
2012-01-01 23:48:38 +01:00
Tom Needham
cbb2db8622
Fix merge conflicts
2012-01-01 01:18:02 +00:00
Tom Needham
5ebf8a87f2
Removed old jquery-ui css and js
2011-12-30 23:08:44 +00:00
Tom Needham
39e67707d7
Updated jquery ui js and css. Improved color scheme.
2011-12-30 22:47:39 +00:00
Bart Visscher
e1b9b65e41
Use correct appid for lostpassword email preference
2011-12-18 23:10:43 +01:00
Georg Ehrke
e5a3ab8aad
Merge branch 'master' into fullcalendar
2011-11-12 15:09:37 +01:00
Robin Appelman
2c68aab198
Merge branch 'master' into newbutton
2011-11-04 03:00:03 +01:00
Brice Maron
c7d1737d47
attempt to manage some special chars in file list
...
Added a jquery function to filter by attributes.
Add more logging in rename file
Use the new function to avoid errors
2011-11-01 22:35:13 +01:00
Bart Visscher
9832a0817d
Merge branch 'master' into fullcalendar
...
Conflicts:
apps/calendar/index.php
2011-10-24 22:40:22 +02:00
Jan-Christoph Borchardt
abf33d32b9
use existing correct info icons
2011-10-23 21:53:00 +02:00
Jan-Christoph Borchardt
0c890a501c
upgraded the new new button. Didn't and doesn't work in Firefox though
2011-10-23 21:51:56 +02:00
Jan-Christoph Borchardt
4140a75a5e
corrected position of in-field labels a bit
2011-10-23 11:46:34 +02:00
Jan-Christoph Borchardt
c28504deca
textfield is now less obtrusive / opaque
2011-10-23 11:46:34 +02:00
Jan-Christoph Borchardt
93c18e9ae3
added all logo source SVGs
2011-10-23 11:46:34 +02:00
Robin Appelman
d46288b0ab
'New' button, needs some css work
2011-10-23 11:40:40 +02:00
Bart Visscher
92fa6f0a48
Fix size calculation with css styling of tipsy popup
2011-10-21 22:08:55 +02:00
Georg Ehrke
9ce15667d5
Merge branch 'calendar' of gitorious.org:owncloud/owncloud
2011-10-16 15:41:00 +02:00
Brice Maron
5d09a5e37e
Add some color in error messages + img for hints
2011-10-16 13:12:11 +02:00
Georg Ehrke
323a98adb7
Merge branch 'master' of gitorious.org:owncloud/owncloud into calendar
2011-10-15 17:16:00 +02:00
Brice Maron
8d4039b678
Add loading message to image lightbox and tweak events
2011-10-14 23:51:51 +02:00
Brice Maron
169dd7da77
Prevent category in jquery-ui on cal. to overflow
2011-10-14 19:09:07 +02:00
Brice Maron
c0b011e714
Initialise hasOtherDB var when not true in installation
2011-10-14 18:04:50 +02:00
Georg Ehrke
a01d10e57d
Merge branch 'master' into calendar
2011-10-13 21:59:16 +02:00
Robin Appelman
d7fa2a0f77
mimetype icon improvements
2011-10-13 16:33:39 +02:00
Tom Needham
deaeab3d92
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-08 15:47:03 +01:00
Marvin Thomas Rabe
bbd96fdd39
webkit searchfield bug fixed
2011-10-08 16:02:43 +02:00
Jan-Christoph Borchardt
71caa4a20c
added code and license links next to version number
2011-10-08 10:10:29 +02:00
Tom Needham
538abb99f1
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:10:50 +01:00
Robin Appelman
1f562a2e83
fixes for the mimetype icons
2011-10-07 18:09:49 +02:00
Tom Needham
65a491eabd
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-07 17:02:56 +01:00
Jan-Christoph Borchardt
ab5e26dd32
renamed icons
2011-10-07 16:30:37 +02:00
Jan-Christoph Borchardt
fa72f1c3cc
some icon corrections
2011-10-07 16:18:47 +02:00
Jan-Christoph Borchardt
0aaa1fb64e
added Silk icons by Mark James (CC-BY)
2011-10-07 16:05:39 +02:00
Bart Visscher
980a0893f0
Change colorselector to use border for selected color
2011-10-07 16:03:26 +02:00
Marvin Thomas Rabe
e345fbd386
conflicts solved
2011-10-06 22:40:11 +02:00
Bart Visscher
3cc7212c82
Add icon for calendar color selector
2011-10-06 21:22:55 +02:00
Marvin Thomas Rabe
7579fc7bc9
updated margins
2011-10-04 21:39:13 +02:00
Tom Needham
2d9c3d75f3
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
2011-10-04 19:17:23 +01:00
Marvin Thomas Rabe
d1518f2901
updated calendar settings
2011-10-04 19:37:26 +02:00
Marvin Thomas Rabe
33f24a42b8
redirect url fixed
2011-10-04 19:27:57 +02:00
Marvin Thomas Rabe
314e84716b
changed shadow transparency to 50%
2011-10-04 18:58:38 +02:00
Marvin Thomas Rabe
de21378291
fixed scrollbar issues
2011-10-04 18:54:07 +02:00
Tom Needham
5c9b069fe5
Updated saving feedback to use loading.gif
2011-10-04 17:43:13 +01:00
Marvin Thomas Rabe
b60f755f4f
fixed height of infield labels
2011-10-04 18:42:53 +02:00
Bart Visscher
e8c6252a4c
Move lostpassword to core dir
2011-10-03 20:44:01 +02:00
Marvin Thomas Rabe
6d8985ceb2
added infield labels. readded fade in of login button. updated label on install page.
2011-10-03 14:41:55 +02:00
Marvin Thomas Rabe
481a37fcf3
Show database only in advanced
2011-10-03 13:32:16 +02:00
Marvin Thomas Rabe
d249e30714
Removed jquery ui files and added own cross image to css.
2011-10-03 01:44:49 +02:00
Marvin Thomas Rabe
41dfce150d
problem with previous selected groups fixed
2011-10-02 15:38:07 +02:00
Marvin Thomas Rabe
c943f48547
fixed link to password recovery. removed duplicated and unused code out of index.php.
2011-10-01 11:08:49 +02:00
Bart Visscher
21a88613a1
Merge branch 'lostpassword'
...
Conflicts:
core/templates/login.php
index.php
lib/util.php
2011-09-30 23:48:20 +02:00
Marvin Thomas Rabe
ddd3599899
added jquery ui icons. otherwise its for casual users impossible to close the new event dialog in the calendar
2011-09-30 20:48:26 +02:00
Marvin Thomas Rabe
e2251a4b38
show typed in username when log in has failed
2011-09-30 20:27:31 +02:00
Marvin Thomas Rabe
0541728404
added text to localisation
2011-09-30 20:23:59 +02:00
Marvin Thomas Rabe
5775421f78
user list has descriptions now
2011-09-30 19:35:25 +02:00
Marvin Thomas Rabe
ccfa2dd24c
Error when only oc_remember_login cookie set fixed.
...
Filled username field when oc_username is set repaired.
Problems with "advanced settings" button in installation wizard fixed.
CSS improved - login and installation now looks more clean.
Request password link removed (email feature not implemented yet).
Database radio button bugs removed.
It is possible to have an empty database password, now ownCloud will support this "security issue".
Ignore Mac OS X ".DSstore" files.
Fade in/out of login button and remember checkbox removed due to some display errors.
2011-09-30 18:25:34 +02:00
Thomas Schmidt
516517dc3c
add margin
2011-09-29 15:55:18 +02:00
Jan-Christoph Borchardt
8d14c489eb
changed short description and styled unobtrusively
2011-09-28 17:14:37 +02:00
Bart Visscher
3fcc7b5949
Use correct name for function state for addScript/addStyle in js
2011-09-26 21:18:56 +02:00
Bart Visscher
950d4e1da4
Move lostpassword code to own app
2011-09-26 21:17:26 +02:00
Bart Visscher
17e631bc5e
Use OC_JSON for json responses
...
Create OC_JSON class, for single point of creating json responses.
No real logic change, this just cleans up the code a bit.
2011-09-25 22:19:28 +02:00
Jan-Christoph Borchardt
7f83176306
no mickey mouse hand for quota bar
2011-09-24 22:13:35 +02:00
Jan-Christoph Borchardt
408c391f83
removed deprecated images and icons
2011-09-24 22:09:41 +02:00
Jan-Christoph Borchardt
c09b125131
relabeled Finish setup button with 'Finishing ...'
2011-09-24 21:56:40 +02:00
Robin Appelman
63907a7508
dont submit the setup form to a new tab
2011-09-24 19:07:24 +02:00
Florian Pritz
e0d013b25e
settings/personal: remove padding from quota bar
...
The text will stay in it's place, but 0% usage will lead to an empty
bar.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:02 +02:00
Florian Pritz
2267b6e97d
use jquery 1.6.4
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:43 +02:00
Bart Visscher
b73f72f62c
After clicking Finish button:
...
- change value to "Please wait...."
- disable all the inputs & buttons
- submit new form, because disabled inputs are not submitted to the server
2011-09-23 19:40:06 +02:00
Bart Visscher
e9950defb2
Make event category choice multiselect
2011-09-23 19:40:06 +02:00
Jan-Christoph Borchardt
5559a0dede
updated translations
2011-09-23 19:08:02 +02:00
Bart Visscher
82c7598861
Remove global vars and use the OC static version.
...
Removed global vars are DOCUMENTROOT, SERVERROOT, SUBURI, WEBROOT and CONFIG_DATADIRECTORY
2011-09-18 19:37:54 +02:00
Bart Visscher
f0da2a2258
Add class versions for leftcontent and rightcontent in css
2011-09-17 01:55:05 +02:00
Bart Visscher
7c9f1007d5
Fix initial visibility of database settings in setup
2011-09-14 23:36:22 +02:00
Jakob Sack
e5e4277ff3
Adding "#leftcontent li.active" for using :active with jQuery
2011-09-08 23:37:07 +02:00
Jan-Christoph Borchardt
d6e9bbfcfa
yet another translation update
2011-09-04 18:16:00 +02:00
Jan-Christoph Borchardt
75383a8308
small wording changes
2011-09-04 18:13:53 +02:00
Jan-Christoph Borchardt
14bbd6f976
updated translations
2011-09-04 18:12:58 +02:00
Jan-Christoph Borchardt
a47f22a275
clarified what we do
2011-09-04 16:38:45 +02:00
Jan-Christoph Borchardt
2fed316efa
hid localhost field for SQLite
2011-09-04 15:03:25 +02:00
Jan-Christoph Borchardt
252bca5057
removed database table prefix choice, use oc_
2011-09-04 14:56:09 +02:00
Jan-Christoph Borchardt
1bf215cd08
updated translations
2011-09-03 15:08:58 +02:00
Jan-Christoph Borchardt
5700d8d6b1
added labels for the other advanced fields, thanks to Elias Probst for the suggestion
2011-08-30 09:17:25 +02:00
Michael Gapczynski
427747abba
Cleanup in login templates and link to lost password reset
2011-08-29 15:01:05 -04:00
Michael Gapczynski
1c955606a1
Initial work on resetting forgotten passwords. It works, but still need to email a token to allow reset
2011-08-29 14:37:18 -04:00
Jan-Christoph Borchardt
bcfdc12852
fixed tipsy gravity for multiselect file actions
2011-08-28 08:46:38 +02:00
Michael Gapczynski
fef7e9d5f4
Style changes for multiselect and add tipsy for file size
2011-08-27 22:16:39 -04:00
Jan-Christoph Borchardt
0054197d02
updated translations
2011-08-28 01:14:32 +02:00
Michael Gapczynski
6ec4d58508
Searchbox hover and focus now changes background color
2011-08-27 16:53:25 -04:00
Michael Gapczynski
0b17a542cb
Fix searchbox enter action
2011-08-27 16:36:15 -04:00
Jan-Christoph Borchardt
464c75e4b2
fix search box position for Chromium. Firefox, well ...
2011-08-27 20:10:26 +02:00
Jan-Christoph Borchardt
ee8c252404
fixed search box position, thanks Michael
2011-08-27 20:04:53 +02:00
Jan-Christoph Borchardt
897bc55d46
Revert "Style searchbox like other textboxes"
...
The search box style is a design decision, search boxes are always styled differently from other inputs.
This reverts commit 9d48ca75ff
.
2011-08-27 20:02:11 +02:00
Michael Gapczynski
b9565cb174
Merge branch 'master' of git://anongit.kde.org/owncloud
2011-08-27 13:42:10 -04:00
Michael Gapczynski
9d48ca75ff
Style searchbox like other textboxes
2011-08-27 13:42:03 -04:00
Côme BERNIGAUD
0e8d3251f5
Added overflow:hidden on the navigation menu
...
That way Apps that have a long name (like OpenStreetGame for instance)
show their name troncated instead of continuing over the application frame.
2011-08-27 18:10:15 +02:00
Michael Gapczynski
46af991574
Remove Chrome focus border from all inputs
2011-08-24 20:00:29 -04:00
Jan-Christoph Borchardt
900382057d
updated translations
2011-08-23 11:20:37 +02:00
Robin Appelman
d5ba4ec825
some improvements in automatic svg replacement
2011-08-22 15:20:24 +02:00
Robin Appelman
13b7cb59eb
also replace svg images with png when the server doesn't send the correct mimetype for svg images
...
(which breaks svg images for most browsers)
2011-08-22 14:53:52 +02:00