Homec4science

Merge branch 'master' into next

Authored by kuncar on Mar 4 2015, 09:33.

Description

Merge branch 'master' into next

  • Changes search and formatter models in order to reflect new column defaults.
  • Removes support for differentiation between guests from login extension.
  • master: Invenio v1.2.0 docs: more complete list of past authors BibSched: completion of distribution files BibRank: completion of distribution files BibDocFile: completion of distribution files BibEdit: addition of ticket template sub-directory I18N: PO file update for the release of v1.2.0 I18N: more complete POTFILES.in installation: new release_1_2_0 upgrade recipe installation: 2015_03_03_tag_value upgrade recipe installation: 2013_09_16_aidPERSONIDDATA fix installation: 2014_08_12_format upgrade recipe fix BibIndex: ambiguous SQL query fix for MariaDB-5.5 WebSession: no differentiation between guests BibIndex: tag.recjsonvalue NOT NULL Invenio v1.1.5 I18N: PO file update for the release of v1.1.5 Invenio v1.0.8 I18N: PO file update for the release of v1.0.8

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>

Conflicts:
AUTHORS
INSTALL
RELEASE-NOTES
invenio/base/translations/cs/LC_MESSAGES/messages.po
invenio/legacy/bibcirculation/webinterface.py
invenio/legacy/webbasket/webinterface.py
invenio/legacy/webuser.py
invenio/modules/accounts/templates/accounts/logout_base.html
modules/bibedit/lib/Makefile.am
modules/bibrank/etc/Makefile.am
modules/bibsched/lib/Makefile.am
modules/webbasket/lib/webbasket_regression_tests.py
modules/webstat/lib/webstat_regression_tests.py

Details

Committed
kuncarMar 4 2015, 09:50
Parents
R3600:1f44bd56885d: Invenio v1.2.0
R3600:d6e3f1947fb7: installation: redis server name
Branches
Unknown
Tags
Unknown

Event Timeline

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:fabfb9c32b0c: Merge branch 'master' into next (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Mar 4 2015, 09:50

Merged Changes

CommitAuthorDetailsCommitted
1f44bd56885dTibor Simko
Invenio v1.2.0 
Mar 3 2015
db167ac34062Tibor Simko
Merge branch 'maint-1.1' 
Mar 3 2015
83182926ce25Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Mar 3 2015
2e4ee8078ba0Tibor Simko
docs: more complete list of past authors 
Mar 3 2015
44dddc2c08c6Tibor Simko
BibSched: completion of distribution files 
Mar 3 2015
c75240a15c3bTibor Simko
BibRank: completion of distribution files 
Mar 3 2015
791c42e8bb81Tibor Simko
BibDocFile: completion of distribution files 
Mar 3 2015
507ba2f8fed0Tibor Simko
BibEdit: addition of ticket template sub-directory 
Mar 3 2015
8ed079318324Tibor Simko
I18N: PO file update for the release of v1.2.0 
Mar 3 2015
b29aa1233692Tibor Simko
I18N: more complete POTFILES.in 
Mar 3 2015
f9f2ea64c77eTibor Simko
installation: new release_1_2_0 upgrade recipe 
Mar 3 2015
b06ba9b37763Tibor Simko
installation: 2015_03_03_tag_value upgrade recipe 
Mar 3 2015
6f1c5be41ea9Tibor Simko
installation: 2013_09_16_aidPERSONIDDATA fix 
Mar 3 2015
0432d58528a1Tibor Simko
installation: 2014_08_12_format upgrade recipe fix 
Mar 3 2015
d446c9099e72Samuele Kaplun/Tibor Simko
BibIndex: ambiguous SQL query fix for MariaDB-5.5 
Mar 3 2015
912b49c96c46Samuele Kaplun/Tibor Simko
WebSession: no differentiation between guests 
Mar 3 2015
e128e971e980Samuele Kaplun/Tibor Simko
BibIndex: tag.recjsonvalue NOT NULL 
Mar 3 2015
9499f84f4a71Tibor Simko
Merge branch 'maint-1.1' 
Mar 2 2015
41356789d2f1Tibor Simko
Invenio v1.1.5 
Mar 2 2015
f661f395aa60Tibor Simko
Merge branch 'maint-1.1' 
Mar 2 2015
f8e3da188053Tibor Simko
I18N: PO file update for the release of v1.1.5 
Mar 2 2015
15ecd1e73650Tibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Mar 2 2015
d25ef5c6dd8bTibor Simko
Invenio v1.0.8 
Mar 2 2015
24f3c2de5aadTibor Simko
Merge branch 'maint-1.0' into maint-1.1 
Mar 2 2015
33380fc4ce10Tibor Simko
I18N: PO file update for the release of v1.0.8 
Mar 2 2015